Message ID | 20250228-export-macro-v2-4-569cc7e8926c@google.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | Check Rust signatures at compile time | expand |
On Fri, Feb 28, 2025 at 12:39:33PM +0000, Alice Ryhl wrote: > This moves the rust_fmt_argument function over to use the new #[export] > macro, which will verify at compile-time that the function signature > matches what is in the header file. ... > I'm not sure which header file to put this in. Any advice? I believe you found the right place.
On Fri, Feb 28, 2025 at 4:37 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Fri, Feb 28, 2025 at 12:39:33PM +0000, Alice Ryhl wrote: > > This moves the rust_fmt_argument function over to use the new #[export] > > macro, which will verify at compile-time that the function signature > > matches what is in the header file. > > ... > > > I'm not sure which header file to put this in. Any advice? > > I believe you found the right place. Thanks for checking! Alice
diff --git a/include/linux/sprintf.h b/include/linux/sprintf.h index 33dcbec71925..029ad83efd74 100644 --- a/include/linux/sprintf.h +++ b/include/linux/sprintf.h @@ -24,4 +24,7 @@ __scanf(2, 0) int vsscanf(const char *, const char *, va_list); extern bool no_hash_pointers; int no_hash_pointers_enable(char *str); +/* Used for Rust formatting ('%pA'). */ +char *rust_fmt_argument(char *buf, char *end, const void *ptr); + #endif /* _LINUX_KERNEL_SPRINTF_H */ diff --git a/lib/vsprintf.c b/lib/vsprintf.c index a8ac4c4fffcf..1da61c3e011f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2284,9 +2284,6 @@ int __init no_hash_pointers_enable(char *str) } early_param("no_hash_pointers", no_hash_pointers_enable); -/* Used for Rust formatting ('%pA'). */ -char *rust_fmt_argument(char *buf, char *end, const void *ptr); - /* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs index 61ee36c5e5f5..cf4714242e14 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -8,13 +8,14 @@ use crate::{ ffi::{c_char, c_void}, + prelude::*, str::RawFormatter, }; use core::fmt; // Called from `vsprintf` with format specifier `%pA`. #[expect(clippy::missing_safety_doc)] -#[no_mangle] +#[export] unsafe extern "C" fn rust_fmt_argument( buf: *mut c_char, end: *mut c_char,