| Date | Tue, 5 Apr 2022 16:48:46 +0200 | Subject | Re: [RFC PATCH v5 041/104] KVM: VMX: Move setting of EPT MMU masks to common VT-x code | From | Paolo Bonzini <> |
| |
On 3/4/22 20:48, isaku.yamahata@intel.com wrote: > From: Sean Christopherson <sean.j.christopherson@intel.com> > > EPT MMU masks are used commonly for VMX and TDX. The value needs to be > initialized in common code before both VMX/TDX-specific initialization > code. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> > --- > arch/x86/kvm/vmx/main.c | 5 +++++ > arch/x86/kvm/vmx/vmx.c | 4 ---- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c > index 3eb9db6d83ac..51aaafe6b432 100644 > --- a/arch/x86/kvm/vmx/main.c > +++ b/arch/x86/kvm/vmx/main.c > @@ -4,6 +4,7 @@ > #include "x86_ops.h" > #include "vmx.h" > #include "nested.h" > +#include "mmu.h" > #include "pmu.h" > #include "tdx.h" > > @@ -22,6 +23,10 @@ static __init int vt_hardware_setup(void) > > tdx_hardware_setup(&vt_x86_ops); > > + if (enable_ept) > + kvm_mmu_set_ept_masks(enable_ept_ad_bits, > + cpu_has_vmx_ept_execute_only()); > + > return 0; > } > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 0edeeed0b4c8..07fd892768be 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7817,10 +7817,6 @@ __init int vmx_hardware_setup(void) > > set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ > > - if (enable_ept) > - kvm_mmu_set_ept_masks(enable_ept_ad_bits, > - cpu_has_vmx_ept_execute_only()); > - > kvm_configure_mmu(enable_ept, 0, vmx_get_max_tdp_level(), > ept_caps_to_lpage_level(vmx_capability.ept)); >
RB
|