From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048153; b=jLnky26nhwO96sz4rL3cNZtGYczSVtCZzNPxG/J3MI4BB960b4UyDXlT+DrjYw1EXmse QNK+1zg/ZgqVsPYpTRoZ2GI3No5VDC+mDtivW7if+6uNIxrJ0gSzI1wE+JepN+sZhxFjE Y4H8aSGnlq7SfoAu8nQ+8+sHvsEsA1xi2en0+F6eu43KYXahjR5S1CwEeG6XeTX1Frn6U fgHmX008SNHmh1F8kqIIM6kG7Mv/CVvk+uiO7gXPI/5B8Ijp5gpmHWBFaw29IK9wyhsgu 4kuCfL/xgIPTitcUFUbx8ns6d+oDlBo3yrjNMA2hrKkgWGCFO1/Sj4WdSRthUlyiylQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048153; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=00JbV7UstqrH3eLDdpDRVaPHhsSHksbP1fMgSplFs2Y=; b=wb98cfiO6f35y4xwPzBTzfSynIkUo6KOb6V5NCyGXL+YTx5aT9p4Cl0uwpZ8/4SLX8kY f8ONeusmMkb8n8pRA88TTfxzKYGCsCd32vvwbB5KEGNJVJheSQAf0EeI76wKkeYf2oht1 E8IYmmDY/+cdQWXPgt3TptOkCJfMoRwyzwZx5/EEOJ9e1UNUXOUXVp/mFeTG9L3UHz5r7 PyMpKY32DqOPSU66FwQpGA4EnzPXdFli8pgp2iGFlH+Qwi4Tbs8rmqOUzSkVmT2cV6Mdx H9PvP3aXC1RlQpXo2Hy64TicIf0kxDTqvn5wZWhQmQh9AWGLWpo0RIOXnHndTMyC0VQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VnhsT9Vq; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DE42606A32C for ; Sat, 7 Nov 2026 10:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VnhsT9Vq Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD96E1F0089F; Sat, 7 Nov 2026 10:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048153; bh=00JbV7UstqrH3eLDdpDRVaPHhsSHksbP1fMgSplFs2Y=; h=From:To:Cc:Subject:Date; b=VnhsT9VqwJjYK5Op5ca8bQ/uGgts7ZUSrd9RvNIsxQVW6lPsjaSgTNu/CTbJGRTg6 YW7iJVR3gaNa8BpvDc/wbe+oeLtJ0QnFg3qRm35Bh0NbFTlWEHj+Zhb7Q2Hnwmb6h6 2ViuPqMJpBf75nKlNwX+tZDml+PW4OiNzbSAdftKRj53E7TgoGIcebX93oiuzKJ0tC ukw7EM18FDPlFNuC2v/5A+o3fZFdkVQ4UD/P/V3iDVZMiljROhPI9JVn+DkFUgHzPv TZF+umjuKDThP3osoY06MaIo/tSHzptiBZN+1mDY5YT02LL26zecNDDZcx70SF4RWQ hqRjdV+P7+WiA== From: Sasha Levin To: xiaoyao.li@intel.com, nik.borisov@suse.com, seanjc@google.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] KVM: VMX: Make handle_bus_lock_vmexit() a shared helper" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:42:31 -0500 Message-ID: <20261107054231-failed-6.1-326fa2c9b4d3@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 326fa2c9b4d3e6cab58c139eb55aaabd7179192e # git commit -s git send-email --to '' --in-reply-to '20261107054231-failed-6.1-326fa2c9b4d3@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 326fa2c9b4d3e6cab58c139eb55aaabd7179192e Mon Sep 17 00:00:00 2001 From: Xiaoyao Li Date: Wed, 19 Aug 2026 17:49:01 +0800 Subject: [PATCH] KVM: VMX: Make handle_bus_lock_vmexit() a shared helper Move handle_bus_lock_vmexit() from vmx.c to main.c to make it a shared helper so that TDX can use it for Bus Lock VM exit handling as well. Rename it to add vt_ prefix to reflect that it is a helper for both VMX and TDX. Cc: stable@vger.kernel.org Signed-off-by: Xiaoyao Li Reviewed-by: Nikolay Borisov Link: https://patch.msgid.link/20260819094903.3060020-8-xiaoyao.li@intel.com Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/common.h | 1 + arch/x86/kvm/vmx/main.c | 11 +++++++++++ arch/x86/kvm/vmx/vmx.c | 13 +------------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h index 7fce1bbabc78c..bbeec197a507a 100644 --- a/arch/x86/kvm/vmx/common.h +++ b/arch/x86/kvm/vmx/common.h @@ -203,5 +203,6 @@ static inline int __vt_handle_notify(struct kvm_vcpu *vcpu, } noinstr void vmx_handle_nmi(struct kvm_vcpu *vcpu); +int vt_handle_bus_lock_vmexit(struct kvm_vcpu *vcpu); #endif /* __KVM_X86_VMX_COMMON_H */ diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index ea0d825e556d2..835de375e8c8c 100644 --- a/arch/x86/kvm/vmx/main.c +++ b/arch/x86/kvm/vmx/main.c @@ -878,6 +878,17 @@ static int vt_gmem_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn, #define vt_op_tdx_only(name) NULL #endif /* CONFIG_KVM_INTEL_TDX */ +int vt_handle_bus_lock_vmexit(struct kvm_vcpu *vcpu) +{ + /* + * Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK + * VM-Exits. Unconditionally set the flag here and leave the handling + * to .handle_exit() callback. + */ + to_vt(vcpu)->exit_reason.bus_lock_detected = true; + return 1; +} + #define VMX_REQUIRED_APICV_INHIBITS \ (BIT(APICV_INHIBIT_REASON_DISABLED) | \ BIT(APICV_INHIBIT_REASON_ABSENT) | \ diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 6df390ae8708f..3ba1e762e7e75 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -6267,17 +6267,6 @@ static int handle_encls(struct kvm_vcpu *vcpu) } #endif /* CONFIG_X86_SGX_KVM */ -static int handle_bus_lock_vmexit(struct kvm_vcpu *vcpu) -{ - /* - * Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK - * VM-Exits. Unconditionally set the flag here and leave the handling to - * vmx_handle_exit(). - */ - to_vt(vcpu)->exit_reason.bus_lock_detected = true; - return 1; -} - static int handle_notify(struct kvm_vcpu *vcpu) { unsigned long exit_qual = vmx_get_exit_qual(vcpu); @@ -6366,7 +6355,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = { [EXIT_REASON_VMFUNC] = handle_vmx_instruction, [EXIT_REASON_PREEMPTION_TIMER] = handle_preemption_timer, [EXIT_REASON_ENCLS] = handle_encls, - [EXIT_REASON_BUS_LOCK] = handle_bus_lock_vmexit, + [EXIT_REASON_BUS_LOCK] = vt_handle_bus_lock_vmexit, [EXIT_REASON_NOTIFY] = handle_notify, [EXIT_REASON_SEAMCALL] = handle_tdx_instruction, [EXIT_REASON_TDCALL] = handle_tdx_instruction, -- 2.53.0