From patchwork Sun May 21 16:04:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 96889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp954655vqo; Sun, 21 May 2023 09:17:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ53f3ioqpFoSFXJgcshyeNySYyfuY9g+4/PKrxs6Wi5aNfPT7cHZjpK72TBj49h23cqsWnK X-Received: by 2002:a05:6a00:1505:b0:63b:4313:f8c4 with SMTP id q5-20020a056a00150500b0063b4313f8c4mr12491792pfu.9.1684685876224; Sun, 21 May 2023 09:17:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684685876; cv=none; d=google.com; s=arc-20160816; b=FhmNRrxJKX21CB7dJUv90avdsrqyHTOmpswgoj0Tw+OKWgSgjW8XXPP5vXhSleCXdD tFU/IEly3At4f6fa/RGJxSYNpWPkKMKm7sHYMvtQHZHjrK/n+Uby9LU5Wt+xrY58PrKO /P4u9H+3lANEFugmGfKjGDPz85nDo9XUjB7boJEF9KILvgnxn7PLEjbQ6qAtdTCvRPjM YbYmt5YVI+9Tz76142mcy1BKXJv57jTycF5AItmI2X5kbBwwMF2eTOBx/hDjRc2bmjX0 esHL3uVQ2VhNilLrJWN/G3IFfLcnOmGfTJ9qGn0O8MRtJpLH9dYOoUsDk/WuXAaFq2er dd9w== 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=EBuAPGhaIxgAYEOc/XPewPF0M+SuFelFr0ZYfEYRP/U=; b=zVSX4zrPXtdAV1+AGUDOkHvMDpjeBuSaGnJyv3Ew0bOyJr/Ctz5ApYZM5Oy4wZOqMI 5wRi9As2BOO9zW1J2X1MB4aNxb6h5mVc+UQYjPWY3yftr2NU64zjs+plsx/VBsNIvOp2 aVavwd7cyNVhGQ4F3RyP0m42WCMoOMEg0VKB1VyUJAr+YmQcmQj66JCJDT85u8XHPAn3 GUU5jJmuXUXFdeSlCcd91NLs5sfQ6zwMRNNhVjy6LyzV5znV9EiqY4DvP7NcNXON0AAj 0Jzu7XebhR20u3mRnivUMPQxjiP8wVbLlIX0s8mutB8B2574bjf+BxbP6XmCFcjjaBH+ okxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bFERoLOh; 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 o3-20020a637e43000000b0052c7ad564e2si3470075pgn.707.2023.05.21.09.17.44; Sun, 21 May 2023 09:17:56 -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=bFERoLOh; 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 S230100AbjEUQGB (ORCPT + 99 others); Sun, 21 May 2023 12:06:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbjEUQFl (ORCPT ); Sun, 21 May 2023 12:05:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E126186; Sun, 21 May 2023 09:05:32 -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 554BB60ECB; Sun, 21 May 2023 16:05:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56A81C433D2; Sun, 21 May 2023 16:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684685130; bh=NjatIeEtMiORYtM/vXhp4DguRc7ec1+8yCNOZt2lIiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bFERoLOh/Bild/3FCF3CRdl+SWSOHvBQR2ytVF8Ylu7KJlSaJ+nMDdrc8mqEGfi3Q HeJ95pibtOGPZ3iVWJwqAmwuDaKNp6A/iegqyX8t3HAs5LnyaYYh8uL2d1VRX8TcJ0 XC2uceW6/4gNAX/hTUAd9gyPCUdW5AJh8MvilTpmY8TTiNuO0opoeQIy1qZggMZStW WYGa+YQrsINfPGuazzEbyLKa5g492mv8hh28OAnh4wj8iD2NlnFOH2KID0d8aDucRz jLndS72n79XHUmlCKVcmO5qhavnWan/UMcmFGjPpBowZ0n80sllJeUBRfEzKqBrE3F +kgOa/aMaNbjA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Masahiro Yamada Subject: [PATCH v6 09/20] modpost: pass struct module pointer to check_section_mismatch() Date: Mon, 22 May 2023 01:04:14 +0900 Message-Id: <20230521160426.1881124-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521160426.1881124-1-masahiroy@kernel.org> References: <20230521160426.1881124-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1766521177112726446?= X-GMAIL-MSGID: =?utf-8?q?1766521177112726446?= 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 40fac4f64fcd..378fb9649545 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1229,7 +1229,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) @@ -1240,7 +1240,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); } @@ -1358,7 +1358,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; @@ -1404,12 +1404,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; @@ -1459,7 +1459,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); } } @@ -1476,19 +1476,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]); } } @@ -1659,7 +1659,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");