diff mbox series

[01/22] KVM: x86/mmu: nested EPT cannot be used in SMM

Message ID	20220414074000.31438-2-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, David Matlack <dmatlack@google.com> Subject: [PATCH 01/22] KVM: x86/mmu: nested EPT cannot be used in SMM Date: Thu, 14 Apr 2022 03:39:39 -0400 Message-Id: <20220414074000.31438-2-pbonzini@redhat.com> In-Reply-To: <20220414074000.31438-1-pbonzini@redhat.com> References: <20220414074000.31438-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit Precedence: bulk
Series	https://www.spinics.net/lists/kvm/msg267878.html \| expand [v3,00/22] https://www.spinics.net/lists/kvm/msg267878.html [01/22] KVM: x86/mmu: nested EPT cannot be used in SMM [02/22] KVM: x86/mmu: constify uses of struct kvm_mmu_role_regs [03/22] KVM: x86/mmu: pull computation of kvm_mmu_role_regs to kvm_init_mmu [04/22] KVM: x86/mmu: rephrase unclear comment [05/22] KVM: x86: Clean up and document nested #PF workaround [06/22] KVM: x86/mmu: remove "bool base_only" arguments [07/22] KVM: x86/mmu: split cpu_role from mmu_role [08/22] KVM: x86/mmu: do not recompute root level from kvm_mmu_role_regs [09/22] KVM: x86/mmu: remove ept_ad field [10/22] KVM: x86/mmu: remove kvm_calc_shadow_root_page_role_common [11/22] KVM: x86/mmu: cleanup computation of MMU roles for two-dimensional paging [12/22] KVM: x86/mmu: cleanup computation of MMU roles for shadow paging [13/22] KVM: x86/mmu: store shadow EFER.NX in the MMU role [14/22] KVM: x86/mmu: remove extended bits from mmu_role, rename field [15/22] KVM: x86/mmu: rename kvm_mmu_role union [16/22] KVM: x86/mmu: remove redundant bits from extended role [17/22] KVM: x86/mmu: remove valid from extended role [18/22] KVM: x86/mmu: simplify and/or inline computation of shadow MMU roles [19/22] KVM: x86/mmu: pull CPU mode computation to kvm_init_mmu [20/22] KVM: x86/mmu: replace shadow_root_level with root_role.level [21/22] KVM: x86/mmu: replace root_level with cpu_role.base.level [22/22] KVM: x86/mmu: replace direct_map with root_role.direct

Commit Message

Paolo Bonzini April 14, 2022, 7:39 a.m. UTC

The role.base.smm flag is always zero when setting up shadow EPT,
do not bother copying it over from vcpu->arch.root_mmu.

Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/mmu/mmu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index c623019929a7..797c51bb6cda 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4910,9 +4910,11 @@  kvm_calc_shadow_ept_root_page_role(struct kvm_vcpu *vcpu, bool accessed_dirty,
 {
 	union kvm_mmu_role role = {0};
 
-	/* SMM flag is inherited from root_mmu */
-	role.base.smm = vcpu->arch.root_mmu.mmu_role.base.smm;
-
+	/*
+	 * KVM does not support SMM transfer monitors, and consequently does not
+	 * support the "entry to SMM" control either.  role.base.smm is always 0.
+	 */
+	WARN_ON_ONCE(is_smm(vcpu));
 	role.base.level = level;
 	role.base.has_4_byte_gpte = false;
 	role.base.direct = false;