Message ID | 20230514152739.962109-9-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp6381122vqo; Sun, 14 May 2023 09:00:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ68Hrr1tEzFqKYsFfwDdK56zNzzZe/SmS8ZKznoMkZUr0eGhsvnl+4TILDQSFOHh2GF1ICg X-Received: by 2002:a17:903:48e:b0:1a9:4cd5:e7e0 with SMTP id jj14-20020a170903048e00b001a94cd5e7e0mr36662796plb.17.1684080011585; Sun, 14 May 2023 09:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684080011; cv=none; d=google.com; s=arc-20160816; b=cCaapcCAKkZ/qm2H+L69itRgMLZS6LcBI8PRSBilt/CTiTj+8vRjhFEAj32EgHvEEy xciabM6h6PsBKJRpA9duyVcpX9w7oNnIVVjrecHhkUAlwY7YZ2iWGNG7gWhixxk95EuX b8NblJDo6e+caeF9i/3QE8q3d3vc7YJQgfngR0hoEHgnB64mbFGV4o2e4mPUPvI9gIan qGcRe4I8f875naokt5JWIIcfi+U9Bbub8J4sk62l0if3L0Rms6iYjfhGP+QBOZk3ItML vaUBU0rng3n904pr/TPwD+1Wo1Q5nW8ww+osNdfqytkqd44SHbxTRuecMBXUEi+wRnvf MdZg== 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=7gVLG/vJeOtNxU6NpQxeecqwrIKOd1PxAg9bLq+m5xU=; b=DdxpZSLBou3vgZzPZdv+/G/S/C0QZ4Wb1NbRNfUW5mmsHB/RlcA7jk3cf/NIT1KPhy Hsbd3obilP3CXsb3RG9FRjWTTMbNg1IYp+RFe1s/32fXyDM5vdTZg/+zgstBimjz6NoZ fn/DkqkpRdYfZLjuzgRsNkDiUPN4/2BhuhuHpcxt1SpXe17T2Sms5PSItZENqQ0yLdSq DsG3N6HI88YjKncEjXq63YjQusDGQInGDtLRdQ8BUI98eRgSn8+zdmoQu3dX/R6A9UoC e2oKxy8a1Zf3gRimZnT+oZBzDb+g9gOsIopji1gd7wD10a7aygcKvP5S5ijtVEOgjH/W jtww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ny5cSgxP; 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 l2-20020a170902ec0200b001ac896ff65dsi12966018pld.480.2023.05.14.08.59.56; Sun, 14 May 2023 09:00:11 -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=ny5cSgxP; 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 S237950AbjENP23 (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Sun, 14 May 2023 11:28:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237624AbjENP2Q (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 14 May 2023 11:28:16 -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 6335F3C2B; Sun, 14 May 2023 08:28:05 -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 CE61D615C2; Sun, 14 May 2023 15:28:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E056C4331D; Sun, 14 May 2023 15:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684078084; bh=bvvrkTjspthXJHxYVNhJuEFtW7e3lRn7rVeZEbWKtEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ny5cSgxPUqjF9P4CwkrK7Z2RUP4eGCXMOwVJPkKH1XJkIkJRoS1ZytF+qsNsgt6nY 0fwD6qg65yx/ZzAUyCzc58hg+u4F0BakEGvpAvMG/vABuBGrdJpFODREnyllvVjmxx eGCMwuHmLTFhtnUQ5AwqlFgIz4mqYiSvYBRiyQymcI5rjnAejI3/9bJP/BI5oN6SDV jw8dgEtdflW8aJVtb7lswKNg+O8VOFD+Lj9887n4aY/e5OWzQW4nxlY8W1A0LDM+bd UwykyJPT/qGu3xcUKABMmi/TJEWPSNHvV16wYT/AFF1eFC98rUohbNH6mSTHFTL19i ThVsftCDSueEQ== From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Pitre <npitre@baylibre.com>, Nicolas Schier <nicolas@fjasle.eu>, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH v5 08/21] modpost: pass 'tosec' down to default_mismatch_handler() Date: Mon, 15 May 2023 00:27:26 +0900 Message-Id: <20230514152739.962109-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230514152739.962109-1-masahiroy@kernel.org> References: <20230514152739.962109-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765885882010545775?= X-GMAIL-MSGID: =?utf-8?q?1765885882010545775?= |
Series |
Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS
|
|
Commit Message
Masahiro Yamada
May 14, 2023, 3:27 p.m. UTC
default_mismatch_handler() does not need to compute 'tosec' because
it is calculated by the caller.
Pass it down to default_mismatch_handler() instead of calling
sec_name() twice.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/mod/modpost.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Comments
On Sun, May 14, 2023 at 8:28 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > default_mismatch_handler() does not need to compute 'tosec' because > it is calculated by the caller. > > Pass it down to default_mismatch_handler() instead of calling > sec_name() twice. Thanks for the patch! Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > scripts/mod/modpost.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index 49357a716519..2cc9c2a4aadc 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -1203,9 +1203,9 @@ static bool is_executable_section(struct elf_info *elf, unsigned int secndx) > > static void default_mismatch_handler(const char *modname, struct elf_info *elf, > const struct sectioncheck* const mismatch, > - Elf_Rela *r, Elf_Sym *sym, const char *fromsec) > + Elf_Rela *r, Elf_Sym *sym, const char *fromsec, > + const char *tosec) > { > - const char *tosec; > Elf_Sym *to; > Elf_Sym *from; > const char *tosym; > @@ -1214,7 +1214,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, > from = find_elf_symbol2(elf, r->r_offset, fromsec); > fromsym = sym_name(elf, from); > > - tosec = sec_name(elf, get_secindex(elf, sym)); > to = find_elf_symbol(elf, r->r_addend, sym); > tosym = sym_name(elf, to); > > @@ -1276,7 +1275,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, > if (!mismatch) > return; > > - default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec); > + default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec, tosec); > } > > static unsigned int *reloc_location(struct elf_info *elf, > -- > 2.39.2 >
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 49357a716519..2cc9c2a4aadc 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1203,9 +1203,9 @@ static bool is_executable_section(struct elf_info *elf, unsigned int secndx) static void default_mismatch_handler(const char *modname, struct elf_info *elf, const struct sectioncheck* const mismatch, - Elf_Rela *r, Elf_Sym *sym, const char *fromsec) + Elf_Rela *r, Elf_Sym *sym, const char *fromsec, + const char *tosec) { - const char *tosec; Elf_Sym *to; Elf_Sym *from; const char *tosym; @@ -1214,7 +1214,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf, from = find_elf_symbol2(elf, r->r_offset, fromsec); fromsym = sym_name(elf, from); - tosec = sec_name(elf, get_secindex(elf, sym)); to = find_elf_symbol(elf, r->r_addend, sym); tosym = sym_name(elf, to); @@ -1276,7 +1275,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, if (!mismatch) return; - default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec); + default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec, tosec); } static unsigned int *reloc_location(struct elf_info *elf,