From patchwork Sun Jun 11 15:50:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 106122 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2106568vqr; Sun, 11 Jun 2023 09:02:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MUiYNO/JzUGqAsxMY8k+7eIHAUqMDf/QRhrQNTnFyyixl5dkb8k0gzLuoeWSV/UoQ8dyB X-Received: by 2002:a17:90a:6c01:b0:25b:c59f:7c0a with SMTP id x1-20020a17090a6c0100b0025bc59f7c0amr2823180pjj.21.1686499338008; Sun, 11 Jun 2023 09:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686499337; cv=none; d=google.com; s=arc-20160816; b=KUbejzefdKA+uwp8mBWxeJcb5QQND5TRAIoSwmzyb5wvkETsf5nwOURkrDVk30NUxP swXnSnyMy8BEYO/C3KCpwsUazHSiC//306D/p3zSvVV9XHLgJ9pmdi7Rpj6E7bBpwuB0 YBdnOdsdjBQ9RMvm/FGoVP2O4/zZoOETUtpHeM5mqQtuu4FNaJzNyE1FaSzK2OpEoh2N et0PEpTojdsRon+q2v0fQiwS9Eu+0MErU6cb6Q5V3IFyrZYGkOawk9YDH6B9FH6hA9bf CFcMek7gvqdFLKvLd5XRMV3mAxOKiV0O1y8kSZbi5THzCL44E6QvA/CObTZCkgotZb9B YhtQ== 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=xs0UB5q2MUTUAA0xioG4GpSDI9elzZomtFRM7ZRT0Dw=; b=zY23Ml+HLOEVJzEjdB4G8I3FedKFus2zed0N9u7dhL/nqF6UNgfjHfArw6nGwSWk+K m45Ujxm+CtySLkIqVl9DUoDZkrrpiU8OR0ISSSRvKBAFaREE59ExL/PmeVQ5TMBg+BiO J4QeaWks8W7+pqBMW8EhVC/1CqPRPU2DiQAhOfe967xYgOYcfvQQZvFKiDTJ1znIjHZn T8oCtlmYLK5t1IsQVXU8n0Pm7v8ElQZA3MtKiGxqOR6+CW6SqyqD0FPgZYWaO6/HUmaM aBEg/np1mq9m7NOcbBMOYscQIznnloR4XFdOSAKBDPeqMDJDVbwPt85tuRka7U7mGK/R gE7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="mG9E/aHB"; 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 oa4-20020a17090b1bc400b002501d633225si2018237pjb.11.2023.06.11.09.02.05; Sun, 11 Jun 2023 09:02:17 -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="mG9E/aHB"; 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 S233759AbjFKPvj (ORCPT + 99 others); Sun, 11 Jun 2023 11:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233716AbjFKPvd (ORCPT ); Sun, 11 Jun 2023 11:51:33 -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 091C6E7F; Sun, 11 Jun 2023 08:51:22 -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 49C8D61C17; Sun, 11 Jun 2023 15:51:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47AFEC4339C; Sun, 11 Jun 2023 15:51:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686498681; bh=E2k80plMQU9lxqznYfeCXHA3QRFfPyTWCxD7fNNPT3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mG9E/aHBS0eMy3ZsbprrDjpHlYaDbUKHEQviwBu2Hg5yVwCTAoWKfjRP/Vovu1p1J N5ES4fuwwSyGZHD3CXqlwukVBnIYMZOaUbQU4s669I0T8pIPaJXRDrxP+tWP/3FMgC 05TPxX24TJW0eSUeLP2vGAeXAv8BWweK4SZWZzZdLDUTY4Y6z1QHEQAzN10xbAeeRk lXLk440Cx8hXVduSWOCasAYu00bPI9KzpCOWLAalWAeoFReA77z6Pc5etabr9uwpe1 aWl4ZBhSAPVngEfVnBMdEWJ0z0LKG8wn7LWTjb/Rq1dWx59bBaVw371EcJ1OhBW//W s4mJgEozN6KGQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-snps-arc@lists.infradead.org, Masahiro Yamada Subject: [PATCH v9 07/11] modpost: use null string instead of NULL pointer for default namespace Date: Mon, 12 Jun 2023 00:50:56 +0900 Message-Id: <20230611155100.2553804-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230611155100.2553804-1-masahiroy@kernel.org> References: <20230611155100.2553804-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?1768422729884743695?= X-GMAIL-MSGID: =?utf-8?q?1768422729884743695?= The default namespace is the null string, "". When set, the null string "" is converted to NULL: s->namespace = namespace[0] ? NOFAIL(strdup(namespace)) : NULL; When printed, the NULL pointer is get back to the null string: sym->namespace ?: "" This saves 1 byte memory allocated for "", but loses the readability. In kernel-space, we strive to save memory, but modpost is a userspace tool used to build the kernel. On modern systems, such small piece of memory is not a big deal. Handle the namespace string as is. Signed-off-by: Masahiro Yamada Reviewed-by: Nick Desaulniers --- scripts/mod/modpost.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 79ad0a346a5c..051ff67875ec 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -300,6 +300,13 @@ static bool contains_namespace(struct list_head *head, const char *namespace) { struct namespace_list *list; + /* + * The default namespace is null string "", which is always implicitly + * contained. + */ + if (!namespace[0]) + return true; + list_for_each_entry(list, head, list) { if (!strcmp(list->namespace, namespace)) return true; @@ -369,7 +376,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; + s->namespace = NOFAIL(strdup(namespace)); list_add_tail(&s->list, &mod->exported_symbols); hash_add_symbol(s); @@ -1829,8 +1836,7 @@ static void check_exports(struct module *mod) else basename = mod->name; - if (exp->namespace && - !contains_namespace(&mod->imported_namespaces, exp->namespace)) { + if (!contains_namespace(&mod->imported_namespaces, exp->namespace)) { modpost_log(allow_missing_ns_imports ? LOG_WARN : LOG_ERROR, "module %s uses symbol %s from namespace %s, but does not import it.\n", basename, exp->name, exp->namespace); @@ -1916,8 +1922,7 @@ static void add_exported_symbols(struct buffer *buf, struct module *mod) list_for_each_entry(sym, &mod->exported_symbols, list) buf_printf(buf, "KSYMTAB_%s(%s, \"%s\", \"%s\");\n", sym->is_func ? "FUNC" : "DATA", sym->name, - sym->is_gpl_only ? "_gpl" : "", - sym->namespace ?: ""); + sym->is_gpl_only ? "_gpl" : "", sym->namespace); if (!modversions) return; @@ -2185,7 +2190,7 @@ static void write_dump(const char *fname) buf_printf(&buf, "0x%08x\t%s\t%s\tEXPORT_SYMBOL%s\t%s\n", sym->crc, sym->name, mod->name, sym->is_gpl_only ? "_GPL" : "", - sym->namespace ?: ""); + sym->namespace); } } write_buf(&buf, fname);