mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
Kbuild updates for v6.5
- Remove the deprecated rule to build *.dtbo from *.dts
- Refactor section mismatch detection in modpost
- Fix bogus ARM section mismatch detections
- Fix error of 'make gtags' with O= option
- Add Clang's target triple to KBUILD_CPPFLAGS to fix a build error with
the latest LLVM version
- Rebuild the built-in initrd when KBUILD_BUILD_TIMESTAMP is changed
- Ignore more compiler-generated symbols for kallsyms
- Fix 'make local*config' to handle the ${CONFIG_FOO} form in Makefiles
- Enable more kernel-doc warnings with W=2
- Refactor <linux/export.h> by generating KSYMTAB data by modpost
- Deprecate <asm/export.h> and <asm-generic/export.h>
- Remove the EXPORT_DATA_SYMBOL macro
- Move the check for static EXPORT_SYMBOL back to modpost, which makes
the build faster
- Re-implement CONFIG_TRIM_UNUSED_KSYMS with one-pass algorithm
- Warn missing MODULE_DESCRIPTION when building modules with W=1
- Make 'make clean' robust against too long argument error
- Exclude more objects from GCOV to fix CFI failures with GCOV
- Allow 'make modules_install' to install modules.builtin and
modules.builtin.modinfo even when CONFIG_MODULES is disabled
- Include modules.builtin and modules.builtin.modinfo in the linux-image
Debian package even when CONFIG_MODULES is disabled
- Revive "Entering directory" logging for the latest Make version
-----BEGIN PGP SIGNATURE-----
iQJJBAABCgAzFiEEbmPs18K1szRHjPqEPYsBB53g2wYFAmSf6B0VHG1hc2FoaXJv
eUBrZXJuZWwub3JnAAoJED2LAQed4NsGS2wP/1izzNJ/64XmQoyBDhZCbuOl7ODF
n4wgVJnsJmRnD/RxXR/AZ0JZwQHhzpGISWQM61rVIf/RVFOB7Apx1HpmomKUUjrL
Yc53wLfhTEizGgwttP6tusLM3RO6jkuMKhjC4rllc0tDLJ3zCcwAjSyiOQQ9PBcH
txwAb8r4/TZUzDDCJ0d98WdhIsNDca/ISeRXKHMiIkfvHe+6yizDKu25Y4B6BL5g
0VPJ9nVJZ+XVwRqdVR+UQoPYGZzZ/O2NqAtU7n4PpBKvFfLACILJW+aBDAz9SqN7
RSxn1ahxwq0vrhlB9bSrQRj3N0g8zsi7/xShEZSnGLCbyxYilr5Gq8C59+QxOIJf
5lGBwZlEgn5aWH+D9abwjEI/QOQbTI9kX09sVzweulGCN9iJlJqyIGsB0Ri0/S2R
c/n7c8nLwnWnGF/+LXYvkrak8L9YRKori//YYf9zdvh4h1c2/0SS0nDoC29DhDru
Am7YmhBAkJXXX3NUB2gLvtdp94GSumqefHeSJ5Sp9v/+f2Ft7ruY2ouJC81xDa4p
nNpvolAq2txlZ9t5OU7x7DQiuCWYSws0W7PJ9FBhyHJchf21UHbcm97/HfDoU8rN
ioLQGm+h+g6oZt8pArk45wccjkR3ydpEFDWenYbTEr2o3zLfeKigZps5uhCK3DW2
gnVk50VNagkzrzvA
=Rc1z
-----END PGP SIGNATURE-----
Merge tag 'kbuild-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
- Remove the deprecated rule to build *.dtbo from *.dts
- Refactor section mismatch detection in modpost
- Fix bogus ARM section mismatch detections
- Fix error of 'make gtags' with O= option
- Add Clang's target triple to KBUILD_CPPFLAGS to fix a build error
with the latest LLVM version
- Rebuild the built-in initrd when KBUILD_BUILD_TIMESTAMP is changed
- Ignore more compiler-generated symbols for kallsyms
- Fix 'make local*config' to handle the ${CONFIG_FOO} form in Makefiles
- Enable more kernel-doc warnings with W=2
- Refactor <linux/export.h> by generating KSYMTAB data by modpost
- Deprecate <asm/export.h> and <asm-generic/export.h>
- Remove the EXPORT_DATA_SYMBOL macro
- Move the check for static EXPORT_SYMBOL back to modpost, which makes
the build faster
- Re-implement CONFIG_TRIM_UNUSED_KSYMS with one-pass algorithm
- Warn missing MODULE_DESCRIPTION when building modules with W=1
- Make 'make clean' robust against too long argument error
- Exclude more objects from GCOV to fix CFI failures with GCOV
- Allow 'make modules_install' to install modules.builtin and
modules.builtin.modinfo even when CONFIG_MODULES is disabled
- Include modules.builtin and modules.builtin.modinfo in the
linux-image Debian package even when CONFIG_MODULES is disabled
- Revive "Entering directory" logging for the latest Make version
* tag 'kbuild-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (72 commits)
modpost: define more R_ARM_* for old distributions
kbuild: revive "Entering directory" for Make >= 4.4.1
kbuild: set correct abs_srctree and abs_objtree for package builds
scripts/mksysmap: Ignore prefixed KCFI symbols
kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb
kbuild: builddeb: always make modules_install, to install modules.builtin*
modpost: continue even with unknown relocation type
modpost: factor out Elf_Sym pointer calculation to section_rel()
modpost: factor out inst location calculation to section_rel()
kbuild: Disable GCOV for *.mod.o
kbuild: Fix CFI failures with GCOV
kbuild: make clean rule robust against too long argument error
script: modpost: emit a warning when the description is missing
kbuild: make modules_install copy modules.builtin(.modinfo)
linux/export.h: rename 'sec' argument to 'license'
modpost: show offset from symbol for section mismatch warnings
modpost: merge two similar section mismatch warnings
kbuild: implement CONFIG_TRIM_UNUSED_KSYMS without recursion
modpost: use null string instead of NULL pointer for default namespace
modpost: squash sym_update_namespace() into sym_add_exported()
...
This commit is contained in:
Linus Torvalds
commit
ad2885979e
44 changed files with 673 additions and 1009 deletions
|
|
@ -82,7 +82,7 @@ ifdef need-builtin
|
|||
targets-for-builtin += $(obj)/built-in.a
|
||||
endif
|
||||
|
||||
targets-for-modules := $(foreach x, o mod $(if $(CONFIG_TRIM_UNUSED_KSYMS), usyms), \
|
||||
targets-for-modules := $(foreach x, o mod, \
|
||||
$(patsubst %.o, %.$x, $(filter %.o, $(obj-m))))
|
||||
|
||||
ifdef need-modorder
|
||||
|
|
@ -101,7 +101,9 @@ else ifeq ($(KBUILD_CHECKSRC),2)
|
|||
endif
|
||||
|
||||
ifneq ($(KBUILD_EXTRA_WARN),)
|
||||
cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $<
|
||||
cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $(KDOCFLAGS) \
|
||||
$(if $(findstring 2, $(KBUILD_EXTRA_WARN)), -Wall) \
|
||||
$<
|
||||
endif
|
||||
|
||||
# Compile C sources (.c)
|
||||
|
|
@ -161,7 +163,7 @@ quiet_cmd_cc_o_c = CC $(quiet_modtag) $@
|
|||
ifdef CONFIG_MODVERSIONS
|
||||
# When module versioning is enabled the following steps are executed:
|
||||
# o compile a <file>.o from <file>.c
|
||||
# o if <file>.o doesn't contain a __ksymtab version, i.e. does
|
||||
# o if <file>.o doesn't contain a __export_symbol_*, i.e. does
|
||||
# not export symbols, it's done.
|
||||
# o otherwise, we calculate symbol versions using the good old
|
||||
# genksyms on the preprocessed source and dump them into the .cmd file.
|
||||
|
|
@ -169,7 +171,7 @@ ifdef CONFIG_MODVERSIONS
|
|||
# be compiled and linked to the kernel and/or modules.
|
||||
|
||||
gen_symversions = \
|
||||
if $(NM) $@ 2>/dev/null | grep -q __ksymtab; then \
|
||||
if $(NM) $@ 2>/dev/null | grep -q ' __export_symbol_'; then \
|
||||
$(call cmd_gensymtypes_$(1),$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
|
||||
>> $(dot-target).cmd; \
|
||||
fi
|
||||
|
|
@ -215,21 +217,12 @@ is-standard-object = $(if $(filter-out y%, $(OBJECT_FILES_NON_STANDARD_$(basetar
|
|||
|
||||
$(obj)/%.o: objtool-enabled = $(if $(is-standard-object),$(if $(delay-objtool),$(is-single-obj-m),y))
|
||||
|
||||
ifdef CONFIG_TRIM_UNUSED_KSYMS
|
||||
cmd_gen_ksymdeps = \
|
||||
$(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd
|
||||
endif
|
||||
|
||||
cmd_check_local_export = $(srctree)/scripts/check-local-export $@
|
||||
|
||||
ifneq ($(findstring 1, $(KBUILD_EXTRA_WARN)),)
|
||||
cmd_warn_shared_object = $(if $(word 2, $(modname-multi)),$(warning $(kbuild-file): $*.o is added to multiple modules: $(modname-multi)))
|
||||
endif
|
||||
|
||||
define rule_cc_o_c
|
||||
$(call cmd_and_fixdep,cc_o_c)
|
||||
$(call cmd,gen_ksymdeps)
|
||||
$(call cmd,check_local_export)
|
||||
$(call cmd,checksrc)
|
||||
$(call cmd,checkdoc)
|
||||
$(call cmd,gen_objtooldep)
|
||||
|
|
@ -240,8 +233,6 @@ endef
|
|||
|
||||
define rule_as_o_S
|
||||
$(call cmd_and_fixdep,as_o_S)
|
||||
$(call cmd,gen_ksymdeps)
|
||||
$(call cmd,check_local_export)
|
||||
$(call cmd,gen_objtooldep)
|
||||
$(call cmd,gen_symversions_S)
|
||||
$(call cmd,warn_shared_object)
|
||||
|
|
@ -260,12 +251,6 @@ cmd_mod = printf '%s\n' $(call real-search, $*.o, .o, -objs -y -m) | \
|
|||
$(obj)/%.mod: FORCE
|
||||
$(call if_changed,mod)
|
||||
|
||||
# List module undefined symbols
|
||||
cmd_undefined_syms = $(NM) $< | sed -n 's/^ *U //p' > $@
|
||||
|
||||
$(obj)/%.usyms: $(obj)/%.o FORCE
|
||||
$(call if_changed,undefined_syms)
|
||||
|
||||
quiet_cmd_cc_lst_c = MKLST $@
|
||||
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
|
||||
$(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \
|
||||
|
|
@ -340,9 +325,7 @@ $(obj)/%.ll: $(src)/%.rs FORCE
|
|||
cmd_gensymtypes_S = \
|
||||
{ echo "\#include <linux/kernel.h>" ; \
|
||||
echo "\#include <asm/asm-prototypes.h>" ; \
|
||||
$(CPP) $(a_flags) $< | \
|
||||
grep "\<___EXPORT_SYMBOL\>" | \
|
||||
sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ; } | \
|
||||
$(NM) $@ | sed -n 's/.* __export_symbol_\(.*\)/EXPORT_SYMBOL(\1);/p' ; } | \
|
||||
$(CPP) -D__GENKSYMS__ $(c_flags) -xc - | $(genksyms)
|
||||
|
||||
quiet_cmd_cc_symtypes_S = SYM $(quiet_modtag) $@
|
||||
|
|
|
|||
|
|
@ -35,6 +35,5 @@ CLANG_FLAGS += -Werror=unknown-warning-option
|
|||
CLANG_FLAGS += -Werror=ignored-optimization-argument
|
||||
CLANG_FLAGS += -Werror=option-ignored
|
||||
CLANG_FLAGS += -Werror=unused-command-line-argument
|
||||
KBUILD_CFLAGS += $(CLANG_FLAGS)
|
||||
KBUILD_AFLAGS += $(CLANG_FLAGS)
|
||||
KBUILD_CPPFLAGS += $(CLANG_FLAGS)
|
||||
export CLANG_FLAGS
|
||||
|
|
|
|||
|
|
@ -37,8 +37,10 @@ __clean-files := $(wildcard $(addprefix $(obj)/, $(__clean-files)))
|
|||
|
||||
# ==========================================================================
|
||||
|
||||
# To make this rule robust against "Argument list too long" error,
|
||||
# remove $(obj)/ prefix, and restore it by a shell command.
|
||||
quiet_cmd_clean = CLEAN $(obj)
|
||||
cmd_clean = rm -rf $(__clean-files)
|
||||
cmd_clean = printf '$(obj)/%s ' $(patsubst $(obj)/%,%,$(__clean-files)) | xargs rm -rf
|
||||
|
||||
__clean: $(subdir-ymn)
|
||||
ifneq ($(strip $(__clean-files)),)
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ try-run = $(shell set -e; \
|
|||
# Usage: aflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
|
||||
|
||||
as-option = $(call try-run,\
|
||||
$(CC) -Werror $(KBUILD_AFLAGS) $(1) -c -x assembler-with-cpp /dev/null -o "$$TMP",$(1),$(2))
|
||||
$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(1) -c -x assembler-with-cpp /dev/null -o "$$TMP",$(1),$(2))
|
||||
|
||||
# as-instr
|
||||
# Usage: aflags-y += $(call as-instr,instr,option1,option2)
|
||||
|
||||
as-instr = $(call try-run,\
|
||||
printf "%b\n" "$(1)" | $(CC) -Werror $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3))
|
||||
printf "%b\n" "$(1)" | $(CC) -Werror $(CLANG_FLAGS) $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3))
|
||||
|
||||
# __cc-option
|
||||
# Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)
|
||||
|
|
|
|||
|
|
@ -418,9 +418,6 @@ endif
|
|||
$(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
|
||||
$(call if_changed_dep,dtb)
|
||||
|
||||
$(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
|
||||
$(call if_changed_dep,dtc)
|
||||
|
||||
$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
|
||||
$(call if_changed_dep,dtc)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ modname = $(notdir $(@:.mod.o=))
|
|||
part-of-module = y
|
||||
|
||||
quiet_cmd_cc_o_c = CC [M] $@
|
||||
cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI), $(c_flags)) -c -o $@ $<
|
||||
cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI) $(CFLAGS_GCOV), $(c_flags)) -c -o $@ $<
|
||||
|
||||
%.mod.o: %.mod.c FORCE
|
||||
$(call if_changed_dep,cc_o_c)
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ modpost-args = \
|
|||
$(if $(KBUILD_MODPOST_WARN),-w) \
|
||||
$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \
|
||||
$(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N) \
|
||||
$(if $(findstring 1, $(KBUILD_EXTRA_WARN)),-W) \
|
||||
-o $@
|
||||
|
||||
modpost-deps := $(MODPOST)
|
||||
|
|
@ -90,6 +91,13 @@ targets += .vmlinux.objs
|
|||
.vmlinux.objs: vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE
|
||||
$(call if_changed,vmlinux_objs)
|
||||
|
||||
ifdef CONFIG_TRIM_UNUSED_KSYMS
|
||||
ksym-wl := $(CONFIG_UNUSED_KSYMS_WHITELIST)
|
||||
ksym-wl := $(if $(filter-out /%, $(ksym-wl)),$(srctree)/)$(ksym-wl)
|
||||
modpost-args += -t $(addprefix -u , $(ksym-wl))
|
||||
modpost-deps += $(ksym-wl)
|
||||
endif
|
||||
|
||||
ifeq ($(wildcard vmlinux.o),)
|
||||
missing-input := vmlinux.o
|
||||
output-symdump := modules-only.symvers
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ quiet_cmd_cc_o_c = CC $@
|
|||
|
||||
ifdef CONFIG_MODULES
|
||||
KASAN_SANITIZE_.vmlinux.export.o := n
|
||||
GCOV_PROFILE_.vmlinux.export.o := n
|
||||
targets += .vmlinux.export.o
|
||||
vmlinux: .vmlinux.export.o
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
# Script to update include/generated/autoksyms.h and dependency files
|
||||
#
|
||||
# Copyright: (C) 2016 Linaro Limited
|
||||
# Created by: Nicolas Pitre, January 2016
|
||||
#
|
||||
|
||||
# Update the include/generated/autoksyms.h file.
|
||||
#
|
||||
# For each symbol being added or removed, the corresponding dependency
|
||||
# file's timestamp is updated to force a rebuild of the affected source
|
||||
# file. All arguments passed to this script are assumed to be a command
|
||||
# to be exec'd to trigger a rebuild of those files.
|
||||
|
||||
set -e
|
||||
|
||||
cur_ksyms_file="include/generated/autoksyms.h"
|
||||
new_ksyms_file="include/generated/autoksyms.h.tmpnew"
|
||||
|
||||
info() {
|
||||
if [ "$quiet" != "silent_" ]; then
|
||||
printf " %-7s %s\n" "$1" "$2"
|
||||
fi
|
||||
}
|
||||
|
||||
info "CHK" "$cur_ksyms_file"
|
||||
|
||||
# Use "make V=1" to debug this script.
|
||||
case "$KBUILD_VERBOSE" in
|
||||
*1*)
|
||||
set -x
|
||||
;;
|
||||
esac
|
||||
|
||||
# Generate a new symbol list file
|
||||
$CONFIG_SHELL $srctree/scripts/gen_autoksyms.sh --modorder "$new_ksyms_file"
|
||||
|
||||
# Extract changes between old and new list and touch corresponding
|
||||
# dependency files.
|
||||
changed=$(
|
||||
count=0
|
||||
sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u |
|
||||
sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' |
|
||||
while read sympath; do
|
||||
if [ -z "$sympath" ]; then continue; fi
|
||||
depfile="include/ksym/${sympath}"
|
||||
mkdir -p "$(dirname "$depfile")"
|
||||
touch "$depfile"
|
||||
# Filesystems with coarse time precision may create timestamps
|
||||
# equal to the one from a file that was very recently built and that
|
||||
# needs to be rebuild. Let's guard against that by making sure our
|
||||
# dep files are always newer than the first file we created here.
|
||||
while [ ! "$depfile" -nt "$new_ksyms_file" ]; do
|
||||
touch "$depfile"
|
||||
done
|
||||
echo $((count += 1))
|
||||
done | tail -1 )
|
||||
changed=${changed:-0}
|
||||
|
||||
if [ $changed -gt 0 ]; then
|
||||
# Replace the old list with tne new one
|
||||
old=$(grep -c "^#define __KSYM_" "$cur_ksyms_file" || true)
|
||||
new=$(grep -c "^#define __KSYM_" "$new_ksyms_file" || true)
|
||||
info "KSYMS" "symbols: before=$old, after=$new, changed=$changed"
|
||||
info "UPD" "$cur_ksyms_file"
|
||||
mv -f "$new_ksyms_file" "$cur_ksyms_file"
|
||||
# Then trigger a rebuild of affected source files
|
||||
exec $@
|
||||
else
|
||||
rm -f "$new_ksyms_file"
|
||||
fi
|
||||
|
|
@ -246,8 +246,7 @@ static void *read_file(const char *filename)
|
|||
/* Ignore certain dependencies */
|
||||
static int is_ignored_file(const char *s, int len)
|
||||
{
|
||||
return str_ends_with(s, len, "include/generated/autoconf.h") ||
|
||||
str_ends_with(s, len, "include/generated/autoksyms.h");
|
||||
return str_ends_with(s, len, "include/generated/autoconf.h");
|
||||
}
|
||||
|
||||
/* Do not parse these files */
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# Copyright (C) 2022 Masahiro Yamada <masahiroy@kernel.org>
|
||||
# Copyright (C) 2022 Owen Rafferty <owen@owenrafferty.com>
|
||||
#
|
||||
# Exit with error if a local exported symbol is found.
|
||||
# EXPORT_SYMBOL should be used for global symbols.
|
||||
|
||||
set -e
|
||||
pid=$$
|
||||
|
||||
# If there is no symbol in the object, ${NM} (both GNU nm and llvm-nm) shows
|
||||
# 'no symbols' diagnostic (but exits with 0). It is harmless and hidden by
|
||||
# '2>/dev/null'. However, it suppresses real error messages as well. Add a
|
||||
# hand-crafted error message here.
|
||||
#
|
||||
# TODO:
|
||||
# Use --quiet instead of 2>/dev/null when we upgrade the minimum version of
|
||||
# binutils to 2.37, llvm to 13.0.0.
|
||||
# Then, the following line will be simpler:
|
||||
# { ${NM} --quiet ${1} || kill 0; } |
|
||||
|
||||
{ ${NM} ${1} 2>/dev/null || { echo "${0}: ${NM} failed" >&2; kill $pid; } } |
|
||||
${AWK} -v "file=${1}" '
|
||||
BEGIN {
|
||||
i = 0
|
||||
}
|
||||
|
||||
# Skip the line if the number of fields is less than 3.
|
||||
#
|
||||
# case 1)
|
||||
# For undefined symbols, the first field (value) is empty.
|
||||
# The outout looks like this:
|
||||
# " U _printk"
|
||||
# It is unneeded to record undefined symbols.
|
||||
#
|
||||
# case 2)
|
||||
# For Clang LTO, llvm-nm outputs a line with type t but empty name:
|
||||
# "---------------- t"
|
||||
!length($3) {
|
||||
next
|
||||
}
|
||||
|
||||
# save (name, type) in the associative array
|
||||
{ symbol_types[$3]=$2 }
|
||||
|
||||
# append the exported symbol to the array
|
||||
($3 ~ /^__ksymtab_/) {
|
||||
export_symbols[i] = $3
|
||||
sub(/^__ksymtab_/, "", export_symbols[i])
|
||||
i++
|
||||
}
|
||||
|
||||
END {
|
||||
exit_code = 0
|
||||
for (j = 0; j < i; ++j) {
|
||||
name = export_symbols[j]
|
||||
# nm(3) says "If lowercase, the symbol is usually local"
|
||||
if (symbol_types[name] ~ /[a-z]/) {
|
||||
printf "%s: error: local symbol %s was exported\n",
|
||||
file, name | "cat 1>&2"
|
||||
exit_code = 1
|
||||
}
|
||||
}
|
||||
|
||||
exit exit_code
|
||||
}'
|
||||
|
||||
exit $?
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
# Create an autoksyms.h header file from the list of all module's needed symbols
|
||||
# as recorded in *.usyms files and the user-provided symbol whitelist.
|
||||
|
||||
set -e
|
||||
|
||||
# Use "make V=1" to debug this script.
|
||||
case "$KBUILD_VERBOSE" in
|
||||
*1*)
|
||||
set -x
|
||||
;;
|
||||
esac
|
||||
|
||||
read_modorder=
|
||||
|
||||
if [ "$1" = --modorder ]; then
|
||||
shift
|
||||
read_modorder=1
|
||||
fi
|
||||
|
||||
output_file="$1"
|
||||
|
||||
needed_symbols=
|
||||
|
||||
# Special case for modversions (see modpost.c)
|
||||
if grep -q "^CONFIG_MODVERSIONS=y$" include/config/auto.conf; then
|
||||
needed_symbols="$needed_symbols module_layout"
|
||||
fi
|
||||
|
||||
ksym_wl=$(sed -n 's/^CONFIG_UNUSED_KSYMS_WHITELIST=\(.*\)$/\1/p' include/config/auto.conf)
|
||||
if [ -n "$ksym_wl" ]; then
|
||||
[ "${ksym_wl}" != "${ksym_wl#/}" ] || ksym_wl="$abs_srctree/$ksym_wl"
|
||||
if [ ! -f "$ksym_wl" ] || [ ! -r "$ksym_wl" ]; then
|
||||
echo "ERROR: '$ksym_wl' whitelist file not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Generate a new ksym list file with symbols needed by the current
|
||||
# set of modules.
|
||||
cat > "$output_file" << EOT
|
||||
/*
|
||||
* Automatically generated file; DO NOT EDIT.
|
||||
*/
|
||||
|
||||
EOT
|
||||
|
||||
{
|
||||
[ -n "${read_modorder}" ] && sed 's/o$/usyms/' modules.order | xargs cat
|
||||
echo "$needed_symbols"
|
||||
[ -n "$ksym_wl" ] && cat "$ksym_wl"
|
||||
} | sed -e 's/ /\n/g' | sed -n -e '/^$/!p' |
|
||||
# Remove the dot prefix for ppc64; symbol names with a dot (.) hold entry
|
||||
# point addresses.
|
||||
sed -e 's/^\.//' |
|
||||
sort -u |
|
||||
# Ignore __this_module. It's not an exported symbol, and will be resolved
|
||||
# when the final .ko's are linked.
|
||||
grep -v '^__this_module$' |
|
||||
sed -e 's/\(.*\)/#define __KSYM_\1 1/' >> "$output_file"
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
set -e
|
||||
|
||||
# List of exported symbols
|
||||
#
|
||||
# If the object has no symbol, $NM warns 'no symbols'.
|
||||
# Suppress the stderr.
|
||||
# TODO:
|
||||
# Use -q instead of 2>/dev/null when we upgrade the minimum version of
|
||||
# binutils to 2.37, llvm to 13.0.0.
|
||||
ksyms=$($NM $1 2>/dev/null | sed -n 's/.*__ksym_marker_\(.*\)/\1/p')
|
||||
|
||||
if [ -z "$ksyms" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "ksymdeps_$1 := \\"
|
||||
|
||||
for s in $ksyms
|
||||
do
|
||||
printf ' $(wildcard include/ksym/%s) \\\n' "$s"
|
||||
done
|
||||
|
||||
echo
|
||||
echo "$1: \$(ksymdeps_$1)"
|
||||
echo
|
||||
echo "\$(ksymdeps_$1):"
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -29,24 +30,8 @@
|
|||
|
||||
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
|
||||
|
||||
#define _stringify_1(x) #x
|
||||
#define _stringify(x) _stringify_1(x)
|
||||
|
||||
#define KSYM_NAME_LEN 512
|
||||
|
||||
/*
|
||||
* A substantially bigger size than the current maximum.
|
||||
*
|
||||
* It cannot be defined as an expression because it gets stringified
|
||||
* for the fscanf() format string. Therefore, a _Static_assert() is
|
||||
* used instead to maintain the relationship with KSYM_NAME_LEN.
|
||||
*/
|
||||
#define KSYM_NAME_LEN_BUFFER 2048
|
||||
_Static_assert(
|
||||
KSYM_NAME_LEN_BUFFER == KSYM_NAME_LEN * 4,
|
||||
"Please keep KSYM_NAME_LEN_BUFFER in sync with KSYM_NAME_LEN"
|
||||
);
|
||||
|
||||
struct sym_entry {
|
||||
unsigned long long addr;
|
||||
unsigned int len;
|
||||
|
|
@ -136,24 +121,40 @@ static void check_symbol_range(const char *sym, unsigned long long addr,
|
|||
}
|
||||
}
|
||||
|
||||
static struct sym_entry *read_symbol(FILE *in)
|
||||
static struct sym_entry *read_symbol(FILE *in, char **buf, size_t *buf_len)
|
||||
{
|
||||
char name[KSYM_NAME_LEN_BUFFER+1], type;
|
||||
char *name, type, *p;
|
||||
unsigned long long addr;
|
||||
unsigned int len;
|
||||
size_t len;
|
||||
ssize_t readlen;
|
||||
struct sym_entry *sym;
|
||||
int rc;
|
||||
|
||||
rc = fscanf(in, "%llx %c %" _stringify(KSYM_NAME_LEN_BUFFER) "s\n", &addr, &type, name);
|
||||
if (rc != 3) {
|
||||
if (rc != EOF && fgets(name, ARRAY_SIZE(name), in) == NULL)
|
||||
fprintf(stderr, "Read error or end of file.\n");
|
||||
readlen = getline(buf, buf_len, in);
|
||||
if (readlen < 0) {
|
||||
if (errno) {
|
||||
perror("read_symbol");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
if (strlen(name) >= KSYM_NAME_LEN) {
|
||||
|
||||
if ((*buf)[readlen - 1] == '\n')
|
||||
(*buf)[readlen - 1] = 0;
|
||||
|
||||
addr = strtoull(*buf, &p, 16);
|
||||
|
||||
if (*buf == p || *p++ != ' ' || !isascii((type = *p++)) || *p++ != ' ') {
|
||||
fprintf(stderr, "line format error\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
name = p;
|
||||
len = strlen(name);
|
||||
|
||||
if (len >= KSYM_NAME_LEN) {
|
||||
fprintf(stderr, "Symbol %s too long for kallsyms (%zu >= %d).\n"
|
||||
"Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
|
||||
name, strlen(name), KSYM_NAME_LEN);
|
||||
name, len, KSYM_NAME_LEN);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -169,8 +170,7 @@ static struct sym_entry *read_symbol(FILE *in)
|
|||
|
||||
/* include the type field in the symbol name, so that it gets
|
||||
* compressed together */
|
||||
|
||||
len = strlen(name) + 1;
|
||||
len++;
|
||||
|
||||
sym = malloc(sizeof(*sym) + len + 1);
|
||||
if (!sym) {
|
||||
|
|
@ -257,6 +257,8 @@ static void read_map(const char *in)
|
|||
{
|
||||
FILE *fp;
|
||||
struct sym_entry *sym;
|
||||
char *buf = NULL;
|
||||
size_t buflen = 0;
|
||||
|
||||
fp = fopen(in, "r");
|
||||
if (!fp) {
|
||||
|
|
@ -265,7 +267,7 @@ static void read_map(const char *in)
|
|||
}
|
||||
|
||||
while (!feof(fp)) {
|
||||
sym = read_symbol(fp);
|
||||
sym = read_symbol(fp, &buf, &buflen);
|
||||
if (!sym)
|
||||
continue;
|
||||
|
||||
|
|
@ -284,6 +286,7 @@ static void read_map(const char *in)
|
|||
table[table_cnt++] = sym;
|
||||
}
|
||||
|
||||
free(buf);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
|
|
@ -806,7 +809,7 @@ static void record_relative_base(void)
|
|||
int main(int argc, char **argv)
|
||||
{
|
||||
while (1) {
|
||||
static struct option long_options[] = {
|
||||
static const struct option long_options[] = {
|
||||
{"all-symbols", no_argument, &all_symbols, 1},
|
||||
{"absolute-percpu", no_argument, &absolute_percpu, 1},
|
||||
{"base-relative", no_argument, &base_relative, 1},
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ foreach my $makefile (@makefiles) {
|
|||
$_ = convert_vars($_, %make_vars);
|
||||
|
||||
# collect objects after obj-$(CONFIG_FOO_BAR)
|
||||
if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
|
||||
if (/obj-\$[({](CONFIG_[^})]*)[)}]\s*[+:]?=\s*(.*)/) {
|
||||
$var = $1;
|
||||
$objs = $2;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ kernel-doc - Print formatted kernel documentation to stdout
|
|||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
kernel-doc [-h] [-v] [-Werror]
|
||||
kernel-doc [-h] [-v] [-Werror] [-Wall] [-Wreturn] [-Wshort-description] [-Wcontents-before-sections]
|
||||
[ -man |
|
||||
-rst [-sphinx-version VERSION] [-enable-lineno] |
|
||||
-none
|
||||
|
|
@ -133,6 +133,9 @@ my $dohighlight = "";
|
|||
|
||||
my $verbose = 0;
|
||||
my $Werror = 0;
|
||||
my $Wreturn = 0;
|
||||
my $Wshort_desc = 0;
|
||||
my $Wcontents_before_sections = 0;
|
||||
my $output_mode = "rst";
|
||||
my $output_preformatted = 0;
|
||||
my $no_doc_sections = 0;
|
||||
|
|
@ -187,9 +190,14 @@ if (defined($ENV{'KCFLAGS'})) {
|
|||
}
|
||||
}
|
||||
|
||||
# reading this variable is for backwards compat just in case
|
||||
# someone was calling it with the variable from outside the
|
||||
# kernel's build system
|
||||
if (defined($ENV{'KDOC_WERROR'})) {
|
||||
$Werror = "$ENV{'KDOC_WERROR'}";
|
||||
}
|
||||
# other environment variables are converted to command-line
|
||||
# arguments in cmd_checkdoc in the build system
|
||||
|
||||
# Generated docbook code is inserted in a template at a point where
|
||||
# docbook v3.1 requires a non-zero sequence of RefEntry's; see:
|
||||
|
|
@ -318,6 +326,16 @@ while ($ARGV[0] =~ m/^--?(.*)/) {
|
|||
$verbose = 1;
|
||||
} elsif ($cmd eq "Werror") {
|
||||
$Werror = 1;
|
||||
} elsif ($cmd eq "Wreturn") {
|
||||
$Wreturn = 1;
|
||||
} elsif ($cmd eq "Wshort-desc") {
|
||||
$Wshort_desc = 1;
|
||||
} elsif ($cmd eq "Wcontents-before-sections") {
|
||||
$Wcontents_before_sections = 1;
|
||||
} elsif ($cmd eq "Wall") {
|
||||
$Wreturn = 1;
|
||||
$Wshort_desc = 1;
|
||||
$Wcontents_before_sections = 1;
|
||||
} elsif (($cmd eq "h") || ($cmd eq "help")) {
|
||||
pod2usage(-exitval => 0, -verbose => 2);
|
||||
} elsif ($cmd eq 'no-doc-sections') {
|
||||
|
|
@ -1748,9 +1766,9 @@ sub dump_function($$) {
|
|||
# This check emits a lot of warnings at the moment, because many
|
||||
# functions don't have a 'Return' doc section. So until the number
|
||||
# of warnings goes sufficiently down, the check is only performed in
|
||||
# verbose mode.
|
||||
# -Wreturn mode.
|
||||
# TODO: always perform the check.
|
||||
if ($verbose && !$noret) {
|
||||
if ($Wreturn && !$noret) {
|
||||
check_return_section($file, $declaration_name, $return_type);
|
||||
}
|
||||
|
||||
|
|
@ -2054,7 +2072,7 @@ sub process_name($$) {
|
|||
$state = STATE_NORMAL;
|
||||
}
|
||||
|
||||
if (($declaration_purpose eq "") && $verbose) {
|
||||
if (($declaration_purpose eq "") && $Wshort_desc) {
|
||||
emit_warning("${file}:$.", "missing initial short description on line:\n$_");
|
||||
}
|
||||
|
||||
|
|
@ -2103,7 +2121,7 @@ sub process_body($$) {
|
|||
}
|
||||
|
||||
if (($contents ne "") && ($contents ne "\n")) {
|
||||
if (!$in_doc_sect && $verbose) {
|
||||
if (!$in_doc_sect && $Wcontents_before_sections) {
|
||||
emit_warning("${file}:$.", "contents before sections\n");
|
||||
}
|
||||
dump_section($file, $section, $contents);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ ${NM} -n ${1} | sed >${2} -e "
|
|||
# (do not forget a space before each pattern)
|
||||
|
||||
# local symbols for ARM, MIPS, etc.
|
||||
/ \$/d
|
||||
/ \\$/d
|
||||
|
||||
# local labels, .LBB, .Ltmpxxx, .L__unnamed_xx, .LASANPC, etc.
|
||||
/ \.L/d
|
||||
|
|
@ -40,8 +40,12 @@ ${NM} -n ${1} | sed >${2} -e "
|
|||
# arm64 EFI stub namespace
|
||||
/ __efistub_/d
|
||||
|
||||
# arm64 local symbols in PIE namespace
|
||||
/ __pi_\\$/d
|
||||
/ __pi_\.L/d
|
||||
|
||||
# arm64 local symbols in non-VHE KVM namespace
|
||||
/ __kvm_nvhe_\$/d
|
||||
/ __kvm_nvhe_\\$/d
|
||||
/ __kvm_nvhe_\.L/d
|
||||
|
||||
# arm64 lld
|
||||
|
|
@ -58,6 +62,8 @@ ${NM} -n ${1} | sed >${2} -e "
|
|||
|
||||
# CFI type identifiers
|
||||
/ __kcfi_typeid_/d
|
||||
/ __kvm_nvhe___kcfi_typeid_/d
|
||||
/ __pi___kcfi_typeid_/d
|
||||
|
||||
# CRC from modversions
|
||||
/ __crc_/d
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -137,6 +137,7 @@ struct elf_info {
|
|||
Elf_Shdr *sechdrs;
|
||||
Elf_Sym *symtab_start;
|
||||
Elf_Sym *symtab_stop;
|
||||
unsigned int export_symbol_secndx; /* .export_symbol section */
|
||||
char *strtab;
|
||||
char *modinfo;
|
||||
unsigned int modinfo_len;
|
||||
|
|
@ -151,11 +152,6 @@ struct elf_info {
|
|||
Elf32_Word *symtab_shndx_stop;
|
||||
};
|
||||
|
||||
static inline int is_shndx_special(unsigned int i)
|
||||
{
|
||||
return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
|
||||
}
|
||||
|
||||
/* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
|
||||
static inline unsigned int get_secindex(const struct elf_info *info,
|
||||
const Elf_Sym *sym)
|
||||
|
|
|
|||
|
|
@ -62,18 +62,14 @@ install_linux_image () {
|
|||
${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install
|
||||
fi
|
||||
|
||||
if is_enabled CONFIG_MODULES; then
|
||||
${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install
|
||||
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
|
||||
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
|
||||
if [ "${SRCARCH}" = um ] ; then
|
||||
mkdir -p "${pdir}/usr/lib/uml/modules"
|
||||
mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
|
||||
fi
|
||||
fi
|
||||
${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install
|
||||
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
|
||||
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
|
||||
|
||||
# Install the kernel
|
||||
if [ "${ARCH}" = um ] ; then
|
||||
mkdir -p "${pdir}/usr/lib/uml/modules"
|
||||
mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
|
||||
mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}"
|
||||
cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map"
|
||||
cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"
|
||||
|
|
|
|||
|
|
@ -33,3 +33,7 @@ rm -f rust/target.json
|
|||
rm -f scripts/bin2c
|
||||
|
||||
rm -f .scmversion
|
||||
|
||||
rm -rf include/ksym
|
||||
|
||||
find . -name '*.usyms' | xargs rm -f
|
||||
|
|
|
|||
|
|
@ -32,6 +32,13 @@ else
|
|||
tree=${srctree}/
|
||||
fi
|
||||
|
||||
# gtags(1) refuses to index any file outside of its current working dir.
|
||||
# If gtags indexing is requested and the build output directory is not
|
||||
# the kernel source tree, index all files in absolute-path form.
|
||||
if [[ "$1" == "gtags" && -n "${tree}" ]]; then
|
||||
tree=$(realpath "$tree")/
|
||||
fi
|
||||
|
||||
# Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
|
||||
if [ "${ALLSOURCE_ARCHS}" = "" ]; then
|
||||
ALLSOURCE_ARCHS=${SRCARCH}
|
||||
|
|
@ -131,7 +138,7 @@ docscope()
|
|||
|
||||
dogtags()
|
||||
{
|
||||
all_target_sources | gtags -i -f -
|
||||
all_target_sources | gtags -i -C "${tree:-.}" -f - "$PWD"
|
||||
}
|
||||
|
||||
# Basic regular expressions with an optional /kind-spec/ for ctags and
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue