Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jon Kohler <jon@nutanix.com>
To:     Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        "H. Peter Anvin" <hpa@zytor.com>,
        Josh Poimboeuf <jpoimboe@kernel.org>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Jon Kohler <jon@nutanix.com>, Alexey Dobriyan <adobriyan@gmail.com>
Subject: [PATCH] KVM: VMX: restore vmx_vmexit alignment
Date:   Wed, 31 May 2023 11:58:21 -0400
Message-Id: <20230531155821.80590-1-jon@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ee//AWFthtxHp1hyP3v5FbAl6uDV6u8g3JoqqivV51C04a04XQq/Pt+zErpM?=
 =?us-ascii?Q?cLzpNPF86KwsDBI4qAip1gXwxWAAhz6UwQijDgKNRQAnVLQoYQs3Br0otVmj?=
 =?us-ascii?Q?hjptq1IaKV/EAHwwAR0TrUpMnLLAunTfAbW6lW4zu0vPvlCcit5tP8so9QFh?=
 =?us-ascii?Q?onKNAL4cjurbjxDDNn5ql2UPDchKr/2b6/W+qVIvgOgafBmJ6uoU3r/FQ+Cb?=
 =?us-ascii?Q?rEmyPRtSLnSDJ+3PopAA588dL9pydSrWGFSgQyHp3g539Gh1RhwVZtQAnx72?=
 =?us-ascii?Q?1UCRHFnPdoJES0i4GNYZBz4M6PX+Go0xBc7nmnGcOjDnpK/5PSYTvjdYbnUf?=
 =?us-ascii?Q?eB+OHOvUFJg2IQhWWOszZdh2KCl08pTbwhX+mrAnkZp+SALUDlxMJ75I5sit?=
 =?us-ascii?Q?XfcAvNo3D9OTGLgyff1YiWoCtjf1VrYrSC9OH+uCYtNMy0tAFJYArWRdzgbR?=
 =?us-ascii?Q?taspRKNf6bjPjgf41ZBZrA7O+A2g+HmV3WGR3X0slF+bTnl7wYYBmUSOjd/n?=
 =?us-ascii?Q?o/dTAYLLRvLubY+p7i/vL98MDC8c/+lBJuTBD0GroF1CIjQptO1/R+T5i/9I?=
 =?us-ascii?Q?bkdBmmGv2JvpglfbgnMOBTv2JLB/PrIgJbFEgV8f76q50M3VRaX5IHgohlIh?=
 =?us-ascii?Q?RLMBuGtoQWmeOYZ4FY/rnOwerwUApcGsTayR7LkHFDlsdd4iogHBW8Tm+R6S?=
 =?us-ascii?Q?mQOLxBQhhQDgY6nO4Juyzx3v6ROfRknStchlS8xxQjubmHFBlKJcY1dmtAMz?=
 =?us-ascii?Q?FnbTnGmcnfwe1dHo55Apy6DFLVh1haCQAwzHklkOknLY3h8mpGJKf06klNfo?=
 =?us-ascii?Q?RNG5RPdjF8IpsIvkwzeO39Cc6fw008lIltWR1DdM3uMashR9ygfgBgmyJhxT?=
 =?us-ascii?Q?vOfHwatLmv58ihwEPlU71fmogyLAyDQ0Q/kOj30p5u0h/I5Ej9OUfABZGZmV?=
 =?us-ascii?Q?JmPH2IlvUNrhqpyprwiMk4LTiJxLg9E2YyITG+3892HEJXn4ahu0nAuh9mpV?=
 =?us-ascii?Q?AHSD98xfwI9AxbDkDtsL+R6gyxud/fHa8GpbxGwVjRqnqXTNX9Ss92meWSYb?=
 =?us-ascii?Q?3rHIMkK4hjRRkKt8KoLdXyVCy3rWJ5Mav4jeR5VZlpQCud1tOakey4+HxoaQ?=
 =?us-ascii?Q?YnIJbYnsjdzquGxsITGfFqFNohfYcMYfwVltpTdercKVllqLCuOWIXddMRgS?=
 =?us-ascii?Q?zCCYRWJHfDVM9TIOHXsLGV/471zh5QkXtSRm8MkGprOMRIIuS6DwN/oAK7F8?=
 =?us-ascii?Q?Tuii9zsa1IdPTDBn/qPysSUdHxYyP0dNdCxz2I09bNYeY/K32jbQyJPzWtAK?=
 =?us-ascii?Q?7IB2gWwcohcn/zZSt/7Znq+WI0KL5c1j3qrSSAzLDf9wHkOyGv0S2zBGGrRF?=
 =?us-ascii?Q?rcOTpYa3D4EtXVhG/400U37nLnqzZ2oRXg46DKB1WF3g0KpfGjaglXhKsfyP?=
 =?us-ascii?Q?30PpkM83k1vV1vnOT2pC0KD2GlV6N15+FCBHH/yYt9/7/B/RX5NH4yB1IiRK?=
 =?us-ascii?Q?looSzWaPMJLgjk+X8O6KsKsUNjxkiwX8Jm9/1nzsFufer49nqL0Gw477h2HH?=
 =?us-ascii?Q?Ptwf5WPrlWcBTz9rE7Ieh5dECMVWCZOGgvaFw7AueA7iEbNQyD0+snF355m8?=
 =?us-ascii?Q?Ca8j2AeW8YWC3vED1rJXVxyaiYK1BTmi/lqhVXw4xEXOohdIluSCRPbdtxzV?=
 =?us-ascii?Q?vVBsQA=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 55e26a83-0ba6-4bbc-3530-08db61efe48f
X-MS-Exchange-CrossTenant-AuthSource: BL0PR02MB4579.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2023 15:58:36.4959
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: BtrbYWwgx+vlRtGsPZNpDM1qKjEUPOj82HlSnj5UUTpwa6SaSqQO1UgdId9mUdNXO4jsF+6nJkKPMOzCRUSL3Gs2d7WTfWpf9b9FyURk1SI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR02MB9604
X-Proofpoint-ORIG-GUID: _I3WxyMWGx9FHhz2iGg3inofqaZBb8fq
X-Proofpoint-GUID: _I3WxyMWGx9FHhz2iGg3inofqaZBb8fq
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-31_10,2023-05-31_03,2023-05-22_02
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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)