From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 869EDC43603 for ; Thu, 12 Dec 2019 14:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 501F92067C for ; Thu, 12 Dec 2019 14:29:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="H6PjXiK3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729740AbfLLO3p (ORCPT ); Thu, 12 Dec 2019 09:29:45 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40276 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729602AbfLLO3p (ORCPT ); Thu, 12 Dec 2019 09:29:45 -0500 Received: by mail-wm1-f67.google.com with SMTP id t14so2735010wmi.5 for ; Thu, 12 Dec 2019 06:29:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=atIC4dDzktzZd5fPGtzE3vmpfZnj98iMVTvtNYLW2Zk=; b=H6PjXiK3Vwvv4b4qvUzLaKpygzYxQwCgG5WQHOVL5xGD4MQlsRhGlv67IbOeEBx5KD CjyWUw3bd8LOdf0ncLgTN6le5bh1AX4eVl7kWfTBg/dBuhs3w6+fQlsjacAe/ysJgcWD Q+Qs+Dk3JKIQoh7B6WAw0einvMtuVamrJAJBYHx5kNK8nldh5FU6RxAH1zRM0vI737m4 jrgDS4iCumlb/kHTHQjKzb189lgp41fbusdqWLAWEHa3uKxukenG6MRB6hI+HxRxnsM+ ExS5yHITpVCquDPAGRfPc2guMgDweNjuWj22PFcwbfrdHywhsuLET104po544Dmqh9dI DdgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=atIC4dDzktzZd5fPGtzE3vmpfZnj98iMVTvtNYLW2Zk=; b=MVS9YVXSqlkMV+LUcZ1IXIpFE9SI0lZObBc/vfTo8M7/9ozjMiVsV9NFFskhxoDWGD aR8W0JpKWGtpbmDLRaqvPhfO5lIaqmuyjmSUDfe4DNk0DPwE/mLmEdBfDxn/lIbdretP OjIFWWZLV7fhaI9DtL7TBgTDTzU607lbbEyrEOY06KIHQcjeivrRa1wKaXG7REFWtk84 BpFPlxs8nSO8k51ktpM52DEIo5sVwNbE0WRcjHY4gFmpRkTiI2BCBEWxgbPZFtxYUD2H /ZL8szZYUtKNEihqxuX6IgQwqobcnvwwnTOmK7afX+UsFXYjR0S28PXISYCiQkQWJ0NO YknA== X-Gm-Message-State: APjAAAUJRLO55m1ds0KuoKd5pHMw8hRRsdQl7d20b0Efq+DcysBMNdkC 41g3crgfV9INa+pl5Xktef168A== X-Google-Smtp-Source: APXvYqx2LjiC6DJHgexdh/+HsHIvsrjQNVYkqTjwDaheOxhdEKO2OL1aGGms5bBEHamg5x9c0R6M3g== X-Received: by 2002:a7b:cf0d:: with SMTP id l13mr6751748wmg.13.1576160981996; Thu, 12 Dec 2019 06:29:41 -0800 (PST) Received: from google.com ([2a00:79e0:d:210:e8f7:125b:61e9:733d]) by smtp.gmail.com with ESMTPSA id u22sm6535464wru.30.2019.12.12.06.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 06:29:41 -0800 (PST) Date: Thu, 12 Dec 2019 14:29:40 +0000 From: Matthias Maennich To: Jessica Yu Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Rasmus Villemoes , Arnd Bergmann , Greg Kroah-Hartman Subject: Re: [PATCH v4] export.h: reduce __ksymtab_strings string duplication by using "MS" section flags Message-ID: <20191212142940.GE58955@google.com> References: <20191206124102.12334-1-jeyu@kernel.org> <20191212141613.24966-1-jeyu@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20191212141613.24966-1-jeyu@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 12, 2019 at 03:16:13PM +0100, Jessica Yu wrote: >Commit c3a6cf19e695 ("export: avoid code duplication in >include/linux/export.h") refactors export.h quite nicely, but introduces >a slight increase in memory usage due to using the empty string "" >instead of NULL to indicate that an exported symbol has no namespace. As >mentioned in that commit, this meant an increase of 1 byte per exported >symbol without a namespace. For example, if a kernel configuration has >about 10k exported symbols, this would mean that the size of >__ksymtab_strings would increase by roughly 10kB. > >We can alleviate this situation by utilizing the SHF_MERGE and >SHF_STRING section flags. SHF_MERGE|SHF_STRING indicate to the linker >that the data in the section are null-terminated strings that can be >merged to eliminate duplication. More specifically, from the binutils >documentation - "for sections with both M and S, a string which is a >suffix of a larger string is considered a duplicate. Thus "def" will be >merged with "abcdef"; A reference to the first "def" will be changed to >a reference to "abcdef"+3". Thus, all the empty strings would be merged >as well as any strings that can be merged according to the cited method >above. For example, "memset" and "__memset" would be merged to just >"__memset" in __ksymtab_strings. > >As of v5.4-rc5, the following statistics were gathered with x86 >defconfig with approximately 10.7k exported symbols. > >Size of __ksymtab_strings in vmlinux: >------------------------------------- >v5.4-rc5: 213834 bytes >v5.4-rc5 with commit c3a6cf19e695: 224455 bytes >v5.4-rc5 with this patch: 205759 bytes > >So, we already see memory savings of ~8kB compared to vanilla -rc5 and >savings of nearly 18.7kB compared to -rc5 with commit c3a6cf19e695 on top. > >Unfortunately, as of this writing, strings will not get deduplicated for >kernel modules, as ld does not do the deduplication for >SHF_MERGE|SHF_STRINGS sections for relocatable files (ld -r), which >kernel modules are. A patch for ld is currently being worked on to >hopefully allow for string deduplication in relocatable files in the >future. > >Suggested-by: Rasmus Villemoes >Reviewed-by: Masahiro Yamada >Signed-off-by: Jessica Yu >--- >v4: > - fix the comment above ___EXPORT_SYMBOL to be more specific about what > entries are being placed in their respective sections. > > include/asm-generic/export.h | 8 +++++--- > include/linux/export.h | 27 ++++++++++++++++++++------- > > 2 files changed, 25 insertions(+), 10 deletions(-) > >diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h >index afddc5442e92..365345f9a9e3 100644 >--- a/include/asm-generic/export.h >+++ b/include/asm-generic/export.h >@@ -27,9 +27,11 @@ > .endm > > /* >- * note on .section use: @progbits vs %progbits nastiness doesn't matter, >- * since we immediately emit into those sections anyway. >+ * note on .section use: we specify progbits since usage of the "M" (SHF_MERGE) >+ * section flag requires it. Use '%progbits' instead of '@progbits' since the >+ * former apparently works on all arches according to the binutils source. > */ >+ > .macro ___EXPORT_SYMBOL name,val,sec > #ifdef CONFIG_MODULES > .section ___ksymtab\sec+\name,"a" >@@ -37,7 +39,7 @@ > __ksymtab_\name: > __put \val, __kstrtab_\name > .previous >- .section __ksymtab_strings,"a" >+ .section __ksymtab_strings,"aMS",%progbits,1 > __kstrtab_\name: > .asciz "\name" > .previous >diff --git a/include/linux/export.h b/include/linux/export.h >index 627841448293..c166d35e3d76 100644 >--- a/include/linux/export.h >+++ b/include/linux/export.h >@@ -82,16 +82,29 @@ struct kernel_symbol { > > #else > >-/* For every exported symbol, place a struct in the __ksymtab section */ >+/* >+ * For every exported symbol, do the following: >+ * >+ * - If applicable, place a CRC entry in the __kcrctab section. >+ * - Put the name of the symbol and namespace (empty string "" for none) in >+ * __ksymtab_strings. >+ * - Place a struct kernel_symbol entry in the __ksymtab section. >+ * >+ * note on .section use: we specify progbits since usage of the "M" (SHF_MERGE) >+ * section flag requires it. Use '%progbits' instead of '@progbits' since the >+ * former apparently works on all arches according to the binutils source. >+ */ > #define ___EXPORT_SYMBOL(sym, sec, ns) \ > extern typeof(sym) sym; \ >+ extern const char __kstrtab_##sym[]; \ >+ extern const char __kstrtabns_##sym[]; \ > __CRC_SYMBOL(sym, sec); \ >- static const char __kstrtab_##sym[] \ >- __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ >- = #sym; \ >- static const char __kstrtabns_##sym[] \ >- __attribute__((section("__ksymtab_strings"), used, aligned(1))) \ >- = ns; \ >+ asm(" .section \"__ksymtab_strings\",\"aMS\",%progbits,1\n" \ >+ "__kstrtab_" #sym ": \n" \ >+ " .asciz \"" #sym "\" \n" \ >+ "__kstrtabns_" #sym ": \n" \ >+ " .asciz \"" ns "\" \n" \ >+ " .previous \n"); \ nit: You might want to align the newline characters up to the asm line. Thanks for working on this! Reviewed-by: Matthias Maennich Cheers, Matthias > __KSYMTAB_ENTRY(sym, sec) > > #endif >-- >2.16.4 >