forked from luck/tmp_suning_uos_patched
ce2b617ce8
Commitc3a6cf19e6("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 commitc3a6cf19e6on 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 <linux@rasmusvillemoes.dk> Reviewed-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Matthias Maennich <maennich@google.com> Signed-off-by: Jessica Yu <jeyu@kernel.org>
95 lines
2.3 KiB
C
95 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
#ifndef __ASM_GENERIC_EXPORT_H
|
|
#define __ASM_GENERIC_EXPORT_H
|
|
|
|
#ifndef KSYM_FUNC
|
|
#define KSYM_FUNC(x) x
|
|
#endif
|
|
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
|
|
#define KSYM_ALIGN 4
|
|
#elif defined(CONFIG_64BIT)
|
|
#define KSYM_ALIGN 8
|
|
#else
|
|
#define KSYM_ALIGN 4
|
|
#endif
|
|
#ifndef KCRC_ALIGN
|
|
#define KCRC_ALIGN 4
|
|
#endif
|
|
|
|
.macro __put, val, name
|
|
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
|
|
.long \val - ., \name - ., 0
|
|
#elif defined(CONFIG_64BIT)
|
|
.quad \val, \name, 0
|
|
#else
|
|
.long \val, \name, 0
|
|
#endif
|
|
.endm
|
|
|
|
/*
|
|
* 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"
|
|
.balign KSYM_ALIGN
|
|
__ksymtab_\name:
|
|
__put \val, __kstrtab_\name
|
|
.previous
|
|
.section __ksymtab_strings,"aMS",%progbits,1
|
|
__kstrtab_\name:
|
|
.asciz "\name"
|
|
.previous
|
|
#ifdef CONFIG_MODVERSIONS
|
|
.section ___kcrctab\sec+\name,"a"
|
|
.balign KCRC_ALIGN
|
|
#if defined(CONFIG_MODULE_REL_CRCS)
|
|
.long __crc_\name - .
|
|
#else
|
|
.long __crc_\name
|
|
#endif
|
|
.weak __crc_\name
|
|
.previous
|
|
#endif
|
|
#endif
|
|
.endm
|
|
|
|
#if defined(CONFIG_TRIM_UNUSED_KSYMS)
|
|
|
|
#include <linux/kconfig.h>
|
|
#include <generated/autoksyms.h>
|
|
|
|
.macro __ksym_marker sym
|
|
.section ".discard.ksym","a"
|
|
__ksym_marker_\sym:
|
|
.previous
|
|
.endm
|
|
|
|
#define __EXPORT_SYMBOL(sym, val, sec) \
|
|
__ksym_marker sym; \
|
|
__cond_export_sym(sym, val, sec, __is_defined(__KSYM_##sym))
|
|
#define __cond_export_sym(sym, val, sec, conf) \
|
|
___cond_export_sym(sym, val, sec, conf)
|
|
#define ___cond_export_sym(sym, val, sec, enabled) \
|
|
__cond_export_sym_##enabled(sym, val, sec)
|
|
#define __cond_export_sym_1(sym, val, sec) ___EXPORT_SYMBOL sym, val, sec
|
|
#define __cond_export_sym_0(sym, val, sec) /* nothing */
|
|
|
|
#else
|
|
#define __EXPORT_SYMBOL(sym, val, sec) ___EXPORT_SYMBOL sym, val, sec
|
|
#endif
|
|
|
|
#define EXPORT_SYMBOL(name) \
|
|
__EXPORT_SYMBOL(name, KSYM_FUNC(name),)
|
|
#define EXPORT_SYMBOL_GPL(name) \
|
|
__EXPORT_SYMBOL(name, KSYM_FUNC(name), _gpl)
|
|
#define EXPORT_DATA_SYMBOL(name) \
|
|
__EXPORT_SYMBOL(name, name,)
|
|
#define EXPORT_DATA_SYMBOL_GPL(name) \
|
|
__EXPORT_SYMBOL(name, name,_gpl)
|
|
|
|
#endif
|