Message ID | 20250204-netconsole-v2-0-5ef5eb5f6056@purestorage.com |
---|---|
Headers | show |
Series | netconsole: allow selection of egress interface via MAC address | expand |
On Tue, Feb 04, 2025 at 02:41:45PM -0700, Uday Shankar wrote: > Currently, netconsole has two methods of configuration - module > parameter and configfs. The former interface allows for netconsole > activation earlier during boot (by specifying the module parameter on > the kernel command line), so it is preferred for debugging issues which > arise before userspace is up/the configfs interface can be used. The > module parameter syntax requires specifying the egress interface name. > This requirement makes it hard to use for a couple reasons: > - The egress interface name can be hard or impossible to predict. For > example, installing a new network card in a system can change the > interface names assigned by the kernel. > - When constructing the module parameter, one may have trouble > determining the original (kernel-assigned) name of the interface > (which is the name that should be given to netconsole) if some stable > interface naming scheme is in effect. A human can usually look at > kernel logs to determine the original name, but this is very painful > if automation is constructing the parameter. > > For these reasons, allow selection of the egress interface via MAC > address when configuring netconsole using the module parameter. Update > the netconsole documentation with an example of the new syntax. > Selection of egress interface by MAC address via configfs is far less > interesting (since when this interface can be used, one should be able > to easily convert between MAC address and interface name), so it is left > unimplemented. > > Signed-off-by: Uday Shankar <ushankar@purestorage.com> Reviewed-by: Breno Leitao <leitao@debian.org> Tested-by: Breno Leitao <leitao@debian.org> > int netpoll_setup(struct netpoll *np) > { > + struct net *net = current->nsproxy->net_ns; > struct net_device *ndev = NULL; > bool ip_overwritten = false; > + char buf[MAC_ADDR_LEN + 1]; > struct in_device *in_dev; > int err; > > rtnl_lock(); > - if (np->dev_name[0]) { > - struct net *net = current->nsproxy->net_ns; > + if (np->dev_name[0]) > ndev = __dev_get_by_name(net, np->dev_name); > - } > + else if (is_valid_ether_addr(np->dev_mac)) > + ndev = dev_getbyhwaddr_rcu(net, ARPHRD_ETHER, np->dev_mac); You do not have the RCU read lock here. You have the rtnl(), which is sufficient, but, CONFIG_PROVE_RCU_LIST will show something as: WARNING: suspicious RCU usage 6.13.0-09701-g6610c7be45bb-dirty #18 Not tainted ----------------------------- net/core/dev.c:1143 RCU-list traversed in non-reader section!! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 1 lock held by swapper/0/1: #0: ffffffff832795b8 (rtnl_mutex){+.+.}-{4:4}, at: netpoll_setup+0x48/0x540 stack backtrace: CPU: 1 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.13.0-virtme-09701-g6610c7be45bb-dirty #18 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x9f/0xf0 lockdep_rcu_suspicious+0x11a/0x150 dev_getbyhwaddr_rcu+0xb6/0xc0 netpoll_setup+0x8a/0x540 ? netpoll_parse_options+0x2bd/0x310 This is not a problem per-se, since you have RTNL. We probably need to tell for_each_netdev_rcu() to not comply about "RCU-list traversed in non-reader section" if RTNL is held. Not sure why we didn't hit in the test infrastructure, tho: https://patchwork.kernel.org/project/netdevbpf/patch/20250204-netconsole-v2-2-5ef5eb5f6056@purestorage.com/ Anyway, no action item for you here. I am talking to Jakub on a way to solve it, and I should send a fix soon. Thanks for the patch, --breno
On Wed, Feb 05, 2025 at 11:07:45AM -0800, Breno Leitao wrote: > > + else if (is_valid_ether_addr(np->dev_mac)) > > + ndev = dev_getbyhwaddr_rcu(net, ARPHRD_ETHER, np->dev_mac); > > You do not have the RCU read lock here. You have the rtnl(), which is > sufficient, but, CONFIG_PROVE_RCU_LIST will show something as: > > WARNING: suspicious RCU usage > 6.13.0-09701-g6610c7be45bb-dirty #18 Not tainted > ----------------------------- > net/core/dev.c:1143 RCU-list traversed in non-reader section!! > other info that might help us debug this: > rcu_scheduler_active = 2, debug_locks = 1 > 1 lock held by swapper/0/1: > #0: ffffffff832795b8 (rtnl_mutex){+.+.}-{4:4}, at: netpoll_setup+0x48/0x540 > stack backtrace: > CPU: 1 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.13.0-virtme-09701-g6610c7be45bb-dirty #18 > Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 > Call Trace: > <TASK> > dump_stack_lvl+0x9f/0xf0 > lockdep_rcu_suspicious+0x11a/0x150 > dev_getbyhwaddr_rcu+0xb6/0xc0 > netpoll_setup+0x8a/0x540 > ? netpoll_parse_options+0x2bd/0x310 > > This is not a problem per-se, since you have RTNL. We probably need to > tell for_each_netdev_rcu() to not comply about "RCU-list traversed in > non-reader section" if RTNL is held. Not sure why we didn't hit in the > test infrastructure, tho: > > https://patchwork.kernel.org/project/netdevbpf/patch/20250204-netconsole-v2-2-5ef5eb5f6056@purestorage.com/ I don't think there is an automated test that will hit this path yet. I guess you got this trace from your manual testing? > > Anyway, no action item for you here. I am talking to Jakub on a way to > solve it, and I should send a fix soon. /** * list_for_each_entry_rcu - iterate over rcu list of given type * @pos: the type * to use as a loop cursor. * @head: the head for your list. * @member: the name of the list_head within the struct. * @cond: optional lockdep expression if called from non-RCU protection. * * This list-traversal primitive may safely run concurrently with * the _rcu list-mutation primitives such as list_add_rcu() * as long as the traversal is guarded by rcu_read_lock(). */ #define list_for_each_entry_rcu(pos, head, member, cond...) \ for (__list_check_rcu(dummy, ## cond, 0), \ pos = list_entry_rcu((head)->next, typeof(*pos), member); \ &pos->member != (head); \ pos = list_entry_rcu(pos->member.next, typeof(*pos), member)) If we do something like list_for_each_entry_rcu(..., lockdep_rtnl_is_held()) ... I think that code will be okay with being called with either rcu or rtnl held. Of course, we need to plumb it through the net-specific helpers.
This series adds support for selecting a netconsole egress interface by specifying the MAC address (in place of the interface name) in the boot/module parameter. Changes since v1 (https://lore.kernel.org/netdev/20241211021851.1442842-1-ushankar@purestorage.com/): - Add a patch to define and use MAC_ADDR_LEN (Simon Horman) - Remove ability to use MAC address to select egress interface via configfs (Breno Leitao) - Misc style fixes (Simon Horman, Breno Leitao) Signed-off-by: Uday Shankar <ushankar@purestorage.com> --- Uday Shankar (2): net, treewide: define and use MAC_ADDR_LEN netconsole: allow selection of egress interface via MAC address Documentation/networking/netconsole.rst | 6 +++- drivers/net/netconsole.c | 2 +- drivers/nvmem/brcm_nvram.c | 2 +- drivers/nvmem/layouts/u-boot-env.c | 2 +- include/linux/if_ether.h | 3 ++ include/linux/netpoll.h | 6 ++++ lib/net_utils.c | 4 +-- net/core/netpoll.c | 51 +++++++++++++++++++++++++-------- net/mac80211/debugfs_sta.c | 5 ++-- 9 files changed, 60 insertions(+), 21 deletions(-) --- base-commit: c2933b2befe25309f4c5cfbea0ca80909735fd76 change-id: 20250204-netconsole-4c610e2f871c Best regards,