From c05bd4c02d587ebb58c04e756a4959d035abd155 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Mon, 4 Feb 2013 11:50:43 +0800 Subject: [PATCH] --- yaml --- r: 356907 b: refs/heads/master c: c08800a56cb8622bb61577abb4a120c6fdc4b9be h: refs/heads/master i: 356905: dc52c0bed1a0d23d89623e7b730fe75617d499ed 356903: 68e8d47e728a108d7091ed7e3aedfd331efe7bc1 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c60a5951b7e4..780c7ffb66a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4293b5e5a68074431cafa74d549c1327ba1d0deb +refs/heads/master: c08800a56cb8622bb61577abb4a120c6fdc4b9be diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 0cf74a641dec..fe9a9cfadbd6 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3227,6 +3227,14 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) if (!is_paging(vcpu)) { hw_cr4 &= ~X86_CR4_PAE; hw_cr4 |= X86_CR4_PSE; + /* + * SMEP is disabled if CPU is in non-paging mode in + * hardware. However KVM always uses paging mode to + * emulate guest non-paging mode with TDP. + * To emulate this behavior, SMEP needs to be manually + * disabled when guest switches to non-paging mode. + */ + hw_cr4 &= ~X86_CR4_SMEP; } else if (!(cr4 & X86_CR4_PAE)) { hw_cr4 &= ~X86_CR4_PAE; }