Skip to content

Commit 331f229

Browse files
JonKohlersean-jc
authored andcommitted
KVM: VMX: restore vmx_vmexit alignment
Commit 8bd200d ("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: 8bd200d ("KVM: VMX: Flatten __vmx_vcpu_run()") Signed-off-by: Jon Kohler <jon@nutanix.com> Suggested-by: Alexey Dobriyan <adobriyan@gmail.com> CC: Josh Poimboeuf <jpoimboe@kernel.org> Acked-by: Josh Poimboeuf <jpoimboe@kernel.org> Reviewed-by: Jim Mattson <jmattson@google.com> Link: https://lore.kernel.org/r/20230531155821.80590-1-jon@nutanix.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 33ab767 commit 331f229

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/kvm/vmx/vmenter.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ SYM_FUNC_START(__vmx_vcpu_run)
187187
_ASM_EXTABLE(.Lvmresume, .Lfixup)
188188
_ASM_EXTABLE(.Lvmlaunch, .Lfixup)
189189

190-
SYM_INNER_LABEL(vmx_vmexit, SYM_L_GLOBAL)
190+
SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL)
191191

192192
/* Restore unwind state from before the VMRESUME/VMLAUNCH. */
193193
UNWIND_HINT_RESTORE

0 commit comments

Comments
 (0)