]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: warn ops-locked drivers still using ndo_set_rx_mode
authorStanislav Fomichev <sdf.kernel@gmail.com>
Thu, 16 Apr 2026 18:57:10 +0000 (11:57 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 21 Apr 2026 10:50:25 +0000 (12:50 +0200)
Now that all in-tree ops-locked drivers have been converted to
ndo_set_rx_mode_async, add a warning in register_netdevice to catch
any remaining or newly added drivers that use ndo_set_rx_mode with
ops locking. This ensures future driver authors are guided toward
the async path.

Also route ops-locked devices through netdev_rx_mode_work even if they
lack rx_mode NDOs, to ensure netdev_ops_assert_locked() does not fire
on the legacy path where only RTNL is held.

Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20260416185712.2155425-14-sdf@fomichev.me
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/core/dev.c
net/core/dev_addr_lists.c

index 8a69aed56fcadbe5dc7913de10a4f6f7aa71bdce..d426c1beeb76f48e038a93a948c0819f924b04c3 100644 (file)
@@ -11360,6 +11360,11 @@ int register_netdevice(struct net_device *dev)
                goto err_uninit;
        }
 
+       if (netdev_need_ops_lock(dev) &&
+           dev->netdev_ops->ndo_set_rx_mode &&
+           !dev->netdev_ops->ndo_set_rx_mode_async)
+               netdev_WARN(dev, "ops-locked drivers should use ndo_set_rx_mode_async\n");
+
        ret = netdev_do_alloc_pcpu_stats(dev);
        if (ret)
                goto err_uninit;
index 4c9e8a69493f89be7cde8e3ac65ffe0a82eaa046..d73fcb0c678530d90f808f0c28c815d0332982fc 100644 (file)
@@ -1370,7 +1370,8 @@ void __dev_set_rx_mode(struct net_device *dev)
        if (!netif_device_present(dev))
                return;
 
-       if (ops->ndo_set_rx_mode_async || ops->ndo_change_rx_flags) {
+       if (ops->ndo_set_rx_mode_async || ops->ndo_change_rx_flags ||
+           netdev_need_ops_lock(dev)) {
                netif_rx_mode_queue(dev);
                return;
        }