Received: by 2002:a05:7412:1703:b0:e2:908c:2ebd with SMTP id dm3csp814316rdb; Fri, 25 Aug 2023 01:41:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0u4PkDT0itiWsVqkF6e4ZzAxoAFmX/GyC0REzANM35Yfh4npN56ULph8GxS/CmVcV7YNl X-Received: by 2002:a81:a24d:0:b0:58c:5259:af15 with SMTP id z13-20020a81a24d000000b0058c5259af15mr18243800ywg.30.1692952865842; Fri, 25 Aug 2023 01:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692952865; cv=none; d=google.com; s=arc-20160816; b=Y55N0xe00t6QjVJmK92LoMIxVLNAmhaI8awEGdSgNvEUTNgGzyhifTU/S1qmC0SMnY KBUOmdRukySxRoKyY7nSDZ/gKhb8Nl9GUhpFO3v1alR+Ja65WZanxQsCv2ie5TpQIhLh 5BTmvRMwiEpRK14ZgY48ZUiDBvrBsRSpwkt6okftNdQpSaIQC+vdRAmt8q3amJXDC6Lo rY15gW+sabzYyQO5Mbjf3fH+P96+IeaV5PRAgpMUayUicQB9e9O1xk+4xVfm+dvSOVgI CTPzyu0Ce/60JTcFZBMi5J2srbORH7PX73ux4rWbWhnmmjismS8iXmRR6tiurpSkHN4c A9jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hYl11HnZ+2oMHnGztKoZs8iz31hLpm/m6/QgBr+KfLI=; fh=ZwaEcDYNCnlh+U7YxZ1LCEcet9pcdhSkEX0cCEOksvY=; b=M+DXC75WShSw56QK9yVzvpNEHadevilYb9DZ4fH9eZ46zHxVDnqjofeQ3zDfweAeLH xbp526Mv43vyVd3QHzfzJnheOxvhY57cKIH5v46tyJjvWWcQT3dUX2QU+I1rVApF+em9 i2P/wDYq1CBkL4GpB7dJnXoXUjR0iLkC+gKecYQKRAtHeWeH4+mjlPGofizNR3aE+vdT +2FComtgFTsry+gjllVQixjAjjQKdPYdDy8m8KcUM+FLD5YLELoNj9GR9FJw78mesNAV pK6pqpaZG7YDhbiQNhdj4OXlHALZE2FpR3lnRjDI/hjkj4OmnDrcMi5m8IZV/GeCjAcH R9/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="r28Uw/7A"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j2-20020a63e742000000b00553a99dd783si1155308pgk.778.2023.08.25.01.40.50; Fri, 25 Aug 2023 01:41:05 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="r28Uw/7A"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243288AbjHYHDQ (ORCPT + 99 others); Fri, 25 Aug 2023 03:03:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242726AbjHYHCQ (ORCPT ); Fri, 25 Aug 2023 03:02:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 016B219AC for ; Fri, 25 Aug 2023 00:02:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8B32A66652 for ; Fri, 25 Aug 2023 07:02:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EA15C433CA; Fri, 25 Aug 2023 07:02:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692946934; bh=up6EQCkk1anAO1jmS2olnlb+On0n5aX/Ud3MSqE+cZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r28Uw/7AeJw1xr4ws4WPL+QRIDOYUqG0xMc8xtYlT703eGDpFnuoe7dJPAt1jSSal c0aHXn00jr7v2yOkLxihYSR63uJ7wQ3/3ufAMIQF+foMzN/dY0qE5tEr+fWoDqpx0l yHgWVYDHSFjZEHFIuUk6j3VquE7kGfKImeTPP17Ve73CU+4herEQFr/94bmfmerivE W6jkTjqFX6sO8OaUqRx+LUowbQ6ZTC2aYyZkmazymk4A1kz03iJaBFTnssmZ/qnd58 BLtej3X7hqGqV8eORRIX1PJENjQtBgRBhy/5IH8QQwtEyaquMdaicADRaLWj5quZRu PGpIQ76fRj40A== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Peter Zijlstra , Babu Moger , Paolo Bonzini , Sean Christopherson , David.Kaplan@amd.com, Andrew Cooper , Nikolay Borisov , gregkh@linuxfoundation.org, Thomas Gleixner Subject: [PATCH 20/23] x86/rethunk: Use SYM_CODE_START[_LOCAL]_NOALIGN macros Date: Fri, 25 Aug 2023 00:01:51 -0700 Message-ID: <1ae65b98ddc256ebc446768d9d0c461675dd0437.1692919072.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org Macros already exist for unaligned code block symbols. Use them. Signed-off-by: Josh Poimboeuf --- arch/x86/lib/retpoline.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 8ba79d2b8997..415521dbe15e 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -149,7 +149,7 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array) * As a result, srso_alias_safe_ret() becomes a safe return. */ .pushsection .text..__x86.rethunk_untrain -SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) +SYM_CODE_START_NOALIGN(srso_alias_untrain_ret) UNWIND_HINT_FUNC ANNOTATE_NOENDBR ASM_NOP2 @@ -159,7 +159,7 @@ SYM_FUNC_END(srso_alias_untrain_ret) .popsection .pushsection .text..__x86.rethunk_safe -SYM_START(srso_alias_safe_ret, SYM_L_GLOBAL, SYM_A_NONE) +SYM_CODE_START_NOALIGN(srso_alias_safe_ret) lea 8(%_ASM_SP), %_ASM_SP UNWIND_HINT_FUNC ANNOTATE_UNRET_SAFE @@ -187,7 +187,7 @@ SYM_CODE_END(srso_alias_return_thunk) */ .align 64 .skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc -SYM_START(srso_untrain_ret, SYM_L_LOCAL, SYM_A_NONE) +SYM_CODE_START_LOCAL_NOALIGN(srso_untrain_ret) ANNOTATE_NOENDBR .byte 0x48, 0xb8 @@ -255,7 +255,7 @@ SYM_CODE_END(srso_return_thunk) */ .align 64 .skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc -SYM_START(retbleed_untrain_ret, SYM_L_LOCAL, SYM_A_NONE) +SYM_CODE_START_LOCAL_NOALIGN(retbleed_untrain_ret) ANNOTATE_NOENDBR /* * As executed from retbleed_untrain_ret, this is: -- 2.41.0