From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 801D32FD1B1 for ; Fri, 23 Jan 2026 11:09:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769166574; cv=none; b=VxTesiY994rejs4CceD7hcQAniJtok13HDbLZQLOO67PuLK8ywDlj+3tQEI3WTmCiAdrrEj7/nGdRm8OUPxMFjsOl4qw3sUIJUX1UY/E17zhGS1ZLsdD3IzeAjbAhD17Z3147eNWSA0Z5rwjepv72ytpLo/HOjKS44GApEA4KyA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769166574; c=relaxed/simple; bh=4iDgbCPDX6zetLw0sIoTMixX1OU29nvoRAcbnlpMyp8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=uOPIzQdvIFRMsmg1ND2qLTOF8jB2YFLh7rdjvg2Jjg2kiUc/QzXlzPHPaxp0xcN8LVANHSpfzNsQx6huArxWK+lP/YVyFvi664cit8pr/2l2aqB+ZBejA9PAP+GooZiVtWWyxE9Ym097T/gxgDhf/rmO8gBeywyp9D7bpyjmQCA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UHKKuGrR; arc=none smtp.client-ip=209.85.219.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UHKKuGrR" Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-894774491deso37043496d6.2 for ; Fri, 23 Jan 2026 03:09:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769166571; x=1769771371; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=0/pAK6MrrOiwwDQc0GBrsxIdwLQE0979ZY3mHhzgGcY=; b=UHKKuGrRBDJYfX0sG/9bxETcd5SZb8WQwP+7HWlx1nIw2UoE23VKeMOvwdQBhRBINE q3YKvVduVJeoHK7pjMmHofRUmMxheAwfCnvyhDkW8qixjat0eO+2EF9EvawjQhoHwpQA uMJeLJismzXFR5MdJLaLGUAi/POQzt1rMNvV9UeJe94BWQDUF5JFeltvobw4DRRMVA8q BvNqu2HZe9CqzmIukR61UfP90vAo0sRHnEh62nBUPhtSAn8n4yey2WpbwbcjIYe3buRx SaHG2BX6vn3n1Ifw26p2gMly7GBRlk6UTn1vL2bfj3Dy2atpYFB9nLb/6RraBHRT3znP mLpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769166571; x=1769771371; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0/pAK6MrrOiwwDQc0GBrsxIdwLQE0979ZY3mHhzgGcY=; b=ZQZovpp8Cip/vF1mOfRFrILRaxKKvbJPMuXUjqiw+b8+r0qtL3XUmgJC+ygoSuWhr0 cWw0z/ZJZRKiDWOGeGXYSMo1lCUpJ6NDehdmSvMa72QNxEkcPiQ0nJzRvksFM24MuJdR kIr/ukDT5PojUxyrNtrljx/tYUGi7Rw3hrcI1k2YUMKt4HeeZ0mV/R5l4RZ2er2XD4Nk h3ZGXpZBV+fsI+r5PDEvVgvZShELiuRVq5eum5DMDUCGQqXw8LG1i0o14fgDbGJZEWSp 0bvfgZPLdXCD0iY9GhBt1RTN0HCZyJ7xLOlqEivTj3uc/yo3zzWciOaQZnJ/lBSUd7cS mcBw== X-Gm-Message-State: AOJu0YwDDTeMX9axuvhtsVH428BrES5Ps+da0FSnpjfO6Z3nzo337/1M BNeLRYlhQVSoKVtVaK9fg5CNVnQVFZHjRzvAdsPOxiZoljjTSSpBIjpD X-Gm-Gg: AZuq6aJm6SttesUV2wRKIZly2fQg6Kw8lUevu+FrenkmNr+dkOKNSSF+iGAYW7VhD26 vF5JTmrG0EgJmilz5tBE15yu/qgCop8hx5YetHTrzre3MYDqPC0+wtaDwxeqf6XaGgcT6s6ETiS UV5lcZ4sh+dRUUuguuojXRzcL4aug3077TAalQKaK4zw4TbxClbh14CiIO18bMvNZtpwFrR5Wbt fyu15gPatAu4L1X+3EiAIkO9cbEGcJmVqbuMmEs2yDLyHVaYaYiB0+nKNhBmYnJl/fV/VipM3ao gach/5lHL2yENbdx6K4/d41pSYhdHQwUpyMVioXtOj82jZSG93IbdjLj6IPb3scmWsnM9MDs1/R 1RDFerKGIbC7xwcOMulHRRosucKYmYY2riL5qr/1p+H4UU+pAG/p7x8CiqGHssjFjSgktoM7KQO js2AOUNJUK9riidBJy2YZz X-Received: by 2002:a05:6214:2628:b0:894:610c:3a22 with SMTP id 6a1803df08f44-89490177e74mr36606866d6.20.1769166571210; Fri, 23 Jan 2026 03:09:31 -0800 (PST) Received: from localhost.localdomain ([128.224.253.2]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-502f7f72d8bsm14348801cf.22.2026.01.23.03.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 03:09:30 -0800 (PST) From: Kevin Hao Date: Fri, 23 Jan 2026 19:09:07 +0800 Subject: [PATCH net] net: cpsw_new: Execute ndo_set_rx_mode callback in a work queue Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260123-bbb-v1-1-176b0b71834d@gmail.com> X-B4-Tracking: v=1; b=H4sIANJWc2kC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDQyNj3aSkJN2UZGMzc9M0M3PDFAMloMqCotS0zAqwKdFKeaklSrG1tQB t+L7sWgAAAA== X-Change-ID: 20260123-bbb-dc3675f671d0 To: netdev@vger.kernel.org Cc: Kevin Hao , stable@vger.kernel.org, Siddharth Vadapalli , Roger Quadros , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kuniyuki Iwashima , linux-omap@vger.kernel.org X-Mailer: b4 0.14.2 Commit 1767bb2d47b7 ("ipv6: mcast: Don't hold RTNL for IPV6_ADD_MEMBERSHIP and MCAST_JOIN_GROUP") removed the RTNL lock for IPV6_ADD_MEMBERSHIP and MCAST_JOIN_GROUP operations. However, this change triggered the following call trace on my BeagleBone Black board: WARNING: net/8021q/vlan_core.c:236 at vlan_for_each+0x120/0x124, CPU#0: rpcbind/496 RTNL: assertion failed at net/8021q/vlan_core.c (236) Modules linked in: CPU: 0 UID: 997 PID: 496 Comm: rpcbind Not tainted 6.19.0-rc6-next-20260122-yocto-standard+ #8 PREEMPT Hardware name: Generic AM33XX (Flattened Device Tree) Call trace: unwind_backtrace from show_stack+0x28/0x2c show_stack from dump_stack_lvl+0x30/0x38 dump_stack_lvl from __warn+0xb8/0x11c __warn from warn_slowpath_fmt+0x130/0x194 warn_slowpath_fmt from vlan_for_each+0x120/0x124 vlan_for_each from cpsw_add_mc_addr+0x54/0xd8 cpsw_add_mc_addr from __hw_addr_ref_sync_dev+0xc4/0xec __hw_addr_ref_sync_dev from __dev_mc_add+0x78/0x88 __dev_mc_add from igmp6_group_added+0x84/0xec igmp6_group_added from __ipv6_dev_mc_inc+0x1fc/0x2f0 __ipv6_dev_mc_inc from __ipv6_sock_mc_join+0x124/0x1b4 __ipv6_sock_mc_join from do_ipv6_setsockopt+0x84c/0x1168 do_ipv6_setsockopt from ipv6_setsockopt+0x88/0xc8 ipv6_setsockopt from do_sock_setsockopt+0xe8/0x19c do_sock_setsockopt from __sys_setsockopt+0x84/0xac __sys_setsockopt from ret_fast_syscall+0x0/0x5 This trace occurs because vlan_for_each() is called within cpsw_ndo_set_rx_mode(), which expects the RTNL lock to be held. Since modifying vlan_for_each() to operate without the RTNL lock is not straightforward, and because ndo_set_rx_mode() is invoked both with and without the RTNL lock across different code paths, simply adding rtnl_lock() in cpsw_ndo_set_rx_mode() is not a viable solution. To resolve this issue, we opt to execute the actual processing within a work queue, following the approach used by the icssg-prueth driver. Fixes: 1767bb2d47b7 ("ipv6: mcast: Don't hold RTNL for IPV6_ADD_MEMBERSHIP and MCAST_JOIN_GROUP.") Signed-off-by: Kevin Hao Cc: stable@vger.kernel.org --- Please note that the cpsw driver also has the same issue. If this resolution is acceptable, I will create another patch to fix the issue in cpsw. Cc: Siddharth Vadapalli Cc: Roger Quadros Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Kuniyuki Iwashima Cc: linux-omap@vger.kernel.org --- drivers/net/ethernet/ti/cpsw_new.c | 29 +++++++++++++++++++++++++++-- drivers/net/ethernet/ti/cpsw_priv.h | 2 ++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index ab88d4c02cbde76207f89cf433e2b383dcde6a83..786d64a952643927ad80d2effbb171dd87f91160 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -248,15 +248,20 @@ static int cpsw_purge_all_mc(struct net_device *ndev, const u8 *addr, int num) return 0; } -static void cpsw_ndo_set_rx_mode(struct net_device *ndev) +static void cpsw_ndo_set_rx_mode_work(struct work_struct *work) { - struct cpsw_priv *priv = netdev_priv(ndev); + struct cpsw_priv *priv = container_of(work, struct cpsw_priv, rx_mode_work); struct cpsw_common *cpsw = priv->cpsw; + struct net_device *ndev = priv->ndev; + rtnl_lock(); + netif_addr_lock_bh(ndev); if (ndev->flags & IFF_PROMISC) { /* Enable promiscuous mode */ cpsw_set_promiscious(ndev, true); cpsw_ale_set_allmulti(cpsw->ale, IFF_ALLMULTI, priv->emac_port); + netif_addr_unlock_bh(ndev); + rtnl_unlock(); return; } @@ -270,6 +275,16 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev) /* add/remove mcast address either for real netdev or for vlan */ __hw_addr_ref_sync_dev(&ndev->mc, ndev, cpsw_add_mc_addr, cpsw_del_mc_addr); + netif_addr_unlock_bh(ndev); + rtnl_unlock(); +} + +static void cpsw_ndo_set_rx_mode(struct net_device *ndev) +{ + struct cpsw_priv *priv = netdev_priv(ndev); + struct cpsw_common *cpsw = priv->cpsw; + + queue_work(cpsw->cmd_wq, &priv->rx_mode_work); } static unsigned int cpsw_rxbuf_total_len(unsigned int len) @@ -1398,6 +1413,7 @@ static int cpsw_create_ports(struct cpsw_common *cpsw) priv->msg_enable = netif_msg_init(debug_level, CPSW_DEBUG); priv->emac_port = i + 1; priv->tx_packet_min = CPSW_MIN_PACKET_SIZE; + INIT_WORK(&priv->rx_mode_work, cpsw_ndo_set_rx_mode_work); if (is_valid_ether_addr(slave_data->mac_addr)) { ether_addr_copy(priv->mac_addr, slave_data->mac_addr); @@ -1976,6 +1992,13 @@ static int cpsw_probe(struct platform_device *pdev) } cpsw_split_res(cpsw); + cpsw->cmd_wq = create_singlethread_workqueue("cpsw_cmd_wq"); + if (!cpsw->cmd_wq) { + dev_err(dev, "error initializing workqueue\n"); + ret = -ENOMEM; + goto clean_cpts; + } + /* setup netdevs */ ret = cpsw_create_ports(cpsw); if (ret) @@ -2042,6 +2065,7 @@ static int cpsw_probe(struct platform_device *pdev) clean_unregister_notifiers: cpsw_unregister_notifiers(cpsw); clean_unregister_netdev: + destroy_workqueue(cpsw->cmd_wq); cpsw_unregister_ports(cpsw); clean_cpts: cpts_release(cpsw->cpts); @@ -2068,6 +2092,7 @@ static void cpsw_remove(struct platform_device *pdev) return; } + destroy_workqueue(cpsw->cmd_wq); cpsw_unregister_notifiers(cpsw); cpsw_unregister_devlink(cpsw); cpsw_unregister_ports(cpsw); diff --git a/drivers/net/ethernet/ti/cpsw_priv.h b/drivers/net/ethernet/ti/cpsw_priv.h index 91add8925e235c6cf5542fde11f3383b9234c872..8cdf4bff198fcc05436ff381a7e4326b3e3c27b1 100644 --- a/drivers/net/ethernet/ti/cpsw_priv.h +++ b/drivers/net/ethernet/ti/cpsw_priv.h @@ -362,6 +362,7 @@ struct cpsw_common { struct net_device *hw_bridge_dev; bool ale_bypass; u8 base_mac[ETH_ALEN]; + struct workqueue_struct *cmd_wq; }; struct cpsw_ale_ratelimit { @@ -391,6 +392,7 @@ struct cpsw_priv { u32 tx_packet_min; struct cpsw_ale_ratelimit ale_bc_ratelimit; struct cpsw_ale_ratelimit ale_mc_ratelimit; + struct work_struct rx_mode_work; }; #define ndev_to_cpsw(ndev) (((struct cpsw_priv *)netdev_priv(ndev))->cpsw) --- base-commit: a0c666c25aeefd16f4b088c6549a6fb6b65a8a1d change-id: 20260123-bbb-dc3675f671d0 Best regards, -- Kevin Hao