Skip to contentSkip to conversation

Fix kmod_load_resources without modules.builtin.modinfo

PATCH Applied Lucas De Marchi 2 participants 5 messages Dec 18, 2020 – Dec 28, 2020

lore
Share & tools
lore
#0 lore raw

cover Fix kmod_load_resources without modules.builtin.modinfo

When there isn't a modules.builtin.modinfo from the kernel, depmod should not generate and 0-sized modules.builtin.alias.bin file. It should rather be an empty index.

Lucas De Marchi (3):
depmod: unconditionally write builtin.alias.bin
shared: fix UNIQ definition
testsuite: add test for empty modules.builtin.aliases.bin

 shared/macro.h                                     |   7 +++++--
 .../lib/modules/5.6.0/modules.alias                |   1 +
 .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin              |   1 +
 .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
 .../lib/modules/5.6.0/modules.dep                  |   0
 .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.devname              |   1 +
 .../lib/modules/5.6.0/modules.softdep              |   1 +
 .../lib/modules/5.6.0/modules.symbols              |   1 +
 .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
 testsuite/test-init.c                              |   9 ++++++++-
 testsuite/testsuite.h                              |   2 +-
 tools/depmod.c                                     |  10 ++++++----
 15 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/3 depmod: unconditionally write builtin.alias.bin

The file is always created and unless we return an error, the temporary file is renamed to its final destination. All other places write the index without checking if the index is empty, so just do the same.

---
 tools/depmod.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
tools/depmod.c +6 -4
index 2c03dfe..3f31cdf 100644
@@ -2419,7 +2419,7 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
 	if (ret < 0) {
 		if (ret == -ENOENT)
 			ret = 0;
-		goto fail;
+		goto out;
 	}
 
 	kmod_list_foreach(l, builtin) {
@@ -2429,7 +2429,7 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
 
 		ret = kmod_module_get_info(mod, &info_list);
 		if (ret < 0)
-			goto fail;
+			goto out;
 
 		kmod_list_foreach(ll, info_list) {
 			char alias[PATH_MAX];
@@ -2454,9 +2454,11 @@ static int output_builtin_alias_bin(struct depmod *depmod, FILE *out)
 		count++;
 	}
 
-	if (count)
+out:
+	/* do not bother writing the index if we are going to discard it */
+	if (!ret)
 		index_write(idx, out);
-fail:
+
 	if (builtin)
 		kmod_module_unref_list(builtin);
 
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 shared: fix UNIQ definition

In reply to Lucas De Marchi

We need a macro indirection for UNIQ to work. Otherwise it won't be unique at all since it will just append "UNIQ" to the name:

In file included from testsuite/test-init.c:30:
testsuite/testsuite.h:142:27: error: redefinition of ‘stest_load_resourcesUNIQ’

---
 shared/macro.h        | 7 +++++--
 testsuite/testsuite.h | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
shared/macro.h +5 -2
index 4fc5405..b59f7dc 100644
@@ -45,9 +45,14 @@
 	})
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr))
+
 #define XSTRINGIFY(x) #x
 #define STRINGIFY(x) XSTRINGIFY(x)
 
+#define XCONCATENATE(x, y) x ## y
+#define CONCATENATE(x, y) XCONCATENATE(x, y)
+#define UNIQ(x) CONCATENATE(x, __COUNTER__)
+
 /* Temporaries for importing index handling */
 #define NOFAIL(x) (x)
 #define fatal(x...) do { } while (0)
@@ -69,5 +74,3 @@
 #define noreturn __attribute__((noreturn))
 #endif
 #endif
-
-#define UNIQ __COUNTER__
testsuite/testsuite.h +1 -1
index 7ed96bf..f190249 100644
@@ -139,7 +139,7 @@ int test_run(const struct test *t);
 
 /* Test definitions */
 #define DEFINE_TEST(_name, ...) \
-	static const struct test s##_name##UNIQ \
+	static const struct test UNIQ(s##_name) \
 	__attribute__((used, section("kmod_tests"), aligned(8))) = { \
 		.name = #_name, \
 		.func = _name, \
Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/3 testsuite: add test for empty modules.builtin.aliases.bin

In reply to Lucas De Marchi
---
 .../lib/modules/5.6.0/modules.alias                |   1 +
 .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin              |   1 +
 .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
 .../lib/modules/5.6.0/modules.dep                  |   0
 .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.devname              |   1 +
 .../lib/modules/5.6.0/modules.softdep              |   1 +
 .../lib/modules/5.6.0/modules.symbols              |   1 +
 .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
 testsuite/test-init.c                              |   9 ++++++++-
 12 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias new file +1 -0
new file mode 100644
index 0000000..ba76e18
@@ -0,0 +1 @@
+# Aliases extracted from modules themselves.
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..7075435f6268c4d815aec093d61e26647666ba76
GIT binary patch
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin new file +1 -0
new file mode 100644
index 0000000..1cbec61
@@ -0,0 +1 @@
+kernel/fake_builtin.ko
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..7075435f6268c4d815aec093d61e26647666ba76
GIT binary patch
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..0423f039013b88f58bce7a26d4086974e5a8b96a
GIT binary patch
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep new file +0 -0
new file mode 100644
index 0000000..e69de29
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..7075435f6268c4d815aec093d61e26647666ba76
GIT binary patch
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname new file +1 -0
new file mode 100644
index 0000000..58f6d6d
@@ -0,0 +1 @@
+# Device nodes to trigger on-demand module loading.
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep new file +1 -0
new file mode 100644
index 0000000..5554ccc
@@ -0,0 +1 @@
+# Soft dependencies extracted from modules themselves.
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols new file +1 -0
new file mode 100644
index 0000000..618c345
@@ -0,0 +1 @@
+# Aliases for symbols, used by symbol_request().
testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..7075435f6268c4d815aec093d61e26647666ba76
GIT binary patch
testsuite/test-init.c +8 -1
index 3a69b43..edbfc23 100644
@@ -52,13 +52,20 @@ static noreturn int test_load_resources(const struct test *t)
 	exit(EXIT_SUCCESS);
 }
 DEFINE_TEST(test_load_resources,
-	    .description = "test if kmod_load_resources works",
+	    .description = "test if kmod_load_resources works (recent modprobe on kernel without modules.builtin.modinfo)",
 	    .config = {
 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-init-load-resources/",
 		[TC_UNAME_R] = "5.6.0",
 	    },
 	    .need_spawn = true);
 
+DEFINE_TEST(test_load_resources,
+	    .description = "test if kmod_load_resources works with empty modules.builtin.aliases.bin (recent depmod on kernel without modules.builtin.modinfo)",
+	    .config = {
+		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-init-load-resources-empty-builtin-aliases-bin/",
+		[TC_UNAME_R] = "5.6.0",
+	    },
+	    .need_spawn = true);
 
 static noreturn int test_initlib(const struct test *t)
 {
Signature · 1 line
2.29.2
#4 lore raw
In reply to Lucas De Marchi

Applied

Lucas De Marchi

Quoted 41 lines · Lucas De Marchi

When there isn't a modules.builtin.modinfo from the kernel, depmod should not generate and 0-sized modules.builtin.alias.bin file. It should rather be an empty index.

Lucas De Marchi (3):
depmod: unconditionally write builtin.alias.bin
shared: fix UNIQ definition
testsuite: add test for empty modules.builtin.aliases.bin

 shared/macro.h                                     |   7 +++++--
 .../lib/modules/5.6.0/modules.alias                |   1 +
 .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin              |   1 +
 .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
 .../lib/modules/5.6.0/modules.dep                  |   0
 .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.devname              |   1 +
 .../lib/modules/5.6.0/modules.softdep              |   1 +
 .../lib/modules/5.6.0/modules.symbols              |   1 +
 .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
 testsuite/test-init.c                              |   9 ++++++++-
 testsuite/testsuite.h                              |   2 +-
 tools/depmod.c                                     |  10 ++++++----
 15 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin

--
2.29.2