diff options
| author | Avi Kivity <avi@redhat.com> | 2010-05-27 14:35:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:21:23 -0700 |
| commit | 57b8799a75fca910443b5fcc645b091d30aac5db (patch) | |
| tree | 26957e5ebf2b9f5a50023f27dc1072dbf8ac1468 /arch | |
| parent | 282d0217435ad7747d615cc19331d72e76f3fa3e (diff) | |
| download | lwn-57b8799a75fca910443b5fcc645b091d30aac5db.tar.gz lwn-57b8799a75fca910443b5fcc645b091d30aac5db.zip | |
KVM: MMU: Remove user access when allowing kernel access to gpte.w=0 page
If cr0.wp=0, we have to allow the guest kernel access to a page with pte.w=0.
We do that by setting spte.w=1, since the host cr0.wp must remain set so the
host can write protect pages. Once we allow write access, we must remove
user access otherwise we mistakenly allow the user to write the page.
Reviewed-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 69325a122580d3a7b26589e8efdd6663001c3297)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index a2656266f999..d5fc36cb4f05 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1843,6 +1843,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, spte |= PT_WRITABLE_MASK; + if (!tdp_enabled && !(pte_access & ACC_WRITE_MASK)) + spte &= ~PT_USER_MASK; + /* * Optimization: for pte sync, if spte was writable the hash * lookup is unnecessary (and expensive). Write protection |