| Message ID | 20240528084225.3215853-1-leitao@debian.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c3390677f6258748a91bf37b9bb21eab89f63b42 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] netconsole: Do not shutdown dynamic configuration if cmdline is invalid | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 28 May 2024 01:42:24 -0700 you wrote: > If a user provides an invalid netconsole configuration during boot time > (e.g., specifying an invalid ethX interface), netconsole will be > entirely disabled. Consequently, the user won't be able to create new > entries in /sys/kernel/config/netconsole/ as that directory does not > exist. > > Apart from misconfiguration, another issue arises when ethX is loaded as > a module and the netconsole= line in the command line points to ethX, > resulting in an obvious failure. This renders netconsole unusable, as > /sys/kernel/config/netconsole/ will never appear. This is more annoying > since users reconfigure (or just toggle) the configuratin later (see > commit 5fbd6cdbe304b ("netconsole: Attach cmdline target to dynamic > target")) > > [...] Here is the summary with links: - [net,v2] netconsole: Do not shutdown dynamic configuration if cmdline is invalid https://git.kernel.org/netdev/net-next/c/c3390677f625 You are awesome, thank you!
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index d7070dd4fe73..ab8a0623b1a1 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1262,6 +1262,8 @@ static int __init init_netconsole(void) while ((target_config = strsep(&input, ";"))) { nt = alloc_param_target(target_config, count); if (IS_ERR(nt)) { + if (IS_ENABLED(CONFIG_NETCONSOLE_DYNAMIC)) + continue; err = PTR_ERR(nt); goto fail; }
If a user provides an invalid netconsole configuration during boot time (e.g., specifying an invalid ethX interface), netconsole will be entirely disabled. Consequently, the user won't be able to create new entries in /sys/kernel/config/netconsole/ as that directory does not exist. Apart from misconfiguration, another issue arises when ethX is loaded as a module and the netconsole= line in the command line points to ethX, resulting in an obvious failure. This renders netconsole unusable, as /sys/kernel/config/netconsole/ will never appear. This is more annoying since users reconfigure (or just toggle) the configuratin later (see commit 5fbd6cdbe304b ("netconsole: Attach cmdline target to dynamic target")) Create /sys/kernel/config/netconsole/ even if the command line arguments are invalid, so, users can create dynamic entries in netconsole. Reported-by: Aijay Adams <aijay@meta.com> Signed-off-by: Breno Leitao <leitao@debian.org> --- Changelog: v2: * Use IS_ENABLED(CONFIG_NETCONSOLE_DYNAMIC) directly instead of a external function to check if dynamic reconfiguration is enabled. --- drivers/net/netconsole.c | 2 ++ 1 file changed, 2 insertions(+)