Module rewrite 13/20: Module versions
Subsystems (2)
PATCH 1/1 Module rewrite 13/20: Module versions
[ This does not delete the old CONFIG_MODVERSIONS code: I'll leave
that to Kai's pleasure, in return for fixing remaining makefile issues. You'll note that the export-objs lines in Makefiles should no longer be neccessary now. ]
Name: modversions support
Author: Rusty Russell
Status: Tested on 2.5.38
Depends: Module/param-oldstyle.patch.gz
Depends: Misc/2-5-38-fixes.patch.gz
D: This implementes CONFIG_MODVERSIONING (similar to the old
D: CONFIG_MODVERSIONS, but with a separate name for the moment so the
D: two can be clearly separated).
D:
D: The makefiles do not quite work correctly: you have to build using: D: make kernel/modversions.o bzImage D: make modules
D:
D: The idea is that modules which want to export symbols place their
D: full path name in the .needmodversion section. Just before the kernel
D: is linked, these names are extracted, and genksyms scans those files to
D: create a version table. This table is then linked into the kernel. D:
D: For modules, after they have been built, another pass adds a
D: .versions section to each module containing the version of each
D: undefined symbol in it.
D:
D: These symbol versions are then checked on insmod. This means that
D: you can insert an unversioned module into a versioned kernel, and
D: vice versa (which taints your kernel).
D:
D: Also, the offensive export-objs defines in Makefiles are now unneccessary.
Makefile +26 -3
@@ -296,6 +296,7 @@ cmd_link_vmlinux = $(LD) $(LDFLAGS) $(LD $(LIBS) \ $(DRIVERS) \ $(NETWORKS) \ + $(kernel_modversions) \ --end-group \ -o vmlinux
@@ -314,7 +315,7 @@ endef LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s -vmlinux: $(vmlinux-objs) arch/$(ARCH)/vmlinux.lds.s FORCE +vmlinux: $(vmlinux-objs) $(kernel_modversions) arch/$(ARCH)/vmlinux.lds.s FORCE $(call if_changed_rule,link_vmlinux) # The actual objects are generated when descending,
@@ -424,8 +425,30 @@ depend dep: .hdepend @$(MAKE) include/linux/modversions.h @touch $@ -ifdef CONFIG_MODVERSIONS +ifdef CONFIG_MODVERSIONING +# Module versions for the kernel: +kernel_modversions = kernel/modversions.o +quiet_cmd_get_modversions = MODVER $@ +cmd_get_modversions = $(CONFIG_SHELL) scripts/extract_versions $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) $(vmlinux-objs) >$@ + +include/linux/generated-modversions.h: $(vmlinux-objs) scripts/extract_versions + $(call cmd,get_modversions) + +kernel/modversions.o: kernel/modversions.c include/linux/generated-modversions.h + $(CC) $(CFLAGS) -c -o $@ $< + +# FIXME: We don't version symbols exported by modules --RR +module_modversions = add_modversions + +add_modversions: include/linux/generated-modversions.h $(patsubst %, _addmodver_%, $(SUBDIRS)) + +$(patsubst %,_addmodver_%,$(SUBDIRS)): FORCE + @$(MAKE) -C $(patsubst _addmodver_%, %, $@) add_modversions + +endif + +ifdef CONFIG_MODVERSIONS # Update modversions.h, but only if it would change. include/linux/modversions.h: scripts/fixdep prepare FORCE
@@ -465,7 +488,7 @@ MODFLAGS += -include $(objtree)/include/ endif .PHONY: modules -modules: $(SUBDIRS) +modules: $(SUBDIRS) $(module_modversions) # Install modules
Rules.make +14 -1
@@ -44,6 +44,13 @@ endif obj := . src := . +# We insert an extra symbol for modversions on SMP +ifdef CONFIG_SMP +modversions_extra = { "__SMP__", 0x01 }, +else +modversions_extra = { "__SMP__", 0x00 }, +endif + # For use in the quiet output echo_target = $(RELDIR)/$@
@@ -130,7 +137,7 @@ basename_flags = -DKBUILD_BASENAME=$(sub modname_flags = -DKBUILD_MODNAME=$(subst $(comma),_,$(subst -,_,$(modname))) c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \ $(modkern_cflags) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) \ - $(basename_flags) $(modname_flags) $(export_flags) + $(basename_flags) $(modname_flags) $(export_flags) -D__DIRNAME__=\"$(CURDIR)\" # Finds the multi-part object the current object will be linked into modname-multi = $(subst $(space),_,$(strip $(foreach m,$(multi-used),\
@@ -271,6 +278,12 @@ first_rule: $(if $(KBUILD_BUILTIN),$(O_T sub_dirs @echo -n +# Module versioning +add_modversions: sub_dirs FORCE + @RELDIR=$(RELDIR) $(CONFIG_SHELL) -e $(TOPDIR)/scripts/add_versions '$(modversions_extra)' $(obj-m) + + + # Compile C sources (.c) # ---------------------------------------------------------------------------
include/linux/module.h +30 -2
@@ -34,6 +34,11 @@ struct kernel_symbolchar name[MODULE_NAME_LEN ]; }; +struct modversion_info { +char symbol[MODULE_NAME_LEN ]; +unsigned long checksum; +}; +#ifdef MODULE /* This is magically filled in by the linker, but THIS_MODULE must be a constant so it works in initializers. */
@@ -47,13 +52,28 @@ extern struct module __this_module;/* Get/put a kernel symbol (calls should be symmetric) */ #define symbol_get (x) ((typeof(&x))(__get_symbol(#x))) +#ifdef CONFIG_MODVERSIONING +#define NEED_MODVERSION (sym) \ + const char __needver_##sym[256] \ + __attribute__((section(".needmodversion"))) \ + = { __DIRNAME__ "/" __FILE__ }; + +extern struct modversion_info modversions[]; +#else /* !CONFIG_MODVERSIONING */ +#define NEED_MODVERSION (sym) +#endif +/* For every exported symbol, place a struct in the __ksymtab section */ -#define EXPORT_SYMBOL (sym) \ +#define EXPORT_SYMBOL_NOVERS (sym) \ const struct kernel_symbol __ksymtab_##sym \ __attribute__((section("__ksymtab"))) \ = { (unsigned long)&sym, #sym } -#define EXPORT_SYMBOL_NOVERS (sym) EXPORT_SYMBOL(sym) +#define EXPORT_SYMBOL (sym) \ + NEED_MODVERSION(sym) \ + EXPORT_SYMBOL_NOVERS(sym) + +/* FIXME: Enforce this. */ #define EXPORT_SYMBOL_GPL (sym) EXPORT_SYMBOL(sym)struct kernel_symbol_group
@@ -285,4 +305,12 @@ extern int module_dummy_usage; (((m)->module_init \ &&__mod_between ((p),(n),(m)->module_init,(m)->init_size)) \ || __mod_between((p),(n),(m)->module_core,(m)->core_size)) + +#ifdef __GENKSYMS__ +/* We want the EXPORT_SYMBOL tag left intact for recognition. */ +#undef EXPORT_SYMBOL +#undef EXPORT_SYMBOL_NOVERS +#undef EXPORT_SYMBOL_GPL +#endif /* __GENKSYMS__ */ +#endif /* _LINUX_MODULE_H */
init/Config.in +1 -0
@@ -15,6 +15,7 @@ mainmenu_option next_comment comment 'Loadable module support' bool 'Enable loadable module support' CONFIG_MODULES dep_bool ' Kernel module loader' CONFIG_KMOD $CONFIG_MODULES +dep_bool ' Kernel module versioning' CONFIG_MODVERSIONING $CONFIG_MODULES dep_bool ' Module unloading' CONFIG_MODULE_UNLOAD $CONFIG_MODULES dep_bool ' Obsolete module parameters' CONFIG_OBSOLETE_MODPARM $CONFIG_MODULES endmenu
kernel/module.c +95 -26
176 lines not on this page · raw message
kernel/modversions.c +13 -0
@@ -0,0 +1,13 @@ +/* Made very late: not referred to be normal makefiles. +(C) Copyright 2002 Rusty Russell, IBM Corporation. +*/ +#include <linux/module.h> +struct modversion_info modversions[] __attribute__((section(".versions"))) = { +#include <linux/generated-modversions.h> +#ifdef CONFIG_SMP + { "__SMP__", 1 }, +#else + { "__SMP__", 0 }, +#endif + { "", 0 } +};
scripts/add_versions +32 -0
@@ -0,0 +1,32 @@ +#! /bin/sh +# For a given list of modules, add a .versions section containing the +# versions it expects. + +set -e + +if [ $# -lt 1 ]; then + echo Usage: add_versions extraversion objfiles... >&2 + exit 1 +fi + +EXTRAVERSION=$1 +shift 1 + +for file; do + trap "rm -f .$file.versions.*" 0 + $NM -u $file | sed 's/\(.*\)/"\1",/' | sort | join -1 1 -2 2 -o 2.1,1.1,2.3,2.4 - $TOPDIR/include/linux/generated-modversions.h > .$file.versions + if [ -s .$file.versions ]; then + echo "Adding versions to $RELDIR/$file" + echo '#include <linux/module.h>' > .$file.versions.c + echo 'struct modversion_info __modversions[] __attribute__((section(".versions"))) = {' >> .$file.versions.c + cat .$file.versions >> .$file.versions.c + echo "$EXTRAVERSION" >> .$file.versions.c + echo '};' >> .$file.versions.c + # Remove old .versions section, won't be required once Makefiles work. + $OBJCOPY --remove-section=.versions $file .$file.versions.none.o + # Compile and add .versions section. + $CC $CFLAGS -c .$file.versions.c + $LD $LDFLAGS -r -o $file .$file.versions.none.o .$file.versions.o + fi + rm -f .$file.versions.* +done
scripts/extract_versions +23 -0
@@ -0,0 +1,23 @@ +#! /bin/sh +# Given a list of object files, output the C structure for the version table. + +set -e + +if [ $# -lt 2 ]; then + echo Usage: extract_versions kernelversion objfiles... >&2 + exit 1 +fi + +VERSION=$1 +shift 1 + +# Join 16-lines into one big filename, then run each filename through genksyms. +# Genksyms produces: +# #define __ver_printk smp_1b7d4074 +# #define printk _set_ver(printk) +# +# And since it's outside the kernel source tree, we use sed on it. +for file in `"$OBJDUMP" --section=.needmodversion --full-contents "$@" | sed -n '/^ *[0-9a-fA-Z][0-9a-fA-Z][0-9a-fA-Z][0-9a-fA-Z] /{N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;s/[0-9A-Za-z ]* //g;s/\n//g;s/\.*$//gp;}' | sort -u`; do + echo "GENKSYMS $file" >&2 + $CPP $CFLAGS -D__GENKSYMS__ $file | genksyms -k $VERSION | sed -n '/#define __ver_/{s///;N;s/\n.*//;s/\([a-zA-Z0-9_]*\)[^a-zA-Z0-9_]*\(.*\)/{ "\1", 0x\2 },/p;}' +done | sort
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.