[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e26953d82abdb61fd66061638c61d7e46f638c91.1745591072.git.legion@kernel.org>
Date: Sat, 26 Apr 2025 18:16:34 +0200
From: Alexey Gladkov <legion@...nel.org>
To: Luis Chamberlain <mcgrof@...nel.org>,
Petr Pavlu <petr.pavlu@...e.com>,
Sami Tolvanen <samitolvanen@...gle.com>,
Daniel Gomez <da.gomez@...sung.com>,
Masahiro Yamada <masahiroy@...nel.org>,
Nathan Chancellor <nathan@...nel.org>,
Nicolas Schier <nicolas.schier@...ux.dev>
Cc: linux-kernel@...r.kernel.org,
linux-modules@...r.kernel.org,
linux-kbuild@...r.kernel.org,
Alexey Gladkov <legion@...nel.org>
Subject: [PATCH v1 3/7] modules: Add macros to specify modinfo prefix
The __MODULE_INFO macros always use __MODULE_INFO_PREFIX. The only way
to use a different prefix is to override __MODULE_INFO_PREFIX, which is
not very useful.
The new macro will be used in file2alias.c to generate modalias for
builtin modules.
Signed-off-by: Alexey Gladkov <legion@...nel.org>
---
include/linux/module.h | 3 +++
include/linux/moduleparam.h | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index d94b196d5a34..e987fd62c734 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -168,6 +168,9 @@ extern void cleanup_module(void);
/* For userspace: you can also call me... */
#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
+#define MODULE_ALIAS_MODNAME(_modname, _alias) \
+ __MODULE_INFO_WITH_PREFIX(_modname ".", alias, alias, _alias)
+
/* Soft module dependencies. See man modprobe.d for details.
* Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz")
*/
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index bfb85fd13e1f..3f819fc67c43 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -20,10 +20,13 @@
/* Chosen so that structs with an unsigned long line up. */
#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
-#define __MODULE_INFO(tag, name, info) \
+#define __MODULE_INFO_WITH_PREFIX(prefix, tag, name, info) \
static const char __UNIQUE_ID(name)[] \
__used __section(".modinfo") __aligned(1) \
- = __MODULE_INFO_PREFIX __stringify(tag) "=" info
+ = prefix __stringify(tag) "=" info
+
+#define __MODULE_INFO(tag, name, info) \
+ __MODULE_INFO_WITH_PREFIX(__MODULE_INFO_PREFIX, tag, name, info)
#define __MODULE_PARM_TYPE(name, _type) \
__MODULE_INFO(parmtype, name##type, #name ":" _type)
--
2.49.0
Powered by blists - more mailing lists