* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: documentation change on allowing checkers besides sparse kbuild: warn when a moduled uses a symbol marked UNUSED kbuild: fix segv in modpost kconfig: enhancing accessibility of lxdialog kbuild: fix ia64 breakage after introducing make -rR
Unified · Split
| @@ -41,8 +41,9 @@ ifndef KBUILD_VERBOSE · 40 unmodified lines | ||
| 41 | 41 | KBUILD_VERBOSE = 0 |
| 42 | 42 | endif |
| 43 | 43 | |
| 44 | −# Call sparse as part of compilation of C files | |
| 45 | −# Use 'make C=1' to enable sparse checking | |
| 44 | +# Call checker as part of compilation of C files | |
| 45 | +# Use 'make C=1' to enable checking (sparse, by default) | |
| 46 | +# Override with 'make C=1 CHECK=checker_executable CHECKFLAGS=....' | |
| 46 | 47 | |
| 47 | 48 | ifdef C |
| 48 | 49 | ifeq ("$(origin C)", "command line") |
| @@ -1060,8 +1061,8 @@ help: · 1011 unmodified lines | ||
| 1060 | 1061 | |
| 1061 | 1062 | @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' |
| 1062 | 1063 | @echo ' make O=dir [targets] Locate all output files in "dir", including .config' |
| 1063 | − @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse)' | |
| 1064 | − @echo ' make C=2 [targets] Force check of all c source with $$CHECK (sparse)' | |
| 1064 | + @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' | |
| 1065 | + @echo ' make C=2 [targets] Force check of all c source with $$CHECK' | |
| 1065 | 1066 | @echo '' |
| 1066 | 1067 | @echo 'Execute "make" or "make all" to build all targets marked with [*] ' |
| 1067 | 1068 | @echo 'For further info see the ./README file' |
| @@ -1352,7 +1353,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) · 284 unmodified lines | ||
| 1352 | 1353 | |
| 1353 | 1354 | a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \ |
| 1354 | 1355 | $(NOSTDINC_FLAGS) $(CPPFLAGS) \ |
| 1355 | − $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | |
| 1356 | + $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o) | |
| 1356 | 1357 | |
| 1357 | 1358 | quiet_cmd_as_o_S = AS $@ |
| 1358 | 1359 | cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< |
| @@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) · 7 unmodified lines | ||
| 8 | 8 | USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) |
| 9 | 9 | |
| 10 | 10 | $(USER_OBJS:.o=.%): \ |
| 11 | − c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o) | |
| 11 | + c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o) | |
| 12 | 12 | $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ |
| 13 | 13 | -Dunix -D__unix__ -D__$(SUBARCH)__ |
| 14 | 14 | |
| @@ -17,7 +17,7 @@ $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ · 2 unmodified lines | ||
| 17 | 17 | UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file)) |
| 18 | 18 | |
| 19 | 19 | $(UNPROFILE_OBJS:.o=.%): \ |
| 20 | − c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o) | |
| 20 | + c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o) | |
| 21 | 21 | $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ |
| 22 | 22 | -Dunix -D__unix__ -D__$(SUBARCH)__ |
| 23 | 23 | |
| @@ -12,6 +12,10 @@ space := $(empty) $(empty) · 11 unmodified lines | ||
| 12 | 12 | # contain a comma |
| 13 | 13 | depfile = $(subst $(comma),_,$(@D)/.$(@F).d) |
| 14 | 14 | |
| 15 | +### | |
| 16 | +# filename of target with directory and extension stripped | |
| 17 | +basetarget = $(basename $(notdir $@)) | |
| 18 | + | |
| 15 | 19 | ### |
| 16 | 20 | # Escape single quote for use in echo statements |
| 17 | 21 | escsq = $(subst $(squote),'\$(squote)',$1) |
| @@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] · 116 unmodified lines | ||
| 117 | 117 | $(obj-m) : quiet_modtag := [M] |
| 118 | 118 | |
| 119 | 119 | # Default for not multi-part modules |
| 120 | −modname = $(*F) | |
| 120 | +modname = $(basetarget) | |
| 121 | 121 | |
| 122 | 122 | $(multi-objs-m) : modname = $(modname-multi) |
| 123 | 123 | $(multi-objs-m:.o=.i) : modname = $(modname-multi) |
| @@ -80,8 +80,10 @@ obj-dirs += $(host-objdirs) · 79 unmodified lines | ||
| 80 | 80 | ##### |
| 81 | 81 | # Handle options to gcc. Support building with separate output directory |
| 82 | 82 | |
| 83 | −_hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS_$(*F).o) | |
| 84 | −_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o) | |
| 83 | +_hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | |
| 84 | + $(HOSTCFLAGS_$(basetarget).o) | |
| 85 | +_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ | |
| 86 | + $(HOSTCXXFLAGS_$(basetarget).o) | |
| 85 | 87 | |
| 86 | 88 | ifeq ($(KBUILD_SRC),) |
| 87 | 89 | __hostc_flags = $(_hostc_flags) |
| @@ -82,12 +82,12 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) · 81 unmodified lines | ||
| 82 | 82 | # than one module. In that case KBUILD_MODNAME will be set to foo_bar, |
| 83 | 83 | # where foo and bar are the name of the modules. |
| 84 | 84 | name-fix = $(subst $(comma),_,$(subst -,_,$1)) |
| 85 | −basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))" | |
| 85 | +basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" | |
| 86 | 86 | modname_flags = $(if $(filter 1,$(words $(modname))),\ |
| 87 | 87 | -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") |
| 88 | 88 | |
| 89 | −_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) | |
| 90 | −_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) | |
| 89 | +_c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o) | |
| 90 | +_a_flags = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o) | |
| 91 | 91 | _cpp_flags = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F)) |
| 92 | 92 | |
| 93 | 93 | # If building the kernel in a separate objtree expand all occurrences |
| @@ -72,7 +72,7 @@ $(modules:.ko=.mod.c): __modpost ; · 71 unmodified lines | ||
| 72 | 72 | # Step 5), compile all *.mod.c files |
| 73 | 73 | |
| 74 | 74 | # modname is set to make c_flags define KBUILD_MODNAME |
| 75 | −modname = $(*F) | |
| 75 | +modname = $(notdir $(@:.mod.o=)) | |
| 76 | 76 | |
| 77 | 77 | quiet_cmd_cc_o_c = CC $@ |
| 78 | 78 | cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \ |
| @@ -187,9 +187,12 @@ int dialog_checklist(const char *title, const char *prompt, int height, · 186 unmodified lines | ||
| 187 | 187 | |
| 188 | 188 | /* Print the list */ |
| 189 | 189 | for (i = 0; i < max_choice; i++) { |
| 190 | − print_item(list, items[(scroll + i) * 3 + 1], | |
| 191 | − status[i + scroll], i, i == choice); | |
| 190 | + if (i != choice) | |
| 191 | + print_item(list, items[(scroll + i) * 3 + 1], | |
| 192 | + status[i + scroll], i, 0); | |
| 192 | 193 | } |
| 194 | + print_item(list, items[(scroll + choice) * 3 + 1], | |
| 195 | + status[choice + scroll], choice, 1); | |
| 193 | 196 | |
| 194 | 197 | print_arrows(dialog, choice, item_no, scroll, |
| 195 | 198 | box_y, box_x + check_x + 5, list_height); |
| @@ -24,7 +24,10 @@ static int all_versions = 0; · 23 unmodified lines | ||
| 24 | 24 | /* If we are modposting external module set to 1 */ |
| 25 | 25 | static int external_module = 0; |
| 26 | 26 | /* How a symbol is exported */ |
| 27 | −enum export {export_plain, export_gpl, export_gpl_future, export_unknown}; | |
| 27 | +enum export { | |
| 28 | + export_plain, export_unused, export_gpl, | |
| 29 | + export_unused_gpl, export_gpl_future, export_unknown | |
| 30 | +}; | |
| 28 | 31 | |
| 29 | 32 | void fatal(const char *fmt, ...) |
| 30 | 33 | { |
| @@ -191,7 +194,9 @@ static struct { · 160 unmodified lines | ||
| 191 | 194 | enum export export; |
| 192 | 195 | } export_list[] = { |
| 193 | 196 | { .str = "EXPORT_SYMBOL", .export = export_plain }, |
| 197 | + { .str = "EXPORT_UNUSED_SYMBOL", .export = export_unused }, | |
| 194 | 198 | { .str = "EXPORT_SYMBOL_GPL", .export = export_gpl }, |
| 199 | + { .str = "EXPORT_UNUSED_SYMBOL_GPL", .export = export_unused_gpl }, | |
| 195 | 200 | { .str = "EXPORT_SYMBOL_GPL_FUTURE", .export = export_gpl_future }, |
| 196 | 201 | { .str = "(unknown)", .export = export_unknown }, |
| 197 | 202 | }; |
| @@ -205,6 +210,8 @@ static const char *export_str(enum export ex) · 7 unmodified lines | ||
| 205 | 210 | static enum export export_no(const char * s) |
| 206 | 211 | { |
| 207 | 212 | int i; |
| 213 | + if (!s) | |
| 214 | + return export_unknown; | |
| 208 | 215 | for (i = 0; export_list[i].export != export_unknown; i++) { |
| 209 | 216 | if (strcmp(export_list[i].str, s) == 0) |
| 210 | 217 | return export_list[i].export; |
| @@ -216,8 +223,12 @@ static enum export export_from_sec(struct elf_info *elf, Elf_Section sec) · 5 unmodified lines | ||
| 216 | 223 | { |
| 217 | 224 | if (sec == elf->export_sec) |
| 218 | 225 | return export_plain; |
| 226 | + else if (sec == elf->export_unused_sec) | |
| 227 | + return export_unused; | |
| 219 | 228 | else if (sec == elf->export_gpl_sec) |
| 220 | 229 | return export_gpl; |
| 230 | + else if (sec == elf->export_unused_gpl_sec) | |
| 231 | + return export_unused_gpl; | |
| 221 | 232 | else if (sec == elf->export_gpl_future_sec) |
| 222 | 233 | return export_gpl_future; |
| 223 | 234 | else |
| @@ -366,8 +377,12 @@ static void parse_elf(struct elf_info *info, const char *filename) · 142 unmodified lines | ||
| 366 | 377 | info->modinfo_len = sechdrs[i].sh_size; |
| 367 | 378 | } else if (strcmp(secname, "__ksymtab") == 0) |
| 368 | 379 | info->export_sec = i; |
| 380 | + else if (strcmp(secname, "__ksymtab_unused") == 0) | |
| 381 | + info->export_unused_sec = i; | |
| 369 | 382 | else if (strcmp(secname, "__ksymtab_gpl") == 0) |
| 370 | 383 | info->export_gpl_sec = i; |
| 384 | + else if (strcmp(secname, "__ksymtab_unused_gpl") == 0) | |
| 385 | + info->export_unused_gpl_sec = i; | |
| 371 | 386 | else if (strcmp(secname, "__ksymtab_gpl_future") == 0) |
| 372 | 387 | info->export_gpl_future_sec = i; |
| 373 | 388 | |
| @@ -1085,38 +1100,64 @@ void buf_write(struct buffer *buf, const char *s, int len) · 711 unmodified lines | ||
| 1085 | 1100 | buf->pos += len; |
| 1086 | 1101 | } |
| 1087 | 1102 | |
| 1088 | −void check_license(struct module *mod) | |
| 1103 | +static void check_for_gpl_usage(enum export exp, const char *m, const char *s) | |
| 1104 | +{ | |
| 1105 | + const char *e = is_vmlinux(m) ?"":".ko"; | |
| 1106 | + | |
| 1107 | + switch (exp) { | |
| 1108 | + case export_gpl: | |
| 1109 | + fatal("modpost: GPL-incompatible module %s%s " | |
| 1110 | + "uses GPL-only symbol '%s'\n", m, e, s); | |
| 1111 | + break; | |
| 1112 | + case export_unused_gpl: | |
| 1113 | + fatal("modpost: GPL-incompatible module %s%s " | |
| 1114 | + "uses GPL-only symbol marked UNUSED '%s'\n", m, e, s); | |
| 1115 | + break; | |
| 1116 | + case export_gpl_future: | |
| 1117 | + warn("modpost: GPL-incompatible module %s%s " | |
| 1118 | + "uses future GPL-only symbol '%s'\n", m, e, s); | |
| 1119 | + break; | |
| 1120 | + case export_plain: | |
| 1121 | + case export_unused: | |
| 1122 | + case export_unknown: | |
| 1123 | + /* ignore */ | |
| 1124 | + break; | |
| 1125 | + } | |
| 1126 | +} | |
| 1127 | + | |
| 1128 | +static void check_for_unused(enum export exp, const char* m, const char* s) | |
| 1129 | +{ | |
| 1130 | + const char *e = is_vmlinux(m) ?"":".ko"; | |
| 1131 | + | |
| 1132 | + switch (exp) { | |
| 1133 | + case export_unused: | |
| 1134 | + case export_unused_gpl: | |
| 1135 | + warn("modpost: module %s%s " | |
| 1136 | + "uses symbol '%s' marked UNUSED\n", m, e, s); | |
| 1137 | + break; | |
| 1138 | + default: | |
| 1139 | + /* ignore */ | |
| 1140 | + break; | |
| 1141 | + } | |
| 1142 | +} | |
| 1143 | + | |
| 1144 | +static void check_exports(struct module *mod) | |
| 1089 | 1145 | { |
| 1090 | 1146 | struct symbol *s, *exp; |
| 1091 | 1147 | |
| 1092 | 1148 | for (s = mod->unres; s; s = s->next) { |
| 1093 | 1149 | const char *basename; |
| 1094 | − if (mod->gpl_compatible == 1) { | |
| 1095 | − /* GPL-compatible modules may use all symbols */ | |
| 1096 | − continue; | |
| 1097 | − } | |
| 1098 | 1150 | exp = find_symbol(s->name); |
| 1099 | 1151 | if (!exp || exp->module == mod) |
| 1100 | 1152 | continue; |
| 1101 | 1153 | basename = strrchr(mod->name, '/'); |
| 1102 | 1154 | if (basename) |
| 1103 | 1155 | basename++; |
| 1104 | − switch (exp->export) { | |
| 1105 | − case export_gpl: | |
| 1106 | − fatal("modpost: GPL-incompatible module %s " | |
| 1107 | − "uses GPL-only symbol '%s'\n", | |
| 1108 | − basename ? basename : mod->name, | |
| 1109 | − exp->name); | |
| 1110 | − break; | |
| 1111 | − case export_gpl_future: | |
| 1112 | − warn("modpost: GPL-incompatible module %s " | |
| 1113 | − "uses future GPL-only symbol '%s'\n", | |
| 1114 | − basename ? basename : mod->name, | |
| 1115 | − exp->name); | |
| 1116 | − break; | |
| 1117 | − case export_plain: /* ignore */ break; | |
| 1118 | − case export_unknown: /* ignore */ break; | |
| 1119 | − } | |
| 1156 | + else | |
| 1157 | + basename = mod->name; | |
| 1158 | + if (!mod->gpl_compatible) | |
| 1159 | + check_for_gpl_usage(exp->export, basename, exp->name); | |
| 1160 | + check_for_unused(exp->export, basename, exp->name); | |
| 1120 | 1161 | } |
| 1121 | 1162 | } |
| 1122 | 1163 | |
| @@ -1271,7 +1312,7 @@ static void write_if_changed(struct buffer *b, const char *fname) · 148 unmodified lines | ||
| 1271 | 1312 | } |
| 1272 | 1313 | |
| 1273 | 1314 | /* parse Module.symvers file. line format: |
| 1274 | − * 0x12345678<tab>symbol<tab>module[<tab>export] | |
| 1315 | + * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something] | |
| 1275 | 1316 | **/ |
| 1276 | 1317 | static void read_dump(const char *fname, unsigned int kernel) |
| 1277 | 1318 | { |
| @@ -1284,7 +1325,7 @@ static void read_dump(const char *fname, unsigned int kernel) · 6 unmodified lines | ||
| 1284 | 1325 | return; |
| 1285 | 1326 | |
| 1286 | 1327 | while ((line = get_next_line(&pos, file, size))) { |
| 1287 | − char *symname, *modname, *d, *export; | |
| 1328 | + char *symname, *modname, *d, *export, *end; | |
| 1288 | 1329 | unsigned int crc; |
| 1289 | 1330 | struct module *mod; |
| 1290 | 1331 | struct symbol *s; |
| @@ -1297,7 +1338,8 @@ static void read_dump(const char *fname, unsigned int kernel) · 6 unmodified lines | ||
| 1297 | 1338 | *modname++ = '\0'; |
| 1298 | 1339 | if ((export = strchr(modname, '\t')) != NULL) |
| 1299 | 1340 | *export++ = '\0'; |
| 1300 | − | |
| 1341 | + if (export && ((end = strchr(export, '\t')) != NULL)) | |
| 1342 | + *end = '\0'; | |
| 1301 | 1343 | crc = strtoul(line, &d, 16); |
| 1302 | 1344 | if (*symname == '\0' || *modname == '\0' || *d != '\0') |
| 1303 | 1345 | goto fail; |
| @@ -1396,7 +1438,7 @@ int main(int argc, char **argv) · 92 unmodified lines | ||
| 1396 | 1438 | for (mod = modules; mod; mod = mod->next) { |
| 1397 | 1439 | if (mod->skip) |
| 1398 | 1440 | continue; |
| 1399 | − check_license(mod); | |
| 1441 | + check_exports(mod); | |
| 1400 | 1442 | } |
| 1401 | 1443 | |
| 1402 | 1444 | for (mod = modules; mod; mod = mod->next) { |
| @@ -117,7 +117,9 @@ struct elf_info { · 116 unmodified lines | ||
| 117 | 117 | Elf_Sym *symtab_start; |
| 118 | 118 | Elf_Sym *symtab_stop; |
| 119 | 119 | Elf_Section export_sec; |
| 120 | + Elf_Section export_unused_sec; | |
| 120 | 121 | Elf_Section export_gpl_sec; |
| 122 | + Elf_Section export_unused_gpl_sec; | |
| 121 | 123 | Elf_Section export_gpl_future_sec; |
| 122 | 124 | const char *strtab; |
| 123 | 125 | char *modinfo; |