modpost: Add flag -E for making section mismatches fatal

The section mismatch warning can be easy to miss during the kernel build process. Allow it to be marked as fatal to be easily caught and prevent bugs from slipping in. Setting CONFIG_SECTION_MISMATCH_WARN_ONLY=y causes these warnings to be non-fatal, since there are a number of section mismatches when using allmodconfig on some architectures, and we do not want to break these builds by default.

Nicolas Boichat committed 11 years ago

Commit 47490ec1 parent 74b22c43 files · +27 −7Browse files

Unified · Split

3 files

lib/Kconfig.debug +9 −0
scripts/Makefile.modpost +1 −0
scripts/mod/modpost.c +17 −7

lib/Kconfig.debug+9−0

@@ -311,6 +311,15 @@ config DEBUG_SECTION_MISMATCH · 310 unmodified lines
311	- Enable verbose reporting from modpost in order to help resolve	311	- Enable verbose reporting from modpost in order to help resolve
312	the section mismatches that are reported.	312	the section mismatches that are reported.
313		313
		314	config SECTION_MISMATCH_WARN_ONLY
		315	bool "Make section mismatch errors non-fatal"
		316	default y
		317	help
		318	If you say N here, the build process will fail if there are any
		319	section mismatch, instead of just throwing warnings.
		320
		321	If unsure, say Y.
		322
314	#	323	#
315	# Select this config option from the architecture Kconfig, if it	324	# Select this config option from the architecture Kconfig, if it
316	# is preferred to always offer frame pointers as a config	325	# is preferred to always offer frame pointers as a config

scripts/Makefile.modpost+1−0

@@ -77,6 +77,7 @@ modpost = scripts/mod/modpost \ · 76 unmodified lines
77	$(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \	77	$(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
78	$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \	78	$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
79	$(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \	79	$(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \
		80	$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \
80	$(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)	81	$(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
81		82
82	MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))	83	MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))

scripts/mod/modpost.c+17−7

 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+static int sec_mismatch_fatal = 0;
 /* ignore missing files */
 static int ignore_missing_files;
 	struct ext_sym_list *extsym_iter;
 	struct ext_sym_list *extsym_start = NULL;
-	while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
+	while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:E")) != -1) {
 		switch (opt) {
 		case 'i':
 			kernel_read = optarg;
 		case 'w':
 			warn_unresolved = 1;
 			break;
+		case 'E':
+			sec_mismatch_fatal = 1;
+			break;
 		default:
 			exit(1);
 		}
 		sprintf(fname, "%s.mod.c", mod->name);
 		write_if_changed(&buf, fname);
 	}
 	if (dump_write)
 		write_dump(dump_write);
-	if (sec_mismatch_count && !sec_mismatch_verbose)
+	if (sec_mismatch_count) {
-		warn("modpost: Found %d section mismatch(es).\n"
+		if (!sec_mismatch_verbose) {
-		     "To see full details build your kernel with:\n"
+			warn("modpost: Found %d section mismatch(es).\n"
-		     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+			     "To see full details build your kernel with:\n"
-		     sec_mismatch_count);
+			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+			     sec_mismatch_count);
+		}
+		if (sec_mismatch_fatal) {
+			fatal("modpost: Section mismatches detected.\n"
+			      "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
+		}
+	}
 	return err;
 }