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=1794049179; b=y2+tmtDYbChJQ42bdlA5ZqC4uOeoQCekAfiAjtTlZ3OGqox2oR3hY8FwO323UBtPESO1 3wbZgOFuL+q4mBIi1Hh4YCDVBZqww2Pyw1gmuuCGVDf2d6dxiFG+YDvZKd6rLvA5DwnjH IaQ8x/2BG/2s6ojwQ30uJvGutJ3wmkfzrnrdOOkih3V3I/HRkyLbZeoCPIuFycUn4obLd A8fgJUGDREcUeY4vnfBhCbSkXQqB/yVxI8K7WLZWcAk2ZlLf5pm7xqN2Gb8mtNZLAmXtN rDW97NxdN/KDpA1DSlSvnaYOHkYG65Wp+DhuoZttXHjue2K8vgZjjLn20nXkh6V71qw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794049179; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=1mVr4jw6qC1zb1wff55HtEml3dRlVyZHqz7FFawbEjg=; b=BAQ/BM2N1tn7MSzz1ruiejAemk4iTTSY7BpAP+OR8r/TAcx34l7CWXEMOcGF8lef6JFx LOcntvUXGkhPAwwtiVkRuOu2xFOIXXiNxQG4tr+hxX1DFXz3YBVa6VwLzlvOGqc5eH7Sd /VTLdrSZeX83cB5sACf7s3fDAaCwVmvhM4yBDnwlUVW5D6rP2OCdR+Idvf4GN1ZvazkaA SJlooHWyzRbQ8efpWaXkfZJp/qagDo/3cmeywjksBMn+PEXDFIBk1RQ+dUh+Zrg85yifT eHVQqJWZgHtio8zrV89ZGoyJ1PqunCZpIFkP4GwfSzszzr8ifX9eiS/ZPa9W5psjUBg== 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=oi4NXnzX; 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 D25AB606A338 for ; Sat, 7 Nov 2026 10:59:38 +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=oi4NXnzX Received: by smtp.kernel.org (Postfix) with ESMTPSA id 382BF1F008A3; Sat, 7 Nov 2026 10:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794049178; bh=1mVr4jw6qC1zb1wff55HtEml3dRlVyZHqz7FFawbEjg=; h=From:To:Cc:Subject:Date; b=oi4NXnzXGZXq/a4QGNDeASu9vgJ4S8KasjPk4efAuhEH8fymeApiOvf6qP+uORrKP JGrKJWd8gLFxXt3cODVj4cJ6P1YsiNmYYPzqdGT4j2edDbyi3X1t0VHKcoQs+0ekbV 6HXyplzyUuqD5ma1GWYdOQtB+N0hSeJmg3fHWDfwB+tJzTQV1KSiNnYVZQBJ/ElV1U JjsfPNywZQWbPq3QCJmm06TYuYhF2B13DTmL6IMGVt06zpyuAjDXQPHC9tTOBYcXI4 T66znJQwEXgoUKcPoHUXER8dCl7cvQMjL24S+7ZuLUX/JuHX+ipnpii3IjIC1ebbdB qCYyzR9kmZO9g== 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 5.15-stable tree Date: Sat, 7 Nov 2026 05:59:36 -0500 Message-ID: <20261107055936-failed-5.15-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 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 326fa2c9b4d3e6cab58c139eb55aaabd7179192e # git commit -s git send-email --to '' --in-reply-to '20261107055936-failed-5.15-326fa2c9b4d3@kernel.org' --subject-prefix 'PATCH 5.15.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