* [PATCH] KVM: VMX: restore vmx_vmexit alignment
@ 2023-05-31 15:58 Jon Kohler
2023-05-31 16:00 ` Jim Mattson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jon Kohler @ 2023-05-31 15:58 UTC (permalink / raw)
To: Sean Christopherson, Paolo Bonzini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Josh Poimboeuf, Peter Zijlstra (Intel),
kvm, linux-kernel
Cc: Jon Kohler, Alexey Dobriyan
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 <jon@nutanix.com>
Suggested-by: Alexey Dobriyan <adobriyan@gmail.com>
CC: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/x86/kvm/vmx/vmenter.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.30.1 (Apple Git-130)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: VMX: restore vmx_vmexit alignment
2023-05-31 15:58 [PATCH] KVM: VMX: restore vmx_vmexit alignment Jon Kohler
@ 2023-05-31 16:00 ` Jim Mattson
2023-05-31 22:48 ` Josh Poimboeuf
2023-06-02 1:25 ` Sean Christopherson
2 siblings, 0 replies; 4+ messages in thread
From: Jim Mattson @ 2023-05-31 16:00 UTC (permalink / raw)
To: Jon Kohler
Cc: Sean Christopherson, Paolo Bonzini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Josh Poimboeuf, Peter Zijlstra (Intel),
kvm, linux-kernel, Alexey Dobriyan
On Wed, May 31, 2023 at 8:59 AM Jon Kohler <jon@nutanix.com> wrote:
>
> 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 <jon@nutanix.com>
> Suggested-by: Alexey Dobriyan <adobriyan@gmail.com>
> CC: Josh Poimboeuf <jpoimboe@kernel.org>
Reviewed-by: Jim Mattson <jmattson@google.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: VMX: restore vmx_vmexit alignment
2023-05-31 15:58 [PATCH] KVM: VMX: restore vmx_vmexit alignment Jon Kohler
2023-05-31 16:00 ` Jim Mattson
@ 2023-05-31 22:48 ` Josh Poimboeuf
2023-06-02 1:25 ` Sean Christopherson
2 siblings, 0 replies; 4+ messages in thread
From: Josh Poimboeuf @ 2023-05-31 22:48 UTC (permalink / raw)
To: Jon Kohler
Cc: Sean Christopherson, Paolo Bonzini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Peter Zijlstra (Intel),
kvm, linux-kernel, Alexey Dobriyan
On Wed, May 31, 2023 at 11:58:21AM -0400, Jon Kohler wrote:
> 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 <jon@nutanix.com>
> Suggested-by: Alexey Dobriyan <adobriyan@gmail.com>
> CC: Josh Poimboeuf <jpoimboe@kernel.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
--
Josh
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] KVM: VMX: restore vmx_vmexit alignment
2023-05-31 15:58 [PATCH] KVM: VMX: restore vmx_vmexit alignment Jon Kohler
2023-05-31 16:00 ` Jim Mattson
2023-05-31 22:48 ` Josh Poimboeuf
@ 2023-06-02 1:25 ` Sean Christopherson
2 siblings, 0 replies; 4+ messages in thread
From: Sean Christopherson @ 2023-06-02 1:25 UTC (permalink / raw)
To: Sean Christopherson, Paolo Bonzini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Josh Poimboeuf, Peter Zijlstra (Intel),
kvm, linux-kernel, Jon Kohler
Cc: Alexey Dobriyan
On Wed, 31 May 2023 11:58:21 -0400, Jon Kohler wrote:
> 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.
>
> [...]
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-02 1:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-31 15:58 [PATCH] KVM: VMX: restore vmx_vmexit alignment Jon Kohler
2023-05-31 16:00 ` Jim Mattson
2023-05-31 22:48 ` Josh Poimboeuf
2023-06-02 1:25 ` Sean Christopherson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®