Message ID | 1457070050-1564-6-git-send-email-nicolas.pitre@linaro.org |
---|---|
State | Superseded |
Headers | show |
On Sat, 5 Mar 2016, Michal Marek wrote: > On Fri, Mar 04, 2016 at 11:53:53PM +0100, Michal Marek wrote: > > Dne 4.3.2016 v 23:51 Michal Marek napsal(a): > > > Dne 4.3.2016 v 06:40 Nicolas Pitre napsal(a): > > >> +cmd_and_fixdep = \ > > >> + $(echo-cmd) $(cmd_$(1)); \ > > >> + $(ksym_dep_filter) | \ > > >> + scripts/basic/fixdep -e $(depfile) $@ '$(make-cmd)' \ > > >> + > $(dot-target).tmp; \ > > >> + rm -f $(depfile); \ > > >> + mv -f $(dot-target).tmp $(dot-target).cmd; > > > > > > While trying this, I got a SIGBUS from fixdep once. My theory is that > > > the depfile is mmap()ed by fixdep and modified by the preprocesor run at > > > the same time. I could not reproduce this so far (still trying). But if > > > it's really this race, the fix would be to disable dependency generation > > > in the preprocessor by passing -Wp,MD,/dev/null or somesuch. But we > > > never had this problem with genksyms, which is weird. It could as well > > > be that my build machine's memory is faulty :(. > > > > Actually, genksyms does not ran in parallel. neither before nor after > run > > this patch. > > I reproduced the SIGBUS after a few iterations, and it crashes in > parse_dep_file(). I'm now testing this > > diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include > index 0be7e09ba381..4fdd8348acf6 100644 > --- a/scripts/Kbuild.include > +++ b/scripts/Kbuild.include > @@ -270,10 +270,12 @@ else > > # Filter out exported kernel symbol names from the preprocessor output. > # See also __KSYM_DEPS__ in include/linux/export.h. > +# We disable the depfile generation here, so as not to overwrite the existing > +# depfile while fixdep is parsing it > ksym_dep_filter = \ > case "$(1)" in \ > - cc_*_c) $(CPP) $(c_flags) -D__KSYM_DEPS__ $< ;; \ > - as_*_S) $(CPP) $(a_flags) -D__KSYM_DEPS__ $< ;; \ > + cc_*_c) $(CPP) $(filter-out -Wp$(comma)-M%, $(c_flags)) -D__KSYM_DEPS__ $< ;; \ > + as_*_S) $(CPP) $(filter-out -Wp$(comma)-M%, $(a_flags)) -D__KSYM_DEPS__ $< ;; \ > cpp_lds_S) : ;; \ > *) echo "Don't know how to preprocess $(1)"; false ;; \ > esac | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p' This makes perfect sense even if I can't reproduce on my side. Are you willing to fold this patch in, or do you prefer that I repost? Nicolas
diff --git a/include/linux/export.h b/include/linux/export.h index 77afdb2a25..2f9ccbe6a6 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -65,7 +65,18 @@ extern struct module __this_module; __attribute__((section("___ksymtab" sec "+" #sym), unused)) \ = { (unsigned long)&sym, __kstrtab_##sym } -#ifdef CONFIG_TRIM_UNUSED_KSYMS +#if defined(__KSYM_DEPS__) + +/* + * For fine grained build dependencies, we want to tell the build system + * about each possible exported symbol even if they're not actually exported. + * We use a string pattern that is unlikely to be valid code that the build + * system filters out from the preprocessor output (see ksym_dep_filter + * in scripts/Kbuild.include). + */ +#define __EXPORT_SYMBOL(sym, sec) === __KSYM_##sym === + +#elif defined(CONFIG_TRIM_UNUSED_KSYMS) #include <linux/kconfig.h> #include <generated/autoksyms.h> diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 8a257fa663..0be7e09ba3 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -258,12 +258,36 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ @set -e; \ $(cmd_and_fixdep)) +ifndef CONFIG_TRIM_UNUSED_KSYMS + cmd_and_fixdep = \ $(echo-cmd) $(cmd_$(1)); \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\ rm -f $(depfile); \ mv -f $(dot-target).tmp $(dot-target).cmd; +else + +# Filter out exported kernel symbol names from the preprocessor output. +# See also __KSYM_DEPS__ in include/linux/export.h. +ksym_dep_filter = \ + case "$(1)" in \ + cc_*_c) $(CPP) $(c_flags) -D__KSYM_DEPS__ $< ;; \ + as_*_S) $(CPP) $(a_flags) -D__KSYM_DEPS__ $< ;; \ + cpp_lds_S) : ;; \ + *) echo "Don't know how to preprocess $(1)"; false ;; \ + esac | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p' + +cmd_and_fixdep = \ + $(echo-cmd) $(cmd_$(1)); \ + $(ksym_dep_filter) | \ + scripts/basic/fixdep -e $(depfile) $@ '$(make-cmd)' \ + > $(dot-target).tmp; \ + rm -f $(depfile); \ + mv -f $(dot-target).tmp $(dot-target).cmd; + +endif + # Usage: $(call if_changed_rule,foo) # Will check if $(cmd_foo) or any of the prerequisites changed, # and if so will execute $(rule_foo). diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index d984deb120..2dc6bf754a 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -354,6 +354,7 @@ static void parse_dep_file(void *map, size_t len) /* Ignore certain dependencies */ if (strrcmp(s, "include/generated/autoconf.h") && + strrcmp(s, "include/generated/autoksyms.h") && strrcmp(s, "arch/um/include/uml-config.h") && strrcmp(s, "include/linux/kconfig.h") && strrcmp(s, ".ver")) {