From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bandan Das Subject: [PATCH 3/3] nVMX: Advertise PML to L1 hypervisor Date: Wed, 3 May 2017 18:14:57 -0400 Message-ID: <20170503221457.18869-4-bsd@redhat.com> References: <20170503221457.18869-1-bsd@redhat.com> Cc: pbonzini@redhat.com, linux-kernel@vger.kernel.org To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:56156 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbdECWPg (ORCPT ); Wed, 3 May 2017 18:15:36 -0400 In-Reply-To: <20170503221457.18869-1-bsd@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Advertise the PML bit in vmcs12 but clear it out before running L2 since we don't depend on hardware support for PML emulation. Signed-off-by: Bandan Das --- arch/x86/kvm/vmx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5e5abb7..df71116 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2763,8 +2763,11 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) vmx->nested.nested_vmx_ept_caps |= VMX_EPT_EXTENT_GLOBAL_BIT | VMX_EPT_EXTENT_CONTEXT_BIT | VMX_EPT_2MB_PAGE_BIT | VMX_EPT_1GB_PAGE_BIT; - if (enable_ept_ad_bits) + if (enable_ept_ad_bits) { + vmx->nested.nested_vmx_secondary_ctls_high |= + SECONDARY_EXEC_ENABLE_PML; vmx->nested.nested_vmx_ept_caps |= VMX_EPT_AD_BIT; + } } else vmx->nested.nested_vmx_ept_caps = 0; @@ -10080,6 +10083,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, if (exec_control & SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES) vmcs_write64(APIC_ACCESS_ADDR, -1ull); + exec_control &= ~SECONDARY_EXEC_ENABLE_PML; vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control); } -- 2.9.3