aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Kohler <[email protected]>2023-05-31 11:58:21 -0400
committerSean Christopherson <[email protected]>2023-06-01 14:20:04 -0700
commit331f229768160dceec5b5694ea32ecf66e2e2452 (patch)
tree75d1748da1f29b20bbec36c6218a8fd0f1e30fc1
parent33ab767c2628136c54c2e2160e4c536c7db9c6d0 (diff)
KVM: VMX: restore vmx_vmexit alignment
Commit 8bd200d23ec4 ("KVM: VMX: Flatten __vmx_vcpu_run()") changed vmx_vmexit from SYM_FUNC_START to SYM_INNER_LABEL, accidentally removing 16 byte alignment as SYM_FUNC_START uses SYM_A_ALIGN and SYM_INNER_LABEL does not. Josh mentioned [1] this was unintentional. Fix by changing to SYM_INNER_LABEL_ALIGN instead. [1] https://lore.kernel.org/lkml/Y3adkSe%2FJ70PqUyt@p183 Fixes: 8bd200d23ec4 ("KVM: VMX: Flatten __vmx_vcpu_run()") Signed-off-by: Jon Kohler <[email protected]> Suggested-by: Alexey Dobriyan <[email protected]> CC: Josh Poimboeuf <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Reviewed-by: Jim Mattson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
-rw-r--r--arch/x86/kvm/vmx/vmenter.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index 631fd7da2bc3..07e927d4d099 100644
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -187,7 +187,7 @@ SYM_FUNC_START(__vmx_vcpu_run)
_ASM_EXTABLE(.Lvmresume, .Lfixup)
_ASM_EXTABLE(.Lvmlaunch, .Lfixup)
-SYM_INNER_LABEL(vmx_vmexit, SYM_L_GLOBAL)
+SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL)
/* Restore unwind state from before the VMRESUME/VMLAUNCH. */
UNWIND_HINT_RESTORE