From patchwork Wed Dec 7 19:16:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 13067549 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B1ADC63706 for ; Wed, 7 Dec 2022 19:17:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229548AbiLGTRn (ORCPT ); Wed, 7 Dec 2022 14:17:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbiLGTRl (ORCPT ); Wed, 7 Dec 2022 14:17:41 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6826C26574; Wed, 7 Dec 2022 11:17:40 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 13CC2B81FE7; Wed, 7 Dec 2022 19:17:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11D22C433D6; Wed, 7 Dec 2022 19:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670440657; bh=O+mCEvtYCx0AflkiAmltBJS93iQNSFHj5Pd7wMO3/i4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ja82WIxkHCB/Rsu+xHdTA0oOP/igTfx8sxCe1ulCIjMXug8rHWT9T18gmwLylyjtv K0t64QbxFcod/6YwdypxTuEsvAYwLPceHEdZwDkA9pCFT+VKjvMugvxztrwjluxKbf SQ24nJlxess2ICufBbAJ5niSq6WL3LrVadzUajgjX6vZ/eCnAdOiumf3dye37iQOTr 1Lk5vasguocZUSg+OAsxVrc750gFCilH0IkCrzj0BNhTdgpYhRIqCj79wKcPBOw3+P TSdTKe/L8RcFHUx/oA8wnZN4qjCVYqR0TMTBhOizIZvILkI6QJGFt1Ami6EKiQ4HnQ ibv1C8PR/H4wg== From: Nathan Chancellor To: Masahiro Yamada Cc: Nick Desaulniers , Tom Rix , Nicolas Schier , Sami Tolvanen , Vincent Donnefort , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, patches@lists.linux.dev, Nathan Chancellor , Alexander Lobakin Subject: [PATCH v2 2/2] modpost: Include '.text.*' in TEXT_SECTIONS Date: Wed, 7 Dec 2022 12:16:57 -0700 Message-Id: <20221207191657.2852229-3-nathan@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221207191657.2852229-1-nathan@kernel.org> References: <20221207191657.2852229-1-nathan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Commit 6c730bfc894f ("modpost: handle -ffunction-sections") added ".text.*" to the OTHER_TEXT_SECTIONS macro to fix certain section mismatch warnings. Unfortunately, this makes it impossible for modpost to warn about section mismatchs with LTO, which implies '-ffunction-sections', as all functions are put in their own '.text.' sections, which may still reference functions in sections they are not supposed to, such as __init. Fix this by moving ".text.*" into TEXT_SECTIONS, so that configurations with '-ffunction-sections' will see warnings about mismatched sections. Link: https://lore.kernel.org/Y39kI3MOtVI5BAnV@google.com/ Reported-by: Vincent Donnefort Reviewed-and-tested-by: Alexander Lobakin Reviewed-by: Sami Tolvanen Tested-by: Vincent Donnefort Signed-off-by: Nathan Chancellor --- scripts/mod/modpost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 2c80da0220c3..c861beabc128 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -823,10 +823,10 @@ static void check_section(const char *modname, struct elf_info *elf, #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS #define DATA_SECTIONS ".data", ".data.rel" -#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ +#define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \ ".kprobes.text", ".cpuidle.text", ".noinstr.text" #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ - ".fixup", ".entry.text", ".exception.text", ".text.*", \ + ".fixup", ".entry.text", ".exception.text", \ ".coldtext", ".softirqentry.text" #define INIT_SECTIONS ".init.*"