mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-28 21:02:43 +01:00
vsprintf: add new %pA format specifier
This patch adds a format specifier `%pA` to `vsprintf` which formats a pointer as `core::fmt::Arguments`. Doing so allows us to directly format to the internal buffer of `printf`, so we do not have to use a temporary buffer on the stack to pre-assemble the message on the Rust side. This specifier is intended only to be used from Rust and not for C, so `checkpatch.pl` is intentionally unchanged to catch any misuse. Reviewed-by: Kees Cook <[email protected]> Acked-by: Petr Mladek <[email protected]> Reviewed-by: Greg Kroah-Hartman <[email protected]> Co-developed-by: Alex Gaynor <[email protected]> Signed-off-by: Alex Gaynor <[email protected]> Co-developed-by: Wedson Almeida Filho <[email protected]> Signed-off-by: Wedson Almeida Filho <[email protected]> Signed-off-by: Gary Guo <[email protected]> Co-developed-by: Miguel Ojeda <[email protected]> Signed-off-by: Miguel Ojeda <[email protected]>
This commit is contained in:
1 parent
8fcbf02492
commit
787983da77
2 files changed
+23
No files matched your search
@@ -625,6 +625,16 @@ Examples::
|
||||
%p4cc Y10 little-endian (0x20303159)
|
||||
%p4cc NV12 big-endian (0xb231564e)
|
||||
|
||||
Rust
|
||||
----
|
||||
|
||||
::
|
||||
|
||||
%pA
|
||||
|
||||
Only intended to be used from Rust code to format ``core::fmt::Arguments``.
|
||||
Do *not* use it from C.
|
||||
|
||||
Thanks
|
||||
======
|
||||
|
||||
|
||||
@@ -2246,6 +2246,9 @@ 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, 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
|
||||
@@ -2372,6 +2375,10 @@ early_param("no_hash_pointers", no_hash_pointers_enable);
|
||||
*
|
||||
* Note: The default behaviour (unadorned %p) is to hash the address,
|
||||
* rendering it useful as a unique identifier.
|
||||
*
|
||||
* There is also a '%pA' format specifier, but it is only intended to be used
|
||||
* from Rust code to format core::fmt::Arguments. Do *not* use it from C.
|
||||
* See rust/kernel/print.rs for details.
|
||||
*/
|
||||
static noinline_for_stack
|
||||
char *pointer(const char *fmt, char *buf, char *end, void *ptr,
|
||||
@@ -2444,6 +2451,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
|
||||
return device_node_string(buf, end, ptr, spec, fmt + 1);
|
||||
case 'f':
|
||||
return fwnode_string(buf, end, ptr, spec, fmt + 1);
|
||||
case 'A':
|
||||
if (!IS_ENABLED(CONFIG_RUST)) {
|
||||
WARN_ONCE(1, "Please remove %%pA from non-Rust code\n");
|
||||
return error_string(buf, end, "(%pA?)", spec);
|
||||
}
|
||||
return rust_fmt_argument(buf, end, ptr);
|
||||
case 'x':
|
||||
return pointer_string(buf, end, ptr, spec);
|
||||
case 'e':
|
||||
|
||||
Reference in new issue
Block a user