aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-11-12 01:47:01 -0500
committerAvi Kivity <avi@redhat.com>2011-01-12 04:29:12 -0500
commite5f3f027960128035a5fa176877b5e9160b35397 (patch)
tree7c8ad1d7cd4d5ab21a71dfe23f0bdf9a0b98caf3
parent5054c0de664dbbb47f1e6b69d668b6018df832f6 (diff)
KVM: MMU: clear apfs if page state is changed
If CR0.PG is changed, the page fault cann't be avoid when the prefault address is accessed later And it also fix a bug: it can retry a page enabled #PF in page disabled context if mmu is shadow page This idear is from Gleb Natapov Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index b7ee61d5bc81..9b875ff05410 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -520,6 +520,9 @@ int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
520 520
521 kvm_x86_ops->set_cr0(vcpu, cr0); 521 kvm_x86_ops->set_cr0(vcpu, cr0);
522 522
523 if ((cr0 ^ old_cr0) & X86_CR0_PG)
524 kvm_clear_async_pf_completion_queue(vcpu);
525
523 if ((cr0 ^ old_cr0) & update_bits) 526 if ((cr0 ^ old_cr0) & update_bits)
524 kvm_mmu_reset_context(vcpu); 527 kvm_mmu_reset_context(vcpu);
525 return 0; 528 return 0;