From patchwork Sun May 14 15:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 93732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp6382333vqo; Sun, 14 May 2023 09:01:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ShlpDpJy7Eu0aBExJj09nn0SjuTy5z3sNkVnZcwrb7Aqbp5DYkC9+ITyV2DPE/7SUjZ2e X-Received: by 2002:a17:902:e845:b0:1ac:63ac:109d with SMTP id t5-20020a170902e84500b001ac63ac109dmr35261023plg.15.1684080104969; Sun, 14 May 2023 09:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684080104; cv=none; d=google.com; s=arc-20160816; b=eqBlEDktSelESLCkliL18EpcPqCnIN5uDsr2eZtHl91N3CGMqRbE0GipOodBxTFNpo fIkHP4arqHT+qe5+7qGtusj7qMfOe2b07e0Vr3BNpPnPVeoYmYP4dxoF7PK/n7fXEdTA 24pYz4EPaME3YdsLJomFn21BZYrEDY3odRUTiR4n4iBnLFT2Z3hIn7ht4a0ui80RMFEI h/WK0DiQ7YREVXK6WoKRqzZAHEgUu8CSocow06286CB+2BrT9u/QcHCKsJCItyC91Avw BXgRodY1sZiS2/lv7Lm5OCcL77ik7wFp+FLaeE6QYhtlZVqoQHnqLXxWn5xElweF/swc JMtg== 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=DDipNiaSzSkR09Rf+jFS/CS/M9eNr48LrCVW+udxJ50=; b=mrW1MrBCsGrDyfG8RCbTHL+mMZfSWTh0WwLJZP9fJOYeZNIPaDIZvZ12WVLyUbXchQ DS3zO2cN9IAUNiLexY+yK2U8sjnfuwDP2iI6oQHbMp9DrRRQ4LOSDgMmLL5n4+QzFK7c joHWkTxKDqIiYIsKOCEF1wKjInpCrB/LJcdHik+IYMJ5hP3S4w36v7WVGFNa5q3jiIs6 b3aK3eopwfUuHU45kkv61MNf5o/ctoavdUQbbOXKr3ebxOJ2//s45Eeqw4sTW0WdV2LM YYvCZDEim0XCmTaOlcRS08uwte5rVIfEeDv3yGNcursl/tbe3SyI8i26nj028YWZ+tuy XvqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="BC3/eot3"; 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.09.01.29; Sun, 14 May 2023 09:01:44 -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="BC3/eot3"; 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 S237712AbjENP31 (ORCPT + 99 others); Sun, 14 May 2023 11:29:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237545AbjENP2u (ORCPT ); Sun, 14 May 2023 11:28:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CEA46AC; Sun, 14 May 2023 08:28:30 -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 0162A61807; Sun, 14 May 2023 15:28:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96EA5C433EF; Sun, 14 May 2023 15:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684078108; bh=aGJ3xn0BmrJvcxnKs1H9H5MNeC4hGTO1aqiwfmy3iA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BC3/eot32EV0/C480CQ+NBpcKoO+WDRGw8vl7T71vF7GUSR75yHfG9o08ee/PPn3I xTyLVeSMk0NFMNYkjB2sXGYpWbSY62ZX3s07gQ/M2o20QCVShoaTBhLkr6bEWdE1rr 4hhM9K/paAcogY2JIh+0e6CyNvHOHRajiPk3UdCv8JjvI1rqYXNgtCxkr7NHCWlLaR nwxNGka4y3VM0t7oKD7QWZaxb2n5WeXpnF5yru736tDFKTELLlCMtvUMYI5nAM9HAR TMgQkvuyAxIonRaU+4cEwpCiCm373xQA9I50GAp2Oj/SBGktKo4zK8SI6RYOYTHhzQ vIamycxhVj01Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Pitre , Nicolas Schier , Masahiro Yamada Subject: [PATCH v5 19/21] modpost: squash sym_update_namespace() into sym_add_exported() Date: Mon, 15 May 2023 00:27:37 +0900 Message-Id: <20230514152739.962109-20-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 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?1765885979853700510?= X-GMAIL-MSGID: =?utf-8?q?1765885979853700510?= Pass a set of the name, license, and namespace to sym_add_exported(). sym_update_namespace() is unneeded. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 5db6a6f76971..7edb9a843ead 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -353,26 +353,8 @@ static const char *sec_name(const struct elf_info *info, unsigned int secindex) #define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0) -static void sym_update_namespace(const char *symname, const char *namespace) -{ - struct symbol *s = find_symbol(symname); - - /* - * That symbol should have been created earlier and thus this is - * actually an assertion. - */ - if (!s) { - error("Could not update namespace(%s) for symbol %s\n", - namespace, symname); - return; - } - - free(s->namespace); - s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL; -} - static struct symbol *sym_add_exported(const char *name, struct module *mod, - bool gpl_only) + bool gpl_only, const char *namespace) { struct symbol *s = find_symbol(name); @@ -385,6 +367,7 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod, s = alloc_symbol(name); s->module = mod; s->is_gpl_only = gpl_only; + s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL; list_add_tail(&s->list, &mod->exported_symbols); hash_add_symbol(s); @@ -1265,8 +1248,7 @@ static void check_export_symbol(struct module *mod, struct elf_info *elf, return; } - s = sym_add_exported(name, mod, is_gpl); - sym_update_namespace(name, sym_get_data(elf, label)); + s = sym_add_exported(name, mod, is_gpl, sym_get_data(elf, label)); /* * We need to be aware whether we are exporting a function or @@ -2135,9 +2117,8 @@ static void read_dump(const char *fname) mod = new_module(modname, strlen(modname)); mod->from_dump = true; } - s = sym_add_exported(symname, mod, gpl_only); + s = sym_add_exported(symname, mod, gpl_only, namespace); sym_set_crc(s, crc); - sym_update_namespace(symname, namespace); } free(buf); return;