From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
andrew+netdev@lunn.ch, horms@kernel.org, sdf@fomichev.me,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 03/11] net: constify dev pointer in misc instance lock helpers
Date: Wed, 12 Mar 2025 23:34:59 +0100 [thread overview]
Message-ID: <20250312223507.805719-4-kuba@kernel.org> (raw)
In-Reply-To: <20250312223507.805719-1-kuba@kernel.org>
lockdep asserts and predicates can operate on const pointers.
In the future this will let us add asserts in functions
which operate on const pointers like dev_get_min_mp_channel_count().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
include/net/netdev_lock.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/net/netdev_lock.h b/include/net/netdev_lock.h
index 99631fbd7f54..689ffdfae50d 100644
--- a/include/net/netdev_lock.h
+++ b/include/net/netdev_lock.h
@@ -11,19 +11,20 @@ static inline bool netdev_trylock(struct net_device *dev)
return mutex_trylock(&dev->lock);
}
-static inline void netdev_assert_locked(struct net_device *dev)
+static inline void netdev_assert_locked(const struct net_device *dev)
{
lockdep_assert_held(&dev->lock);
}
-static inline void netdev_assert_locked_or_invisible(struct net_device *dev)
+static inline void
+netdev_assert_locked_or_invisible(const struct net_device *dev)
{
if (dev->reg_state == NETREG_REGISTERED ||
dev->reg_state == NETREG_UNREGISTERING)
netdev_assert_locked(dev);
}
-static inline bool netdev_need_ops_lock(struct net_device *dev)
+static inline bool netdev_need_ops_lock(const struct net_device *dev)
{
bool ret = dev->request_ops_lock || !!dev->queue_mgmt_ops;
@@ -46,7 +47,7 @@ static inline void netdev_unlock_ops(struct net_device *dev)
netdev_unlock(dev);
}
-static inline void netdev_ops_assert_locked(struct net_device *dev)
+static inline void netdev_ops_assert_locked(const struct net_device *dev)
{
if (netdev_need_ops_lock(dev))
lockdep_assert_held(&dev->lock);
--
2.48.1
next prev parent reply other threads:[~2025-03-12 22:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 22:34 [PATCH net-next 00/11] net: skip taking rtnl_lock for queue GET Jakub Kicinski
2025-03-12 22:34 ` [PATCH net-next 01/11] net: bubble up taking netdev instance lock to callers of net_devmem_unbind_dmabuf() Jakub Kicinski
2025-03-12 22:34 ` [PATCH net-next 02/11] net: remove netif_set_real_num_rx_queues() helper for when SYSFS=n Jakub Kicinski
2025-03-12 22:34 ` Jakub Kicinski [this message]
2025-03-12 22:35 ` [PATCH net-next 04/11] net: explain "protection types" for the instance lock Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 05/11] net: designate queue counts as "double ops protected" by " Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 06/11] net: designate queue -> napi linking as "ops protected" Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 07/11] net: protect rxq->mp_params with the instance lock Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 08/11] net: make NETDEV_UNREGISTER and instance lock more consistent Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 09/11] net: designate XSK pool pointers in queues as "ops protected" Jakub Kicinski
2025-03-13 8:28 ` Stanislav Fomichev
2025-03-19 21:51 ` Paolo Abeni
2025-03-12 22:35 ` [PATCH net-next 10/11] netdev: add "ops compat locking" helpers Jakub Kicinski
2025-03-12 22:35 ` [PATCH net-next 11/11] netdev: don't hold rtnl_lock over nl queue info get when possible Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250312223507.805719-4-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).