printk: Userspace format indexing support
Subsystems (15)
Chris Down
reviewerv6 cover printk: Userspace format indexing support
We have a number of systems industry-wide that have a subset of their functionality that works as follows:
1. Receive a message from local kmsg, serial console, or netconsole;
2. Apply a set of rules to classify the message;
3. Do something based on this classification (like scheduling a remediation for the machine), rinse, and repeat.
As a couple of examples of places we have this implemented just inside Facebook, although this isn't a Facebook-specific problem, we have this inside our netconsole processing (for alarm classification), and as part of our machine health checking. We use these messages to determine fairly important metrics around production health, and it's important that we get them right.
While for some kinds of issues we have counters, tracepoints, or metrics with a stable interface which can reliably indicate the issue, in order to react to production issues quickly we need to work with the interface which most kernel developers naturally use when developing: printk.
Most production issues come from unexpected phenomena, and as such usually the code in question doesn't have easily usable tracepoints or other counters available for the specific problem being mitigated. We have a number of lines of monitoring defence against problems in production (host metrics, process metrics, service metrics, etc), and where it's not feasible to reliably monitor at another level, this kind of pragmatic netconsole monitoring is essential.
As one would expect, monitoring using printk is rather brittle for a number of reasons -- most notably that the message might disappear entirely in a new version of the kernel, or that the message may change in some way that the regex or other classification methods start to silently fail.
One factor that makes this even harder is that, under normal operation, many of these messages are never expected to be hit. For example, there may be a rare hardware bug which one wants to detect if it was to ever happen again, but its recurrence is not likely or anticipated. This precludes using something like checking whether the printk in question was printed somewhere fleetwide recently to determine whether the message in question is still present or not, since we don't anticipate that it should be printed anywhere, but still need to monitor for its future presence in the long-term.
This class of issue has happened on a number of occasions, causing unhealthy machines with hardware issues to remain in production for longer than ideal. As a recent example, some monitoring around blk_update_request fell out of date and caused semi-broken machines to remain in production for longer than would be desirable.
Searching through the codebase to find the message is also extremely fragile, because many of the messages are further constructed beyond their callsite (eg. btrfs_printk and other module-specific wrappers, each with their own functionality). Even if they aren't, guessing the format and formulation of the underlying message based on the aesthetics of the message emitted is not a recipe for success at scale, and our previous issues with fleetwide machine health checking demonstrate as much.
This provides a solution to the issue of silently changed or deleted
printks: we record pointers to all printk format strings known at compile time into a new .printk_index section, both in vmlinux and modules. At runtime, this can then be iterated by looking at <debugfs>/printk/index/<module>, which emits the following format, both readable by humans and able to be parsed by machines:
$ head -1 vmlinux; shuf -n 5 vmlinux
# <level[,flags]> filename:line function "format"
<5> block/blk-settings.c:661 disk_stack_limits "%s: Warning: Device %s is misaligned\n"
<4> kernel/trace/trace.c:8296 trace_create_file "Could not create tracefs '%s' entry\n"
<6> arch/x86/kernel/hpet.c:144 _hpet_print_config "hpet: %s(%d):\n"
<6> init/do_mounts.c:605 prepare_namespace "Waiting for root device %s...\n"
<6> drivers/acpi/osl.c:1410 acpi_no_auto_serialize_setup "ACPI: auto-serialization disabled\n"This mitigates the majority of cases where we have a highly-specific printk which we want to match on, as we can now enumerate and check whether the format changed or the printk callsite disappeared entirely in userspace. This allows us to catch changes to printks we monitor earlier and decide what to do about it before it becomes problematic.
There is no additional runtime cost for printk callers or printk itself, and the assembly generated is exactly the same.
---
v2:
- Use seq_printf instead of step by step accumulation
- Scope fptr closer to its use
- Prevent seq_file from needing to alloc a new buffer
- Always provide KERN_SOH + level, even if caller omitted it
- Provide one file per module
- Update changelog to show ease of parsing
- Provide printk -> _printk for ARCH=um (thanks, LKP robot)
- Move to debugfs (thanks, Steven)
---
v3:
- Reduce locking during open by moving size lifetime to the inode
- Don't explicitly check for debugfs errors (thanks, gregkh)
---
v4:
- Fix a missed extern int printk fixup in ia64 (thanks, lkp)
---
v5:
Thanks Petr for the extensive feedback.
- Move all module handling from module notifier to module.[ch] directly
- Change to readable output format
- Handled by new string_escape(ESCAPE_PRINTF)
- Add file/line/function information
- Mass rename everything to printk_index/CONFIG_PRINTK_INDEX/pi_*
- As a result, this version does away with the mutex/hashtable
- Use seq_file iteration API instead of simple_open
- Remove debugfs file first to avoid ENOENT
- Tear down backing datastructure if debugfs file creation fails
- Move code under ifdef guard to kernel/printk/index.c
- Add pi_sec (formerly printk_fmt_sec) documentation
- Handle coexisting LOG_CONT + level
- Add header to debugfs output
- ...and probably some other stuff I forgot. :-)
---
v6:
- Rebase on next-20210518
- Remove pi_sec, do on demand lookups instead
- Lookup debugfs file on demand
- pi_sec_{store,remove} now only changes debugfs, so renamed
- Don't check for debugfs failure (again)
- Extract lookup logic into pi_get_entry
- Make the stored struct const __used
- Use _p_func directly, which allows including void-returning functions
- Move more stuff outside PRINTK_INDEX #ifdef using __printk_index_emit
- Scope __{start,stop}_printk_index more tightly
- Move parse_prefix to printk_parse_prefix in internal.h
- Put PRINTK_INDEX definition below TRACEDATA
- Use a module notifier again
- pi_object -> pi_entry, with clearer vars
- Reword Kconfig
- Split out printk_info_flags/string_helpers stuff into patches
- Use seq_escape_str directly now that ESCAPE_APPEND exists
- Add dev_printk indexing support
Chris Down (4):
string_helpers: Escape double quotes in escape_special
printk: Straighten out log_flags into printk_info_flags
printk: Userspace format indexing support
printk: index: Add indexing support to dev_printk
MAINTAINERS | 5 + arch/arm/kernel/entry-v7m.S | 2 +- arch/arm/lib/backtrace-clang.S | 2 +- arch/arm/lib/backtrace.S | 2 +- arch/arm/mach-rpc/io-acorn.S | 2 +- arch/arm/vfp/vfphw.S | 6 +- arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- arch/openrisc/kernel/entry.S | 6 +- arch/powerpc/kernel/head_fsl_booke.S | 2 +- arch/um/include/shared/user.h | 3 +- arch/x86/kernel/head_32.S | 2 +- drivers/base/core.c | 6 +- include/asm-generic/vmlinux.lds.h | 13 ++ include/linux/dev_printk.h | 63 ++++++--- include/linux/module.h | 5 + include/linux/printk.h | 95 ++++++++++++- init/Kconfig | 14 ++ kernel/module.c | 5 + kernel/printk/Makefile | 1 + kernel/printk/index.c | 198 +++++++++++++++++++++++++++ kernel/printk/internal.h | 4 + kernel/printk/printk.c | 60 ++++---- kernel/printk/printk_ringbuffer.h | 6 + lib/string_helpers.c | 4 + lib/test-string_helpers.c | 14 +- 25 files changed, 448 insertions(+), 76 deletions(-) create mode 100644 kernel/printk/index.c
Signature · 1 line
2.31.1
Chris Down
reviewerPATCH v6 1/4 string_helpers: Escape double quotes in escape_special
From an abstract point of view, escape_special's counterpart, unescape_special, already handles the unescaping of blackslashed double quote sequences.
As a more practical example, printk indexing is an example case where this is already practically useful. Compare an example with ESCAPE_SPECIAL | ESCAPE_SPACE, with quotes not escaped:
[root@ktst ~]# grep drivers/pci/pci-stub.c:69 /sys/kernel/debug/printk/index/vmlinux <4> drivers/pci/pci-stub.c:69 pci_stub_init "pci-stub: invalid ID string "%s"\n"
...and the same after this patch:
[root@ktst ~]# grep drivers/pci/pci-stub.c:69 /sys/kernel/debug/printk/index/vmlinux <4> drivers/pci/pci-stub.c:69 pci_stub_init "pci-stub: invalid ID string \"%s\"\n"
One can of course, alternatively, use ESCAPE_APPEND with a quote in @only, but without this patch quotes are coerced into hex or octal which can hurt readability quite significantly.
A new ESCAPE_QUOTE/ESCAPE_PRINTK option is also possible, but it seems reasonable to use the simplest strategy first, since this is already decoded properly.
--- lib/string_helpers.c | 4 ++++ lib/test-string_helpers.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)
lib/string_helpers.c +4 -0
@@ -361,6 +361,9 @@ static bool escape_special(unsigned char c, char **dst, char *end)case '\e' : to ='e' ;break ; +case '"' : + to ='"' ; +break ;default :return false; }
@@ -474,6 +477,7 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* '\t' - horizontal tab * '\v' - vertical tab * %ESCAPE_SPECIAL: +* '\"' - double quote * '\\' - backslash * '\a' - alert (BEL) * '\e' - escape
lib/test-string_helpers.c +7 -7
@@ -140,13 +140,13 @@ static const struct test_string_2 escape0[] __initconst = {{ },{ .in = "\\h\\\"\a\e\\", .s1 = {{ - .out = "\\\\h\\\\\"\\a\\e\\\\", + .out = "\\\\h\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL, },{ - .out = "\\\\\\150\\\\\\042\\a\\e\\\\", + .out = "\\\\\\150\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ - .out = "\\\\\\x68\\\\\\x22\\a\\e\\\\", + .out = "\\\\\\x68\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL | ESCAPE_HEX, },{ /* terminator */
@@ -157,10 +157,10 @@ static const struct test_string_2 escape0[] __initconst = {{ .out = "\eb \\C\007\"\x90\\r]", .flags = ESCAPE_SPACE, },{ - .out = "\\eb \\\\C\\a\"\x90\r]", + .out = "\\eb \\\\C\\a\\\"\x90\r]", .flags = ESCAPE_SPECIAL, },{ - .out = "\\eb \\\\C\\a\"\x90\\r]", + .out = "\\eb \\\\C\\a\\\"\x90\\r]", .flags = ESCAPE_SPACE | ESCAPE_SPECIAL, },{ .out = "\\033\\142\\040\\134\\103\\007\\042\\220\\015\\135",
@@ -169,10 +169,10 @@ static const struct test_string_2 escape0[] __initconst = {{ .out = "\\033\\142\\040\\134\\103\\007\\042\\220\\r\\135", .flags = ESCAPE_SPACE | ESCAPE_OCTAL, },{ - .out = "\\e\\142\\040\\\\\\103\\a\\042\\220\\015\\135", + .out = "\\e\\142\\040\\\\\\103\\a\\\"\\220\\015\\135", .flags = ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ - .out = "\\e\\142\\040\\\\\\103\\a\\042\\220\\r\\135", + .out = "\\e\\142\\040\\\\\\103\\a\\\"\\220\\r\\135", .flags = ESCAPE_SPACE | ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ .out = "\eb \\C\007\"\x90\r]",
Signature · 1 line
2.31.1
Re: [PATCH v6 1/4] string_helpers: Escape double quotes in escape_special
Quoted 16 lines · Chris Down
From an abstract point of view, escape_special's counterpart,
unescape_special, already handles the unescaping of blackslashed double quote sequences.As a more practical example, printk indexing is an example case where this is already practically useful. Compare an example with
ESCAPE_SPECIAL | ESCAPE_SPACE, with quotes not escaped:[root@ktst ~]# grep
drivers/pci/pci-stub.c:69/sys/kernel/debug/printk/index/vmlinux<4>drivers/pci/pci-stub.c:69pci_stub_init"pci-stub: invalid ID string "%s"\n"...and the same after this patch:
[root@ktst ~]# grep
drivers/pci/pci-stub.c:69/sys/kernel/debug/printk/index/vmlinux<4>drivers/pci/pci-stub.c:69pci_stub_init"pci-stub: invalid ID string \"%s\"\n"
Quoted 7 lines
One can of course, alternatively, use
ESCAPE_APPENDwith a quote in @only, but without this patch quotes are coerced into hex or octal which can hurt readability quite significantly.A new ESCAPE_QUOTE/ESCAPE_PRINTK option is also possible, but it seems reasonable to use the simplest strategy first, since this is already decoded properly.
We have only one direct user of ESCAPE_SPECIAL and there " is not used.
Indirect ones are %pE, but IIRC most of them are either debug messages or some kind of (non-ABI) messages.
It would be nice if you can confirm this and put a note into commit message.
If the above is confirmed, feel free to add mine Reviewed-by; Andy Shevchenko <[email protected]>
Quoted 80 lines
Signed-off-by Chris Down <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Rasmus Villemoes <[email protected]>--- lib/string_helpers.c | 4 ++++ lib/test-string_helpers.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)lib/string_helpers.c +4
-0@@ -361,6 +361,9 @@ static bool escape_special(unsigned char c, char **dst, char *end)case '\e' : to ='e' ;break ; +case '"' : + to ='"' ; +break ;default :return false; }@@ -474,6 +477,7 @@ static bool escape_hex(unsigned char c, char **dst, char *end)* '\t' - horizontal tab * '\v' - vertical tab * %ESCAPE_SPECIAL: +* '\"' - double quote * '\\' - backslash * '\a' - alert (BEL) * '\e' - escape lib/test-string_helpers.c +7
-7@@ -140,13 +140,13 @@ static const struct test_string_2 escape0[] __initconst = {{ },{ .in = "\\h\\\"\a\e\\", .s1 = {{ - .out = "\\\\h\\\\\"\\a\\e\\\\", + .out = "\\\\h\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL, },{ - .out = "\\\\\\150\\\\\\042\\a\\e\\\\", + .out = "\\\\\\150\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ - .out = "\\\\\\x68\\\\\\x22\\a\\e\\\\", + .out = "\\\\\\x68\\\\\\\"\\a\\e\\\\", .flags = ESCAPE_SPECIAL | ESCAPE_HEX, },{ /* terminator */@@ -157,10 +157,10 @@ static const struct test_string_2 escape0[] __initconst = {{ .out = "\eb \\C\007\"\x90\\r]", .flags = ESCAPE_SPACE, },{ - .out = "\\eb \\\\C\\a\"\x90\r]", + .out = "\\eb \\\\C\\a\\\"\x90\r]", .flags = ESCAPE_SPECIAL, },{ - .out = "\\eb \\\\C\\a\"\x90\\r]", + .out = "\\eb \\\\C\\a\\\"\x90\\r]", .flags = ESCAPE_SPACE | ESCAPE_SPECIAL, },{ .out = "\\033\\142\\040\\134\\103\\007\\042\\220\\015\\135",@@ -169,10 +169,10 @@ static const struct test_string_2 escape0[] __initconst = {{ .out = "\\033\\142\\040\\134\\103\\007\\042\\220\\r\\135", .flags = ESCAPE_SPACE | ESCAPE_OCTAL, },{ - .out = "\\e\\142\\040\\\\\\103\\a\\042\\220\\015\\135", + .out = "\\e\\142\\040\\\\\\103\\a\\\"\\220\\015\\135", .flags = ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ - .out = "\\e\\142\\040\\\\\\103\\a\\042\\220\\r\\135", + .out = "\\e\\142\\040\\\\\\103\\a\\\"\\220\\r\\135", .flags = ESCAPE_SPACE | ESCAPE_SPECIAL | ESCAPE_OCTAL, },{ .out = "\eb \\C\007\"\x90\r]",Signature · 1 line
2.31.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Chris Down
reviewerRe: [PATCH v6 1/4] string_helpers: Escape double quotes in escape_special
Quoted 9 lines · Andy Shevchenko
We have only one direct user of
ESCAPE_SPECIALand there " is not used.Indirect ones are %pE, but IIRC most of them are either debug messages or some kind of (non-ABI) messages.
It would be nice if you can confirm this and put a note into commit message.
If the above is confirmed, feel free to add mine Reviewed-by; Andy Shevchenko <[email protected]>
Thanks for reviewing! :-) I will triple check that and add for v7.
Re: [PATCH v6 1/4] string_helpers: Escape double quotes in escape_special
In reply to Chris DownQuoted 1 line · Chris Down
Quoted 1 line
From an abstract point of view, escape_special's counterpart,
The first line starts with '<'. I guess that it is a typo ;-)
Quoted 2 lines
unescape_special, already handles the unescaping of blackslashed double quote sequences.
Yup. Makes sense.
Quoted 3 lines
Signed-off-by Chris Down <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Rasmus Villemoes <[email protected]>
I agree with Andy that you should double check the existing users and add a note that none is affected.
With it, feel free to add:
Best Regards,
Petr
Chris Down
reviewerPATCH v6 2/4 printk: Straighten out log_flags into printk_info_flags
In reply to Chris DownIn the past, enum log_flags was part of struct log, hence the name. struct log has since been reworked and now this struct is stored inside struct printk_info. However, the name was never updated, which is somewhat confusing -- especially since these flags operate at the record level rather than at the level of an abstract log.
printk_info_flags also joins its other metadata struct friends in printk_ringbuffer.h.
--- kernel/printk/printk.c | 43 ++++++++++++++----------------- kernel/printk/printk_ringbuffer.h | 6 +++++ 2 files changed, 26 insertions(+), 23 deletions(-)
kernel/printk/printk.c +20 -23
@@ -350,11 +350,6 @@ static int console_msg_format = MSG_FORMAT_DEFAULT;* non-prinatable characters are escaped in the "\xff" notation. */ -enum log_flags { -LOG_NEWLINE =2 ,/* text ended with a newline */ -LOG_CONT =8 ,/* text is a fragment of a continuation line */ -}; -/* syslog_lock protects syslog_* variables and write access to clear_seq. */ static DEFINE_RAW_SPINLOCK (syslog_lock);
@@ -1966,19 +1961,20 @@ static inline u32 printk_caller_id(void)* * @text: The terminated text message. * @level: A pointer to the current level value, will be updated. -* @lflags: A pointer to the current log flags, will be updated. +* @flags: A pointer to the current printk_info flags, will be updated. * * @level may be NULL if the caller is not interested in the parsed value. * Otherwise the variable pointed to by @level must be set to * LOGLEVEL_DEFAULT in order to be updated with the parsed value. * -* @lflags may be NULL if the caller is not interested in the parsed value. -* Otherwise the variable pointed to by @lflags will be OR'd with the parsed +* @flags may be NULL if the caller is not interested in the parsed value. +* Otherwise the variable pointed to by @flags will be OR'd with the parsed * value. * * Return: The length of the parsed level and control flags. */ -static u16 parse_prefix (char *text,int *level,enum log_flags *lflags) +static u16 parse_prefix (char *text,int *level, +enum printk_info_flags *flags) {u16 prefix_len =0 ;int kern_level;
@@ -1994,8 +1990,8 @@ static u16 parse_prefix(char *text, int *level, enum log_flags *lflags) *level = kern_level -'0' ;break ;case 'c' :/* KERN_CONT */ -if (lflags) - *lflags |=LOG_CONT ; +if (flags) + *flags |=LOG_CONT ; } prefix_len +=2 ;
@@ -2005,8 +2001,9 @@ static u16 parse_prefix(char *text, int *level, enum log_flags *lflags)return prefix_len; } -static u16 printk_sprint (char *text,u16 size,int facility,enum log_flags *lflags, -const char *fmt,va_list args) +static u16 printk_sprint (char *text,u16 size,int facility, +enum printk_info_flags *flags,const char *fmt, +va_list args) {u16 text_len;
@@ -2015,7 +2012,7 @@ static u16 printk_sprint(char *text, u16 size, int facility, enum log_flags *lfl/* Mark and strip a trailing newline. */ if (text_len && text[text_len -1 ] =='\n' ) { text_len--; - *lflags |=LOG_NEWLINE ; + *flags |=LOG_NEWLINE ; }/* Strip log level and control flags. */
@@ -2039,7 +2036,7 @@ int vprintk_store(int facility, int level, {const u32 caller_id =printk_caller_id ();struct prb_reserved_entry e; -enum log_flags lflags =0 ; +enum printk_info_flags flags =0 ;struct printk_record r;u16 trunc_msg_len =0 ;char prefix_buf[8 ];
@@ -2071,22 +2068,22 @@ int vprintk_store(int facility, int level,/* Extract log level or control flags. */ if (facility ==0 ) -parse_prefix (&prefix_buf[0 ], &level, &lflags); +parse_prefix (&prefix_buf[0 ], &level, &flags);if (level ==LOGLEVEL_DEFAULT ) level = default_message_loglevel;if (dev_info) - lflags |=LOG_NEWLINE ; + flags |=LOG_NEWLINE ; -if (lflags &LOG_CONT ) { +if (flags &LOG_CONT ) {prb_rec_init_wr (&r, reserve_size);if (prb_reserve_in_last (&e, prb, &r, caller_id,LOG_LINE_MAX )) { text_len =printk_sprint (&r.text_buf[r.info->text_len], reserve_size, - facility, &lflags, fmt, args); + facility, &flags, fmt, args); r.info->text_len += text_len; -if (lflags &LOG_NEWLINE ) { +if (flags &LOG_NEWLINE ) { r.info->flags |=LOG_NEWLINE ;prb_final_commit (&e); }else {
@@ -2113,20 +2110,20 @@ int vprintk_store(int facility, int level, }/* fill message */ - text_len =printk_sprint (&r.text_buf[0 ], reserve_size, facility, &lflags, fmt, args); + text_len =printk_sprint (&r.text_buf[0 ], reserve_size, facility, &flags, fmt, args);if (trunc_msg_len)memcpy (&r.text_buf[text_len], trunc_msg, trunc_msg_len); r.info->text_len = text_len + trunc_msg_len; r.info->facility = facility; r.info->level = level &7 ; - r.info->flags = lflags &0x1f ; + r.info->flags = flags &0x1f ; r.info->ts_nsec = ts_nsec; r.info->caller_id = caller_id;if (dev_info)memcpy (&r.info->dev_info, dev_info,sizeof (r.info->dev_info));/* A message without a trailing newline can be continued. */ -if (!(lflags &LOG_NEWLINE )) +if (!(flags &LOG_NEWLINE ))prb_commit (&e);else prb_final_commit (&e);
kernel/printk/printk_ringbuffer.h +6 -0
@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; }; +/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +}; +/* * A descriptor: the complete meta-data for a record. *
Signature · 1 line
2.31.1
Re: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 11 lines · Chris Down
In the past,
enum log_flagswas part ofstruct log, hence the name.struct loghas since been reworked and now this struct is stored insidestruct printk_info. However, the name was never updated, which is somewhat confusing -- especially since these flags operate at the record level rather than at the level of an abstract log.
printk_info_flagsalso joins its other metadata struct friends inprintk_ringbuffer.h.Signed-off-by Chris Down <[email protected]>Cc Petr Mladek <[email protected]>
Just one nit below.
kernel/printk/printk_ringbuffer.h struct prb_data_blk_lpos { · line 57
Quoted 13 lines
kernel/printk/printk_ringbuffer.h +5
-0@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; }; +/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +};
Nit: Could you please move this after "enum desc_state" declaration?
Quoted 5 lines
kernel/printk/printk_ringbuffer.h +0
-0/* * A descriptor: the complete meta-data for a record. * Signature · 1 line
2.31.1
Best Regards,
Petr
John Ogness
maintainerRe: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 8 lines · Petr Mladek
Quoted 8 lines
kernel/printk/printk_ringbuffer.h +0
-0@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; };
Quoted 7 lines
kernel/printk/printk_ringbuffer.h struct prb_data_blk_lpos { · line 57
Quoted 5 lines
kernel/printk/printk_ringbuffer.h +5
-0+/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +};Nit: Could you please move this after "enum
desc_state" declaration?
Is there a reason that this enum is moved into printk_ringbuffer.h? The ringbuffer does not use this enum.
John Ogness
Petr Mladek
maintainerRe: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 17 lines · John Ogness
Quoted 8 lines · Petr Mladek
Quoted 8 lines
kernel/printk/printk_ringbuffer.h +0
-0@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; };Quoted 7 lines
kernel/printk/printk_ringbuffer.h struct prb_data_blk_lpos { · line 57
Quoted 5 lines
kernel/printk/printk_ringbuffer.h +5
-0+/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +};Nit: Could you please move this after "enum
desc_state" declaration?
Quoted 2 lines
Is there a reason that this enum is moved into
printk_ringbuffer.h? The ringbuffer does not use this enum.
We want to use it in two source files: printk.c and index.c Alternative solution would be to move it to kernel/printk/internal.h.
Well, will internal.h still be needed after we remove printk_safe?
Anyway, I do not have strong opinion about it.
Best Regards,
Petr
John Ogness
maintainerRe: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 16 lines · Petr Mladek
Quoted 16 lines
Quoted 15 lines
kernel/printk/printk_ringbuffer.h struct prb_data_blk_lpos { · line 57
Quoted 13 lines
kernel/printk/printk_ringbuffer.h +5
-0@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; }; +/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +};Nit: Could you please move this after "enum
desc_state" declaration?
Quoted 7 lines
Quoted 2 lines
Is there a reason that this enum is moved into
printk_ringbuffer.h? The ringbuffer does not use this enum.We want to use it in two source files:
printk.candindex.cAlternative solution would be to move it tokernel/printk/internal.h.Well, will
internal.hstill be needed after we removeprintk_safe?
We wouldn't be able to remove internal.h until deferred printing is removed. And that cannot happen until after printing kthreads exist. So it will still hang around for a while.
But even so, I do not like the idea of turning printk_ringbuffer.h into the new internal.h. The ringbuffer is quite complex and IMHO we should try to keep the printk_ringbuffer.* files as isolated as possible.
I would prefer to put this enum declaration in internal.h. Even if eventually it is the only thing left in internal.h.
John Ogness
Petr Mladek
maintainerRe: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 29 lines · John Ogness
Quoted 16 lines · Petr Mladek
Quoted 16 lines
Quoted 15 lines
kernel/printk/printk_ringbuffer.h struct prb_data_blk_lpos { · line 57
Quoted 13 lines
kernel/printk/printk_ringbuffer.h +5
-0@@ -50,6 +50,12 @@ struct prb_data_blk_lpos {unsigned long next; }; +/* Flags for a single printk record. */ +enum printk_info_flags { +LOG_NEWLINE =2 ,/* text ended with a newline */ +LOG_CONT =8 ,/* text is a fragment of a continuation line */ +};Nit: Could you please move this after "enum
desc_state" declaration?Quoted 7 lines
Quoted 2 lines
Is there a reason that this enum is moved into
printk_ringbuffer.h? The ringbuffer does not use this enum.We want to use it in two source files:
printk.candindex.cAlternative solution would be to move it tokernel/printk/internal.h.Well, will
internal.hstill be needed after we removeprintk_safe?We wouldn't be able to remove
internal.huntil deferred printing is removed. And that cannot happen until after printing kthreads exist. So it will still hang around for a while.
Quoted 6 lines
But even so, I do not like the idea of turning
printk_ringbuffer.hinto the newinternal.h. The ringbuffer is quite complex and IMHO we should try to keep the printk_ringbuffer.* files as isolated as possible.I would prefer to put this enum declaration in
internal.h. Even if eventually it is the only thing left ininternal.h.
Fair enough. Chris, please move enum printk_info_flags declaration into kernel/printk/internal.h
Best Regards,
Petr
Chris Down
reviewerRe: [PATCH v6 2/4] printk: Straighten out log_flags into printk_info_flags
Quoted 2 lines · Petr Mladek
Fair enough. Chris, please move enum
printk_info_flagsdeclaration intokernel/printk/internal.h
Sure thing, will do for v7 once the points in the other patch are agreed on. Thanks! :-)
Chris Down
reviewerPATCH v6 3/4 printk: Userspace format indexing support
In reply to Chris DownWe have a number of systems industry-wide that have a subset of their functionality that works as follows:
1. Receive a message from local kmsg, serial console, or netconsole;
2. Apply a set of rules to classify the message;
3. Do something based on this classification (like scheduling a remediation for the machine), rinse, and repeat.
As a couple of examples of places we have this implemented just inside Facebook, although this isn't a Facebook-specific problem, we have this inside our netconsole processing (for alarm classification), and as part of our machine health checking. We use these messages to determine fairly important metrics around production health, and it's important that we get them right.
While for some kinds of issues we have counters, tracepoints, or metrics with a stable interface which can reliably indicate the issue, in order to react to production issues quickly we need to work with the interface which most kernel developers naturally use when developing: printk.
Most production issues come from unexpected phenomena, and as such usually the code in question doesn't have easily usable tracepoints or other counters available for the specific problem being mitigated. We have a number of lines of monitoring defence against problems in production (host metrics, process metrics, service metrics, etc), and where it's not feasible to reliably monitor at another level, this kind of pragmatic netconsole monitoring is essential.
As one would expect, monitoring using printk is rather brittle for a number of reasons -- most notably that the message might disappear entirely in a new version of the kernel, or that the message may change in some way that the regex or other classification methods start to silently fail.
One factor that makes this even harder is that, under normal operation, many of these messages are never expected to be hit. For example, there may be a rare hardware bug which one wants to detect if it was to ever happen again, but its recurrence is not likely or anticipated. This precludes using something like checking whether the printk in question was printed somewhere fleetwide recently to determine whether the message in question is still present or not, since we don't anticipate that it should be printed anywhere, but still need to monitor for its future presence in the long-term.
This class of issue has happened on a number of occasions, causing unhealthy machines with hardware issues to remain in production for longer than ideal. As a recent example, some monitoring around blk_update_request fell out of date and caused semi-broken machines to remain in production for longer than would be desirable.
Searching through the codebase to find the message is also extremely fragile, because many of the messages are further constructed beyond their callsite (eg. btrfs_printk and other module-specific wrappers, each with their own functionality). Even if they aren't, guessing the format and formulation of the underlying message based on the aesthetics of the message emitted is not a recipe for success at scale, and our previous issues with fleetwide machine health checking demonstrate as much.
This provides a solution to the issue of silently changed or deleted
printks: we record pointers to all printk format strings known at compile time into a new .printk_index section, both in vmlinux and modules. At runtime, this can then be iterated by looking at <debugfs>/printk/index/<module>, which emits the following format, both readable by humans and able to be parsed by machines:
$ head -1 vmlinux; shuf -n 5 vmlinux
# <level[,flags]> filename:line function "format"
<5> block/blk-settings.c:661 disk_stack_limits "%s: Warning: Device %s is misaligned\n"
<4> kernel/trace/trace.c:8296 trace_create_file "Could not create tracefs '%s' entry\n"
<6> arch/x86/kernel/hpet.c:144 _hpet_print_config "hpet: %s(%d):\n"
<6> init/do_mounts.c:605 prepare_namespace "Waiting for root device %s...\n"
<6> drivers/acpi/osl.c:1410 acpi_no_auto_serialize_setup "ACPI: auto-serialization disabled\n"This mitigates the majority of cases where we have a highly-specific printk which we want to match on, as we can now enumerate and check whether the format changed or the printk callsite disappeared entirely in userspace. This allows us to catch changes to printks we monitor earlier and decide what to do about it before it becomes problematic.
There is no additional runtime cost for printk callers or printk itself, and the assembly generated is exactly the same.
--- MAINTAINERS | 5 + arch/arm/kernel/entry-v7m.S | 2 +- arch/arm/lib/backtrace-clang.S | 2 +- arch/arm/lib/backtrace.S | 2 +- arch/arm/mach-rpc/io-acorn.S | 2 +- arch/arm/vfp/vfphw.S | 6 +- arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- arch/openrisc/kernel/entry.S | 6 +- arch/powerpc/kernel/head_fsl_booke.S | 2 +- arch/um/include/shared/user.h | 3 +- arch/x86/kernel/head_32.S | 2 +- include/asm-generic/vmlinux.lds.h | 13 ++ include/linux/module.h | 5 + include/linux/printk.h | 95 ++++++++++++- init/Kconfig | 14 ++ kernel/module.c | 5 + kernel/printk/Makefile | 1 + kernel/printk/index.c | 198 +++++++++++++++++++++++++++ kernel/printk/internal.h | 4 + kernel/printk/printk.c | 21 +-- 20 files changed, 364 insertions(+), 28 deletions(-) create mode 100644 kernel/printk/index.c
MAINTAINERS +5 -0
@@ -14765,6 +14765,11 @@ S: Maintained F: include/linux/printk.h F: kernel/printk/ +PRINTK INDEXING +R: Chris Down <[email protected]> +S: Maintained +F: kernel/printk/index.c + PRISM54 WIRELESS DRIVER M: Luis Chamberlain <[email protected]> L: [email protected]
arch/arm/kernel/entry-v7m.S +1 -1
@@ -23,7 +23,7 @@ __invalid_entry: adr r0, strerr mrs r1, ipsr mov r2, lr - bl printk + bl _printk #endif mov r0, sp bl show_regs
arch/arm/lib/backtrace-clang.S +1 -1
@@ -202,7 +202,7 @@ finished_setup: 1006: adr r0, .Lbad mov r1, loglvl mov r2, frame - bl printk + bl _printk no_frame: ldmfd sp!, {r4 - r9, fp, pc} ENDPROC(c_backtrace) .pushsection __ex_table,"a"
arch/arm/lib/backtrace.S +1 -1
@@ -103,7 +103,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions 1006: adr r0, .Lbad mov r1, loglvl mov r2, frame - bl printk + bl _printk no_frame: ldmfd sp!, {r4 - r9, pc} ENDPROC(c_backtrace)
arch/arm/mach-rpc/io-acorn.S +1 -1
@@ -25,4 +25,4 @@ ENTRY(insl) ENTRY(outsl) adr r0, .Liosl_warning mov r1, lr - b printk + b _printk
arch/arm/vfp/vfphw.S +3 -3
@@ -23,7 +23,7 @@ #ifdef DEBUG stmfd sp!, {r0-r3, ip, lr} ldr r0, =1f - bl printk + bl _printk ldmfd sp!, {r0-r3, ip, lr} .pushsection .rodata, "a"
@@ -38,7 +38,7 @@ stmfd sp!, {r0-r3, ip, lr} mov r1, \arg ldr r0, =1f - bl printk + bl _printk ldmfd sp!, {r0-r3, ip, lr} .pushsection .rodata, "a"
@@ -55,7 +55,7 @@ mov r2, \arg2 mov r1, \arg1 ldr r0, =1f - bl printk + bl _printk ldmfd sp!, {r0-r3, ip, lr} .pushsection .rodata, "a"
arch/ia64/include/uapi/asm/cmpxchg.h +2 -2
@@ -139,9 +139,9 @@ extern long ia64_cmpxchg_called_with_bad_pointer(void);do { \if (_cmpxchg_bugcheck_count-- <=0 ) { \void *ip; \ -extern int printk (const char *fmt, ...); \ +extern int _printk (const char *fmt, ...); \ ip = (void *)ia64_getreg (_IA64_REG_IP); \ -printk ("CMPXCHG_BUGCHECK: stuck at %p on word %p\n" , ip, (v));\ +_printk ("CMPXCHG_BUGCHECK: stuck at %p on word %p\n" , ip, (v));\break ; \ } \ }while (0 )
arch/openrisc/kernel/entry.S +3 -3
@@ -551,7 +551,7 @@ EXCEPTION_ENTRY(_external_irq_handler) l.movhi r3,hi(42f) l.ori r3,r3,lo(42f) l.sw 0x0(r1),r3 - l.jal printk + l.jal _printk l.sw 0x4(r1),r4 l.addi r1,r1,0x8
@@ -681,8 +681,8 @@ _syscall_debug: l.sw -4(r1),r27 l.sw -8(r1),r11 l.addi r1,r1,-8 - l.movhi r27,hi(printk) - l.ori r27,r27,lo(printk) + l.movhi r27,hi(_printk) + l.ori r27,r27,lo(_printk) l.jalr r27 l.nop l.addi r1,r1,8
arch/powerpc/kernel/head_fsl_booke.S +1 -1
@@ -858,7 +858,7 @@ KernelSPE: ori r3,r3,87f@l mr r4,r2 /* current */ lwz r5,_NIP(r1) - bl printk + bl _printk #endif b interrupt_return #ifdef CONFIG_PRINTK
arch/um/include/shared/user.h +2 -1
@@ -38,7 +38,8 @@ extern void panic(const char *fmt, ...)#define UM_KERN_CONT KERN_CONT#ifdef UML_CONFIG_PRINTK -extern int printk (const char *fmt, ...) +#define printk (...) _printk(__VA_ARGS__) +extern int _printk (const char *fmt, ...) __attribute__ ((format (printf,1 ,2 )));#else static inline int printk (const char *fmt, ...)
arch/x86/kernel/head_32.S +1 -1
@@ -432,7 +432,7 @@ SYM_FUNC_START(early_ignore_irq) pushl 32(%esp) pushl 40(%esp) pushl $int_msg - call printk + call _printk call dump_stack
include/asm-generic/vmlinux.lds.h +13 -0
@@ -483,6 +483,8 @@ \TRACEDATA \ \ +PRINTK_INDEX \ + \ /* Kernel symbol table: Normal symbols */ \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ __start___ksymtab = .; \
@@ -893,6 +895,17 @@#define TRACEDATA #endif +#ifdef CONFIG_PRINTK_INDEX +#define PRINTK_INDEX \ + .printk_index : AT(ADDR(.printk_index) - LOAD_OFFSET) { \ + __start_printk_index = .; \ + *(.printk_index) \ + __stop_printk_index = .; \ + } +#else +#define PRINTK_INDEX +#endif +#define NOTES \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ __start_notes = .; \
include/linux/module.h +5 -0
@@ -511,6 +511,11 @@ struct module {struct klp_modinfo *klp_info;#endif +#ifdef CONFIG_PRINTK_INDEX +unsigned int printk_index_size; +struct pi_entry **printk_index_start; +#endif +#ifdef CONFIG_MODULE_UNLOAD /* What modules depend on me? */ struct list_head source_list;
include/linux/printk.h +91 -4
121 lines not on this page · raw message
init/Kconfig +14 -0
@@ -781,6 +781,20 @@ config PRINTK_SAFE_LOG_BUF_SHIFT 13 => 8 KB for each CPU 12 => 4 KB for each CPU +config PRINTK_INDEX + bool "Printk indexing debugfs interface" + depends on PRINTK && DEBUG_FS + help + Add support for indexing of all printk formats known at compile time + at <debugfs>/printk/index/<module>. + + This can be used as part of maintaining daemons which monitor + /dev/kmsg, as it permits auditing the printk formats present in a + kernel, allowing detection of cases where monitored printks are + changed or no longer present. + + There is no additional runtime cost to printk with this enabled. + # # Architectures with an unreliable sched_clock() should select this: #
kernel/module.c +5 -0
@@ -3349,6 +3349,11 @@ static int find_module_sections(struct module *mod, struct load_info *info)sizeof (unsigned long ), &mod->num_kprobe_blacklist);#endif +#ifdef CONFIG_PRINTK_INDEX + mod->printk_index_start =section_objs (info,".printk_index" , +sizeof (*mod->printk_index_start), + &mod->printk_index_size); +#endif #ifdef CONFIG_HAVE_STATIC_CALL_INLINE mod->static_call_sites = section_objs(info, ".static_call_sites", sizeof(*mod->static_call_sites),
kernel/printk/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-y = printk.o obj-$(CONFIG_PRINTK) += printk_safe.o obj-$(CONFIG_A11Y_BRAILLE_CONSOLE) += braille.o obj-$(CONFIG_PRINTK) += printk_ringbuffer.o +obj-$(CONFIG_PRINTK_INDEX) += index.o
kernel/printk/index.c new file +198 -0
198 lines not on this page · raw message
kernel/printk/internal.h +4 -0
@@ -4,6 +4,8 @@*/ #include <linux/percpu.h> +#include "printk_ringbuffer.h" +#ifdef CONFIG_PRINTK #define PRINTK_SAFE_CONTEXT_MASK 0x007ffffff
@@ -51,6 +53,8 @@ bool printk_percpu_data_ready(void);void defer_console_output (void ); +u16 printk_parse_prefix (const char *text,int *level, +enum printk_info_flags *flags);#else /*
kernel/printk/printk.c +12 -9
@@ -1957,7 +1957,7 @@ static inline u32 printk_caller_id(void) }/** -* parse_prefix - Parse level and control flags. +* printk_parse_prefix - Parse level and control flags. * * @text: The terminated text message. * @level: A pointer to the current level value, will be updated.
@@ -1973,7 +1973,7 @@ static inline u32 printk_caller_id(void)* * Return: The length of the parsed level and control flags. */ -static u16 parse_prefix (char *text,int *level, +u16 printk_parse_prefix (const char *text,int *level,enum printk_info_flags *flags) {u16 prefix_len =0 ;
@@ -2019,7 +2019,7 @@ static u16 printk_sprint(char *text, u16 size, int facility,if (facility ==0 ) {u16 prefix_len; - prefix_len =parse_prefix (text,NULL ,NULL ); + prefix_len =printk_parse_prefix (text,NULL ,NULL );if (prefix_len) { text_len -= prefix_len;memmove (text, text + prefix_len, text_len);
@@ -2068,7 +2068,7 @@ int vprintk_store(int facility, int level,/* Extract log level or control flags. */ if (facility ==0 ) -parse_prefix (&prefix_buf[0 ], &level, &flags); +printk_parse_prefix (&prefix_buf[0 ], &level, &flags);if (level ==LOGLEVEL_DEFAULT ) level = default_message_loglevel;
@@ -2185,10 +2185,13 @@ int vprintk_default(const char *fmt, va_list args)EXPORT_SYMBOL_GPL (vprintk_default);/** -* printk - print a kernel message +* _printk - print a kernel message * @fmt: format string * -* This is printk(). It can be called from any context. We want it to work. +* This is _printk(). It can be called from any context. We want it to work. +* +* If printk indexing is enabled, _printk() is called from printk_index_wrap. +* Otherwise, printk is simply #defined to _printk. * * We try to grab the console_lock. If we succeed, it's easy - we log the * output and call the console drivers. If we fail to get the semaphore, we
@@ -2205,7 +2208,7 @@ EXPORT_SYMBOL_GPL(vprintk_default);* * See the vsnprintf() documentation for format string extensions over C99. */ -asmlinkage __visible int printk(const char *fmt, ...) +asmlinkage __visible int _printk(const char *fmt, ...) {va_list args;int r;
@@ -2216,7 +2219,7 @@ asmlinkage __visible int printk(const char *fmt, ...) return r; } -EXPORT_SYMBOL (printk); +EXPORT_SYMBOL (_printk);#else /* CONFIG_PRINTK */
@@ -3201,7 +3204,7 @@ int vprintk_deferred(const char *fmt, va_list args)return r; } -int printk_deferred (const char *fmt, ...) +int _printk_deferred (const char *fmt, ...) {va_list args;int r;
Signature · 1 line
2.31.1
Quoted 82 lines · Chris Down
We have a number of systems industry-wide that have a subset of their functionality that works as follows:
1. Receive a message from local kmsg, serial console, or netconsole;
2. Apply a set of rules to classify the message;
3. Do something based on this classification (like scheduling a remediation for the machine), rinse, and repeat.As a couple of examples of places we have this implemented just inside Facebook, although this isn't a Facebook-specific problem, we have this inside our netconsole processing (for alarm classification), and as part of our machine health checking. We use these messages to determine fairly important metrics around production health, and it's important that we get them right.
While for some kinds of issues we have counters, tracepoints, or metrics with a stable interface which can reliably indicate the issue, in order to react to production issues quickly we need to work with the interface which most kernel developers naturally use when developing: printk.
Most production issues come from unexpected phenomena, and as such usually the code in question doesn't have easily usable tracepoints or other counters available for the specific problem being mitigated. We have a number of lines of monitoring defence against problems in production (host metrics, process metrics, service metrics, etc), and where it's not feasible to reliably monitor at another level, this kind of pragmatic netconsole monitoring is essential.
As one would expect, monitoring using printk is rather brittle for a number of reasons -- most notably that the message might disappear entirely in a new version of the kernel, or that the message may change in some way that the regex or other classification methods start to silently fail.
One factor that makes this even harder is that, under normal operation, many of these messages are never expected to be hit. For example, there may be a rare hardware bug which one wants to detect if it was to ever happen again, but its recurrence is not likely or anticipated. This precludes using something like checking whether the printk in question was printed somewhere fleetwide recently to determine whether the message in question is still present or not, since we don't anticipate that it should be printed anywhere, but still need to monitor for its future presence in the long-term.
This class of issue has happened on a number of occasions, causing unhealthy machines with hardware issues to remain in production for longer than ideal. As a recent example, some monitoring around
blk_update_requestfell out of date and caused semi-broken machines to remain in production for longer than would be desirable.Searching through the codebase to find the message is also extremely fragile, because many of the messages are further constructed beyond their callsite (eg.
btrfs_printkand other module-specific wrappers, each with their own functionality). Even if they aren't, guessing the format and formulation of the underlying message based on the aesthetics of the message emitted is not a recipe for success at scale, and our previous issues with fleetwide machine health checking demonstrate as much.This provides a solution to the issue of silently changed or deleted
printks: we record pointers to all printk format strings known at compile time into a new .printk_index section, both in vmlinux and modules. At runtime, this can then be iterated by looking at <debugfs>/printk/index/<module>, which emits the following format, both readable by humans and able to be parsed by machines:$ head -1 vmlinux; shuf -n 5 vmlinux # <level[,flags]> filename:line function "format" <5> block/blk-settings.c:661 disk_stack_limits "%s: Warning: Device %s is misaligned\n" <4> kernel/trace/trace.c:8296 trace_create_file "Could not create tracefs '%s' entry\n" <6> arch/x86/kernel/hpet.c:144 _hpet_print_config "hpet: %s(%d):\n" <6> init/do_mounts.c:605 prepare_namespace "Waiting for root device %s...\n" <6> drivers/acpi/osl.c:1410 acpi_no_auto_serialize_setup "ACPI: auto-serialization disabled\n"This mitigates the majority of cases where we have a highly-specific printk which we want to match on, as we can now enumerate and check whether the format changed or the printk callsite disappeared entirely in userspace. This allows us to catch changes to printks we monitor earlier and decide what to do about it before it becomes problematic.
There is no additional runtime cost for printk callers or printk itself, and the assembly generated is exactly the same.
...
include/linux/printk.h extern int kptr_restrict; · line 337
Quoted 3 lines
include/linux/printk.h +2
-0+#define __printk_index_emit (_fmt, _level, _pre_fmt, _post_fmt) \ + ({ \
do {} while (0) is more generic than ({ GCC extension.
Quoted 11 lines
include/linux/printk.h +11
-0+if (__builtin_constant_p (_fmt) &&__builtin_constant_p (_level)) { \ +/* +* The compiler may not be able to eliminate the +* non-constant variants of _fmt and _level, so we need +* to make sure that it doesn't see any hypothetical +* assignment for non-constants even though this is +* already inside the __builtin_constant_p guard. +*/ \ + static const struct pi_entry _entry \ + __used = { \ + .fmt =__builtin_constant_p (_fmt) ? (_fmt) :NULL , \
include/linux/printk.h extern int kptr_restrict; · line 358
Quoted 10 lines
include/linux/printk.h +10
-0+ .func = __func__, \ + .file = __FILE__, \ + .line = __LINE__, \ + .level = __builtin_constant_p(_level) ? (_level) : NULL, \ + .pre_fmt = _pre_fmt, \ + .post_fmt = _post_fmt, \ + }; \ + static const struct pi_entry *_entry_ptr \ + __used __section(".printk_index") = &_entry; \ + } \
Something wrong with indentation of some of the \
Also in here and in the rest of the series.
Quoted 1 line
(quoted diff) +1
-0+ })
...
Quoted 2 lines
+/*
+ *printk/index.c- Userspace indexing of printk formats
Keeping file name in the file is not the best idea.
Quoted 1 line
+ */
...
kernel/printk/index.c line 23
Quoted 3 lines
kernel/printk/index.c new file +3
-0+static const char *pi_get_module_name (struct module *mod) +{ +return mod ? mod->name :"vmlinux" ;
First of all, you have several occurrences of the "vmlinux" literal. Second, can't you get it from somewhere else? Is it even guaranteed that the name is always the same?
Quoted 1 line
+}
...
kernel/printk/index.c line 40
Quoted 7 lines
kernel/printk/index.c new file +7
-0+switch (op) { +case MODULE_STATE_COMING : +pi_create_file (mod); +break ; +case MODULE_STATE_GOING : +pi_remove_file (mod); +break ;
Missed default.
Quoted 1 line
(quoted diff) +1
-0+ }
...
kernel/printk/index.c line 53
Quoted 3 lines
kernel/printk/index.c new file +3
-0+static void __init pi_setup_module_notifier (void ) +{ +}
One line and marked inline?
...
Quoted 1 line
+static void *pi_start(struct
seq_file*s,loff_t*pos);
Not sure I understand why forward declaration is here. (I deliberately left more context below)
Quoted 21 lines
kernel/printk/index.c new file +21
-0+static void *pi_next (struct seq_file *s,void *v,loff_t *pos) +{ +const struct module *mod = s->file->f_inode->i_private; +struct pi_entry *entry =pi_get_entry (mod, *pos); + + (*pos)++; + +return entry; +} + +static void *pi_start (struct seq_file *s,loff_t *pos) +{ +/* +* Make show() print the header line. Do not update *pos because +* pi_next() still has to return the entry at index 0 later. +*/ +if (*pos ==0 ) +return SEQ_START_TOKEN ; + +return pi_next (s,NULL , pos); +}
...
kernel/printk/index.c line 114
Quoted 2 lines
kernel/printk/index.c new file +2
-0+#define seq_escape_printf_format (s, src) \ + seq_escape_str(s, src, ESCAPE_ANY | ESCAPE_NAP | ESCAPE_APPEND, "\"\\")
Hmm... But after your ESCAPE_SPECIAL update why " is in @only? Not sure about back slash either.
...
kernel/printk/index.c line 125
Quoted 2 lines
kernel/printk/index.c new file +2
-0+seq_puts (s, +"# <level[,flags]> filename:line function \"format\"\n" );
One line.
...
kernel/printk/index.c line 144
Quoted 5 lines
kernel/printk/index.c new file +4
-0+if (entry->pre_fmt) +seq_escape_printf_format (s, entry->pre_fmt); +if (entry->post_fmt) +seq_escape_printf_format (s, entry->post_fmt);
Maybe you can make seq_escape_printf_format() NULL-aware?
...
kernel/printk/index.c line 152
Quoted 3 lines
kernel/printk/index.c new file +3
-0+static void pi_stop (struct seq_file *p,void *v) +{ +}
One line?
...
kernel/printk/index.c line 159
Quoted 6 lines
kernel/printk/index.c new file +6
-0+static const struct seq_operations dfs_index_seq_ops = { + .start = pi_start, + .next = pi_next, + .show = pi_show, + .stop = pi_stop, +};
DEFINE_SEQ_SHOW_ATTRIBUTE(...);
...
Review
Quoted 2 lines
(quoted diff) +2
-0+ +
One blank line is enough here and everywhere else.
...
kernel/printk/index.c line 195
Quoted 10 lines
kernel/printk/index.c new file +10
-0+static int __init pi_init (void ) +{ +struct dentry *dfs_root =debugfs_create_dir ("printk" ,NULL ); + + dfs_index =debugfs_create_dir ("index" , dfs_root); +pi_setup_module_notifier (); +pi_create_file (NULL ); + +return 0 ; +}
No __exit? (There is a corresponding call for exit)
...
kernel/printk/printk.c static inline u32 printk_caller_id(void) · line 1977
Quoted 2 lines
kernel/printk/printk.c +1
-0+u16 printk_parse_prefix (const char *text,int *level,enum printk_info_flags *flags)
Now one line?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Chris Down
reviewerHey Andy,
Thanks for the detailed feedback! All points not explicitly replied to here are acked and will be improved. :-)
Quoted 7 lines · Andy Shevchenko
kernel/printk/index.c line 23
Quoted 3 lines
kernel/printk/index.c new file +3
-0+static const char *pi_get_module_name (struct module *mod) +{ +return mod ? mod->name :"vmlinux" ;First of all, you have several occurrences of the "vmlinux" literal. Second, can't you get it from somewhere else? Is it even guaranteed that the name is always the same?
Hmm, I don't know if it's guaranteed, but we already have similar logic in (as one example) livepatch, which seems to suggest it's not obviously wrong:
% grep -R '"vmlinux"' kernel/livepatch/
kernel/livepatch/core.c: sympos, name, objname ? objname : "vmlinux");
kernel/livepatch/core.c: bool sec_vmlinux = !strcmp(sec_objname, "vmlinux");
kernel/livepatch/core.c: sym_vmlinux = !strcmp(sym_objname, "vmlinux");
kernel/livepatch/core.c: if (strcmp(objname ? objname : "vmlinux", sec_objname))
kernel/livepatch/core.c: name = klp_is_module(obj) ? obj->name : "vmlinux";
kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux");
kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux");
kernel/livepatch/core.c: if (!strcmp(mod->name, "vmlinux")) {Is there another name or method you'd prefer? :-)
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
Quoted 5 lines
kernel/printk/index.c line 114
Quoted 2 lines
kernel/printk/index.c new file +2
-0+#define seq_escape_printf_format (s, src) \ + seq_escape_str(s, src, ESCAPE_ANY | ESCAPE_NAP | ESCAPE_APPEND, "\"\\")Hmm... But after your
ESCAPE_SPECIALupdate why " is in @only? Not sure about back slash either.
Good question! It's because ESCAPE_NAP (used to reduce scope of ESCAPE_OCTAL) will cause double quote and backslash to be ignored for quoting otherwise, even with ESCAPE_SPECIAL from ESCAPE_ANY.
I touched on this briefly in the changelog for the patch adding the quote to ESCAPE_SPECIAL:
From "string_helpers: Escape double quotes in escape_special":
Quoted 3 lines
One can of course, alternatively, use
ESCAPE_APPENDwith a quote in @only, but without this patch quotes are coerced into hex or octal which can hurt readability quite significantly.
Maybe you know of a more intuitive way to deal with this? :-)
Quoted 4 lines
Quoted 4 lines
kernel/printk/index.c new file +4
-0+static int __init pi_init (void ) +{ +struct dentry *dfs_root =debugfs_create_dir ("printk" ,NULL ); +
Quoted 8 lines
kernel/printk/index.c line 195
Quoted 6 lines
kernel/printk/index.c new file +6
-0+ dfs_index =debugfs_create_dir ("index" , dfs_root); +pi_setup_module_notifier (); +pi_create_file (NULL ); + +return 0 ; +}No
__exit? (There is a corresponding call for exit)
Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from Kconfig. Maybe I'm missing something and there's some other way that might be invoked?
Thanks a lot for the feedback! :-)
Quoted 1 line · Chris Down
Andy Shevchenko writes:
...
Quoted 19 lines
Quoted 5 lines
kernel/printk/index.c line 23
Quoted 1 line
kernel/printk/index.c new file +1
-0+return mod ? mod->name :"vmlinux" ;First of all, you have several occurrences of the "vmlinux" literal. Second, can't you get it from somewhere else? Is it even guaranteed that the name is always the same?
Hmm, I don't know if it's guaranteed, but we already have similar logic in (as one example) livepatch, which seems to suggest it's not obviously wrong:
% grep -R '"vmlinux"' kernel/livepatch/ kernel/livepatch/core.c: sympos, name, objname ? objname : "vmlinux"); kernel/livepatch/core.c: bool sec_vmlinux = !strcmp(sec_objname, "vmlinux"); kernel/livepatch/core.c: sym_vmlinux = !strcmp(sym_objname, "vmlinux"); kernel/livepatch/core.c: if (strcmp(objname ? objname : "vmlinux", sec_objname)) kernel/livepatch/core.c: name = klp_is_module(obj) ? obj->name : "vmlinux"; kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: if (!strcmp(mod->name, "vmlinux")) {
Quoted 5 lines
Is there another name or method you'd prefer? :-)
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
I have heard that modern GCC (at least) can utilize same constant literals in a single compilation unit, so it won't be duplicated.
But more serious here is the guarantees of the name. Shouldn't it come from KBuild / Makefile into some header like version do?
livepatch has to be fixed accordingly.
...
Quoted 9 lines
Quoted 5 lines
kernel/printk/index.c line 114
Quoted 2 lines
kernel/printk/index.c new file +2
-0+#define seq_escape_printf_format (s, src) \ + seq_escape_str(s, src, ESCAPE_ANY | ESCAPE_NAP | ESCAPE_APPEND, "\"\\")Hmm... But after your
ESCAPE_SPECIALupdate why " is in @only? Not sure about back slash either.Good question! It's because
ESCAPE_NAP(used to reduce scope ofESCAPE_OCTAL) will cause double quote and backslash to be ignored for quoting otherwise, even withESCAPE_SPECIALfromESCAPE_ANY.
Ah, makes sense. Yep, it's a bit complicated, but okay, perhaps it needs a comment near to the macro.
Quoted 9 lines
I touched on this briefly in the changelog for the patch adding the quote to
ESCAPE_SPECIAL:From "
string_helpers: Escape double quotes inescape_special":Quoted 3 lines
One can of course, alternatively, use
ESCAPE_APPENDwith a quote in @only, but without this patch quotes are coerced into hex or octal which can hurt readability quite significantly.Maybe you know of a more intuitive way to deal with this? :-)
...
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
+static int
__initpi_init(void)No
__exit? (There is a corresponding call for exit)Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from
Kconfig. Maybe I'm missing something and there's some other way that might be invoked?
While it's true, it may help in these cases:
1) getting things done in a clean way
2) finding bugs during boot cycle
3) (possibly) making better debugging in virtual environments
4) (also possibly) clean up something which shouldn't be seen by the next (unsecure) kernel, like kexec.
I'm not sure about these, but it what comes to my mind.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Chris Down
reviewerQuoted 9 lines · Andy Shevchenko
Quoted 3 lines
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
I have heard that modern GCC (at least) can utilize same constant literals in a single compilation unit, so it won't be duplicated.
But more serious here is the guarantees of the name. Shouldn't it come from KBuild /
Makefileinto some header like version do?
I'm not against that, but it seems like something worth doing outside of this patch series, unless you have strong feelings to the contrary?
More than happy to put that on my TODO list for tree-wide cleanups.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
kernel/printk/index.c line 114
Quoted 2 lines
kernel/printk/index.c new file +2
-0+#define seq_escape_printf_format (s, src) \ + seq_escape_str(s, src, ESCAPE_ANY | ESCAPE_NAP | ESCAPE_APPEND, "\"\\")Hmm... But after your
ESCAPE_SPECIALupdate why " is in @only? Not sure about back slash either.
Quoted 6 lines
Quoted 3 lines
Good question! It's because
ESCAPE_NAP(used to reduce scope ofESCAPE_OCTAL) will cause double quote and backslash to be ignored for quoting otherwise, even withESCAPE_SPECIALfromESCAPE_ANY.Ah, makes sense. Yep, it's a bit complicated, but okay, perhaps it needs a comment near to the macro.
Sure thing, will do.
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
+static int
__initpi_init(void)No
__exit? (There is a corresponding call for exit)Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from
Kconfig. Maybe I'm missing something and there's some other way that might be invoked?
Quoted 8 lines
While it's true, it may help in these cases:
1) getting things done in a clean way
2) finding bugs during boot cycle
3) (possibly) making better debugging in virtual environments
4) (also possibly) clean up something which shouldn't be seen by the next (unsecure) kernel, like kexec.I'm not sure about these, but it what comes to my mind.
Hmm. Petr, what do you think? :-)
Chris Down
reviewerQuoted 8 lines · Chris Down
Quoted 7 lines · Andy Shevchenko
Quoted 3 lines
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
I have heard that modern GCC (at least) can utilize same constant literals in a single compilation unit, so it won't be duplicated.
Quoted 6 lines
Quoted 2 lines
But more serious here is the guarantees of the name. Shouldn't it come from KBuild /
Makefileinto some header like version do?I'm not against that, but it seems like something worth doing outside of this patch series, unless you have strong feelings to the contrary?
More than happy to put that on my TODO list for tree-wide cleanups.
Now I think about it, we even just call it that in struct module's is_vmlinux, and set that by doing strcmp(modname, "vmlinux") == 0, so it seems pretty static from a terminology point of view.
It would be nice to just always use mod->name, but unfortunately with !CONFIG_MODULES we don't have struct module fleshed out at all in order to do so.
Quoted 24 lines · Andy Shevchenko
Quoted 1 line · Chris Down
Andy Shevchenko writes:
...
Quoted 19 lines
Quoted 5 lines
kernel/printk/index.c line 23
Quoted 1 line
kernel/printk/index.c new file +1
-0+return mod ? mod->name :"vmlinux" ;First of all, you have several occurrences of the "vmlinux" literal. Second, can't you get it from somewhere else? Is it even guaranteed that the name is always the same?
Hmm, I don't know if it's guaranteed, but we already have similar logic in (as one example) livepatch, which seems to suggest it's not obviously wrong:
% grep -R '"vmlinux"' kernel/livepatch/ kernel/livepatch/core.c: sympos, name, objname ? objname : "vmlinux"); kernel/livepatch/core.c: bool sec_vmlinux = !strcmp(sec_objname, "vmlinux"); kernel/livepatch/core.c: sym_vmlinux = !strcmp(sym_objname, "vmlinux"); kernel/livepatch/core.c: if (strcmp(objname ? objname : "vmlinux", sec_objname)) kernel/livepatch/core.c: name = klp_is_module(obj) ? obj->name : "vmlinux"; kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: if (!strcmp(mod->name, "vmlinux")) {
Quoted 8 lines
Quoted 5 lines
Is there another name or method you'd prefer? :-)
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
I have heard that modern GCC (at least) can utilize same constant literals in a single compilation unit, so it won't be duplicated.
Yes, except it's not gcc but ld, string deduplication happens across compilation units, and "modern" isn't required, SHF_STRINGS and SHF_MERGE have been part of the ELF spec for decades, with support in binutils landing around 2001-04-13 AFAICT.
IOW, don't uglify the code by introducing macros or const char[] objects. Using string literals is just fine.
Quoted 11 lines
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
+static int
__initpi_init(void)No
__exit? (There is a corresponding call for exit)Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from
Kconfig. Maybe I'm missing something and there's some other way that might be invoked?While it's true, it may help in these cases:
1) getting things done in a clean way
Huh?
Quoted 1 line
2) finding bugs during boot cycle
What bugs would code that doesn't get executed find?
Quoted 1 line
3) (possibly) making better debugging in virtual environments
How?
Quoted 2 lines
4) (also possibly) clean up something which shouldn't be seen by the next (unsecure) kernel, like kexec.
Tearing down a few debugfs files wouldn't touch a lot of memory, the printk format strings are very unlikely to be sensitive, and I highly doubt __exit code is kept around and run at kexec time anyway.
IOW, please do not bloat the kernel image with __exit code in things which cannot be built modular.
Rasmus
Quoted 3 lines · Rasmus Villemoes
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Chris Down
Andy Shevchenko writes:
...
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
Quoted 5 lines
kernel/printk/index.c line 23
Quoted 1 line
kernel/printk/index.c new file +1
-0+return mod ? mod->name :"vmlinux" ;First of all, you have several occurrences of the "vmlinux" literal. Second, can't you get it from somewhere else? Is it even guaranteed that the name is always the same?
Hmm, I don't know if it's guaranteed, but we already have similar logic in (as one example) livepatch, which seems to suggest it's not obviously wrong:
% grep -R '"vmlinux"' kernel/livepatch/ kernel/livepatch/core.c: sympos, name, objname ? objname : "vmlinux"); kernel/livepatch/core.c: bool sec_vmlinux = !strcmp(sec_objname, "vmlinux"); kernel/livepatch/core.c: sym_vmlinux = !strcmp(sym_objname, "vmlinux"); kernel/livepatch/core.c: if (strcmp(objname ? objname : "vmlinux", sec_objname)) kernel/livepatch/core.c: name = klp_is_module(obj) ? obj->name : "vmlinux"; kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: klp_is_module(obj) ? obj->name : "vmlinux"); kernel/livepatch/core.c: if (!strcmp(mod->name, "vmlinux")) {Quoted 8 lines
Quoted 5 lines
Is there another name or method you'd prefer? :-)
As for the literals, are you saying that you prefer that it's symbolised as a macro or static char, or do you know of an API where this kind of name can be canonically accessed?
I have heard that modern GCC (at least) can utilize same constant literals in a single compilation unit, so it won't be duplicated.
Quoted 7 lines
Yes, except it's not gcc but ld, string deduplication happens across compilation units, and "modern" isn't required,
SHF_STRINGSandSHF_MERGEhave been part of the ELF spec for decades, with support in binutils landing around 2001-04-13 AFAICT.IOW, don't uglify the code by introducing macros or const char[] objects. Using string literals is just fine.
What I'm talking about is two things:
- is it guaranteed that the name is always the same?
- is it guaranteed that nobody will make a mistake in the name when typing it over and over?
...
Quoted 19 lines
Quoted 10 lines
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
+static int
__initpi_init(void)No
__exit? (There is a corresponding call for exit)Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from
Kconfig. Maybe I'm missing something and there's some other way that might be invoked?While it's true, it may help in these cases:
1) getting things done in a clean wayHuh?
Quoted 1 line
2) finding bugs during boot cycle
What bugs would code that doesn't get executed find?
Quoted 1 line
3) (possibly) making better debugging in virtual environments
Quoted 8 lines
How?
Quoted 2 lines
4) (also possibly) clean up something which shouldn't be seen by the next (unsecure) kernel, like kexec.
Tearing down a few debugfs files wouldn't touch a lot of memory, the printk format strings are very unlikely to be sensitive, and I highly doubt
__exitcode is kept around and run at kexec time anyway.
I admit that I'm on a learning curve in this area, and perhaps it was unclear from the above that the list I gave is what I think may or might be relevant.
Quoted 2 lines
IOW, please do not bloat the kernel image with
__exitcode in things which cannot be built modular.
Why we have exitcall in the code which can't be modular? Is somebody going to clean that up? (Ex. git grep -w __exitcall)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Petr Mladek
maintainerQuoted 31 lines · Andy Shevchenko
Quoted 21 lines · Rasmus Villemoes
Quoted 11 lines · Andy Shevchenko
Quoted 7 lines · Chris Down
Quoted 3 lines
Quoted 1 line
+static int
__initpi_init(void)No
__exit? (There is a corresponding call for exit)Hmm, can't printk only be built in to the kernel, so it can't be unloaded? At least it looks that way from
Kconfig. Maybe I'm missing something and there's some other way that might be invoked?While it's true, it may help in these cases:
1) getting things done in a clean wayHuh?
Quoted 1 line
2) finding bugs during boot cycle
What bugs would code that doesn't get executed find?
Quoted 1 line
3) (possibly) making better debugging in virtual environments
Quoted 8 lines
How?
Quoted 2 lines
4) (also possibly) clean up something which shouldn't be seen by the next (unsecure) kernel, like kexec.
Tearing down a few debugfs files wouldn't touch a lot of memory, the printk format strings are very unlikely to be sensitive, and I highly doubt
__exitcode is kept around and run at kexec time anyway.
Quoted 8 lines
I admit that I'm on a learning curve in this area, and perhaps it was unclear from the above that the list I gave is what I think may or might be relevant.
Quoted 2 lines
IOW, please do not bloat the kernel image with
__exitcode in things which cannot be built modular.Why we have exitcall in the code which can't be modular? Is somebody going to clean that up? (Ex.
git grep -w __exitcall)
Most exit calls are in "um" arch code. AFAIK, it is a kernel that can be booted in userspace. And it is very special.
Anyway, this functionality (printk index) do not need any special handling during suspend, reboot, halt, or other system state changes.
It only has to be initialized during boot at the right time. It is after debugfs is initialized and before modules can be loaded.
Best Regards,
Petr
Petr Mladek
maintainerQuoted 32 lines · Chris Down
We have a number of systems industry-wide that have a subset of their functionality that works as follows:
1. Receive a message from local kmsg, serial console, or netconsole;
2. Apply a set of rules to classify the message;
3. Do something based on this classification (like scheduling a remediation for the machine), rinse, and repeat.This provides a solution to the issue of silently changed or deleted
printks: we record pointers to all printk format strings known at compile time into a new .printk_index section, both in vmlinux and modules. At runtime, this can then be iterated by looking at <debugfs>/printk/index/<module>, which emits the following format, both readable by humans and able to be parsed by machines:include/linux/printk.h +13
-0+#ifdef CONFIG_PRINTK_INDEX +struct pi_entry { + const char *fmt; + const char *func; + const char *file; + unsigned int line; + + /* + * While printk and pr_* have the level stored in the string at compile + * time, some subsystems dynamically add it at runtime through the + * format string. For these dynamic cases, we allow the subsystem to + * tell us the level at compile time. + *
include/linux/printk.h extern int kptr_restrict; · line 333
Quoted 10 lines
include/linux/printk.h +10
-0+* NULL indicates that the level, if any, is stored in fmt. +*/ +const char *level; + +/* +* The format string before and after the fmt, or at least something +* that would match whatever it could be. +*/ +const char *pre_fmt; +const char *post_fmt;
Are you aware of any subsystem having some extra post_fmt, please?
I think about calling this "subsys_fmt" or "subsys_prefix".
Well, the main question is whether we need to store this at all. Does it bring any useful information?
Note that we do not store the value defined by pr_fmt() which is yet another automatically added prefix.
I would personally omit these prefixes. The most important information is:
+ fmt: is the pattern that the system monitors would most likely look for.
+ level: says whether the string will appear on console that shows only messages below a certain console_loglevel
+ func, file, line: help to find the string in the kernel sources. It is useful when investigating what has changed.
For example, pre_fmt="%s %s:" used by dev_printk (4th patch) is not much useful.
Quoted 10 lines
include/linux/printk.h +10
-0+} __packed; + +#define __printk_index_emit (_fmt, _level, _pre_fmt, _post_fmt) \ + ({ \ + if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \ +/* +* The compiler may not be able to eliminate the +* non-constant variants of _fmt and _level, so we need +* to make sure that it doesn't see any hypothetical +* assignment for non-constants even though this is
include/linux/printk.h extern int kptr_restrict; · line 353
Quoted 10 lines
include/linux/printk.h +10
-0+* already inside the __builtin_constant_p guard. +*/ \ + static const struct pi_entry _entry \ + __used = { \ + .fmt =__builtin_constant_p (_fmt) ? (_fmt) :NULL , \ + .func = __func__, \ + .file = __FILE__, \ + .line = __LINE__, \ + .level =__builtin_constant_p (_level) ? (_level) :NULL , \ + .pre_fmt = _pre_fmt, \
Should this also be?
.pre_fmt = __builtin_constant_p(_pre_fmt) ? _pre_fmt : NULL
include/linux/printk.h extern int kptr_restrict; · line 354
Quoted 1 line
include/linux/printk.h +1
-0+ .post_fmt = _post_fmt, \
Similar here.
Well, I would remove .pre_fmt and .post_fmt completely.
Quoted 16 lines
include/linux/printk.h +16
-0+ }; \ + static const struct pi_entry *_entry_ptr \ + __used __section(".printk_index") = &_entry; \ + } \ + }) + +#else /* !CONFIG_PRINTK_INDEX */ +#define __printk_index_emit (...) do {} while (0) +#endif /* CONFIG_PRINTK_INDEX */ + +/* +* Some subsystems have their own custom printk that applies a va_format to a +* generic format, for example, to include a device number or other metadata +* alongside the format supplied by the caller. +* +* In order to store these in the way they would be emitted by the printk
include/linux/printk.h extern int kptr_restrict; · line 380
Quoted 10 lines
include/linux/printk.h +10
-0+* infrastructure, the subsystem provides us with the start, fixed string, and +* any subsequent text in the format string. +* +* We take a variable argument list as pr_fmt/dev_fmt/etc are sometimes passed +* as multiple arguments (eg: `"%s: ", "blah"`), and we must only take the +* first one. +* +* pre and post must be known at compile time, or compilation will fail (since +* this is a mistake). If fmt or level is not known at compile time, no index +* entry will be made (since this can legitimately happen).
How is this achieved, please?
__printk_index_emit() creates the entry when the following check is true:
if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level))
It checks neither _pre_fmt nor _post_fmt.
Quoted 31 lines
+ */
include/linux/printk.h +10
-0+#define printk_index_subsys_emit (pre, post, level, fmt, ...) \ + __printk_index_emit(fmt, level, pre, post) + +#define printk_index_wrap (_p_func, _fmt, ...) \ + ({ \ + __printk_index_emit(_fmt, NULL, NULL, NULL); \ + _p_func(_fmt, ##__VA_ARGS__); \ + }) + +kernel/printk/index.c new file +17
-0@@ -0,0 +1,198 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* printk/index.c - Userspace indexing of printk formats +*/ + +#include <linux/debugfs.h> +#include <linux/module.h> +#include <linux/printk.h> +#include <linux/slab.h> +#include <linux/string_helpers.h> + +#include "internal.h" + +extern struct pi_entry *__start_printk_index[]; +extern struct pi_entry *__stop_printk_index[]; + +/* The base dir for module formats, typically debugfs/printk/index/ */
kernel/printk/index.c line 27
Quoted 10 lines
kernel/printk/index.c new file +10
-0+static struct dentry *dfs_index; + +#ifdef CONFIG_MODULES +static const char *pi_get_module_name (struct module *mod) +{ +return mod ? mod->name :"vmlinux" ; +} + +void pi_create_file (struct module *mod); +void pi_remove_file (struct module *mod);
I would personally move all this module-notify-related code right above pi_init() definition and avoid any forward declarations.
Quoted 17 lines
kernel/printk/index.c new file +17
-0+ +static int pi_module_notify (struct notifier_block *nb,unsigned long op, +void *data) +{ +struct module *mod = data; + +switch (op) { +case MODULE_STATE_COMING : +pi_create_file (mod); +break ; +case MODULE_STATE_GOING : +pi_remove_file (mod); +break ; + } + +return NOTIFY_OK ; +}
[...]
Quoted 5 lines
kernel/printk/index.c new file +5
-0+static int pi_show (struct seq_file *s,void *v) +{ +const struct pi_entry *entry = v; +int level =LOGLEVEL_DEFAULT ; +enum printk_info_flags flags =0 ;
kernel/printk/index.c line 130
Quoted 10 lines
kernel/printk/index.c new file +10
-0+u16 prefix_len =0 ; + +if (v ==SEQ_START_TOKEN ) { +seq_puts (s, +"# <level[,flags]> filename:line function \"format\"\n" ); +return 0 ; + } + +if (!entry->fmt) +return 0 ;
Is this just a paranoid check or is it a valid case?
Is is possible to update __printk_index_emit() to do not create entries with fmt = NULL ?
We should either remove the above check or add a comment explaining why it is necessary.
kernel/printk/index.c line 135
Quoted 5 lines
kernel/printk/index.c new file +5
-0+ +if (entry->level) +printk_parse_prefix (entry->level, &level, &flags); +else + prefix_len =printk_parse_prefix (entry->fmt, &level, &flags);
This is missing:
if (level == LOGLEVEL_DEFAULT) level = default_message_loglevel;
Without it, it produces lines with loglevel <-1>, for example:
<-1> init/do_mounts.c:457 mount_block_root "\n"
<-1> init/do_mounts.c:456 mount_block_root " %s"
<-1> init/do_mounts.c:454 mount_block_root "No filesystem could mount root, tried: "
kernel/printk/index.c line 139
Quoted 4 lines
kernel/printk/index.c new file +4
-0+ +seq_printf (s,"<%d%s> %s:%d %s \"" , + level, flags &LOG_CONT ?",c" :"" , entry->file, + entry->line, entry->func);
It produces the following for continuous lines:
<-1,c> arch/x86/events/core.c:2101 init_hw_perf_events "%s PMU driver.\n"
<-1,c> arch/x86/events/core.c:2091 init_hw_perf_events "no PMU driver, software events only.\n"
But we should print the loglevel only when explicitly defined. So I would do it the following way:
if (flags & LOG_CONT) {
if (level == LOGLEVEL_DEFAULT)
seq_printf(s, "<c>");
else
seq_printf(s, "<%d,c>", level);
} else {
if (level == LOGLEVEL_DEFAULT)
level = default_message_loglevel;
seq_printf(s, "<%d>", level);
}
seq_printf(s, " %s:%d %s \"", entry->file, entry->line, entry->func);Quoted 24 lines
kernel/printk/index.c new file +10
-0+if (entry->pre_fmt) +seq_escape_printf_format (s, entry->pre_fmt); +seq_escape_printf_format (s, entry->fmt + prefix_len); +if (entry->post_fmt) +seq_escape_printf_format (s, entry->post_fmt); +seq_puts (s,"\"\n" ); + +return 0 ; +} +kernel/printk/internal.h +2
-0@@ -4,6 +4,8 @@*/ #include <linux/percpu.h> +#include "printk_ringbuffer.h" +#ifdef CONFIG_PRINTK #define PRINTK_SAFE_CONTEXT_MASK 0x007ffffff
kernel/printk/internal.h bool printk_percpu_data_ready(void); · line 57
Quoted 5 lines
kernel/printk/internal.h +2
-0@@ -51,6 +53,8 @@ bool printk_percpu_data_ready(void);void defer_console_output (void ); +u16 printk_parse_prefix (const char *text,int *level, +enum printk_info_flags *flags);
It would be nice to do all this parse_prefix() shuffling and renaming in another preparatoty patch. I mean to have two preparaty patches:
+ patch renaming enum log_flags -> printk_info_flags
+ patch renaming parse_prefix -> printk_parse_prefix
That said, I do not resit on it. It is just nice to have ;-)
kernel/printk/internal.h bool printk_percpu_data_ready(void); · line 60
Quoted 3 lines
kernel/printk/internal.h +0
-0#else /*
I am really happy with the progress. The remaining problems are mostly with the support for the subsystem-specific printk() callers that was added in this revision.
Best Regards,
Petr
Chris Down
reviewerHey Petr,
Thanks for the feedback -- apologies for the delay in getting back.
Anything not explicitly replied to here is acked and will be fixed for v7.
Quoted 1 line · Petr Mladek
Are you aware of any subsystem having some extra
post_fmt, please?
Good thinking -- I just checked and I didn't find any, so I guess we can add that later if needed and do without it for now. :-)
Quoted 5 lines
Well, the main question is whether we need to store this at all. Does it bring any useful information?
Note that we do not store the value defined by
pr_fmt()which is yet another automatically added prefix.
Hmm, we do actually store pr_fmt, since it's known at compile time (or we wouldn't store it at all if it was dynamic due to the __builtin_constant_p check). Or are you seeing something different?
Quoted 6 lines
I would personally omit these prefixes. The most important information is:
+ fmt: is the pattern that the system monitors would most likely look for.
Quoted 8 lines
+ level: says whether the string will appear on console that shows only messages below a certain
console_loglevel+ func, file, line: help to find the string in the kernel sources. It is useful when investigating what has changed.
For example, pre_fmt="%s %s:" used by
dev_printk(4th patch) is not much useful.
In this case it's not super useful, but for cases where you can put something more useful (like "BTRFS: ...") it can make matching significantly less ambiguous.
Having this information means that system monitors know that they can anchor the matching at both ends when linking a printk format with some output, rather than having to look for a substring (in which case things become more difficult to determine).
I agree that in this particular case with dev_printk it's not incredibly useful, but there are certainly others we may want to have in future (like the btrfs case) where it would certainly help disambiguate. :-)
Quoted 24 lines
Quoted 11 lines
include/linux/printk.h +10
-0+} __packed; + +#define __printk_index_emit (_fmt, _level, _pre_fmt, _post_fmt) \ + ({ \ + if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \ +/* +* The compiler may not be able to eliminate the +* non-constant variants of _fmt and _level, so we need +* to make sure that it doesn't see any hypothetical +* assignment for non-constants even though this is include/linux/printk.h extern int kptr_restrict; · line 353
Quoted 10 lines
include/linux/printk.h +10
-0+* already inside the __builtin_constant_p guard. +*/ \ + static const struct pi_entry _entry \ + __used = { \ + .fmt =__builtin_constant_p (_fmt) ? (_fmt) :NULL , \ + .func = __func__, \ + .file = __FILE__, \ + .line = __LINE__, \ + .level =__builtin_constant_p (_level) ? (_level) :NULL , \ + .pre_fmt = _pre_fmt, \Should this also be?
Quoted 2 lines
.pre_fmt = __builtin_constant_p(_pre_fmt) ? _pre_fmt : NULL
Hmm, if pre_fmt for a subsystem isn't known at compile time, it's an error on the developer's end -- otherwise things can't be stored anyway and there's no point.
Quoted 11 lines
Quoted 3 lines
+ * pre and post must be known at compile time, or compilation will fail (since
+ * this is a mistake). If fmt or level is not known at compile time, no index
+ * entry will be made (since this can legitimately happen).How is this achieved, please?
__printk_index_emit()creates the entry when the following check is true:if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level))It checks neither
_pre_fmtnor_post_fmt.
Maybe my phrasing wasn't clear, but compilation would fail in that case because .pre_fmt = _pre_fmt will be a non-constant static initialiser, no?
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!entry->fmt) + return 0;Is this just a paranoid check or is it a valid case?
It happens only for the following printk:
arch/x86/mm/fault.c:534 show_fault_oops "BUG: kernel NULL pointer dereference, address: %px\n"
I must confess, I'm not entirely sure why, although it's ironic/interesting that it happens on _the_ NULL-related deref printk...
Quoted 5 lines
Is is possible to update
__printk_index_emit()to do not create entries with fmt = NULL ?We should either remove the above check or add a comment explaining why it is necessary.
The trick is unfortunately necessary for the reason described in the comment above the double check:
/*
* The compiler may not be able to eliminate the
* non-constant variants of _fmt and _level, so we need
* to make sure that it doesn't see any hypothetical
* assignment for non-constants even though this is
* already inside the __builtin_constant_p guard. */
Happy to add another comment if it helps.
Quoted 10 lines
kernel/printk/index.c line 135
Quoted 7 lines
kernel/printk/index.c new file +5
-0+ +if (entry->level) +printk_parse_prefix (entry->level, &level, &flags); +else + prefix_len =printk_parse_prefix (entry->fmt, &level, &flags);This is missing:
Quoted 8 lines
if (level == LOGLEVEL_DEFAULT) level = default_message_loglevel;Without it, it produces lines with loglevel <-1>, for example:
<-1>
init/do_mounts.c:457mount_block_root"\n"
<-1>init/do_mounts.c:456mount_block_root" %s"
<-1>init/do_mounts.c:454mount_block_root"No filesystem could mount root, tried: "
Hmm, from the perspective of someone building this printk-checking infrastructure, I want -1 here instead of dynamically changing the output to default_message_loglevel, because default_message_loglevel may not be the same across systems. For example, having "-1" allows people to know these will come out at whatever the default message loglevel is, rather than necessarily being always at (say) level 4 or whatever it happens to be set at on the running system.
Without that, it's also not possible to compare entries across systems or across time, because the default loglevel may dynamically change at runtime, and it's not possible to disambiguate "will always be KERN_X" from "happens to be KERN_X" on this system.
And if someone really does want to know what value it will be right now, they can just look at /proc/sys/kernel/printk and change it out as desired.
Quoted 13 lines
kernel/printk/index.c line 139
Quoted 4 lines
kernel/printk/index.c new file +4
-0+ +seq_printf (s,"<%d%s> %s:%d %s \"" , + level, flags &LOG_CONT ?",c" :"" , entry->file, + entry->line, entry->func);It produces the following for continuous lines:
<-1,c>
arch/x86/events/core.c:2101init_hw_perf_events"%s PMU driver.\n"
<-1,c>arch/x86/events/core.c:2091init_hw_perf_events"no PMU driver, software events only.\n"But we should print the loglevel only when explicitly defined. So I would do it the following way:
Quoted 12 lines
if (flags & LOG_CONT) {
if (level == LOGLEVEL_DEFAULT)
seq_printf(s, "<c>");
else
seq_printf(s, "<%d,c>", level);
} else {
if (level == LOGLEVEL_DEFAULT)
level = default_message_loglevel;
seq_printf(s, "<%d>", level);
}
seq_printf(s, " %s:%d %s \"", entry->file, entry->line, entry->func);Ah yes, that's a decent point, since we don't treat this as meaning LOGLEVEL_DEFAULT. I'll have a think about how to make it better for v7.
Quoted 3 lines
I am really happy with the progress. The remaining problems are mostly with the support for the subsystem-specific
printk()callers that was added in this revision.
That's great! I really appreciate your time and your diligent review, you've definitely helped improve this patchset for the better :-)
Thanks,
Chris
Petr Mladek
maintainerQuoted 3 lines · Chris Down
Hey Petr,
Thanks for the feedback -- apologies for the delay in getting back.
No problem at all.
Quoted 7 lines
Quoted 2 lines · Petr Mladek
Note that we do not store the value defined by
pr_fmt()which is yet another automatically added prefix.Hmm, we do actually store
pr_fmt, since it's known at compile time (or we wouldn't store it at all if it was dynamic due to the__builtin_constant_pcheck). Or are you seeing something different?
I see. Well, the prefix defined by pr_fmt() becomes part of entry.fmt. It is _not_ stored in entry.pre_fmt which confused me.
As I mentioned in the previous mail. I think about using "subsys_fmt" or "subsys_prefix" instead of "pre_fmt".
Anyway, we should improve the comment. For example, something like:
/* * The format string used by various subsystem specific printk() * wrappers to prefix the message. * * Note that the static prefix defined by pr_fmt() macro is handled * another way. It is stored directly in the message format (@fmt). */ const char *subsys_fmt;
Quoted 10 lines
Quoted 1 line
I would personally omit these prefixes. The most important
Having this information means that system monitors know that they can anchor the matching at both ends when linking a printk format with some output, rather than having to look for a substring (in which case things become more difficult to determine).
I agree that in this particular case with
dev_printkit's not incredibly useful, but there are certainly others we may want to have in future (like the btrfs case) where it would certainly help disambiguate. :-)
Fair enough.
Quoted 23 lines
Quoted 23 lines
Quoted 10 lines
include/linux/printk.h +10
-0+} __packed; + +#define __printk_index_emit (_fmt, _level, _pre_fmt, _post_fmt) \ + ({ \ + if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \ +/* +* The compiler may not be able to eliminate the +* non-constant variants of _fmt and _level, so we need +* to make sure that it doesn't see any hypothetical +* assignment for non-constants even though this is include/linux/printk.h extern int kptr_restrict; · line 353
Quoted 10 lines
include/linux/printk.h +10
-0+* already inside the __builtin_constant_p guard. +*/ \ + static const struct pi_entry _entry \ + __used = { \ + .fmt =__builtin_constant_p (_fmt) ? (_fmt) :NULL , \ + .func = __func__, \ + .file = __FILE__, \ + .line = __LINE__, \ + .level =__builtin_constant_p (_level) ? (_level) :NULL , \ + .pre_fmt = _pre_fmt, \Should this also be?
Quoted 6 lines
Quoted 2 lines
.pre_fmt = __builtin_constant_p(_pre_fmt) ? _pre_fmt : NULLHmm, if
pre_fmtfor a subsystem isn't known at compile time, it's an error on the developer's end -- otherwise things can't be stored anyway and there's no point.
I see.
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
+ * pre and post must be known at compile time, or compilation will fail (since
+ * this is a mistake). If fmt or level is not known at compile time, no index
+ * entry will be made (since this can legitimately happen).How is this achieved, please?
Quoted 8 lines
Quoted 5 lines
__printk_index_emit()creates the entry when the following check is true:if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level))It checks neither
_pre_fmtnor_post_fmt.Maybe my phrasing wasn't clear, but compilation would fail in that case because
.pre_fmt = _pre_fmtwill be a non-constant static initialiser, no?
I see. It was not obvious to me.
Quoted 8 lines
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!entry->fmt) + return 0;Is this just a paranoid check or is it a valid case?
It happens only for the following printk:
arch/x86/mm/fault.c:534show_fault_oops"BUG: kernel NULL pointer dereference, address: %px\n"
I actually see the above format in the index/vmlinux. So, I added some debugging info ad the problem seems to be with
[ 94.840349] Err: Printk index entry without format defined [ 94.841160] arch/x86/mm/fault.c:435, is_errata93
The string is defined as:
static const char errata93_warning[] =KERN_ERR
"******* Your BIOS seems to not contain a fix for K8 errata #93\n" "******* Working around it, but it may cause SEGVs or burn power.\n" "******* Please consider a BIOS update.\n"
"******* Disabling USB legacy in the BIOS may also help.\n";
And it is used:
printk_once(errata93_warning);
Strange. I do not understand what is so special about it. The string is constant so it should not be the problem handled by the double __builtin_constant_p.
Anyway, we should keep the check for entry->fmt == NULL to be on the same side. And it is likely needed also in situations that are handled by the double __builtin_constant_p.
Quoted 17 lines
Quoted 5 lines
Is is possible to update
__printk_index_emit()to do not create entries with fmt = NULL ?We should either remove the above check or add a comment explaining why it is necessary.
The trick is unfortunately necessary for the reason described in the comment above the double check:
/*
* The compiler may not be able to eliminate the
* non-constant variants of_fmtand_level, so we need
* to make sure that it doesn't see any hypothetical
* assignment for non-constants even though this is
* already inside the__builtin_constant_pguard. */
Quoted 1 line
Happy to add another comment if it helps.
I re-read the discussion about this,
namely https://lore.kernel.org/r/3Kf896Zt9O+/[email protected]
Frankly, the comment above ftrace_vprintk() is easier to understand for me. I mean:
/*
* The double __builtin_constant_p is because gcc will give us an error
* if we try to allocate the static variable to fmt if it is not a
* constant. Even with the outer if statement.
*/
Quoted 25 lines
Quoted 8 lines
kernel/printk/index.c line 135
Quoted 5 lines
kernel/printk/index.c new file +5
-0+ +if (entry->level) +printk_parse_prefix (entry->level, &level, &flags); +else + prefix_len =printk_parse_prefix (entry->fmt, &level, &flags);This is missing:
Quoted 8 lines
if (level == LOGLEVEL_DEFAULT) level = default_message_loglevel;Without it, it produces lines with loglevel <-1>, for example:
<-1>
init/do_mounts.c:457mount_block_root"\n"
<-1>init/do_mounts.c:456mount_block_root" %s"
<-1>init/do_mounts.c:454mount_block_root"No filesystem could mount root, tried: "Hmm, from the perspective of someone building this printk-checking infrastructure, I want -1 here instead of dynamically changing the output to
default_message_loglevel, becausedefault_message_loglevelmay not be the same across systems. For example, having "-1" allows people to know these will come out at whatever the default message loglevel is, rather than necessarily being always at (say) level 4 or whatever it happens to be set at on the running system.
Quoted 7 lines
Without that, it's also not possible to compare entries across systems or across time, because the default loglevel may dynamically change at runtime, and it's not possible to disambiguate "will always be
KERN_X" from "happens to beKERN_X" on this system.And if someone really does want to know what value it will be right now, they can just look at
/proc/sys/kernel/printkand change it out as desired.
Fair enough.
Best Regards,
Petr
Chris Down
reviewerQuoted 16 lines · Petr Mladek
Quoted 7 lines
Quoted 2 lines · Petr Mladek
Note that we do not store the value defined by
pr_fmt()which is yet another automatically added prefix.Hmm, we do actually store
pr_fmt, since it's known at compile time (or we wouldn't store it at all if it was dynamic due to the__builtin_constant_pcheck). Or are you seeing something different?I see. Well, the prefix defined by
pr_fmt()becomes part of entry.fmt. It is _not_ stored in entry.pre_fmt which confused me.As I mentioned in the previous mail. I think about using "
subsys_fmt" or "subsys_prefix" instead of "pre_fmt".Anyway, we should improve the comment. For example, something like:
Quoted 8 lines
/* * The format string used by various subsystem specific printk() * wrappers to prefix the message. * * Note that the static prefix defined by pr_fmt() macro is handled * another way. It is stored directly in the message format (@fmt). */ const char *subsys_fmt;
Sounds totally reasonable, will do.
Quoted 22 lines
Quoted 17 lines
Quoted 5 lines
Is is possible to update
__printk_index_emit()to do not create entries with fmt = NULL ?We should either remove the above check or add a comment explaining why it is necessary.
The trick is unfortunately necessary for the reason described in the comment above the double check:
/*
* The compiler may not be able to eliminate the
* non-constant variants of_fmtand_level, so we need
* to make sure that it doesn't see any hypothetical
* assignment for non-constants even though this is
* already inside the__builtin_constant_pguard. */Quoted 1 line
Happy to add another comment if it helps.
I re-read the discussion about this,
namely https://lore.kernel.org/r/3Kf896Zt9O+/[email protected]
Quoted 8 lines
Frankly, the comment above
ftrace_vprintk()is easier to understand for me. I mean:/*
* The double__builtin_constant_pis because gcc will give us an error
* if we try to allocate the static variable to fmt if it is not a
* constant. Even with the outer if statement.
*/
Oh yes, that does sound more clear. I'll update it :-)
Thanks!
Chris Down
reviewerPATCH v6 4/4 printk: index: Add indexing support to dev_printk
In reply to Chris DownWhile for most kinds of issues we have counters, tracepoints, or metrics with a stable interface which can reliably be used to indicate issues, in order to react to production issues quickly we sometimes need to work with the interface which most kernel developers naturally use when
developing: printk, and printk-esques like dev_printk.
dev_printk is by far the most likely custom subsystem printk to benefit from the printk indexing infrastructure, since niche device issues brought about by production changes, firmware upgrades, and the like are one of the most common things that we need printk infrastructure's assistance to monitor.
Often these errors were never expected to practically manifest in reality, and exhibit in code without extensive (or any) metrics present. As such, there are typically very few options for issue detection available to those with large fleets at the time the incident happens, and we thus benefit strongly from monitoring netconsole in these instances.
As such, add the infrastructure for dev_printk to be indexed in the printk index. Even on a minimal kernel config, the coverage of the base kernel's printk index is significantly improved:
Before:
[root@ktst ~]# wc -l /sys/kernel/debug/printk/index/vmlinux 4497 /sys/kernel/debug/printk/index/vmlinux
After:
[root@ktst ~]# wc -l /sys/kernel/debug/printk/index/vmlinux 5573 /sys/kernel/debug/printk/index/vmlinux
In terms of implementation, in order to trivially disambiguate them, dev_printk is now a macro which wraps _dev_printk. If preferred, it's also possible to have the macro and function have the same name.
--- drivers/base/core.c | 6 ++-- include/linux/dev_printk.h | 63 ++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 20 deletions(-)
drivers/base/core.c +3 -3
@@ -4547,8 +4547,8 @@ static void __dev_printk(const char *level, const struct device *dev,printk ("%s(NULL device *): %pV" , level, vaf); } -void dev_printk (const char *level,const struct device *dev, -const char *fmt, ...) +void _dev_printk (const char *level,const struct device *dev, +const char *fmt, ...) {struct va_format vaf;va_list args;
@@ -4562,7 +4562,7 @@ void dev_printk(const char *level, const struct device *dev,va_end (args); } -EXPORT_SYMBOL (dev_printk); +EXPORT_SYMBOL (_dev_printk);#define define_dev_printk_level (func, kern_level) \ void func(const struct device *dev, const char *fmt, ...) \
include/linux/dev_printk.h +46 -17
86 lines not on this page · raw message
Signature · 1 line
2.31.1
Petr Mladek
maintainerRe: [PATCH v6 4/4] printk: index: Add indexing support to dev_printk
Quoted 25 lines · Chris Down
While for most kinds of issues we have counters, tracepoints, or metrics with a stable interface which can reliably be used to indicate issues, in order to react to production issues quickly we sometimes need to work with the interface which most kernel developers naturally use when
developing: printk, and printk-esques likedev_printk.
dev_printkis by far the most likely custom subsystem printk to benefit from the printk indexing infrastructure, since niche device issues brought about by production changes, firmware upgrades, and the like are one of the most common things that we need printk infrastructure's assistance to monitor.Often these errors were never expected to practically manifest in reality, and exhibit in code without extensive (or any) metrics present. As such, there are typically very few options for issue detection available to those with large fleets at the time the incident happens, and we thus benefit strongly from monitoring netconsole in these instances.
As such, add the infrastructure for
dev_printkto be indexed in the printk index. Even on a minimal kernel config, the coverage of the base kernel's printk index is significantly improved:Before:
Quoted 7 lines
[root@ktst ~]# wc -l
/sys/kernel/debug/printk/index/vmlinux4497/sys/kernel/debug/printk/index/vmlinuxAfter:
[root@ktst ~]# wc -l
/sys/kernel/debug/printk/index/vmlinux5573/sys/kernel/debug/printk/index/vmlinux
Cool.
Quoted 3 lines
In terms of implementation, in order to trivially disambiguate them,
dev_printkis now a macro which wraps_dev_printk. If preferred, it's also possible to have the macro and function have the same name.
I prefer to use _dev_printk to disambiguate the macro and function names. By other words, I prefer the approach used in this patch.
Please, remove the "If preferred..." sentence in the next version.
Quoted 7 lines
include/linux/dev_printk.h +0
-0@@ -97,25 +97,54 @@ void _dev_info(const struct device *dev, const char *fmt, ...)#endif
include/linux/dev_printk.h void _dev_info(const struct device *dev, const char *fmt, ...) · line 108
Quoted 10 lines
include/linux/dev_printk.h +9
-0+/* +* Some callsites directly call dev_printk rather than going through the +* dev_<level> infrastructure, so we need to emit here as well as inside those +* level-specific macros. Only one index entry will be produced, either way, +* since dev_printk's `fmt` isn't known at compile time if going through the +* dev_<level> macros. +*/ +#define dev_printk (level, dev, fmt, ...) ({ \ + dev_printk_index_emit(level, fmt); \
Please, define dev_printk_index_emit() macro before it is used for the first time.
Quoted 27 lines
include/linux/dev_printk.h +8
-14+ _dev_printk(level, dev, fmt, ##__VA_ARGS__); \ +}) +/* * #defines for all the dev_<level> macros to prefix with whatever * possible use of #define dev_fmt(fmt) ... */ -#define dev_emerg (dev, fmt, ...) \ - _dev_emerg(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_crit (dev, fmt, ...) \ - _dev_crit(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_alert (dev, fmt, ...) \ - _dev_alert(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_err (dev, fmt, ...) \ - _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_warn (dev, fmt, ...) \ - _dev_warn(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_notice (dev, fmt, ...) \ - _dev_notice(dev, dev_fmt(fmt), ##__VA_ARGS__) -#define dev_info (dev, fmt, ...) \ - _dev_info(dev, dev_fmt(fmt), ##__VA_ARGS__) +#define dev_printk_index_emit (level, fmt) \ + printk_index_subsys_emit("%s %s: ", "", level, fmt) + +#define dev_emerg (dev, fmt, ...) ({ \ + dev_printk_index_emit(KERN_EMERG, dev_fmt(fmt)); \
include/linux/dev_printk.h void _dev_info(const struct device *dev, const char *fmt, ...) · line 131
Quoted 10 lines
include/linux/dev_printk.h +10
-0+ _dev_emerg(dev, dev_fmt(fmt), ##__VA_ARGS__); \ +}) +#define dev_crit (dev, fmt, ...) ({ \ + dev_printk_index_emit(KERN_CRIT, dev_fmt(fmt)); \ + _dev_crit(dev, dev_fmt(fmt), ##__VA_ARGS__); \ +}) +#define dev_alert (dev, fmt, ...) ({ \ + dev_printk_index_emit(KERN_ALERT, dev_fmt(fmt)); \ + _dev_alert(dev, dev_fmt(fmt), ##__VA_ARGS__); \ +})
I would slightly reduce the duplcation the follwing way:
#define dev_printk_index_wrap(_p_func, level, dev, fmt, ...) \
({ \
printk_index_subsys_emit("%s %s: ", "", level, dev_fmt(fmt)); \
_p_func(dev, dev_fmt(fmt), ##__VA_ARGS__); \
})#define dev_printk(level, dev, fmt, ...) \ dev_printk_index_wrap(_dev_printk, level, dev, ##__VA_ARGS__)
#define dev_crit(dev, fmt, ...) \ dev_printk_index_wrap(_dev_crit, KERN_CRIT, dev, ##__VA_ARGS__) #define dev_alert(dev, fmt, ...) \ dev_printk_index_wrap(_dev_alert, KERN_ALERT, dev, ##__VA_ARGS__)
Note that I did not try to complile it, so there might be a mistake.
BTW: I was curious why we actually need _dev_crit() defined as a function. But it seems to reduce size of the kernel binaries, see
the commit 38a1ec40efa196efbac0253 ("device.h drivers/base/core.c Convert dev_<level> logging macros to functions"). Sigh.
Best Regards,
Petr