The external module build shows the following warning if Module.symvers is missing in the kernel tree. WARNING: Symbol version dump "Module.symvers" is missing. Modules may not have dependencies or modversions. I think this is an important heads-up because the resulting modules may not work as expected. This happens when you did not build the entire kernel tree, for example, you might have prepared the minimal setups for external modules by 'make defconfig && make modules_preapre'. A problem is that 'make modules' creates Module.symvers even without vmlinux. In this case, that warning is suppressed since Module.symvers already exists in spite of its incomplete content. The incomplete (i.e. invalid) Module.symvers should not be created. This commit changes the second pass of modpost to dump symbols into modules-only.symvers. The final Module.symvers is created by concatenating vmlinux.symvers and modules-only.symvers if both exist. Module.symvers is supposed to collect symbols from both vmlinux and modules. It might be a bit confusing, and I am not quite sure if it is an official interface, but presumably it is difficult to rename it because some tools (e.g. kmod) parse it.
Showing the changes to scripts (2 of 5 files). Show all
Unified · Split
| @@ -68,7 +68,20 @@ else · 67 unmodified lines | |||
| 68 | ifeq ($(KBUILD_EXTMOD),) | 68 | ifeq ($(KBUILD_EXTMOD),) |
| 69 | 69 | ||
| 70 | input-symdump := vmlinux.symvers | 70 | input-symdump := vmlinux.symvers |
| 71 | output-symdump := Module.symvers | 71 | output-symdump := modules-only.symvers |
| 72 | |||
| 73 | quiet_cmd_cat = GEN $@ | ||
| 74 | cmd_cat = cat $(real-prereqs) > $@ | ||
| 75 | |||
| 76 | ifneq ($(wildcard vmlinux.symvers),) | ||
| 77 | |||
| 78 | __modpost: Module.symvers | ||
| 79 | Module.symvers: vmlinux.symvers modules-only.symvers FORCE | ||
| 80 | $(call if_changed,cat) | ||
| 81 | |||
| 82 | targets += Module.symvers | ||
| 83 | |||
| 84 | endif | ||
| 72 | 85 | ||
| 73 | else | 86 | else |
| 74 | 87 | ||
| @@ -2423,19 +2423,6 @@ fail: · 2422 unmodified lines | |||
| 2423 | fatal("parse error in symbol dump file\n"); | 2423 | fatal("parse error in symbol dump file\n"); |
| 2424 | } | 2424 | } |
| 2425 | 2425 | ||
| 2426 | /* For normal builds always dump all symbols. | ||
| 2427 | * For external modules only dump symbols | ||
| 2428 | * that are not read from kernel Module.symvers. | ||
| 2429 | **/ | ||
| 2430 | static int dump_sym(struct symbol *sym) | ||
| 2431 | { | ||
| 2432 | if (!external_module) | ||
| 2433 | return 1; | ||
| 2434 | if (sym->module->from_dump) | ||
| 2435 | return 0; | ||
| 2436 | return 1; | ||
| 2437 | } | ||
| 2438 | |||
| 2439 | static void write_dump(const char *fname) | 2426 | static void write_dump(const char *fname) |
| 2440 | { | 2427 | { |
| 2441 | struct buffer buf = { }; | 2428 | struct buffer buf = { }; |
| @@ -2446,7 +2433,7 @@ static void write_dump(const char *fname) · 4 unmodified lines | |||
| 2446 | for (n = 0; n < SYMBOL_HASH_SIZE ; n++) { | 2433 | for (n = 0; n < SYMBOL_HASH_SIZE ; n++) { |
| 2447 | symbol = symbolhash[n]; | 2434 | symbol = symbolhash[n]; |
| 2448 | while (symbol) { | 2435 | while (symbol) { |
| 2449 | if (dump_sym(symbol)) { | 2436 | if (!symbol->module->from_dump) { |
| 2450 | namespace = symbol->namespace; | 2437 | namespace = symbol->namespace; |
| 2451 | buf_printf(&buf, "0x%08x\t%s\t%s\t%s\t%s\n", | 2438 | buf_printf(&buf, "0x%08x\t%s\t%s\t%s\t%s\n", |
| 2452 | symbol->crc, symbol->name, | 2439 | symbol->crc, symbol->name, |