| From 07ad1cfcd0f5724025927a8b7cf6855af0e2b47b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 8 Mar 2025 13:45:06 +0900 |
| Subject: rust: module: place cleanup_module() in .exit.text section |
| |
| From: FUJITA Tomonori <fujita.tomonori@gmail.com> |
| |
| [ Upstream commit 249c3a0e53acefc2b06d3b3e1fc28fb2081f878d ] |
| |
| Place cleanup_module() in .exit.text section. Currently, |
| cleanup_module() is likely placed in the .text section. It's |
| inconsistent with the layout of C modules, where cleanup_module() is |
| placed in .exit.text. |
| |
| [ Boqun asked for an example of how the section changed to be |
| put in the log. Tomonori provided the following examples: |
| |
| C module: |
| |
| $ objdump -t ~/build/x86/drivers/block/loop.o|grep clean |
| 0000000000000000 l O .exit.data 0000000000000008 __UNIQUE_ID___addressable_cleanup_module412 |
| 0000000000000000 g F .exit.text 000000000000009c cleanup_module |
| |
| Rust module without this patch: |
| |
| $ objdump -t ~/build/x86/samples/rust/rust_minimal.o|grep clean |
| 00000000000002b0 g F .text 00000000000000c6 cleanup_module |
| 0000000000000000 g O .exit.data 0000000000000008 _R...___UNIQUE_ID___addressable_cleanup_module |
| |
| Rust module with this patch: |
| |
| $ objdump -t ~/build/x86/samples/rust/rust_minimal.o|grep clean |
| 0000000000000000 g F .exit.text 00000000000000c6 cleanup_module |
| 0000000000000000 g O .exit.data 0000000000000008 _R...___UNIQUE_ID___addressable_cleanup_module |
| |
| - Miguel ] |
| |
| Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com> |
| Acked-by: Jarkko Sakkinen <jarkko@kernel.org> |
| Link: https://lore.kernel.org/r/20250308044506.14458-1-fujita.tomonori@gmail.com |
| Signed-off-by: Miguel Ojeda <ojeda@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| rust/macros/module.rs | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/rust/macros/module.rs b/rust/macros/module.rs |
| index 2f66107847f78..44e5cb108cea7 100644 |
| --- a/rust/macros/module.rs |
| +++ b/rust/macros/module.rs |
| @@ -278,6 +278,7 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream { |
| #[cfg(MODULE)] |
| #[doc(hidden)] |
| #[no_mangle] |
| + #[link_section = \".exit.text\"] |
| pub extern \"C\" fn cleanup_module() {{ |
| // SAFETY: |
| // - This function is inaccessible to the outside due to the double |
| -- |
| 2.39.5 |
| |