diff options
| author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2011-03-04 18:56:41 +0800 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-17 13:08:32 -0300 |
| commit | da8dc75f0c4663a568a0ed4e744c6d55d428d8b6 (patch) | |
| tree | ec0caa9ac963af4d8c1a58d3f7e6933a80699e11 /arch/x86/kvm | |
| parent | 38a778aa1899b9c6cf3e300a02782c9b78c547ab (diff) | |
| download | blackbird-op-linux-da8dc75f0c4663a568a0ed4e744c6d55d428d8b6.tar.gz blackbird-op-linux-da8dc75f0c4663a568a0ed4e744c6d55d428d8b6.zip | |
KVM: MMU: fix kvm_mmu_slot_remove_write_access dropping intermediate W bits
Only remove write access in the last sptes.
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index b6a9963400a7..b9bf016d7f0f 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3540,12 +3540,17 @@ void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot) pt = sp->spt; for (i = 0; i < PT64_ENT_PER_PAGE; ++i) { - if (sp->role.level != PT_PAGE_TABLE_LEVEL - && is_large_pte(pt[i])) { + if (!is_shadow_present_pte(pt[i]) || + !is_last_spte(pt[i], sp->role.level)) + continue; + + if (is_large_pte(pt[i])) { drop_spte(kvm, &pt[i], shadow_trap_nonpresent_pte); --kvm->stat.lpages; + continue; } + /* avoid RMW */ if (is_writable_pte(pt[i])) update_spte(&pt[i], pt[i] & ~PT_WRITABLE_MASK); |
