Skip to contentSkip to conversation

kbuild: use modpost-args-y to clean up modpost arguments

PATCH In review Masahiro Yamada 2 participants 4 messages Sep 6, 2022 – Sep 15, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kbuild: use modpost-args-y to clean up modpost arguments

Separate the modpost executable (scripts/mod/modpost) and the command parameters for the next commit.

---

 Makefile                 |  2 +-
 scripts/Makefile.modpost | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
Makefile +1 -1
index aee4f0769d9d..e07236209606 100644
@@ -1908,7 +1908,7 @@ tags TAGS cscope gtags: FORCE
 # ---------------------------------------------------------------------------
 
 PHONY += nsdeps
-nsdeps: export KBUILD_NSDEPS=1
+nsdeps: export KBUILD_NSDEPS=y
 nsdeps: modules
 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/nsdeps
 
scripts/Makefile.modpost +11 -11
index ceb1d78140e7..87821a5fe16b 100644
@@ -38,17 +38,17 @@ __modpost:
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
-MODPOST = scripts/mod/modpost								\
-	$(if $(CONFIG_MODVERSIONS),-m)							\
-	$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)					\
-	$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)					\
-	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))					\
-	$(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)	\
-	-o $@
+MODPOST = scripts/mod/modpost
+
+modpost-args-$(CONFIG_MODVERSIONS)				+= -m
+modpost-args-$(CONFIG_MODULE_SRCVERSION_ALL)			+= -a
+modpost-args-$(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)	+= -N
+modpost-args-$(KBUILD_NSDEPS)					+= -N -d $(MODULES_NSDEPS)
+modpost-args-y += $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)
 
 # 'make -i -k' ignores compile errors, and builds as many modules as possible.
 ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)
-MODPOST += -n
+modpost-args-y += -n
 endif
 
 ifeq ($(KBUILD_EXTMOD),)
@@ -99,12 +99,12 @@ module.symvers-if-present := $(wildcard Module.symvers)
 output-symdump := $(KBUILD_EXTMOD)/Module.symvers
 missing-input := $(filter-out $(module.symvers-if-present), Module.symvers)
 
-MODPOST += -e $(addprefix -i ,$(module.symvers-if-present) $(KBUILD_EXTRA_SYMBOLS))
+modpost-args-y += -e $(addprefix -i ,$(module.symvers-if-present) $(KBUILD_EXTRA_SYMBOLS))
 
 endif # ($(KBUILD_EXTMOD),)
 
 ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)
-MODPOST += -w
+modpost-args-y += -w
 endif
 
 modorder-if-needed := $(if $(KBUILD_MODULES), $(MODORDER))
@@ -117,7 +117,7 @@ quiet_cmd_modpost = MODPOST $@
 		echo >&2 "WARNING: $(missing-input) is missing."; \
 		echo >&2 "         Modules may not have dependencies or modversions."; \
 		echo >&2 "         You may get many unresolved symbol warnings.";) \
-	sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(vmlinux.o-if-present) -T -
+	sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(modpost-args-y) $(vmlinux.o-if-present) -T - -o $@
 
 targets += $(output-symdump)
 $(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) FORCE
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 kbuild: re-run modpost stage when scripts/mod/modpost is updated

vmlinux depends on .vmlinux.export.c, modules depend on *.mod.c.

They are output from modpost, so the modpost stage must be re-run when the modpost code is updated.

---

 scripts/Makefile.modpost | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.modpost +1 -1
index 87821a5fe16b..1afe50971f3b 100644
@@ -120,7 +120,7 @@ quiet_cmd_modpost = MODPOST $@
 	sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(modpost-args-y) $(vmlinux.o-if-present) -T - -o $@
 
 targets += $(output-symdump)
-$(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) FORCE
+$(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.symvers-if-present) $(MODPOST) FORCE
 	$(call if_changed,modpost)
 
 __modpost: $(output-symdump)
Signature · 1 line
2.34.1
#2 lore raw
In reply to Masahiro Yamada
Quoted 35 lines · Masahiro Yamada

Separate the modpost executable (scripts/mod/modpost) and the command parameters for the next commit.

---

 Makefile                 |  2 +-
 scripts/Makefile.modpost | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
Makefile +1 -1
index aee4f0769d9d..e07236209606 100644
@@ -1908,7 +1908,7 @@ tags TAGS cscope gtags: FORCE
 # ---------------------------------------------------------------------------
 
 PHONY += nsdeps
-nsdeps: export KBUILD_NSDEPS=1
+nsdeps: export KBUILD_NSDEPS=y
 nsdeps: modules
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/nsdeps
 
scripts/Makefile.modpost +0 -3
index ceb1d78140e7..87821a5fe16b 100644
@@ -38,17 +38,17 @@ __modpost:
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
-MODPOST = scripts/mod/modpost                                                          \
-       $(if $(CONFIG_MODVERSIONS),-m)                                                  \
-       $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)                                        \

scripts/Makefile.modpost __modpost: · line 46

Quoted 10 lines
scripts/Makefile.modpost +6 -4
-       $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)                                  \
-       $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))                                     \
-       $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)       \
-       -o $@
+MODPOST = scripts/mod/modpost
+
+modpost-args-$(CONFIG_MODVERSIONS)                             += -m
+modpost-args-$(CONFIG_MODULE_SRCVERSION_ALL)                   += -a
+modpost-args-$(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)  += -N
+modpost-args-$(KBUILD_NSDEPS)                                  += -N -d $(MODULES_NSDEPS)

Was it intentional that you included -N for KBUILD_NSDEPS? That seems like a change in behavior. Everything else LGTM but that.

scripts/Makefile.modpost __modpost: · line 47

Quoted 1 line
scripts/Makefile.modpost +1 -0
+modpost-args-y += $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)

Ugh, your pattern kind of falls apart for the above ^. Maybe this is the most concise way to express this, but boy I sure do sometimes wish for a programming language that had booleans and simple negation. Maybe I would regret that in a build system...

Signature · 2 lines
Thanks,
~Nick Desaulniers
#3 lore raw
Quoted 34 lines · Nick Desaulniers
Quoted 32 lines · Masahiro Yamada

Separate the modpost executable (scripts/mod/modpost) and the command parameters for the next commit.

---

 Makefile                 |  2 +-
 scripts/Makefile.modpost | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
Makefile +1 -1
index aee4f0769d9d..e07236209606 100644
@@ -1908,7 +1908,7 @@ tags TAGS cscope gtags: FORCE
 # ---------------------------------------------------------------------------
 
 PHONY += nsdeps
-nsdeps: export KBUILD_NSDEPS=1
+nsdeps: export KBUILD_NSDEPS=y
 nsdeps: modules
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/nsdeps
 
scripts/Makefile.modpost +0 -0
index ceb1d78140e7..87821a5fe16b 100644
@@ -38,17 +38,17 @@ __modpost:
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
Quoted 15 lines

scripts/Makefile.modpost __modpost: · line 46

Quoted 13 lines
scripts/Makefile.modpost +6 -7
-MODPOST = scripts/mod/modpost                                                          \
-       $(if $(CONFIG_MODVERSIONS),-m)                                                  \
-       $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)                                        \
-       $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)                                  \
-       $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))                                     \
-       $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)       \
-       -o $@
+MODPOST = scripts/mod/modpost
+
+modpost-args-$(CONFIG_MODVERSIONS)                             += -m
+modpost-args-$(CONFIG_MODULE_SRCVERSION_ALL)                   += -a
+modpost-args-$(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)  += -N
+modpost-args-$(KBUILD_NSDEPS)                                  += -N -d $(MODULES_NSDEPS)

Was it intentional that you included -N for KBUILD_NSDEPS?

Yes.
See $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS) in the original code.

Quoted 2 lines

That seems
like a change in behavior. Everything else LGTM but that.

No behavior change.

If both CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS and KBUILD_NSDEPS are defined, -N was previously passed just once, but now twice.
This is a slight change, but behavior is still the same.

Quoted 9 lines

scripts/Makefile.modpost __modpost: · line 47

Quoted 1 line
scripts/Makefile.modpost +1 -0
+modpost-args-y += $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)

Ugh, your pattern kind of falls apart for the above ^. Maybe this is the most concise way to express this, but boy I sure do sometimes wish for a programming language that had booleans and simple negation. Maybe I would regret that in a build system...
--
Thanks,
~Nick Desaulniers

I do not think CONFIG_SECTION_MISMATCH_WARN_ONLY will live long, but a cleaner fix is to stop negating the option.

Anyway, I do not care about that.

scripts/Makefile.modpost +0 -1
index 911606496341..c5a18920646d 100644
@@ -44,7 +44,7 @@ include $(srctree)/scripts/Kbuild.include
 MODPOST = scripts/mod/modpost
                 \
        $(if $(CONFIG_MODVERSIONS),-m)
                 \
        $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)
                 \
-       $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)
                 \
+       $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),-E)
                 \
        -o $@

ifdef MODPOST_VMLINUX

scripts/mod/modpost.c +2 -2
index 2c80da0220c3..be55dd541055 100644
@@ -33,7 +33,7 @@ static bool external_module;
 static bool warn_unresolved;
 
 static int sec_mismatch_count;
-static bool sec_mismatch_warn_only = true;
+static bool sec_mismatch_warn_only;
 /* ignore missing files */
 static bool ignore_missing_files;
 /* If set to 1, only warn (instead of error) about missing ns imports */
@@ -2355,7 +2355,7 @@ int main(int argc, char **argv)
                        warn_unresolved = true;
                        break;
                case 'E':
-                       sec_mismatch_warn_only = false;
+                       sec_mismatch_warn_only = true;
                        break;
                case 'N':
                        allow_missing_ns_imports = true;
Signature · 2 lines
Best Regards
Masahiro Yamada