From patchwork Wed Dec 7 19:16:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 13067548 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 A229EC63705 for ; Wed, 7 Dec 2022 19:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229846AbiLGTRm (ORCPT ); Wed, 7 Dec 2022 14:17:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbiLGTRk (ORCPT ); Wed, 7 Dec 2022 14:17:40 -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 9C2F81EC5B; Wed, 7 Dec 2022 11:17:38 -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 57663B81F86; Wed, 7 Dec 2022 19:17:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50B73C43470; Wed, 7 Dec 2022 19:17:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670440656; bh=2rBYuZvHrFw6BWvRwxpqptxIjzeWHSbg9PrlE7+shJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GgFIJOn4hiE1wEMjtsEnFpM8zBYMzwcNdWpjKMMULtwhe4EhKmj/Bfaai+EVvK/lG 3FeotmzeFmqcn3LZRZ/c1uT7FNas3lXagpaFpGY9aLvE2ow14CJaSN+fzkkF0ysw3o /b9ov/yP28e0preCaDu2ArZSptJi2gWIPUFb601dRRS1cYrytE3xL0Bp/lFZ0Syz7M wwiimOzaCE0rbZVWDy7A3XTP0c3iWKD3wLkRi/H7Q2re8oDHb5uiceBSmIAXvgWjtZ uVKQl0U3KZrvzp8BTwTsoXcLaX+OE21OnT0BYSp1RF3lhHHGYehVHqkN1is13+T/nW naXUY4WV/BfBQ== 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 , Daniel Jordan , Steffen Klassert , linux-crypto@vger.kernel.org Subject: [PATCH v2 1/2] padata: Mark padata_work_init() as __ref Date: Wed, 7 Dec 2022 12:16:56 -0700 Message-Id: <20221207191657.2852229-2-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 When building arm64 allmodconfig + ThinLTO with clang and a proposed modpost update to account for -ffuncton-sections, the following warning appears: WARNING: modpost: vmlinux.o: section mismatch in reference: padata_work_init (section: .text.padata_work_init) -> padata_mt_helper (section: .init.text) WARNING: modpost: vmlinux.o: section mismatch in reference: padata_work_init (section: .text.padata_work_init) -> padata_mt_helper (section: .init.text) LLVM has optimized padata_work_init() to include the address of padata_mt_helper() directly, which causes modpost to complain since padata_work_init() is not __init, whereas padata_mt_helper() is. In reality, padata_work_init() is only called with padata_mt_helper() as the work_fn argument in code that is __init, so this warning will not result in any problems. Silence it with __ref, which makes it clear to modpost that padata_work_init() can only use padata_mt_helper() in __init code. Suggested-by: Daniel Jordan Signed-off-by: Nathan Chancellor Acked-by: Daniel Jordan --- Cc: Steffen Klassert Cc: Daniel Jordan Cc: linux-crypto@vger.kernel.org --- kernel/padata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 76dcd734eca23168cb008912c0f69ff408905235 diff --git a/kernel/padata.c b/kernel/padata.c index e5819bb8bd1d..4c3137fe8449 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -83,8 +83,8 @@ static struct padata_work *padata_work_alloc(void) return pw; } -static void padata_work_init(struct padata_work *pw, work_func_t work_fn, - void *data, int flags) +static __ref void padata_work_init(struct padata_work *pw, work_func_t work_fn, + void *data, int flags) { if (flags & PADATA_WORK_ONSTACK) INIT_WORK_ONSTACK(&pw->pw_work, work_fn); 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.*"