livepatch: Create and include UAPI headers
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 15 lines
include/uapi/linux/livepatch.h new file +8
-0@@ -0,0 +1,28 @@ +/* +* livepatch.h - Kernel Live Patching Core +* +* Copyright (C) 2016 Josh Poimboeuf <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2
include/uapi/linux/livepatch.h line 18
Quoted 10 lines
include/uapi/linux/livepatch.h new file +10
-0+* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see <http://www.gnu.org/licenses/>. +*/
People will ask to replace GPL boilerplate with SPDX tag.
include/uapi/linux/livepatch.h line 22
Quoted 4 lines
include/uapi/linux/livepatch.h new file +4
-0+#ifndef _UAPI_LIVEPATCH_H +#define _UAPI_LIVEPATCH_H + +#include <linux/types.h>
#include is not necessary here, I think.
include/uapi/linux/livepatch.h line 26
Quoted 4 lines
include/uapi/linux/livepatch.h new file +4
-0+#define KLP_RELA_PREFIX ".klp.rela." +#define KLP_SYM_PREFIX ".klp.sym." + +#endif /* _UAPI_LIVEPATCH_H */
Miroslav
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 2/8] kbuild: Support for Symbols.list creation
More CCs added. I'd give you lore.kernel.org link for the whole patch set (and cover letter), but the patch set is not archived for some strange reason.
Quoted 40 lines · Joao Moreira
For automatic resolution of livepatch relocations, a file called Symbols.list is used. This file maps symbols within every compiled kernel object allowing the identification of symbols whose name is unique, thus relocation can be automatically inferred, or providing information that helps developers when code annotation is required for solving the matter.
Add support for creating Symbols.list in the main
Makefile. First, ensure that built-in is compiled whenCONFIG_LIVEPATCHis enabled (as required to achieve a complete Symbols.list file). Define the command to build Symbols.list (cmd_klp_map) and hook it in the modules rule.As it is undesirable to have symbols from livepatch objects inside Symbols.list, make livepatches discernible by modifying
scripts/Makefile.buildto create a .livepatch file for each livepatch in $(MODVERDIR). This file then used bycmd_klp_mapto identify and bypass livepatches.For identifying livepatches during the build process, a flag variable LIVEPATCH_$(basetarget).o is considered in
scripts/Makefile.build. This way, set this flag for the livepatch sampleMakefileinsamples/livepatch/Makefile.Finally, Add a clean rule to ensure that Symbols.list is removed during clean.
Notes:
To achieve a correct Symbols.list file, all kernel objects must be considered, thus, its construction require these objects to be priorly built. On the other hand, invoking
scripts/Makefile.modpostwithout having a complete Symbols.list in place would occasionally lead to in-tree livepatches being post-processed incorrectly. To prevent this from becoming a circular dependency, the construction of Symbols.list uses non-post-processed kernel objects and such does not cause harm as the symbols normally referenced from within livepatches are visible at this stage. Also due to these requirements, the spot in-between modules compilation and the invocation ofscripts/Makefile.modpostwas picked for hookingcmd_klp_map.
Quoted 6 lines
The approach based on .livepatch files was proposed as an alternative to using
MODULE_INFOstatementes. This approach was originally proposed by Miroslav Benes as a workaround for identifying livepathces without depending on modinfo during the modpost stage. It was moved to this patch as the approach also shown to be useful while building Symbols.list.
If I remember correctly, the approach was originally proposed by Michal Marek. I only wanted to avoid modinfo.
Quoted 83 lines
Signed-off-by Joao Moreira <[email protected]>--- .gitignore | 1 + Makefile | 28 +++++++++++++++++++++++++--- samples/livepatch/Makefile | 1 + scripts/Makefile.build | 6 ++++++ 4 files changed, 33 insertions(+), 3 deletions(-).gitignore +1
-0@@ -45,6 +45,7 @@ *.xz Module.symvers modules.builtin +Symbols.list # # Top-level generic filesMakefile +25
-3@@ -560,10 +560,13 @@ KBUILD_BUILTIN := 1 # If we have only "make modules", don't compile built-in objects. # When we're building modules with modversions, we need to consider # the built-in objects during the descend as well, in order to -# make sure the checksums are up to date before we record them. +# make sure the checksums are up to date before we record them. The +# same applies for building livepatches, as built-in objects may hold +# symbols which are referenced from livepatches and are required by +# klp-convert post-processing tool for resolving these cases. ifeq ($(MAKECMDGOALS),modules) - KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1) + KBUILD_BUILTIN := $(if $(or $(CONFIG_MODVERSIONS), $(CONFIG_LIVEPATCH)),1) endif # If we have "make <whatever> modules", compile modules@@ -1255,9 +1258,25 @@ all: modules # duplicate lines in modules.order files. Those are removed # using awk while concatenating to the final file. +quiet_cmd_klp_map = KLP Symbols.list +SLIST = $(objtree)/Symbols.list + +define cmd_klp_map + $(shell echo "klp-convert-symbol-data.0.1" > $(SLIST)) \ + $(shell echo "*vmlinux" >> $(SLIST)) \ + $(shell nm -f posix $(objtree)/vmlinux | cut -d\ -f1 >> $(SLIST)) \ + $(foreach m, $(wildcard $(MODVERDIR)/*.mod), \ + $(eval mod = $(patsubst %.ko,%.o,$(shell head -n1 $(m)))) \ + $(if $(wildcard $(MODVERDIR)/$(shell basename -s .o $(mod)).livepatch),,\ + $(eval fmod = $(subst $(quote),_,$(subst -,_,$(mod)))) \ + $(shell echo "*$(shell basename -s .o $(fmod))" >> $(SLIST)) \ + $(shell nm -f posix $(mod) | cut -d\ -f1 >> $(SLIST)))) +endef + PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + $(if $(CONFIG_LIVEPATCH), $(call cmd,klp_map)) @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost@@ -1352,7 +1371,10 @@ vmlinuxclean: $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean) -clean: archclean vmlinuxclean +klpclean: + $(Q) rm -f $(objtree)/Symbols.list + +clean: archclean vmlinuxclean klpclean # mrproper - Delete all generated files, including .config #samples/livepatch/Makefile +0
-0
samples/livepatch/Makefile line 4
Quoted 4 lines
samples/livepatch/Makefile +1
-0@@ -1,3 +1,4 @@ +LIVEPATCH_livepatch-sample.o := y obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-sample.o obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-mod.o obj-$(CONFIG_SAMPLE_LIVEPATCH) += livepatch-shadow-fix1.o
We should eventually add the same flag even for the rest of samples.
Quoted 27 lines
scripts/Makefile.build +6
-0@@ -247,6 +247,11 @@ cmd_gen_ksymdeps = \ $(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd endif +ifdef CONFIG_LIVEPATCH +cmd_livepatch = $(if $(LIVEPATCH_$(basetarget).o), \ + $(shell touch $(MODVERDIR)/$(basetarget).livepatch)) +endif + define rule_cc_o_c $(call cmd,checksrc) $(call cmd_and_fixdep,cc_o_c)@@ -283,6 +288,7 @@ $(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) F $(call if_changed_rule,cc_o_c) @{ echo $(@:.o=.ko); echo $@; \ $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod) + $(call cmd_livepatch) quiet_cmd_cc_lst_c = MKLST $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \Signature · 1 line
2.16.4
Miroslav
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 5/8] modpost: Integrate klp-convert
Adding CCs...
Quoted 24 lines · Joao Moreira
From: Josh Poimboeuf <[email protected]>
Create
cmd_klp_convertand hook it intoscripts/Makefile.modpost.cmd_klp_convertinvokes klp-convert with the right arguments for the conversion of unresolved symbols inside a livepatch.[khlebnikov:
* savecmd_ld_ko_ointo .module.cmd,if_changed_ruledoesn't do that
* fix bashisms for debian where/bin/shis a symlink to/bin/dash
* renamerule_link_moduletorule_ld_ko_o, otherwise arg-check insideif_changed_rulecomparescmd_link_moduleandcmd_ld_ko_o
* check modinfo -F livepatch only ifCONFIG_LIVEPATCHis true ][mbenes:
* remove modinfo call.LIVEPATCH_in Makefiled
][jmoreira:
* split up: move the .livepatch file-based scheme for identifying livepatches to a previous patch, as it was required for correctly building Symbols.list there.
]
Quoted 4 lines
Signed-off-by Josh Poimboeuf <[email protected]>Signed-off-by Konstantin Khlebnikov <[email protected]>Signed-off-by Miroslav Benes <[email protected]>Signed-off-by Joao Moreira <[email protected]>
I'm definitely not an expert on this topic (and we talked about it in the past off-list), but I'd simplify the SoB chain. At least you don't need my SoB there. I'm happy that you took the code and transformed it.
Quoted 96 lines
--- scripts/Kbuild.include | 4 +++- scripts/Makefile.modpost | 16 +++++++++++++++- scripts/mod/modpost.c | 6 +++++- scripts/mod/modpost.h | 1 + 4 files changed, 24 insertions(+), 3 deletions(-)scripts/Kbuild.include +3
-1@@ -239,6 +239,8 @@ endif # (needed for the shell) make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1))))) +save-cmd = printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd + # Find any prerequisites that is newer than target or that does not exist. # PHONY targets skipped in both cases. any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^)@@ -246,7 +248,7 @@ any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) # Execute command if command has changed or prerequisite(s) are updated. if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ $(cmd); \ - printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) + $(save-cmd), @:) # Execute the command and also postprocess generated .d dependencies file. if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)),$(cmd_and_fixdep),@:)scripts/Makefile.modpost +15
-1@@ -125,8 +125,22 @@ quiet_cmd_ld_ko_o = LD [M] $@ -o $@ $(filter-out FORCE,$^) ; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) +SLIST = $(objtree)/Symbols.list +KLP_CONVERT = scripts/livepatch/klp-convert +quiet_cmd_klp_convert = KLP $@ + cmd_klp_convert = mv $@ $(@:.ko=.klp.o); \ + $(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@ + +define rule_ld_ko_o + $(call cmd,ld_ko_o) $(cmd_ld_ko_o) ; \ + $(call save-cmd,ld_ko_o) ; \ + $(if $(CONFIG_LIVEPATCH), \ + $(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \ + $(call echo-cmd,klp_convert) $(cmd_klp_convert) )) +endef + $(modules): %.ko :%.o %.mod.o FORCE - +$(call if_changed,ld_ko_o) + +$(call if_changed_rule,ld_ko_o) targets += $(modules)scripts/mod/modpost.c +5
-1@@ -1979,6 +1979,10 @@ static void read_symbols(const char *modname) license =get_next_modinfo (&info,"license" , license); } +/* Livepatch modules have unresolved symbols resolved by klp-convert */ +if (get_modinfo (info.modinfo, info.modinfo_len,"livepatch" )) + mod->livepatch =1 ; +for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { symname =remove_dot (info.strtab + sym->st_name);@@ -2106,7 +2110,7 @@ static int check_exports(struct module *mod)const char *basename; exp =find_symbol (s->name);if (!exp || exp->module == mod) { -if (have_vmlinux && !s->weak) { +if (have_vmlinux && !s->weak && !mod->livepatch) {if (warn_unresolved) {warn ("\"%s\" [%s.ko] undefined!\n" , s->name, mod->name);scripts/mod/modpost.h +1
-0@@ -118,6 +118,7 @@ struct module {int skip;int has_init;int has_cleanup; +int livepatch;struct buffer dev_table_buf;char srcversion[25 ];int is_dot_o;Signature · 1 line
2.16.4
Miroslav
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 6/8] modpost: Add modinfo flag to livepatch modules
Adding CCs...
Quoted 37 lines · Joao Moreira
From: Miroslav Benes <[email protected]>
Currently, livepatch infrastructure in the kernel relies on
MODULE_INFO(livepatch, "Y")statement in a livepatch module. Then the kernel module loader knows a module is indeed livepatch module and can behave accordingly.klp-convert, on the other hand relies on LIVEPATCH_* statement in the module's
Makefilefor exactly the same reason.Remove dependency on modinfo and generate
MODULE_INFOflag automatically in modpost when LIVEPATCH_* is defined in the module'sMakefile. Generate a list of all built livepatch modules based on the .livepatch file and store it in (MODVERDIR)/livepatchmods. Give this list as an argument for modpost which will use it to identify livepatch modules.As
MODULE_INFOis no longer needed, remove it.[jmoreira:
* fixmodpost.c(add_livepatch_flag) to update module structure with livepatch flag and prevent modpost from breaking due to unresolved symbols]Signed-off-by Miroslav Benes <[email protected]>Signed-off-by Joao Moreira <[email protected]>--- samples/livepatch/livepatch-sample.c | 1 - scripts/Makefile.modpost | 8 +++- scripts/mod/modpost.c | 84 +++++++++++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 8 deletions(-)samples/livepatch/livepatch-sample.c +0
-0
samples/livepatch/livepatch-sample.c static void livepatch_exit(void) · line 93
Quoted 4 lines
samples/livepatch/livepatch-sample.c +0
-1@@ -90,4 +90,3 @@ static void livepatch_exit(void)module_init (livepatch_init);module_exit (livepatch_exit);MODULE_LICENSE ("GPL" ); -MODULE_INFO (livepatch,"Y" );
Again, we shoud do the same for the other samples we have in samples/livepatch/ directory.
Quoted 168 lines
scripts/Makefile.modpost +7
-1@@ -65,6 +65,11 @@ MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort __modules := $(shell $(MODLISTCMD)) modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) +# find all .livepatch files listed in $(MODVERDIR)/ +ifdef CONFIG_LIVEPATCH +$(shell find $(MODVERDIR) -name '*.livepatch' | xargs -r -I{} basename {} .livepatch > $(MODVERDIR)/livepatchmods) +endif + # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules))@@ -79,7 +84,8 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ + $(if $(CONFIG_LIVEPATCH),-l $(MODVERDIR)/livepatchmods) MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))scripts/mod/modpost.c +78
-6@@ -1979,10 +1979,6 @@ static void read_symbols(const char *modname) license =get_next_modinfo (&info,"license" , license); } -/* Livepatch modules have unresolved symbols resolved by klp-convert */ -if (get_modinfo (info.modinfo, info.modinfo_len,"livepatch" )) - mod->livepatch =1 ; -for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { symname =remove_dot (info.strtab + sym->st_name);@@ -2421,6 +2417,76 @@ static void write_dump(const char *fname)free (buf.p); } +struct livepatch_mod_list { +struct livepatch_mod_list *next; +char *livepatch_mod; +}; + +static struct livepatch_mod_list *load_livepatch_mods (const char *fname) +{ +struct livepatch_mod_list *list_iter, *list_start =NULL ; +unsigned long size, pos =0 ; +void *file =grab_file (fname, &size); +char *line; + +if (!file) +return NULL ; + +while ((line =get_next_line (&pos, file, size))) { + list_iter =NOFAIL (malloc (sizeof (*list_iter))); + list_iter->next = list_start; + list_iter->livepatch_mod =NOFAIL (strdup (line)); + list_start = list_iter; + } +release_file (file, size); + +return list_start; +} + +static void free_livepatch_mods (struct livepatch_mod_list *list_start) +{ +struct livepatch_mod_list *list_iter; + +while (list_start) { + list_iter = list_start->next; +free (list_start->livepatch_mod); +free (list_start); + list_start = list_iter; + } +} + +static int is_livepatch_mod (const char *modname, +struct livepatch_mod_list *list) +{ +const char *myname; + +if (!list) +return 0 ; + + myname =strrchr (modname,'/' ); +if (myname) + myname++; +else + myname = modname; + +while (list) { +if (!strcmp (myname, list->livepatch_mod)) +return 1 ; + list = list->next; + } +return 0 ; +} + +static void add_livepatch_flag (struct buffer *b,struct module *mod, +struct livepatch_mod_list *list) +{ +if (is_livepatch_mod (mod->name, list)) { +buf_printf (b,"\nMODULE_INFO(livepatch, \"Y\");\n" ); + mod->livepatch =1 ; + } +} + +struct ext_sym_list {struct ext_sym_list *next;const char *file;@@ -2436,8 +2502,9 @@ int main(int argc, char **argv)int err;struct ext_sym_list *extsym_iter;struct ext_sym_list *extsym_start =NULL ; +struct livepatch_mod_list *livepatch_mods =NULL ; -while ((opt =getopt (argc, argv,"i:I:e:mnsST:o:awE" )) !=-1 ) { +while ((opt =getopt (argc, argv,"i:I:e:l:mnsST:o:awM:K:E" )) !=-1 ) {switch (opt) {case 'i' : kernel_read = optarg;@@ -2454,6 +2521,9 @@ int main(int argc, char **argv) extsym_iter->file = optarg; extsym_start = extsym_iter;break ; +case 'l' : + livepatch_mods =load_livepatch_mods (optarg); +break ;case 'm' : modversions =1 ;break ;@@ -2514,15 +2584,16 @@ int main(int argc, char **argv) buf.pos =0 ; err |=check_modname_len (mod); - err |=check_exports (mod);add_header (&buf, mod);add_intree_flag (&buf, !external_module);add_retpoline (&buf);add_staging_flag (&buf, mod->name); +add_livepatch_flag (&buf, mod, livepatch_mods); err |=add_versions (&buf, mod);add_depends (&buf, mod);add_moddevtable (&buf, mod);add_srcversion (&buf, mod); + err |=check_exports (mod);sprintf (fname,"%s.mod.c" , mod->name);write_if_changed (&buf, fname);@@ -2541,6 +2612,7 @@ int main(int argc, char **argv) "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n"); } } +free_livepatch_mods (livepatch_mods);free (buf.p);return err;Signature · 1 line
2.16.4
Miroslav
Re: [PATCH v2 6/8] modpost: Add modinfo flag to livepatch modules
Quoted 1 line · Miroslav Benes
Adding CCs...
Where was this posted? I don't see it on lkml. It would be good to be able to see the whole series for review.
Quoted 218 lines · Joao Moreira
Quoted 38 lines
From: Miroslav Benes <[email protected]>
Currently, livepatch infrastructure in the kernel relies on
MODULE_INFO(livepatch, "Y")statement in a livepatch module. Then the kernel module loader knows a module is indeed livepatch module and can behave accordingly.klp-convert, on the other hand relies on LIVEPATCH_* statement in the module's
Makefilefor exactly the same reason.Remove dependency on modinfo and generate
MODULE_INFOflag automatically in modpost when LIVEPATCH_* is defined in the module'sMakefile. Generate a list of all built livepatch modules based on the .livepatch file and store it in (MODVERDIR)/livepatchmods. Give this list as an argument for modpost which will use it to identify livepatch modules.As
MODULE_INFOis no longer needed, remove it.[jmoreira:
* fixmodpost.c(add_livepatch_flag) to update module structure with livepatch flag and prevent modpost from breaking due to unresolved symbols]Signed-off-by Miroslav Benes <[email protected]>Signed-off-by Joao Moreira <[email protected]>--- samples/livepatch/livepatch-sample.c | 1 - scripts/Makefile.modpost | 8 +++- scripts/mod/modpost.c | 84 +++++++++++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 8 deletions(-)samples/livepatch/livepatch-sample.c +0
-0samples/livepatch/livepatch-sample.c static void livepatch_exit(void) · line 93
Quoted 4 lines
samples/livepatch/livepatch-sample.c +0
-1@@ -90,4 +90,3 @@ static void livepatch_exit(void)module_init (livepatch_init);module_exit (livepatch_exit);MODULE_LICENSE ("GPL" ); -MODULE_INFO (livepatch,"Y" );Again, we shoud do the same for the other samples we have in
samples/livepatch/directory.Quoted 168 lines
scripts/Makefile.modpost +7
-1@@ -65,6 +65,11 @@ MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort __modules := $(shell $(MODLISTCMD)) modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) +# find all .livepatch files listed in $(MODVERDIR)/ +ifdef CONFIG_LIVEPATCH +$(shell find $(MODVERDIR) -name '*.livepatch' | xargs -r -I{} basename {} .livepatch > $(MODVERDIR)/livepatchmods) +endif + # Stop after building .o files if NOFINAL is set. Makes compile tests quicker _modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules))@@ -79,7 +84,8 @@ modpost = scripts/mod/modpost \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \ + $(if $(CONFIG_LIVEPATCH),-l $(MODVERDIR)/livepatchmods) MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))scripts/mod/modpost.c +78
-6@@ -1979,10 +1979,6 @@ static void read_symbols(const char *modname) license =get_next_modinfo (&info,"license" , license); } -/* Livepatch modules have unresolved symbols resolved by klp-convert */ -if (get_modinfo (info.modinfo, info.modinfo_len,"livepatch" )) - mod->livepatch =1 ; -for (sym = info.symtab_start; sym < info.symtab_stop; sym++) { symname =remove_dot (info.strtab + sym->st_name);@@ -2421,6 +2417,76 @@ static void write_dump(const char *fname)free (buf.p); } +struct livepatch_mod_list { +struct livepatch_mod_list *next; +char *livepatch_mod; +}; + +static struct livepatch_mod_list *load_livepatch_mods (const char *fname) +{ +struct livepatch_mod_list *list_iter, *list_start =NULL ; +unsigned long size, pos =0 ; +void *file =grab_file (fname, &size); +char *line; + +if (!file) +return NULL ; + +while ((line =get_next_line (&pos, file, size))) { + list_iter =NOFAIL (malloc (sizeof (*list_iter))); + list_iter->next = list_start; + list_iter->livepatch_mod =NOFAIL (strdup (line)); + list_start = list_iter; + } +release_file (file, size); + +return list_start; +} + +static void free_livepatch_mods (struct livepatch_mod_list *list_start) +{ +struct livepatch_mod_list *list_iter; + +while (list_start) { + list_iter = list_start->next; +free (list_start->livepatch_mod); +free (list_start); + list_start = list_iter; + } +} + +static int is_livepatch_mod (const char *modname, +struct livepatch_mod_list *list) +{ +const char *myname; + +if (!list) +return 0 ; + + myname =strrchr (modname,'/' ); +if (myname) + myname++; +else + myname = modname; + +while (list) { +if (!strcmp (myname, list->livepatch_mod)) +return 1 ; + list = list->next; + } +return 0 ; +} + +static void add_livepatch_flag (struct buffer *b,struct module *mod, +struct livepatch_mod_list *list) +{ +if (is_livepatch_mod (mod->name, list)) { +buf_printf (b,"\nMODULE_INFO(livepatch, \"Y\");\n" ); + mod->livepatch =1 ; + } +} + +struct ext_sym_list {struct ext_sym_list *next;const char *file;@@ -2436,8 +2502,9 @@ int main(int argc, char **argv)int err;struct ext_sym_list *extsym_iter;struct ext_sym_list *extsym_start =NULL ; +struct livepatch_mod_list *livepatch_mods =NULL ; -while ((opt =getopt (argc, argv,"i:I:e:mnsST:o:awE" )) !=-1 ) { +while ((opt =getopt (argc, argv,"i:I:e:l:mnsST:o:awM:K:E" )) !=-1 ) {switch (opt) {case 'i' : kernel_read = optarg;@@ -2454,6 +2521,9 @@ int main(int argc, char **argv) extsym_iter->file = optarg; extsym_start = extsym_iter;break ; +case 'l' : + livepatch_mods =load_livepatch_mods (optarg); +break ;case 'm' : modversions =1 ;break ;@@ -2514,15 +2584,16 @@ int main(int argc, char **argv) buf.pos =0 ; err |=check_modname_len (mod); - err |=check_exports (mod);add_header (&buf, mod);add_intree_flag (&buf, !external_module);add_retpoline (&buf);add_staging_flag (&buf, mod->name); +add_livepatch_flag (&buf, mod, livepatch_mods); err |=add_versions (&buf, mod);add_depends (&buf, mod);add_moddevtable (&buf, mod);add_srcversion (&buf, mod); + err |=check_exports (mod);sprintf (fname,"%s.mod.c" , mod->name);write_if_changed (&buf, fname);@@ -2541,6 +2612,7 @@ int main(int argc, char **argv) "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n"); } } +free_livepatch_mods (livepatch_mods);free (buf.p);return err;Signature · 1 line
2.16.4Miroslav
Signature · 1 line
Josh