From patchwork Thu Jun 8 14:24:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 105000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp380615rwl; Thu, 8 Jun 2023 07:46:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5DwZ91aJr8ncBjuwhtFF/3h5hePRLBE6h1zHhwfx8n7ZlYp/vGAuXh6U90shMFUtmnpvKp X-Received: by 2002:a05:6a20:8e19:b0:10c:1378:f2ae with SMTP id y25-20020a056a208e1900b0010c1378f2aemr3337527pzj.46.1686235560367; Thu, 08 Jun 2023 07:46:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686235560; cv=none; d=google.com; s=arc-20160816; b=Iih5gjTtTpr/cPctuhqd6cTVLNVaVj3pZocN6GXBLV95rO5oYPk9OHRsVMDVkZKDov 7kiH0LuuPHdCK4IMaph5i3Kl9UE642mJluheBJjEtq6WPxHwETo+gG1F0VU7Xc37tIAH +BcMUu932MwSe/FiPJE+p38cjA8D/9200HTEa8XZXnuynAuJsbRjaPyaWhO62ns7YMlu QIjrFv3Tmn/Yf1VeMJLj4tziUTBAfJ7wPdtx3kP+XWNtARzbwUOw7qUE0bI9vfEWZq4a SERhgR8edF4bNbj0yCYxLcwD8S1YuafCjUXLhIPUhOI/smNaG041iim+zd5qwjHth0L/ zDzg== 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=X4Z8PeZ7UOfRvHfPPKV9T3Z6LgQays0r4cx3yEjrbQg=; b=r9JAvz4AGM8KYrhNf8rPUT+aRbRYSg+3ooygyATI7RU05tS9pIW6GwFMLRN5oFaDC/ enghvjW0dtwtmCwLGKYlzYPlsZwwoepCsCvIUUKZ5to5tcT1INw/xTgLgIT6BGYVQ6ct frTYUg+P63/iGtouWmBgWXcQzVzi/cTFC8KT0T+7M1HgIM6xbqNtjaVdzlVqLAXceYyH +6J/CM1HYuj/U1dxCOjrFY6bGFJCsGUVrEJ+meL8MgrxHahaUvDwgFDNqcJFbDx3iG4u QRr5dYlVOSOyZLOYz1kZoHljpsrfm69JXk2KEatqIIhNPBrRw2F6/Ul4gyXuD7NankNi qhwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VLIntpql; 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 r14-20020aa7988e000000b0064490c20e80si950333pfl.59.2023.06.08.07.45.47; Thu, 08 Jun 2023 07:46:00 -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=VLIntpql; 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 S237155AbjFHOZW (ORCPT + 99 others); Thu, 8 Jun 2023 10:25:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237092AbjFHOZH (ORCPT ); Thu, 8 Jun 2023 10:25:07 -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 901CA30C7; Thu, 8 Jun 2023 07:24:51 -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 764D764E28; Thu, 8 Jun 2023 14:24:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D7A8C4339C; Thu, 8 Jun 2023 14:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686234286; bh=WxsbZJQWaT5jCsrdDCJG6B1Ekj8QHp6BWQx+hm3BcWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VLIntpqlzV0PbXTunOMMpYAbiC5B7RzbxYYbqvwtEwLaTiLF7ZmPeFO95GFKba0Jn VDBNtT3wUnFHvkz15AIr0Ai5TNfHAI/lbUuC+c4mNVdJBdWb5Iqe4xdGRMiRdfLo/1 CRns73rILLWLvRiOL6YgKsthMyMgWdYkt8g3fOp8AP1k9KuD7dXbxiWSzXY4krmNMt zMtu3NkGpcWa+uORL5M3NxCMz4lchkYojjnC73CKuXufUnMCicLrLynGbKgrjrqMNm q7Gqju5e7XwhWorTDS7a7oRqX0fWkmVJ1N7umFCs3hUp6ZztOGcG9pkYU1XPr4McHa J+eAPcqHWH8Vw== 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 06/11] modpost: squash sym_update_namespace() into sym_add_exported() Date: Thu, 8 Jun 2023 23:24:23 +0900 Message-Id: <20230608142428.256985-7-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?1768146138743839238?= X-GMAIL-MSGID: =?utf-8?q?1768146138743839238?= 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 a3185ee6ec1a..4b0a009de0fb 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -355,26 +355,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); @@ -387,6 +369,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); @@ -1230,8 +1213,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 @@ -2174,9 +2156,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;