From patchwork Sat Jun 10 09:13:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 105914 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1442513vqr; Sat, 10 Jun 2023 02:37:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mtcfRK+4Nuxh/9MjOdZAP32IuKoR/sLSQAo6jxvxpyNBnajOTmVEaFL6xsoJqMyeMQQkY X-Received: by 2002:a17:90a:4882:b0:255:3aa8:9d45 with SMTP id b2-20020a17090a488200b002553aa89d45mr3376991pjh.39.1686389828174; Sat, 10 Jun 2023 02:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686389828; cv=none; d=google.com; s=arc-20160816; b=YjKDp/vacEW/OOa2YpUzZXO2vpUNOJ/n2R+BAliQCYcUs8NIqeVX3uJtrxwIF9frk0 jTaTa+aBUYhBPZmvR4wAzlhGv1jipFKsizv2Lphoa7XeIrxOnmKA2rmpVbPme1tT28hZ RSPcuWfyyJJmK3yp8GdGzhAEcAJWG5ySeMoR8nBN/YBIBS74qr/ghWEaVv+hufXrRL/F hdrZKbX3I9lkCiZDoPX77uXdBHv2ejcNr34yH+x+ZJGZqFJUcY/jpc+pU/8sSUNVDn2o 7Or9CZuL5zHo7ba4QMrLUo5FPcphQovR6ijfn2JfENyvxRWt1STWQVB/Giri2r5k0lYm 6QeQ== 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=00s9AHbs8LYiD8GgD/yn7gvYyoMusoN+sBSbU6E04RuNjQB3fIMpmTn4IH0D197VWe Ite9y1DsYHITy3j9S0Dgm4Sd+CfSBPypXfZL3kb9lFzXMvMDZcbaQKMSo/TAJAfF2oLk ojvNLXYpZJaNd87rWwstP3063qQ1l/OgphueBfr2Ek+6ihS66Us8Tpudj2d5Ec3305Oy OXC0KQpxmHX3SXBUj3oYciHNYDHifYSdLht1IjS5mcFAXN+HChNN5Gd4fh8cNW0i8lL2 6iurRpZjvVALaKzpzN51yNTgoqsanHZW592pCZkT1spUZB1awpj359DWO8Gf8PRgw7Lt MjiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GN6fr7O0; 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 my9-20020a17090b4c8900b00256a98800absi4008217pjb.186.2023.06.10.02.36.56; Sat, 10 Jun 2023 02:37:08 -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=GN6fr7O0; 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 S234295AbjFJJNq (ORCPT + 99 others); Sat, 10 Jun 2023 05:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234197AbjFJJNh (ORCPT ); Sat, 10 Jun 2023 05:13:37 -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 AB8C63AA6; Sat, 10 Jun 2023 02:13:36 -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 417226112F; Sat, 10 Jun 2023 09:13:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12B7CC4339C; Sat, 10 Jun 2023 09:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686388415; bh=Ly+sWm6TM1FV97DnfVYc+edRAEXC0kuE80+arR4Mn2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GN6fr7O02dw/w8UlKq3m5oavUp5IwXvAZhiYjsmCnTMG8QlbqSOLpwMRs7zvBJZc3 t/qDlka+IZ5iYkN+k6iJvezINNBl2fbnfXfQdv38dLACaoVDunsEhorJGCXwKAR9Wx rfI61GcMj66s4+CaXBUmn05suIXS20FHx0cpavQPOIC+7v2rgr2mK70iYxYzb7XRCG Fx2QG55kOaDIWkH4MuSJPAo3ZUXSBf7proy56fAKCAYt2GOZV/Qy6DsTFw6Ul7jMj4 AUWXTJ1f7Z4/youyy8ihE6RZMMyUOYNwhabT1mYjcJJrNvWiOItALsKGNi/n5hm91q n+qQ5fmBS6szQ== 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 v8 02/11] modpost: pass struct module pointer to check_section_mismatch() Date: Sat, 10 Jun 2023 18:13:11 +0900 Message-Id: <20230610091320.1054554-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230610091320.1054554-1-masahiroy@kernel.org> References: <20230610091320.1054554-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?1768307900481850005?= X-GMAIL-MSGID: =?utf-8?q?1768307900481850005?= 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");