Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: s/dev_set_threaded/netif_set_threaded/

Commit cc34acd577f1 ("docs: net: document new locking reality")
introduced netif_ vs dev_ function semantics: the former expects locked
netdev, the latter takes care of the locking. We don't strictly
follow this semantics on either side, but there are more dev_xxx handlers
now that don't fit. Rename them to netif_xxx where appropriate.

Note that one dev_set_threaded call still remains in mt76 for debugfs file.

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-7-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Stanislav Fomichev and committed by
Jakub Kicinski
5d4d8461 93893a57

+23 -10
+1 -1
Documentation/networking/net_cachelines/net_device.rst
··· 165 165 struct lock_class_key* qdisc_tx_busylock 166 166 bool proto_down 167 167 unsigned:1 wol_enabled 168 - unsigned:1 threaded napi_poll(napi_enable,dev_set_threaded) 168 + unsigned:1 threaded napi_poll(napi_enable,netif_set_threaded) 169 169 unsigned_long:1 see_all_hwtstamp_requests 170 170 unsigned_long:1 change_proto_down 171 171 unsigned_long:1 netns_immutable
+1 -1
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
··· 2688 2688 adapter->mii.mdio_write = atl1c_mdio_write; 2689 2689 adapter->mii.phy_id_mask = 0x1f; 2690 2690 adapter->mii.reg_num_mask = MDIO_CTRL_REG_MASK; 2691 - dev_set_threaded(netdev, true); 2691 + netif_set_threaded(netdev, true); 2692 2692 for (i = 0; i < adapter->rx_queue_count; ++i) 2693 2693 netif_napi_add(netdev, &adapter->rrd_ring[i].napi, 2694 2694 atl1c_clean_rx);
+1 -1
drivers/net/ethernet/mellanox/mlxsw/pci.c
··· 156 156 } 157 157 strscpy(mlxsw_pci->napi_dev_rx->name, "mlxsw_rx", 158 158 sizeof(mlxsw_pci->napi_dev_rx->name)); 159 - dev_set_threaded(mlxsw_pci->napi_dev_rx, true); 159 + netif_set_threaded(mlxsw_pci->napi_dev_rx, true); 160 160 161 161 return 0; 162 162
+1 -1
drivers/net/ethernet/renesas/ravb_main.c
··· 3075 3075 if (info->coalesce_irqs) { 3076 3076 netdev_sw_irq_coalesce_default_on(ndev); 3077 3077 if (num_present_cpus() == 1) 3078 - dev_set_threaded(ndev, true); 3078 + netif_set_threaded(ndev, true); 3079 3079 } 3080 3080 3081 3081 /* Network device register */
+1 -1
drivers/net/wireguard/device.c
··· 366 366 if (ret < 0) 367 367 goto err_free_handshake_queue; 368 368 369 - dev_set_threaded(dev, true); 369 + netif_set_threaded(dev, true); 370 370 ret = register_netdevice(dev); 371 371 if (ret < 0) 372 372 goto err_uninit_ratelimiter;
+1 -1
drivers/net/wireless/ath/ath10k/snoc.c
··· 936 936 937 937 bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX); 938 938 939 - dev_set_threaded(ar->napi_dev, true); 939 + netif_set_threaded(ar->napi_dev, true); 940 940 ath10k_core_napi_enable(ar); 941 941 /* IRQs are left enabled when we restart due to a firmware crash */ 942 942 if (!test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))
+1
include/linux/netdevice.h
··· 589 589 return napi_complete_done(n, 0); 590 590 } 591 591 592 + int netif_set_threaded(struct net_device *dev, bool threaded); 592 593 int dev_set_threaded(struct net_device *dev, bool threaded); 593 594 594 595 void napi_disable(struct napi_struct *n);
+3 -3
net/core/dev.c
··· 4798 4798 4799 4799 if (test_bit(NAPI_STATE_THREADED, &napi->state)) { 4800 4800 /* Paired with smp_mb__before_atomic() in 4801 - * napi_enable()/dev_set_threaded(). 4801 + * napi_enable()/netif_set_threaded(). 4802 4802 * Use READ_ONCE() to guarantee a complete 4803 4803 * read on napi->thread. Only call 4804 4804 * wake_up_process() when it's not NULL. ··· 6990 6990 return 0; 6991 6991 } 6992 6992 6993 - int dev_set_threaded(struct net_device *dev, bool threaded) 6993 + int netif_set_threaded(struct net_device *dev, bool threaded) 6994 6994 { 6995 6995 struct napi_struct *napi; 6996 6996 int err = 0; ··· 7031 7031 7032 7032 return err; 7033 7033 } 7034 - EXPORT_SYMBOL(dev_set_threaded); 7034 + EXPORT_SYMBOL(netif_set_threaded); 7035 7035 7036 7036 /** 7037 7037 * netif_queue_set_napi - Associate queue with the napi
+12
net/core/dev_api.c
··· 367 367 netdev_unlock_ops(dev); 368 368 } 369 369 EXPORT_SYMBOL(netdev_state_change); 370 + 371 + int dev_set_threaded(struct net_device *dev, bool threaded) 372 + { 373 + int ret; 374 + 375 + netdev_lock(dev); 376 + ret = netif_set_threaded(dev, threaded); 377 + netdev_unlock(dev); 378 + 379 + return ret; 380 + } 381 + EXPORT_SYMBOL(dev_set_threaded);
+1 -1
net/core/net-sysfs.c
··· 757 757 if (val != 0 && val != 1) 758 758 return -EOPNOTSUPP; 759 759 760 - ret = dev_set_threaded(dev, val); 760 + ret = netif_set_threaded(dev, val); 761 761 762 762 return ret; 763 763 }