From patchwork Thu Jun 8 14:24:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 104994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp371268rwl; Thu, 8 Jun 2023 07:31:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55HH8p69Gvphjk1HRTIymCuHNejefpr2MAaKZXnn5YF12WzIFij0Xtwe/RNIkEWUIM0u48 X-Received: by 2002:a05:6a00:158d:b0:64d:40e0:5580 with SMTP id u13-20020a056a00158d00b0064d40e05580mr2848012pfk.3.1686234677747; Thu, 08 Jun 2023 07:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686234677; cv=none; d=google.com; s=arc-20160816; b=y2IuduIpzxiTk5yJvul2P3G+ykOAoW6Zv62jNcHgEbfq1k3Qr+HqJ9Q4MUlK5WJJyG W7dnEw46af4vVM5nUq12gUdOJok4U6YDi93Ku0wZJ+WQPk8yUmm99m7xHY2ujHB49OQF 9F9E9fnqLE/GBuzEGacT8TiobJ2YvGBYV4IYK7AkfPeJpsmkm/y5Ea6sLqTsp4lpzBP7 HXeos+RO0GXQWDip8fvJlCfJ6Pk+IpYDfHqVyr4IZel8p8fHQQuMYrTgtkmZtiMyWQyr RUXRUDkHqpHvxxV9PX40gI8rxzaXlVsuXsJb/EEh+QwscdW1xwMH2MO401c5GvkOK9ZP Pzsw== 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=QdmNUIqG7ds7rBdJCsc4wL6l92o8tud4N9bDUyUrmoI=; b=qoJlB3baB820yd47rX9FklczQtHW+lWIe9wICnuD4TZDknn8SIrF04a39DVkvK2K/M Mwwb8lWyUig7mYgw+IAHV8rPnDd8yi346AHLrlMuTKRwchltIzfcYQfnYWDQLaUBwLbY udK+db+p2YyPbxX+6y0b3mFVH2bnmU7+FQR01bTIXEsQeIo+Tn2nfwM4SapAzf2CXm2j T1Txnfeq2dhqW3+6rIroHQfkndaG/M/q5lUabJLsV35plIOINoySDXH4NhoNBi53P5Xp 8Pn4X8v+qgbFlwrM5lYE1PTZZ+q28YsNAMTC5ClXlXzmT8ptscVx4NqCTlGmNBzm6crC ueeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YIEqPaQT; 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 z10-20020aa7948a000000b0065a4bc8a998si856914pfk.385.2023.06.08.07.31.02; Thu, 08 Jun 2023 07:31:17 -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=YIEqPaQT; 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 S237061AbjFHOZD (ORCPT + 99 others); Thu, 8 Jun 2023 10:25:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237142AbjFHOY4 (ORCPT ); Thu, 8 Jun 2023 10:24:56 -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 F304D30D6; Thu, 8 Jun 2023 07:24:40 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 85DF764E25; Thu, 8 Jun 2023 14:24:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B05E9C4339E; Thu, 8 Jun 2023 14:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686234280; bh=Ly+sWm6TM1FV97DnfVYc+edRAEXC0kuE80+arR4Mn2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YIEqPaQTLVy0UhU1ANwEfuEfbfEPgIno+/ovrkvx9dnO45qiOUOgsUsy0jl+9Gnhh izr28sadiVKgyl1es0lpCzCTM1+wBX++R7Wo0xkIdY4inVzGOpE945pi/ckygQNpwJ H1kS13OF2pGCT1NrMKtWJj7HhYrZ6iOMBF0tZAYK/keO3xz6XJFbaSq9tA87gkOz0/ Xqu7W0u4tu4GE85hoZP+Eb0S6BC9kNRmPdvobLpSqIyBkeoijjkqtVQlCRLGkr9sO0 izcqZemm2v3L+Zz8NmAwS2k6MKDXYl4vDVhhi/mSSmGdIlZ1k1jfXMVLDhYGJdAOti RLXebP6yE/j0g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-um@lists.infradead.org, Masahiro Yamada Subject: [PATCH v7 02/11] modpost: pass struct module pointer to check_section_mismatch() Date: Thu, 8 Jun 2023 23:24:19 +0900 Message-Id: <20230608142428.256985-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230608142428.256985-1-masahiroy@kernel.org> References: <20230608142428.256985-1-masahiroy@kernel.org> 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,T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768145212972204122?= X-GMAIL-MSGID: =?utf-8?q?1768145212972204122?= The next commit will use it. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 8decf04633bc..403ba4d923f5 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1211,7 +1211,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, } } -static void check_section_mismatch(const char *modname, struct elf_info *elf, +static void check_section_mismatch(struct module *mod, struct elf_info *elf, Elf_Sym *sym, unsigned int fsecndx, const char *fromsec, Elf_Addr faddr, Elf_Addr taddr) @@ -1222,7 +1222,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, if (!mismatch) return; - default_mismatch_handler(modname, elf, mismatch, sym, + default_mismatch_handler(mod->name, elf, mismatch, sym, fsecndx, fromsec, faddr, tosec, taddr); } @@ -1406,7 +1406,7 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) #define R_LARCH_SUB32 55 #endif -static void section_rela(const char *modname, struct elf_info *elf, +static void section_rela(struct module *mod, struct elf_info *elf, Elf_Shdr *sechdr) { Elf_Rela *rela; @@ -1452,12 +1452,12 @@ static void section_rela(const char *modname, struct elf_info *elf, break; } - check_section_mismatch(modname, elf, elf->symtab_start + r_sym, + check_section_mismatch(mod, elf, elf->symtab_start + r_sym, fsecndx, fromsec, r.r_offset, r.r_addend); } } -static void section_rel(const char *modname, struct elf_info *elf, +static void section_rel(struct module *mod, struct elf_info *elf, Elf_Shdr *sechdr) { Elf_Rel *rel; @@ -1507,7 +1507,7 @@ static void section_rel(const char *modname, struct elf_info *elf, fatal("Please add code to calculate addend for this architecture\n"); } - check_section_mismatch(modname, elf, elf->symtab_start + r_sym, + check_section_mismatch(mod, elf, elf->symtab_start + r_sym, fsecndx, fromsec, r.r_offset, r.r_addend); } } @@ -1524,19 +1524,19 @@ static void section_rel(const char *modname, struct elf_info *elf, * to find all references to a section that reference a section that will * be discarded and warns about it. **/ -static void check_sec_ref(const char *modname, struct elf_info *elf) +static void check_sec_ref(struct module *mod, struct elf_info *elf) { int i; Elf_Shdr *sechdrs = elf->sechdrs; /* Walk through all sections */ for (i = 0; i < elf->num_sections; i++) { - check_section(modname, elf, &elf->sechdrs[i]); + check_section(mod->name, elf, &elf->sechdrs[i]); /* We want to process only relocation sections and not .init */ if (sechdrs[i].sh_type == SHT_RELA) - section_rela(modname, elf, &elf->sechdrs[i]); + section_rela(mod, elf, &elf->sechdrs[i]); else if (sechdrs[i].sh_type == SHT_REL) - section_rel(modname, elf, &elf->sechdrs[i]); + section_rel(mod, elf, &elf->sechdrs[i]); } } @@ -1707,7 +1707,7 @@ static void read_symbols(const char *modname) sym_get_data(&info, sym)); } - check_sec_ref(modname, &info); + check_sec_ref(mod, &info); if (!mod->is_vmlinux) { version = get_modinfo(&info, "version");