From patchwork Wed Aug 2 14:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 129919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp550552vqx; Wed, 2 Aug 2023 08:48:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlHvSVg/e8GvXoYfa5SH99kVqxRwRcVY9Pv9WHeuV0Rt6ZOW7Gt9HOcuEownJPrDXmcc/RTw X-Received: by 2002:a17:902:76cc:b0:1bc:e6a:2059 with SMTP id j12-20020a17090276cc00b001bc0e6a2059mr6960435plt.26.1690991314898; Wed, 02 Aug 2023 08:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690991314; cv=none; d=google.com; s=arc-20160816; b=s80+r+186CpEjyhxz2LuFQXDVhkLILzYoImjSgmj80RRykwORlEx1ylZAb7cFEIceg RlYonxPSoeEXZ251a9bwmc2my/gw0wgb0HjGrXh/enymQNcBd6nbgtKO6z0ZmKaFeGlh tEw6hEZF/HrDti18TAgd9Mi8nkAbGa2HFdNzS8OW3/x+kqoOopg4FuqCE5kHDWUkr5FX lTVudB00OTXJrKeqmfJ4p5Pbwrr6xVTy36Cpv5TBn6rNTb/lTgDsgrb3uSSPjK8Qh0Yv 7kml/5EJnIzGi+ryU1vGZLM3ZCZTOx5xCHGoowcJszgv78B1+uG3JzsTlkxUxiETRIA7 wnzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=iBsgB1YLGfdl/SuhRbFuHsRmPl5vqrv9c+Xp2VGeIns=; fh=MWxlNZsqKOZay4lqG2IosM3VQOBDas3F2EcMfbwebEQ=; b=dym0zlAyVOrRlb3LRqVVXlzbnEs1dLFQxZPxJqjRgmq6KU+qNGaWjTQqnwUub7FWlc 35IqErTdtwg7AGWEPFLdYG12t1TMjD3d15pZfiw2YuDhKWAjpS8SwFBA1kXt14b0uZei bDoADtVACq3U93JZ7KvLlQtqeDx2DIjAt0VMFVO9cDfcvaZej3UjhouEtAG1qycZts28 rpDcAEUAt6cto/gsiML9yeX9TJiDRG1siuA8ydNAYOEU93z3c1PCilHp++GvDcf7aT+c qaqaEkKfr5zHfSjp4G7ENptw8ZpHQcWbQAOx6v+YODY8P1Y9rcuaEesIhMVAunTyM1P1 1Uqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=YO9grGOi; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a170902da8e00b001bb7b0d358bsi2618498plx.272.2023.08.02.08.48.20; Wed, 02 Aug 2023 08:48:34 -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=@linutronix.de header.s=2020 header.b=YO9grGOi; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233766AbjHBOdV (ORCPT + 99 others); Wed, 2 Aug 2023 10:33:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231795AbjHBOdU (ORCPT ); Wed, 2 Aug 2023 10:33:20 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 677221723; Wed, 2 Aug 2023 07:33:18 -0700 (PDT) Date: Wed, 02 Aug 2023 14:33:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690986796; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iBsgB1YLGfdl/SuhRbFuHsRmPl5vqrv9c+Xp2VGeIns=; b=YO9grGOi6dMO5re7MmmMEkWvlIcKpXTNPZRXY9A1EJKHFhqPGRtwgveF6hX7elLOtSLdL2 8qMih6NwA8uJg0FlHlaAZwswAQfS5j+BkPc7JBHWZEATmA0ZYrg/+jTRRvTcNHTI46sUy0 JJsMH8Hb3kg0hexYTt4yL0+lwl68xhXqAScVmE568OAdhlRpvKRTSI+c3mknty4JoypMk8 vCWsAEXZLDFFgukEXfdue8rIw6aEMd4cG1SuZoskB9L+JSGLeYCbjDhjF2LeqkeIr1VST/ cRM62+zDMTugwM61R88rKorxau6OLHGb/m2VH4k3t/8MstDhHEN7quL+cX+4yA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690986796; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iBsgB1YLGfdl/SuhRbFuHsRmPl5vqrv9c+Xp2VGeIns=; b=uRe1hDAh9TJSm1ycOqyQBOKXTb8CnsvlijTKGrq30Qox39Rwa7gCXALXKPLe65B7PJ6/iL +and02IxgK0+6jDw== From: "tip-bot2 for Petr Pavlu" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG Cc: Petr Pavlu , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230711091952.27944-2-petr.pavlu@suse.com> References: <20230711091952.27944-2-petr.pavlu@suse.com> MIME-Version: 1.0 Message-ID: <169098679602.28540.7005603884356771970.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771116661811027902 X-GMAIL-MSGID: 1773132908740179605 The following commit has been merged into the x86/core branch of tip: Commit-ID: 973ab2d61f33dc85212c486e624af348c4eeb5c9 Gitweb: https://git.kernel.org/tip/973ab2d61f33dc85212c486e624af348c4eeb5c9 Author: Petr Pavlu AuthorDate: Tue, 11 Jul 2023 11:19:51 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 02 Aug 2023 16:27:07 +02:00 x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG Linker script arch/x86/kernel/vmlinux.lds.S matches the thunk sections ".text.__x86.*" from arch/x86/lib/retpoline.S as follows: .text { [...] TEXT_TEXT [...] __indirect_thunk_start = .; *(.text.__x86.*) __indirect_thunk_end = .; [...] } Macro TEXT_TEXT references TEXT_MAIN which normally expands to only ".text". However, with CONFIG_LTO_CLANG, TEXT_MAIN becomes ".text .text.[0-9a-zA-Z_]*" which wrongly matches also the thunk sections. The output layout is then different than expected. For instance, the currently defined range [__indirect_thunk_start, __indirect_thunk_end] becomes empty. Prevent the problem by using ".." as the first separator, for example, ".text..__x86.indirect_thunk". This pattern is utilized by other explicit section names which start with one of the standard prefixes, such as ".text" or ".data", and that need to be individually selected in the linker script. Fixes: dc5723b02e52 ("kbuild: add support for Clang LTO") Signed-off-by: Petr Pavlu Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20230711091952.27944-2-petr.pavlu@suse.com Acked-by: Josh Poimboeuf --- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/x86/lib/retpoline.S | 4 ++-- tools/objtool/check.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 03c885d..a4cd04c 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -134,7 +134,7 @@ SECTIONS SOFTIRQENTRY_TEXT #ifdef CONFIG_RETPOLINE __indirect_thunk_start = .; - *(.text.__x86.*) + *(.text..__x86.*) __indirect_thunk_end = .; #endif STATIC_CALL_TEXT diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 3fd066d..3bea963 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -12,7 +12,7 @@ #include #include - .section .text.__x86.indirect_thunk + .section .text..__x86.indirect_thunk .macro POLINE reg @@ -131,7 +131,7 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array) */ #ifdef CONFIG_RETHUNK - .section .text.__x86.return_thunk + .section .text..__x86.return_thunk /* * Safety details here pertain to the AMD Zen{1,2} microarchitecture: diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 8936a05..e096eb3 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -389,7 +389,7 @@ static int decode_instructions(struct objtool_file *file) if (!strcmp(sec->name, ".noinstr.text") || !strcmp(sec->name, ".entry.text") || !strcmp(sec->name, ".cpuidle.text") || - !strncmp(sec->name, ".text.__x86.", 12)) + !strncmp(sec->name, ".text..__x86.", 12)) sec->noinstr = true; /*