KVM: VMX: restore vmx_vmexit alignment
PATCH 1/1 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
--- arch/x86/kvm/vmx/vmenter.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/vmenter.S +1 -1
@@ -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
Signature · 1 line
2.30.1 (Apple Git-130)
Quoted 6 lines · Jon Kohler
Commit
8bd200d23ec4("KVM: VMX: Flatten__vmx_vcpu_run()") changedvmx_vmexitfromSYM_FUNC_STARTtoSYM_INNER_LABEL, accidentally removing 16 byte alignment asSYM_FUNC_STARTusesSYM_A_ALIGNandSYM_INNER_LABELdoes not. Josh mentioned [1] this was unintentional.
Quoted 8 lines
Fix by changing to
SYM_INNER_LABEL_ALIGNinstead.[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]>
Quoted 5 lines · Jon Kohler
Commit
8bd200d23ec4("KVM: VMX: Flatten__vmx_vcpu_run()") changedvmx_vmexitfromSYM_FUNC_STARTtoSYM_INNER_LABEL, accidentally removing 16 byte alignment asSYM_FUNC_STARTusesSYM_A_ALIGNandSYM_INNER_LABELdoes not. Josh mentioned [1] this was unintentional.
Quoted 8 lines
Fix by changing to
SYM_INNER_LABEL_ALIGNinstead.[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]>
Signature · 1 line
Josh
Quoted 8 lines · Jon Kohler
Commit
8bd200d23ec4("KVM: VMX: Flatten__vmx_vcpu_run()") changedvmx_vmexitfromSYM_FUNC_STARTtoSYM_INNER_LABEL, accidentally removing 16 byte alignment asSYM_FUNC_STARTusesSYM_A_ALIGNandSYM_INNER_LABELdoes not. Josh mentioned [1] this was unintentional.Fix by changing to
SYM_INNER_LABEL_ALIGNinstead.[...]
Applied to kvm-x86 vmx, thanks!
[1/1] KVM: VMX: restore vmx_vmexit alignment
https://github.com/kvm-x86/linux/commit/331f22976816
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes