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.

Cc: stable@vger.kernel.org
Signed-off-by: Yosry Ahmed <yosry@kernel.org>
Link: https://patch.msgid.link/20260303003421.2185681-3-yosry@kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 0a35c815f4d2668475189d91ef1c8bf6f0a10172..9c64d036e30bd38193ade30c3cc3859a678f7937 100644 (file)
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -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);
        }
 

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 9b4f5a46d55061f15fb3d0ae9f5a1b163644edde..7170f2f623afe314e4d7e919cf545deabfde608f 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -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;

diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index ebd7b36b1ceb9b1ba1c6f7ef5622f6fc1ff8a232..44d767cd1d25a9b408d70be5fb6041ba62590584 100644 (file)
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -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);