net: rename netdev_ops_assert_locked()

Jakub suggests renaming the existing assert to match
the netdev_lock_ops_compat() semantics.

We want netdev_assert_locked_ops() to mean - if the driver
is ops locked - check that it's holding the device lock.

The existing helper check for either ops lock or rtnl_lock,
which is the locking behavior of netdev_lock_ops_compat().

The reason for naming divergence is likely that
netdev_ops_assert_locked() predated the _compat() helpers.

Suggested-by: Jakub Sitnicki <jakub@cloudflare.com>
Reviewed-by: Nicolai Buchwitz <nb@tipi-net.de>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20260603012840.2254293-2-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3587f39202d2788f6981a7dede4370c9578a4036..2402cc865e76b175b03b3e2b6950c52833581bb9 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -16762,7 +16762,7 @@ int bnxt_restore_pf_fw_resources(struct bnxt *bp)
 {
        int rc;
 
-       netdev_ops_assert_locked(bp->dev);
+       netdev_assert_locked_ops_compat(bp->dev);
        bnxt_hwrm_func_qcaps(bp);
 
        if (netif_running(bp->dev))

diff --git a/include/net/netdev_lock.h b/include/net/netdev_lock.h
index 3d3aef80beac18c07855944d2ed6e4ed17fcf2c5..8e84d29b0bfb001bf12b08be9bb7216c1c8baf0c 100644 (file)
--- a/include/net/netdev_lock.h
+++ b/include/net/netdev_lock.h
@@ -64,7 +64,7 @@ static inline void netdev_unlock_full_to_ops(struct net_device *dev)
                netdev_unlock(dev);
 }
 
-static inline void netdev_ops_assert_locked(const struct net_device *dev)
+static inline void netdev_assert_locked_ops_compat(const struct net_device *dev)
 {
        if (netdev_need_ops_lock(dev))
                lockdep_assert_held(&dev->lock);
@@ -73,11 +73,11 @@ static inline void netdev_ops_assert_locked(const struct net_device *dev)
 }
 
 static inline void
-netdev_ops_assert_locked_or_invisible(const struct net_device *dev)
+netdev_assert_locked_ops_compat_or_invisible(const struct net_device *dev)
 {
        if (dev->reg_state == NETREG_REGISTERED ||
            dev->reg_state == NETREG_UNREGISTERING)
-               netdev_ops_assert_locked(dev);
+               netdev_assert_locked_ops_compat(dev);
 }
 
 static inline void netdev_lock_ops_compat(struct net_device *dev)

diff --git a/net/core/dev.c b/net/core/dev.c
index 804e8ad25010ea66a5ddb2777c3ed09ee545dc1f..1ecd5691992ea46634fd869bd9e278b254fea1e6 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1593,7 +1593,7 @@ EXPORT_SYMBOL(netdev_features_change);
 
 void netif_state_change(struct net_device *dev)
 {
-       netdev_ops_assert_locked_or_invisible(dev);
+       netdev_assert_locked_ops_compat_or_invisible(dev);
 
        if (dev->flags & IFF_UP) {
                struct netdev_notifier_change_info change_info = {
@@ -1693,7 +1693,7 @@ static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
 
        set_bit(__LINK_STATE_START, &dev->state);
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (ops->ndo_validate_addr)
                ret = ops->ndo_validate_addr(dev);
@@ -1770,7 +1770,7 @@ static void __dev_close_many(struct list_head *head)
                 *      event.
                 */
 
-               netdev_ops_assert_locked(dev);
+               netdev_assert_locked_ops_compat(dev);
 
                if (ops->ndo_stop)
                        ops->ndo_stop(dev);
@@ -3198,7 +3198,7 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
 
        if (dev->reg_state == NETREG_REGISTERED ||
            dev->reg_state == NETREG_UNREGISTERING) {
-               netdev_ops_assert_locked(dev);
+               netdev_assert_locked_ops_compat(dev);
 
                rc = netdev_queue_update_kobjects(dev, dev->real_num_tx_queues,
                                                  txq);
@@ -3247,7 +3247,7 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq)
                return -EINVAL;
 
        if (dev->reg_state == NETREG_REGISTERED) {
-               netdev_ops_assert_locked(dev);
+               netdev_assert_locked_ops_compat(dev);
 
                rc = net_rx_queue_update_kobjects(dev, dev->real_num_rx_queues,
                                                  rxq);
@@ -7294,7 +7294,7 @@ void netif_queue_set_napi(struct net_device *dev, unsigned int queue_index,
 
        if (WARN_ON_ONCE(napi && !napi->dev))
                return;
-       netdev_ops_assert_locked_or_invisible(dev);
+       netdev_assert_locked_ops_compat_or_invisible(dev);
 
        switch (type) {
        case NETDEV_QUEUE_TYPE_RX:
@@ -9589,7 +9589,7 @@ int __dev_set_promiscuity(struct net_device *dev, int inc, bool notify)
        kuid_t uid;
        kgid_t gid;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        promiscuity = dev->promiscuity + inc;
        if (promiscuity == 0) {
@@ -9648,7 +9648,7 @@ int netif_set_allmulti(struct net_device *dev, int inc, bool notify)
        unsigned int old_flags = dev->flags, old_gflags = dev->gflags;
        unsigned int allmulti, flags;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        allmulti = dev->allmulti + inc;
        if (allmulti == 0) {
@@ -9716,7 +9716,7 @@ int __dev_change_flags(struct net_device *dev, unsigned int flags,
        unsigned int old_flags = dev->flags;
        int ret;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        /*
         *      Set the flags on our device.
@@ -9864,7 +9864,7 @@ int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
 {
        int err, orig_mtu;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (new_mtu == dev->mtu)
                return 0;
@@ -10317,7 +10317,7 @@ static int dev_xdp_install(struct net_device *dev, enum bpf_xdp_mode mode,
        struct netdev_bpf xdp;
        int err;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (dev->cfg->hds_config == ETHTOOL_TCP_DATA_SPLIT_ENABLED &&
            prog && !prog->aux->xdp_has_frags) {
@@ -10769,7 +10769,7 @@ u32 dev_get_min_mp_channel_count(const struct net_device *dev)
 {
        int i;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        for (i = dev->real_num_rx_queues - 1; i >= 0; i--)
                if (dev->_rx[i].mp_params.mp_priv)
@@ -10997,7 +10997,7 @@ int __netdev_update_features(struct net_device *dev)
        int err = -1;
 
        ASSERT_RTNL();
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        features = netdev_get_wanted_features(dev);
 

diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index d73fcb0c678530d90f808f0c28c815d0332982fc..6b493af8dc8be363f87fd66b764649997ac73915 100644 (file)
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -1260,7 +1260,7 @@ static void netif_rx_mode_run(struct net_device *dev)
        int err;
 
        might_sleep();
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        __hw_addr_init(&uc_snap);
        __hw_addr_init(&mc_snap);

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index ff2c1d4538efbc89cd49d8d8477542a6e7bacbad..9c35aac8b2e98e9d06e79f76060fb2383215ffb9 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -277,7 +277,7 @@ static bool linkwatch_clean_dev(struct net_device *dev)
 
 void __linkwatch_sync_dev(struct net_device *dev)
 {
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (linkwatch_clean_dev(dev)) {
                linkwatch_do_dev(dev);

diff --git a/net/core/lock_debug.c b/net/core/lock_debug.c
index 9e9fb25314b9c3cffbd66b6714b95b2d03e021ec..14fd8fcdcd562a946b8c0d14c57afc5a4fed9b2f 100644 (file)
--- a/net/core/lock_debug.c
+++ b/net/core/lock_debug.c
@@ -24,7 +24,7 @@ int netdev_debug_event(struct notifier_block *nb, unsigned long event,
        case NETDEV_CHANGE:
        case NETDEV_REGISTER:
        case NETDEV_UP:
-               netdev_ops_assert_locked(dev);
+               netdev_assert_locked_ops_compat(dev);
                fallthrough;
        case NETDEV_DOWN:
        case NETDEV_REBOOT:

diff --git a/net/core/netdev_queues.c b/net/core/netdev_queues.c
index 73fb28087a93d651084c4ccbc099b4b8e3d06838..4d6864bb4f6bc92387b9687776b9ea1f36a55b54 100644 (file)
--- a/net/core/netdev_queues.c
+++ b/net/core/netdev_queues.c
@@ -40,7 +40,7 @@ struct device *netdev_queue_get_dma_dev(struct net_device *dev,
        struct netdev_rx_queue *hw_rxq;
        struct device *dma_dev;
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        /* Only RX side supports queue leasing today. */
        if (type != NETDEV_QUEUE_TYPE_RX || !netif_rxq_is_leased(dev, idx))

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 6cbd13b61bd184a5dab40e20895a71ff95367724..25e22c48060a076ea6377e199d41a3c34798d5cf 100644 (file)
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -98,7 +98,7 @@ int ethnl_ops_begin(struct net_device *dev)
        if (dev->dev.parent)
                pm_runtime_get_sync(dev->dev.parent);
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (!netif_device_present(dev) ||
            dev->reg_state >= NETREG_UNREGISTERING) {
@@ -1005,7 +1005,7 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd,
                       ops->req_info_size - sizeof(*req_info));
        }
 
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        ethnl_init_reply_data(reply_data, ops, dev);
        ret = ops->prepare_data(req_info, reply_data, &info);

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index f5a93155e7eb3239cafe57c058b28083d7b2fac6..af3a0e94773c74fb46d9e6e577f8b354ff961612 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -380,7 +380,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)
        int err = -ENOMEM;
 
        ASSERT_RTNL();
-       netdev_ops_assert_locked(dev);
+       netdev_assert_locked_ops_compat(dev);
 
        if (dev->mtu < IPV6_MIN_MTU && dev != blackhole_netdev)
                return ERR_PTR(-EINVAL);

diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index d981cfdd85357823135fa1a68aefd9273156579d..1f28a9641571e470a8f56017d8d08eae1700dddf 100644 (file)
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -239,7 +239,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool,
        bpf.xsk.pool = pool;
        bpf.xsk.queue_id = queue_id;
 
-       netdev_ops_assert_locked(netdev);
+       netdev_assert_locked_ops_compat(netdev);
        err = netdev->netdev_ops->ndo_bpf(netdev, &bpf);
        if (err)
                goto err_unreg_pool;