From: Peder Bergan The rust_helper_ prefix marks these C wrappers as Rust implementation details. Their exports use the default namespace, so GPL-compatible modules can link against them without an explicit import. Export the wrappers in RUST_HELPERS so modpost can detect accidental dependencies at build time by flagging a missing namespace import. Have module! supply the import when the helpers are exported, since inlining and generic instantiation can introduce calls through ordinary Rust abstractions. The KASAN test links its Rust object into a module whose C object supplies the metadata. Import the namespace in that C file when building the test as a module with out-of-line Rust helpers. External modules that call these helpers without module! also need an explicit import. Suggested-by: Wedson Almeida Filho Link: https://github.com/Rust-for-Linux/linux/issues/216 Signed-off-by: Peder Bergan --- The modular x86-64 KASAN build failed at modpost on v1 and now passes with strict namespace checks. With CONFIG_MODVERSIONS enabled, the test module and kernel export record the same checksum for the helper. OpenAI Codex assisted with coding and testing. --- Changes in v2: - Import RUST_HELPERS in the C metadata for the modular KASAN test when using out-of-line Rust helpers. https://lore.kernel.org/linux-modules/sashiko-outbox-225583@kernel.org/ - Link to v1: https://patch.msgid.link/20261120-rust-helper-namespace-v1-1-3b9a05553ff6@gmail.com --- mm/kasan/kasan_test_c.c | 3 +++ rust/Makefile | 4 +++- rust/exports.c | 2 ++ rust/macros/module.rs | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index b9e167ed5be32..f8e96c1194e02 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -34,6 +34,9 @@ #define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE) MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING"); +#if defined(MODULE) && defined(CONFIG_RUST) && !defined(CONFIG_RUST_INLINE_HELPERS) +MODULE_IMPORT_NS("RUST_HELPERS"); +#endif static bool multishot; diff --git a/rust/Makefile b/rust/Makefile index 0165626decbe7..17c559052e936 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -569,9 +569,10 @@ $(obj)/helpers/helpers.bc $(obj)/helpers/helpers_module.bc: $(src)/helpers/helpe rust_exports = $(NM) -p --defined-only $(1) | awk '$$2~/(T|R|D|B)/ && $$3!~/__(pfx|cfi|odr_asan)/ { printf $(2),$$3 }' +rust_export_macro = EXPORT_SYMBOL_RUST_GPL quiet_cmd_exports = EXPORTS $@ cmd_exports = \ - $(call rust_exports,$<,"EXPORT_SYMBOL_RUST_GPL(%s);\n") > $@ + $(call rust_exports,$<,"$(rust_export_macro)(%s);\n") > $@ $(obj)/exports_core_generated.h: $(obj)/core.o FORCE $(call if_changed,exports) @@ -585,6 +586,7 @@ $(obj)/exports_core_generated.h: $(obj)/core.o FORCE # function either. Therefore, we export all symbols from helpers and bindings. # In the future, this may be revisited to reduce the number of exports after # the compiler is informed about the places codegen is required. +$(obj)/exports_helpers_generated.h: private rust_export_macro = EXPORT_SYMBOL_RUST_HELPER_GPL $(obj)/exports_helpers_generated.h: $(obj)/helpers/helpers.o FORCE $(call if_changed,exports) diff --git a/rust/exports.c b/rust/exports.c index 1b52460b0f4ee..fde2a52d2a1ae 100644 --- a/rust/exports.c +++ b/rust/exports.c @@ -14,6 +14,8 @@ #include #define EXPORT_SYMBOL_RUST_GPL(sym) extern int sym; EXPORT_SYMBOL_GPL(sym) +#define EXPORT_SYMBOL_RUST_HELPER_GPL(sym) \ + extern int sym; EXPORT_SYMBOL_NS_GPL(sym, "RUST_HELPERS") #include "exports_core_generated.h" #include "exports_bindings_generated.h" diff --git a/rust/macros/module.rs b/rust/macros/module.rs index 0a7b9e24c9600..ac3376fa8fb85 100644 --- a/rust/macros/module.rs +++ b/rust/macros/module.rs @@ -467,6 +467,11 @@ pub(crate) fn module(info: ModuleInfo) -> Result { } } + // Inlined kernel code can introduce calls to C helpers in any Rust module. + if !cfg!(CONFIG_RUST_INLINE_HELPERS) { + modinfo.emit_only_loadable("import_ns", "RUST_HELPERS", false); + } + // Built-in modules also export the `file` modinfo string. let file = std::env::var("RUST_MODFILE").expect("Unable to fetch RUST_MODFILE environmental variable"); --- base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3 change-id: 20261120-rust-helper-namespace-57e8c37ee7df Best regards, -- Peder Bergan