From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C45573CBE7D for ; Tue, 5 May 2026 19:52:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778010757; cv=none; b=oTef4XXIBETaTB7uAhDAThP3GxijEjXXjXS7zBEV2uCf2uy+cQmf5Kut48Ek6bNvYmxP2YPlg7Ff6W2mT9mhH+f1bRM0pjdoivg0DbDzfpFpmHPZKZuPhl69ultC6GtWnECd+hrA0Iknuc+XJFRkx++qYzSjHehxb9BBsd0tGcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778010757; c=relaxed/simple; bh=X2Z78ecZ3ZOqfsmKUl49A6t2EIzk4qED2aVr+auIv38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aiBuSkZxQABiOfZ9EPriWVOlyro5KL1PJ7n2AWQFTXbPDg8xhUAjuSyRlNbgdOfKZQp59kvdZNA/Agz6BB4ADc82V9lOndCSHfVs8hP1Un30AZaAzn7v6kPguljy1tkLjNy3yEK1eTnt4mUKl+4f0OANHDCu2txgsZa3oGJ26Tc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=HmviypTR; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=OvYVtk4S; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HmviypTR"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="OvYVtk4S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778010755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ou2MGqWQWlSf5Uj7do5k2J/VRiPnju6cFxW52aKM19Y=; b=HmviypTRag2uJvJ34lNXb3E1wFj5BWjAf1n4+jpHRp6npIx28LM5ykEipsDvB5zZa24QDK A7YKme4g9WMg7VkRz5WViL8NK/yqH4T0XN4NsVsAXVjKslm4Medse1jZYb3fc0FmL3GEX4 GmPhm7cLqYTmTB32I5hMAuHE0HqTmCc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-Jy_FkJtjMPuTH5hjai0Zig-1; Tue, 05 May 2026 15:52:33 -0400 X-MC-Unique: Jy_FkJtjMPuTH5hjai0Zig-1 X-Mimecast-MFC-AGG-ID: Jy_FkJtjMPuTH5hjai0Zig_1778010752 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-488c2aa6becso39940845e9.2 for ; Tue, 05 May 2026 12:52:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778010751; x=1778615551; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ou2MGqWQWlSf5Uj7do5k2J/VRiPnju6cFxW52aKM19Y=; b=OvYVtk4SgRG6fZ0PdGeqtlv5ffgzZJ+oBj2mnXk3oQ2Qryji9UwOVSMi6tisOSqiKz 8/NaEiEwPp4zjvyJFnXerJWBBTdSX9BvDZvK53liVXviiKMsEWZt+ltKf+W6qwgxQm1T dRGI9FlilNSXfa68TtVDiEi+g3UXqZzGw1V34aosNsXxTI07rlzYH3mF64S79wZr3PcE mM9cTs79uONdrBxAg1sjtYjCSEwgZv3m5dqM36kiAvc8des0EOI3CNP/QhN5l+OQEIqW /sozRkrBkD1ZNDf6j5Y7N/sSrAxeyh/Y3zmu7/iGwyAlQSwY2B/0wfa8o4hJy8LVOiE1 Cr4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778010751; x=1778615551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ou2MGqWQWlSf5Uj7do5k2J/VRiPnju6cFxW52aKM19Y=; b=CEKQ3M97DIk1g3aT/R+fGwI3Njww3h+/gGqDkF1wNkVQHer4Z87YZTnRpcAa4yhE3k wfWrlOEHKfGlI3hpBzPRGxwE2HQ1z+k/GGxQ3GX1EIQKCw1Vv6Y6cfwolqkXDkbDKY8J Ekb9uJTptj9G4oyxrtkAFpwV+vGlXK2hrS/r7QACT6DSObfteGPULCChefsLiWYIysa/ rSIqkOw5llEbk10TaTIXkvbZ3HINp+6BpFPb9ovfi/DA3jP4XXdNUbR0UtYjL7Awcr11 0UpVPCuYxQGghP7aO1jc90ZBrmddB6zcJO8qGw68bXEAZo5Pk1V4ypMa0hmxBjfbq3fz T62Q== X-Gm-Message-State: AOJu0YwS/HY0kmr6f3stBIbDPzvnbbKglN+ct5XyQ8PN8OT23vE5slXS pfdneDklll0WyysOf8EQuJv2T8SVaJusfHi9gSNUw4LixS64/0e/uGXOuVZwJCFlOaByqhYNe02 6HKGA616Ql7u9KJH6rlyThmk0zihTfoq+gdPFjL2k5vKEixWGEmX8XDopuBISY81qL47uYhAhP/ Bx8GOvzc4haBfXTCiGRaNUSbjd2JvAITOoAT+zig1mpi2LklphLw== X-Gm-Gg: AeBDies1cT6WlJpZb7wiPqsL5hoqfFi4G/mY5Sug5bFxKNotiOW+FTNmOMmgpNdq+2y zA572gBnSt0kUwXH369KNNA5+MqDTaIk0mxmYMxsqLeL8AP0C3OFaAoVRmQB5NuStSzgZAdKh3O QL8ia7CTQSJNCn05+J9SoUFycu0RLlpcUl7PohnlMiQcSv6DUj6IMcdJhTETeH+qTX575RLEE++ HYorePzKmUpW/QvmRNX2UmD85rkK0wenYi8V1lnMRLbKjfWYPVbgQT2OlFrMn+L7iHdyslGfj5p accfefPQ8Yefj1tkycTI52hzeoknWgl6Jlgbh2CZP9EfEWsQela6JF7H7I/3qK/YuGc1UlG7tkF b3jT2oIX2UmxDxGZs1K7JbZ9aWtqL0NxeQ6Q0vFvulBK1nrY8YcT62TgLjy82jzpXH4PnwKLApC Ovuzlg8D3z7RmItMHBTRsD/fM5TWW3bDNDxSXhpfU= X-Received: by 2002:a05:600c:3b96:b0:48a:66a8:9981 with SMTP id 5b1f17b1804b1-48e51f55272mr10710455e9.27.1778010751544; Tue, 05 May 2026 12:52:31 -0700 (PDT) X-Received: by 2002:a05:600c:3b96:b0:48a:66a8:9981 with SMTP id 5b1f17b1804b1-48e51f55272mr10709995e9.27.1778010751111; Tue, 05 May 2026 12:52:31 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a8eb694fcsm397588845e9.3.2026.05.05.12.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2026 12:52:29 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: d.riley@proxmox.com, jon@nutanix.com, Sean Christopherson Subject: [PATCH 01/28] KVM: TDX/VMX: rework EPT_VIOLATION_EXEC_FOR_RING3_LIN into PROT_MASK Date: Tue, 5 May 2026 21:51:59 +0200 Message-ID: <20260505195226.563317-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260505195226.563317-1-pbonzini@redhat.com> References: <20260505195226.563317-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jon Kohler EPT exit qualification bit 6 is used when mode-based execute control is enabled, and reflects user executable addresses. Rework name to reflect the intention and add to EPT_VIOLATION_PROT_MASK, which allows simplifying the return evaluation in tdx_is_sept_violation_unexpected_pending a pinch. Rework handling in __vmx_handle_ept_violation to unconditionally clear EPT_VIOLATION_PROT_USER_EXEC until MBEC is implemented, as suggested by Sean [1]. Note: Intel SDM Table 29-7 defines bit 6 as: If the "mode-based execute control" VM-execution control is 0, the value of this bit is undefined. If that control is 1, this bit is the logical-AND of bit 10 in the EPT paging-structure entries used to translate the guest-physical address of the access causing the EPT violation. In this case, it indicates whether the guest-physical address was executable for user-mode linear addresses. [1] https://lore.kernel.org/all/aCJDzU1p_SFNRIJd@google.com/ Suggested-by: Sean Christopherson Signed-off-by: Jon Kohler Message-ID: <20251223054806.1611168-2-jon@nutanix.com> Tested-by: David Riley Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/vmx.h | 5 +++-- arch/x86/kvm/vmx/common.h | 9 +++++++-- arch/x86/kvm/vmx/tdx.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 37080382df54..b2291a766e3f 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -608,10 +608,11 @@ enum vm_entry_failure_code { #define EPT_VIOLATION_PROT_READ BIT(3) #define EPT_VIOLATION_PROT_WRITE BIT(4) #define EPT_VIOLATION_PROT_EXEC BIT(5) -#define EPT_VIOLATION_EXEC_FOR_RING3_LIN BIT(6) +#define EPT_VIOLATION_PROT_USER_EXEC BIT(6) #define EPT_VIOLATION_PROT_MASK (EPT_VIOLATION_PROT_READ | \ EPT_VIOLATION_PROT_WRITE | \ - EPT_VIOLATION_PROT_EXEC) + EPT_VIOLATION_PROT_EXEC | \ + EPT_VIOLATION_PROT_USER_EXEC) #define EPT_VIOLATION_GVA_IS_VALID BIT(7) #define EPT_VIOLATION_GVA_TRANSLATED BIT(8) diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h index 412d0829d7a2..adf925500b9e 100644 --- a/arch/x86/kvm/vmx/common.h +++ b/arch/x86/kvm/vmx/common.h @@ -94,8 +94,13 @@ static inline int __vmx_handle_ept_violation(struct kvm_vcpu *vcpu, gpa_t gpa, /* Is it a fetch fault? */ error_code |= (exit_qualification & EPT_VIOLATION_ACC_INSTR) ? PFERR_FETCH_MASK : 0; - /* ept page table entry is present? */ - error_code |= (exit_qualification & EPT_VIOLATION_PROT_MASK) + /* + * ept page table entry is present? + * note: unconditionally clear USER_EXEC until mode-based + * execute control is implemented + */ + error_code |= (exit_qualification & + (EPT_VIOLATION_PROT_MASK & ~EPT_VIOLATION_PROT_USER_EXEC)) ? PFERR_PRESENT_MASK : 0; if (exit_qualification & EPT_VIOLATION_GVA_IS_VALID) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 1e47c194af53..89f9fe30435d 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1845,7 +1845,7 @@ static inline bool tdx_is_sept_violation_unexpected_pending(struct kvm_vcpu *vcp if (eeq_type != TDX_EXT_EXIT_QUAL_TYPE_PENDING_EPT_VIOLATION) return false; - return !(eq & EPT_VIOLATION_PROT_MASK) && !(eq & EPT_VIOLATION_EXEC_FOR_RING3_LIN); + return !(eq & EPT_VIOLATION_PROT_MASK); } static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu) -- 2.54.0