FAILED: patch "[PATCH] KVM: SVM: Switch svm_copy_lbrs() to a macro" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe 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 <[email protected]>.
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 361dbe8173c460a2bf8aee23920f6c2dbdcabb94
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026050306-limeade-submarine-4f0e@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 361dbe8173c460a2bf8aee23920f6c2dbdcabb94 Mon Sep 17 00:00:00 2001
From: Yosry Ahmed <[email protected]>
Date: Tue, 3 Mar 2026 00:33:56 +0000
Subject: [PATCH] KVM: SVM: Switch svm_copy_lbrs() to a macro
In preparation for using svm_copy_lbrs() with 'struct vmcb_save_area' without a containing 'struct vmcb', and later even 'struct vmcb_save_area_cached', make it a macro.
Macros are generally not preferred compared to functions, mainly due to type-safety. However, in this case it seems like having a simple macro copying a few fields is better than copy-pasting the same 5 lines of code in different places.
arch/x86/kvm/svm/nested.c +4 -4
@@ -710,10 +710,10 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12* Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits. */ -svm_copy_lbrs (vmcb02, vmcb12); +svm_copy_lbrs (&vmcb02->save, &vmcb12->save); vmcb02->save.dbgctl &= ~DEBUGCTL_RESERVED_BITS ; }else { -svm_copy_lbrs (vmcb02, vmcb01); +svm_copy_lbrs (&vmcb02->save, &vmcb01->save); }vmcb_mark_dirty (vmcb02,VMCB_LBR );svm_update_lbrv (&svm->vcpu);
@@ -1233,9 +1233,9 @@ int nested_svm_vmexit(struct vcpu_svm *svm)if (unlikely (guest_cpu_cap_has (vcpu,X86_FEATURE_LBRV ) && (svm->nested.ctl.virt_ext &LBR_CTL_ENABLE_MASK ))) { -svm_copy_lbrs (vmcb12, vmcb02); +svm_copy_lbrs (&vmcb12->save, &vmcb02->save); }else { -svm_copy_lbrs (vmcb01, vmcb02); +svm_copy_lbrs (&vmcb01->save, &vmcb02->save);vmcb_mark_dirty (vmcb01,VMCB_LBR ); }
arch/x86/kvm/svm/svm.c +0 -9
@@ -841,15 +841,6 @@ static void svm_recalc_msr_intercepts(struct kvm_vcpu *vcpu)*/ } -void svm_copy_lbrs (struct vmcb *to_vmcb,struct vmcb *from_vmcb) -{ - to_vmcb->save.dbgctl = from_vmcb->save.dbgctl; - to_vmcb->save.br_from = from_vmcb->save.br_from; - to_vmcb->save.br_to = from_vmcb->save.br_to; - to_vmcb->save.last_excp_from = from_vmcb->save.last_excp_from; - to_vmcb->save.last_excp_to = from_vmcb->save.last_excp_to; -} -static void __svm_enable_lbrv (struct kvm_vcpu *vcpu) {to_svm (vcpu)->vmcb->control.virt_ext |=LBR_CTL_ENABLE_MASK ;
arch/x86/kvm/svm/svm.h +9 -1
@@ -713,8 +713,16 @@ static inline void *svm_vcpu_alloc_msrpm(void)return svm_alloc_permissions_map (MSRPM_SIZE ,GFP_KERNEL_ACCOUNT ); } +#define svm_copy_lbrs (to, from) \ +do { \ + (to)->dbgctl = (from)->dbgctl; \ + (to)->br_from = (from)->br_from; \ + (to)->br_to = (from)->br_to; \ + (to)->last_excp_from = (from)->last_excp_from; \ + (to)->last_excp_to = (from)->last_excp_to; \ +} while (0) +void svm_vcpu_free_msrpm (void *msrpm); -void svm_copy_lbrs (struct vmcb *to_vmcb,struct vmcb *from_vmcb);void svm_enable_lbrv (struct kvm_vcpu *vcpu);void svm_update_lbrv (struct kvm_vcpu *vcpu);