diff options
author | Avi Kivity <avi@redhat.com> | 2012-05-14 19:07:56 +0400 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-05-17 01:09:26 +0400 |
commit | d8368af8b46b904def42a0f341d2f4f29001fa77 (patch) | |
tree | 00ae5723342936821b855356544bef08ac967b3d /include/linux/kvm.h | |
parent | c142786c6291189b5c85f53d91743e1eefbd8fe0 (diff) | |
download | linux-d8368af8b46b904def42a0f341d2f4f29001fa77.tar.xz |
KVM: Fix mmu_reload() clash with nested vmx event injection
Currently the inject_pending_event() call during guest entry happens after
kvm_mmu_reload(). This is for historical reasons - we used to
inject_pending_event() in atomic context, while kvm_mmu_reload() needs task
context.
A problem is that nested vmx can cause the mmu context to be reset, if event
injection is intercepted and causes a #VMEXIT instead (the #VMEXIT resets
CR0/CR3/CR4). If this happens, we end up with invalid root_hpa, and since
kvm_mmu_reload() has already run, no one will fix it and we end up entering
the guest this way.
Fix by reordering event injection to be before kvm_mmu_reload(). Use
->cancel_injection() to undo if kvm_mmu_reload() fails.
https://bugzilla.kernel.org/show_bug.cgi?id=42980
Reported-by: Luke-Jr <luke-jr+linuxbugs@utopios.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'include/linux/kvm.h')
0 files changed, 0 insertions, 0 deletions