KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE
PATCH 1/1 KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE
Reset the MMU context during kvm_set_cr4() if SMAP or PKE is toggled. Recent commits to (correctly) not reload PDPTRs when SMAP/PKE are toggled inadvertantly skipped the MMU context reset due to the mask of bits that triggers PDPTR loads also being used to trigger MMU context resets.
--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
@@ -977,6 +977,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)unsigned long old_cr4 =kvm_read_cr4 (vcpu);unsigned long pdptr_bits =X86_CR4_PGE |X86_CR4_PSE |X86_CR4_PAE |X86_CR4_SMEP ; +unsigned long mmu_role_bits = pdptr_bits |X86_CR4_SMAP |X86_CR4_PKE ;if (kvm_valid_cr4 (vcpu, cr4))return 1 ;
@@ -1004,7 +1005,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)if (kvm_x86_ops.set_cr4 (vcpu, cr4))return 1 ; -if (((cr4 ^ old_cr4) & pdptr_bits) || +if (((cr4 ^ old_cr4) & mmu_role_bits) || (!(cr4 &X86_CR4_PCIDE ) && (old_cr4 &X86_CR4_PCIDE )))kvm_mmu_reset_context (vcpu);
Signature · 1 line
2.28.0
Quoted 7 lines · Sean Christopherson
Reset the MMU context during
kvm_set_cr4()if SMAP or PKE is toggled. Recent commits to (correctly) not reload PDPTRs when SMAP/PKE are toggled inadvertantly skipped the MMU context reset due to the mask of bits that triggers PDPTR loads also being used to trigger MMU context resets.
Quoted 6 lines
Fixes 427890aff855 ("kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode")Fixes cb957adb4ea4 ("kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode")Cc Jim Mattson <[email protected]>Cc Peter Shier <[email protected]>Cc Oliver Upton <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Thanks for the fix!
Quoted 30 lines · Sean Christopherson
Reset the MMU context during
kvm_set_cr4()if SMAP or PKE is toggled. Recent commits to (correctly) not reload PDPTRs when SMAP/PKE are toggled inadvertantly skipped the MMU context reset due to the mask of bits that triggers PDPTR loads also being used to trigger MMU context resets.Fixes 427890aff855 ("kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode")Fixes cb957adb4ea4 ("kvm: x86: Toggling CR4.PKE does not load PDPTEs in PAE mode")Cc Jim Mattson <[email protected]>Cc Peter Shier <[email protected]>Cc Oliver Upton <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/x86/kvm/x86.c +1
-0@@ -977,6 +977,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)unsigned long old_cr4 =kvm_read_cr4 (vcpu);unsigned long pdptr_bits =X86_CR4_PGE |X86_CR4_PSE |X86_CR4_PAE |X86_CR4_SMEP ; +unsigned long mmu_role_bits = pdptr_bits |X86_CR4_SMAP |X86_CR4_PKE ;if (kvm_valid_cr4 (vcpu, cr4))return 1 ;
arch/x86/kvm/x86.c int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) · line 1011
Quoted 8 lines
arch/x86/kvm/x86.c +1
-1@@ -1004,7 +1005,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)if (kvm_x86_ops.set_cr4 (vcpu, cr4))return 1 ; -if (((cr4 ^ old_cr4) & pdptr_bits) || +if (((cr4 ^ old_cr4) & mmu_role_bits) || (!(cr4 &X86_CR4_PCIDE ) && (old_cr4 &X86_CR4_PCIDE )))kvm_mmu_reset_context (vcpu);
Queued, thanks.
Paolo