summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/mmu.c
diff options
context:
space:
mode:
authorXiao Guangrong2010-07-16 05:23:04 +0200
committerAvi Kivity2010-08-02 05:40:57 +0200
commitdaa3db693ce925a14b7e17ab6f306dc0e6a5342c (patch)
tree1511926bdec125fca374320924dacce8b49d84c3 /arch/x86/kvm/mmu.c
parentKVM: MMU: add missing reserved bits check in speculative path (diff)
downloadkernel-qcow2-linux-daa3db693ce925a14b7e17ab6f306dc0e6a5342c.tar.gz
kernel-qcow2-linux-daa3db693ce925a14b7e17ab6f306dc0e6a5342c.tar.xz
kernel-qcow2-linux-daa3db693ce925a14b7e17ab6f306dc0e6a5342c.zip
KVM: MMU: fix broken page accessed tracking with ept enabled
In current code, if ept is enabled(shadow_accessed_mask = 0), the page accessed tracking is lost. Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r--arch/x86/kvm/mmu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d2ea9cabc066..9b3b916ebeae 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -687,7 +687,7 @@ static void drop_spte(struct kvm *kvm, u64 *sptep, u64 new_spte)
if (!is_rmap_spte(old_spte))
return;
pfn = spte_to_pfn(old_spte);
- if (old_spte & shadow_accessed_mask)
+ if (!shadow_accessed_mask || old_spte & shadow_accessed_mask)
kvm_set_pfn_accessed(pfn);
if (is_writable_pte(old_spte))
kvm_set_pfn_dirty(pfn);
@@ -815,7 +815,8 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
kvm_set_pfn_dirty(spte_to_pfn(*spte));
old_spte = __xchg_spte(spte, new_spte);
if (is_shadow_present_pte(old_spte)
- && (old_spte & shadow_accessed_mask))
+ && (!shadow_accessed_mask ||
+ old_spte & shadow_accessed_mask))
mark_page_accessed(pfn_to_page(spte_to_pfn(old_spte)));
spte = rmap_next(kvm, rmapp, spte);
}