From patchwork Mon Aug 21 01:19:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 136347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2845299vqi; Mon, 21 Aug 2023 00:49:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOqeBWFnGOLetjZOG2VjJaEz2JwXIcFiiS18p7ZpgzFCcn7n5OSWDL/3wWYBCyPn+1iDeD X-Received: by 2002:a05:6a00:2d1c:b0:676:8fac:37 with SMTP id fa28-20020a056a002d1c00b006768fac0037mr8746020pfb.4.1692604180163; Mon, 21 Aug 2023 00:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692604180; cv=none; d=google.com; s=arc-20160816; b=MEySs0Kbh2jmHUUGRm/etd++sj5CL+QTnIcwawiXKfAllnUfIdeD8izk+mlM0nvV5h Nsnmzr/cXZ0aI7lSF6GZEeFq+wZhphKOsNtEv9hOcN/TPHG3SjwKxye3xsB0MaxmV09I XUYdu5EH9MjE3VuFwvGqFIKltgicdHNOolPE9lbpXStJLwbwsCicHntLetWMolOzaFrK C+bJQS353igCkxlj9pANpr/+kiN7Lgwuw/tRP3oTSGdtVIGggTZHG5vKEAkyo0oSjjig PkB6BQCBPMaDpxsSN1Ld1Ubvp9AtIsb9HOSflUuNUB9/2SP/jiB2c6e+lGDMeYwuJWWz cDZg== 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=nBr9QRbTFY9REBZE0zhNoOMuGRel1GeFTAwUlMVAg6k=; fh=1KVrD/LnRsN9N7k2d12iARV4DA2tVMW012QtKSrD46c=; b=Lo0dwB2GJI53zJX+fXz4vtYKVZsySsvPXwOW2G1kLtl5SMaXnhKMWua63cCF/l5F79 BCtf2bJh7L77twiCSpUVuROim7EDMJpe8NKALU1F6ER7lT+DLo6v3BhEGqhC70BWxTET kYrlkVB/g8DmX/sFWL5xtSQzy+J4b5tbJkcHfORD8/XZUo6lzJtzfw/kYa816gThT5mL Aw2DPzq5ZIEJ75cE66kbiJSDAmD+/otcrmJNxiUZG31NRLFkLaoTdLzLglQuFIYjmycl OgkfIH61pZRUzGhc9Qy7sVZ7wjwI8c82vuBtSK4N5o0Mx5x9JaLfD560IkezHPn+ELN8 7siw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kHOSMxip; 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 m4-20020a056a00080400b00686db9a11bbsi7146121pfk.61.2023.08.21.00.49.26; Mon, 21 Aug 2023 00:49:40 -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=kHOSMxip; 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 S232319AbjHUBT6 (ORCPT + 99 others); Sun, 20 Aug 2023 21:19:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232297AbjHUBTk (ORCPT ); Sun, 20 Aug 2023 21:19:40 -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 778CCBB for ; Sun, 20 Aug 2023 18:19:37 -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 5007D62656 for ; Mon, 21 Aug 2023 01:19:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48445C433CA; Mon, 21 Aug 2023 01:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692580776; bh=Rh6jVE627xOscRDx5dqwSk4xoZ7NqUVdoeif7QYfiIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kHOSMxip3/QqUYd1m5/BLbDmsTpT/F9Prp4TIfTL8TfCODSnLJq3YG00YoDaSEh/z I/psGJ4yR5FH+/bg32mE/1xGIMBLUNVXza9RzrTZIQ9LltFno8+fXRtRfqr3PppS/q 8Z2TcdcEaM9zieB0Qd5MLpKWhBFADWOrN3Ne7cCGyWZ8682HcQC8QYo+VIYJ1jzOgK vtJlz6zqg9eV3C1TYLC1S/zSayYYE5R2xA6Vyj43OovHJrK67AlG7t4ZF9w/V104TA 9uifkOzTIi3TJjucoX0scP4eEz1gbS+D7BzrzN9aUtO1wIGcso6Y0TwVo2uaCJP1f4 7ih/O7ITBMeUw== 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 16/22] x86/srso: Unexport untraining functions Date: Sun, 20 Aug 2023 18:19:13 -0700 Message-ID: <3f72ac3b503c69ab65d86b4372ca54909d730d7a.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=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: 1774824121030588009 X-GMAIL-MSGID: 1774824121030588009 These functions aren't called outside of retpoline.S. Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/nospec-branch.h | 4 ---- arch/x86/lib/retpoline.S | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 197ff4f4d1ce..6c14fd1f5912 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -352,10 +352,6 @@ extern void retbleed_return_thunk(void); extern void srso_return_thunk(void); extern void srso_alias_return_thunk(void); -extern void retbleed_untrain_ret(void); -extern void srso_untrain_ret(void); -extern void srso_alias_untrain_ret(void); - extern void entry_untrain_ret(void); extern void entry_ibpb(void); diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index cd86aeb5fdd3..5e3b016c6d3e 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -157,7 +157,6 @@ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) lfence jmp srso_alias_return_thunk SYM_FUNC_END(srso_alias_untrain_ret) -__EXPORT_THUNK(srso_alias_untrain_ret) .section .text..__x86.rethunk_safe #else @@ -216,7 +215,7 @@ SYM_CODE_END(srso_alias_return_thunk) */ .align 64 .skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc -SYM_START(retbleed_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) +SYM_START(retbleed_untrain_ret, SYM_L_LOCAL, SYM_A_NONE) ANNOTATE_NOENDBR /* * As executed from retbleed_untrain_ret, this is: @@ -264,7 +263,6 @@ SYM_CODE_END(retbleed_return_thunk) jmp retbleed_return_thunk int3 SYM_FUNC_END(retbleed_untrain_ret) -__EXPORT_THUNK(retbleed_untrain_ret) /* * SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret() @@ -278,7 +276,7 @@ __EXPORT_THUNK(retbleed_untrain_ret) */ .align 64 .skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc -SYM_START(srso_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) +SYM_START(srso_untrain_ret, SYM_L_LOCAL, SYM_A_NONE) ANNOTATE_NOENDBR .byte 0x48, 0xb8 @@ -299,7 +297,6 @@ SYM_INNER_LABEL(srso_safe_ret, SYM_L_GLOBAL) ud2 SYM_CODE_END(srso_safe_ret) SYM_FUNC_END(srso_untrain_ret) -__EXPORT_THUNK(srso_untrain_ret) SYM_CODE_START(srso_return_thunk) UNWIND_HINT_FUNC