From nobody Thu Apr 2 20:17:58 2026 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 BA15C3A1A58 for ; Thu, 26 Mar 2026 18:17:33 +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=1774549055; cv=none; b=WwRd6Rhd8nlma7D5B+3rV75wOtmdvYWlRtmdhiQ9njURzWz7oG98rT2hWL7B4iJLvPLSNS14ne/4T1O0uXTlxExvL+fjY/YETJIeiPs3e2BMmwc3sCA33/OQYqeuHv/QSVMq9bcPAtZhwOFJJ9u2GfXJM0+vNc+POpJJ9o4kg8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549055; c=relaxed/simple; bh=/hgPA8ofUfgPut6kjk1EiKMkvUvqj4HcFOe/kxoKD5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RmimshJ85Oidv/OP788jRCSwvIr2yn/x0Idb2SBlcgZ43+qAxOGnJNEuRuJ4NbowVEJiP0F44n2rBKFFtbhyn8kbzyzz8ns9RdbwW0x8Sm9SGLMG8U6NEEC9W6DfifIpml7MfEzMllshah7BP+mQE++JsHdJU0eqcc4hKStixJk= 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=fnEfgenV; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=i9RoY2bM; 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="fnEfgenV"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="i9RoY2bM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549052; 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=WDapCol8DB+8Onsizv1MMEQf+Ju0eOGDbqoSTr6KUVY=; b=fnEfgenV3Zbm+30x+QylL2KciQzotj5fsmOPXHsDC5brcxKIp7XfIuxfzM6axnV9isbWCm FVnUSQriRvQizDAk8rL1yVkEZ5IzYGPoU2pnJ5iFNs9N/IVoajNDFG3G0FWx9q/I+JVtW/ urkzZut3Ln3PalG3mxVHyQ7uYbSwoxc= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-353-ogNs68ERNlOX75dG9Qvu9Q-1; Thu, 26 Mar 2026 14:17:31 -0400 X-MC-Unique: ogNs68ERNlOX75dG9Qvu9Q-1 X-Mimecast-MFC-AGG-ID: ogNs68ERNlOX75dG9Qvu9Q_1774549050 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4362197d1easo842415f8f.2 for ; Thu, 26 Mar 2026 11:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549049; x=1775153849; 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=WDapCol8DB+8Onsizv1MMEQf+Ju0eOGDbqoSTr6KUVY=; b=i9RoY2bMJWiDNAhtB064Er8wZviqeEtFxYXU57iHddcxP7SAecRiyOTMD+xphFtUGM gFw4wRAsfmYFF5VKDCNyon/gm8EJT2gF6muWuO+wlRB7Cv5LX342xuz7zXKVfdJb5oTB cqkV7UU/fQUF1gbY5AzTp5MYUPzPgsm4j42SVGwEOpe7NbNn/m9SgV47rRd4gtWSOrb2 lrcVaXtaJ4QGPYALnpo9F/t2UnVj6U0xywAl3+++Kqm3Xsm1Q+2KdCs5tm5b7DYeg47x r0UD+zum/ZJa4s1TXnfzeplAAHPHlz8mjZRtO50bnTrWaEEE6w5SuroJCNMDwx7buzLT KVXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549049; x=1775153849; 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=WDapCol8DB+8Onsizv1MMEQf+Ju0eOGDbqoSTr6KUVY=; b=sUiAwjf/NhqI5FHo1+LVzmj4KCV7yQr1NyAH65ebMetC2Jj+cT4N/0D3c6h/FJd2k+ xqcGpcVuIal5t9tpG//AYH1aPBVXEVH4NYcapwA6C9Q2pMJm5m3eg1+M71F3b9VABzF6 lsQbh32BJ6dEr5QhF44+cz6Y6gb6M2RG2bOcyGGgZBtV4rd+JZT/aBo80NiEXeFomFtw 2iKn1ZdEMKAQM9DP8Y4U7T3QtjU+V0+lwbnQYBnV5Fdk9w3NWuVbxgzSu4lGZZRzyMZ2 EUSFSUURHPnKfEkLisRQ7e8zJ8v170Dcet3m6g8hP8vnizu3MVNgR4DMmifWxdE/nTB7 JsCA== X-Gm-Message-State: AOJu0YzKt2NehQMoOu63++/dvglsP8X+sF2HYJwH83ryIBziO0G5vwpk dn5vAwMp+KXSt1o6hmALAm/3C22q4B+AX2/YwXPjQl4sXvPXKJrNaCeQ/hbIKdQAGvUIN14mfAM 6DzoCNkth9JmrKquDxugNXG5yLu4G0WEcuvUCDTLCoiwYYXN0Bp6qPSaOWAPFutzgg5VezsyHwf tpMoHrA1jTGjKElJyCTthIM3E6n08sFwvc/6Duu6fjPuAeUxheLw== X-Gm-Gg: ATEYQzwouUvbNpa/E57jgqd3CKt4scTTa6rzZmiwRQ8hgLu+mAVBQIMogQgFhbNsyCo D62116mxeJxLovB4RPMWQXPiylmmpqpXuh4sXK4hGJYLAQAXg/5xw2RCDPiXCx9LtYLDj6hwR3G ah3vnZH9inOPT+JJDgmgAQJYFaQquXBrLq2CZxyVesHncSeGRNnTSdP6AeAtIUZ4C6dqbWEXM0M VU8Y5okZDVpA1+TX/2djyD6VRUOXS89o8HRBwBAS3pjopahXeVgR2vuR4ukSZuGYJgFZcFKhJFt gvDOAYKVFEAFTz4Hk0RTfu8rbL5p6SQ2qOPdHEJgT9Y++NyajMBwBUlGwyg/u7P+pNrcENtvz77 b+nGwh+AHB6JFXRUgYxuIg/SK0HTQRAvbleNXZoVwm9BuHFiPuBb4lsHDARmwgrvXApm/1UEAOF L6S51oSM/ag6DDDXRbXoKt4iA2 X-Received: by 2002:a05:6000:2c06:b0:43b:5762:2999 with SMTP id ffacd0b85a97d-43b88a8e8ffmr12921636f8f.37.1774549049188; Thu, 26 Mar 2026 11:17:29 -0700 (PDT) X-Received: by 2002:a05:6000:2c06:b0:43b:5762:2999 with SMTP id ffacd0b85a97d-43b88a8e8ffmr12921578f8f.37.1774549048681; Thu, 26 Mar 2026 11:17:28 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b919e7111sm9492066f8f.37.2026.03.26.11.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:17:27 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Nikunj A Dadhania , Amit Shah , Sean Christopherson , Marcelo Tosatti Subject: [PATCH 01/24] KVM: TDX/VMX: rework EPT_VIOLATION_EXEC_FOR_RING3_LIN into PROT_MASK Date: Thu, 26 Mar 2026 19:16:59 +0100 Message-ID: <20260326181723.218115-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326181723.218115-1-pbonzini@redhat.com> References: <20260326181723.218115-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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> 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 b92ff87e3560..7fdc6b787d70 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -597,10 +597,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) =20 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 |=3D (exit_qualification & EPT_VIOLATION_ACC_INSTR) ? PFERR_FETCH_MASK : 0; - /* ept page table entry is present? */ - error_code |=3D (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 |=3D (exit_qualification & + (EPT_VIOLATION_PROT_MASK & ~EPT_VIOLATION_PROT_USER_EXEC)) ? PFERR_PRESENT_MASK : 0; =20 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 c5065f84b78b..fa740f70ee75 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1855,7 +1855,7 @@ static inline bool tdx_is_sept_violation_unexpected_p= ending(struct kvm_vcpu *vcp if (eeq_type !=3D TDX_EXT_EXIT_QUAL_TYPE_PENDING_EPT_VIOLATION) return false; =20 - return !(eq & EPT_VIOLATION_PROT_MASK) && !(eq & EPT_VIOLATION_EXEC_FOR_R= ING3_LIN); + return !(eq & EPT_VIOLATION_PROT_MASK); } =20 static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu) --=20 2.53.0