From patchwork Mon Aug 21 01:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 136355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2877943vqi; Mon, 21 Aug 2023 02:15:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGW/LOQ5XHkbmK+uL8qA26SXVSrqBoG2KcPqEFYSEuW2Rt6X5SzjUqS5/Rjj3tq7uZ3lctk X-Received: by 2002:a17:906:5198:b0:99d:de25:89b3 with SMTP id y24-20020a170906519800b0099dde2589b3mr3649955ejk.26.1692609331700; Mon, 21 Aug 2023 02:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692609331; cv=none; d=google.com; s=arc-20160816; b=rZmIJuntbQG/9a1Ntm4cc/hceU0XM23mWErotMnsg3wi/i6zYCg/NGvrVKU3uCbxOT l5kncJT4EGh+HJ4hS1CWH0sHfptdQGBVxdC82U5HFGXiRJ9FCj8/e6L8tqXao6kuMgrY bX1M6AtrfXMNE0evVSNRiHz4OTqfgZffDNHYB+VgTh54KCI+87lEZEPQY4apwlMTxTjt QGmzdwdEukMXaYIUq60Nx4BL6yMpihfLvH/eM5wBioEQkaKo0jb/ttcuELdp1KTsUwZF EbWzTjlHDz2t1xcNi+xCn1NPn8V+zZ1bNMRsKYA8KjAtuG+omTnfBqTeDoq9Ji6k+btF J3Ww== 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=dQ5MU2kYtzsWmO3+NWqvPh9mSzIuSrk3TYWuuAeLHVQ=; fh=1KVrD/LnRsN9N7k2d12iARV4DA2tVMW012QtKSrD46c=; b=nva1j8B+nEInaj4+Qb6xmdgoqGdrJa6c90LOJMuRAeTDP0tLHto4OTu8zdNZ16l+DO xPvTTbV3YuS7bOWWFlAk+uP4Ht7wnbnLzaY4XtKHpQqSV46yy6Gs6IC61PKeMWatZ9pk o1gIqQEYG07wIbMv7JQ4AzD4IMW3lx5hixsZMkqClMooxJheemY7Qk2WpOrBTCA0GOFO 2ApEuUWlUNyy2W7RApD9xbH3/AhkRUJgIXU5FaKynXeQde2cErVFByXHyLdNKde/vJZP DCxH+L02Dhx3QyA3sbGULEvfv2BJAfpKe7YJnveroMr1pNxh2mbNwe57PCDeo5nNsQlX IFTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TLFc6PUE; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dc11-20020a170906c7cb00b00988a9273633si5272850ejb.344.2023.08.21.02.15.07; Mon, 21 Aug 2023 02:15:31 -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=TLFc6PUE; 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 S232431AbjHUBUB (ORCPT + 99 others); Sun, 20 Aug 2023 21:20:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232346AbjHUBTo (ORCPT ); Sun, 20 Aug 2023 21:19:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AD81C5 for ; Sun, 20 Aug 2023 18:19:38 -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 1B9C962600 for ; Mon, 21 Aug 2023 01:19:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78351C433BC; Mon, 21 Aug 2023 01:19:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692580777; bh=/KwWNgSYPkUd1BQwjMGaME6UyYfycSaI0h8YlDU3UQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLFc6PUE0KYjVA7Hw//4qd4fhfK0GfvqceS+T76cxUjcVCTGQd9vF4KPeO1wDPKil /PTO3QmqAQWHbXT3NgZ9YYAOfs6eZpGNmKFpT3H2bZDLDXtCGqTcdGkpCNW6USJhEf 7DM1qWXADpuqKUqxS0WXNX+hrJZYfTOoYId0glwLXOY6aZjN9nV/BUoGkPBtECXH5y o7Pf3O5yHOHkMstIDNni9GnojPzcr6jxwHS639nNI0ftqvxkyZEfygU0GUAk0x9FKu 2j7r9S3oUqLLmys73+3pjex3ERQew9Jwv+B0jOH2NnrqBPwaDS/srw8XXYZchCpKov gpLLWDU6QwGng== 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 18/22] x86/rethunk: Use SYM_CODE_START[_LOCAL]_NOALIGN macros Date: Sun, 20 Aug 2023 18:19:15 -0700 Message-ID: <319d14f7bb8303bbc51eba782ed94279720eb156.1692580085.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774829522403346564 X-GMAIL-MSGID: 1774829522403346564 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 e5be0ecf3ce0..af3c1f0e4fb8 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: