Commit e07ba344 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-maintain-netif-vs-dev-prefix-semantics' 

Stanislav Fomichev says:

====================
net: maintain netif vs dev prefix semantics

Commit cc34acd5 ("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. We care only
about driver-visible APIs, don't touch stack-internal routines.

The rest seem to be ok:
  * dev_xdp_prog_count - mostly called by sw drivers (bonding), should not matter
  * dev_get_by_xxx - too many to reasonably cleanup, already have different flavors
  * dev_fetch_sw_netstats - don't need instance lock
  * dev_get_tstats64 - never called directly, only as an ndo callback
  * dev_pick_tx_zero - never called directly, only as an ndo callback
  * dev_add_pack / dev_remove_pack - called early enough (in module init) to not matter
  * dev_get_iflink - mostly called by sw drivers, should not matter
  * dev_fill_forward_path - ditto
  * dev_getbyhwaddr_rcu - ditto
  * dev_getbyhwaddr - ditto
  * dev_getfirstbyhwtype - ditto
  * dev_valid_name - ditto
  * __dev_forward_skb dev_forward_skb dev_queue_xmit_nit - established helpers, no netif vs dev distinction
====================

Link: https://patch.msgid.link/20250717172333.1288349-1-sdf@fomichev.me


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 25250f40 88d3cec2

Documentation/networking/net_cachelines/net_device.rst

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct sfp_bus* sfp_bus 
struct lock_class_key*              qdisc_tx_busylock

bool                                proto_down

unsigned:1                          wol_enabled

unsigned:1                          threaded                                                            napi_poll(napi_enable,dev_set_threaded)

unsigned:1                          threaded                                                            napi_poll(napi_enable,netif_set_threaded)

unsigned_long:1                     see_all_hwtstamp_requests

unsigned_long:1                     change_proto_down

unsigned_long:1                     netns_immutable

drivers/infiniband/sw/rxe/rxe_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int rxe_query_port(struct ib_device *ibdev, 
	attr->state = ib_get_curr_port_state(ndev);

	if (attr->state == IB_PORT_ACTIVE)

		attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP;

	else if (dev_get_flags(ndev) & IFF_UP)

	else if (netif_get_flags(ndev) & IFF_UP)

		attr->phys_state = IB_PORT_PHYS_STATE_POLLING;

	else

		attr->phys_state = IB_PORT_PHYS_STATE_DISABLED;

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int bond_set_dev_addr(struct net_device *bond_dev, 


	slave_dbg(bond_dev, slave_dev, "bond_dev=%p slave_dev=%p slave_dev->addr_len=%d\n",

		  bond_dev, slave_dev, slave_dev->addr_len);

	err = dev_pre_changeaddr_notify(bond_dev, slave_dev->dev_addr, NULL);

	err = netif_pre_changeaddr_notify(bond_dev, slave_dev->dev_addr, NULL);

	if (err)

		return err;
@@ -2669,7 +2669,7 @@ static int __bond_release_one(struct net_device *bond_dev, 


	if (unregister) {

		netdev_lock_ops(slave_dev);

		__dev_set_mtu(slave_dev, slave->original_mtu);

		__netif_set_mtu(slave_dev, slave->original_mtu);

		netdev_unlock_ops(slave_dev);

	} else {

		dev_set_mtu(slave_dev, slave->original_mtu);
@@ -6743,3 +6743,4 @@ module_exit(bonding_exit); 
MODULE_LICENSE("GPL");

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR("Thomas Davis, tadavis@lbl.gov and many others");

MODULE_IMPORT_NS("NETDEV_INTERNAL");

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2688,7 +2688,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adapter->mii.mdio_write = atl1c_mdio_write;

	adapter->mii.phy_id_mask = 0x1f;

	adapter->mii.reg_num_mask = MDIO_CTRL_REG_MASK;

	dev_set_threaded(netdev, true);

	netif_set_threaded(netdev, true);

	for (i = 0; i < adapter->rx_queue_count; ++i)

		netif_napi_add(netdev, &adapter->rrd_ring[i].napi,

			       atl1c_clean_rx);

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −1
Original line number Diff line number Diff line
@@ -4967,7 +4967,7 @@ void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev) 
		list_add_tail(&dev->close_list, &dev_list);

	}



	dev_close_many(&dev_list, false);

	netif_close_many(&dev_list, false);



	eth->dma_dev = dma_dev;
@@ -5610,3 +5610,4 @@ module_platform_driver(mtk_driver); 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");

MODULE_DESCRIPTION("Ethernet driver for MediaTek SoC");

MODULE_IMPORT_NS("NETDEV_INTERNAL");