| Message ID | 20230731083542.3665886-1-leitao@debian.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] netconsole: Enable compile time configuration | expand |
On Mon, 31 Jul 2023 01:35:41 -0700 Breno Leitao wrote: > +config NETCONSOLE_EXTENDED_LOG > + bool "Set kernel extended message as default" > + depends on NETCONSOLE > + default n > + help > + Set extended log support for netconsole message. If this option is > + set, log messages are transmitted with extended metadata header in a > + format similar to /dev/kmsg. See > + <file:Documentation/networking/netconsole.rst> for details. > + > +config NETCONSOLE_PREPEND_RELEASE > + bool "Prepend kernel release version in the message" ... by default > + depends on NETCONSOLE_EXTENDED_LOG > + default n > + help > + Set kernel release to be prepended to each netconsole message by > + default. If this option is set, the kernel release is prepended into > + the first field of every netconsole message, so, the netconsole > + server/peer can easily identify what kernel release is logging each > + message. See <file:Documentation/networking/netconsole.rst> for > + details. I had to look at the code to see what this does, exactly. I think you either need to make similar changes to make_netconsole_target() so that instances created via sysfs have the same default. Or rewrite the help message to talk about forcing kernel command line arguments, rather than setting defaults.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 368c6f5b327e..2c7b4b634a8f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -332,6 +332,28 @@ config NETCONSOLE_DYNAMIC at runtime through a userspace interface exported using configfs. See <file:Documentation/networking/netconsole.rst> for details. +config NETCONSOLE_EXTENDED_LOG + bool "Set kernel extended message as default" + depends on NETCONSOLE + default n + help + Set extended log support for netconsole message. If this option is + set, log messages are transmitted with extended metadata header in a + format similar to /dev/kmsg. See + <file:Documentation/networking/netconsole.rst> for details. + +config NETCONSOLE_PREPEND_RELEASE + bool "Prepend kernel release version in the message" + depends on NETCONSOLE_EXTENDED_LOG + default n + help + Set kernel release to be prepended to each netconsole message by + default. If this option is set, the kernel release is prepended into + the first field of every netconsole message, so, the netconsole + server/peer can easily identify what kernel release is logging each + message. See <file:Documentation/networking/netconsole.rst> for + details. + config NETPOLL def_bool NETCONSOLE diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 87f18aedd3bd..8cadbcd699ae 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -181,6 +181,11 @@ static struct netconsole_target *alloc_param_target(char *target_config) if (!nt) goto fail; + if (IS_ENABLED(CONFIG_NETCONSOLE_EXTENDED_LOG)) + nt->extended = true; + if (IS_ENABLED(CONFIG_NETCONSOLE_PREPEND_RELEASE)) + nt->release = true; + nt->np.name = "netconsole"; strscpy(nt->np.dev_name, "eth0", IFNAMSIZ); nt->np.local_port = 6665;
Enable netconsole features to be set at compilation time. Create two Kconfig options that allow users to set extended logs and release prepending features at compilation time. Right now, the user needs to pass command line parameters to netconsole, such as "+"/"r" to enable extended logs and version prepending features. With these two options, the user could set the default values for the features at compile time, and don't need to pass it in the command line to get them enabled, simplifying the command line. Signed-off-by: Breno Leitao <leitao@debian.org> --- v1 -> v2: * Improvements in the Kconfig help section. --- drivers/net/Kconfig | 22 ++++++++++++++++++++++ drivers/net/netconsole.c | 5 +++++ 2 files changed, 27 insertions(+)