lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 16 Nov 2020 10:26:35 -0800 From: isaku.yamahata@...el.com To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>, "H . Peter Anvin" <hpa@...or.com>, Paolo Bonzini <pbonzini@...hat.com>, Vitaly Kuznetsov <vkuznets@...hat.com>, Wanpeng Li <wanpengli@...cent.com>, Jim Mattson <jmattson@...gle.com>, Joerg Roedel <joro@...tes.org>, x86@...nel.org, linux-kernel@...r.kernel.org, kvm@...r.kernel.org Cc: isaku.yamahata@...el.com, isaku.yamahata@...il.com, Sean Christopherson <sean.j.christopherson@...el.com> Subject: [RFC PATCH 50/67] KVM: VMX: Move setting of EPT MMU masks to common VT-x code From: Sean Christopherson <sean.j.christopherson@...el.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@...el.com> --- arch/x86/kvm/vmx/main.c | 17 +++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index 85bc238c0852..52e7a9d25e9c 100644 --- a/arch/x86/kvm/vmx/main.c +++ b/arch/x86/kvm/vmx/main.c @@ -26,6 +26,20 @@ static int __init vt_check_processor_compatibility(void) return 0; } +static __init void vt_set_ept_masks(void) +{ + const u64 u_mask = VMX_EPT_READABLE_MASK; + const u64 a_mask = enable_ept_ad_bits ? VMX_EPT_ACCESS_BIT : 0ull; + const u64 d_mask = enable_ept_ad_bits ? VMX_EPT_DIRTY_BIT : 0ull; + const u64 p_mask = cpu_has_vmx_ept_execute_only() ? 0ull : + VMX_EPT_READABLE_MASK; + const u64 x_mask = VMX_EPT_EXECUTABLE_MASK; + const u64 nx_mask = 0ull; + + kvm_mmu_set_mask_ptes(u_mask, a_mask, d_mask, nx_mask, x_mask, p_mask, + VMX_EPT_RWX_MASK, 0ull); +} + static __init int vt_hardware_setup(void) { int ret; @@ -34,6 +48,9 @@ static __init int vt_hardware_setup(void) if (ret) return ret; + if (enable_ept) + vt_set_ept_masks(); + return 0; } diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 966d48eada40..f6b2ddff58e1 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5411,16 +5411,6 @@ static void shrink_ple_window(struct kvm_vcpu *vcpu) } } -static void vmx_enable_tdp(void) -{ - kvm_mmu_set_mask_ptes(VMX_EPT_READABLE_MASK, - enable_ept_ad_bits ? VMX_EPT_ACCESS_BIT : 0ull, - enable_ept_ad_bits ? VMX_EPT_DIRTY_BIT : 0ull, - 0ull, VMX_EPT_EXECUTABLE_MASK, - cpu_has_vmx_ept_execute_only() ? 0ull : VMX_EPT_READABLE_MASK, - VMX_EPT_RWX_MASK, 0ull); -} - /* * Indicate a busy-waiting vcpu in spinlock. We do not enable the PAUSE * exiting, so only get here on cpu with PAUSE-Loop-Exiting. @@ -7602,9 +7592,6 @@ static __init int hardware_setup(struct kvm_x86_ops *x86_ops) set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ - if (enable_ept) - vmx_enable_tdp(); - if (!enable_ept) ept_lpage_level = 0; else if (cpu_has_vmx_ept_1g_page()) -- 2.17.1
Powered by blists - more mailing lists