[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250207-arm_fix_selftest-v1-1-487518d2fd1c@debian.org>
Date: Fri, 07 Feb 2025 04:11:34 -0800
From: Breno Leitao <leitao@...ian.org>
To: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>
Cc: linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
kernel-team@...a.com, kuniyu@...zon.com, ushankar@...estorage.com,
Breno Leitao <leitao@...ian.org>
Subject: [PATCH RFC net-next] net: Add dev_getbyhwaddr_rtnl() helper
Add dedicated helper for finding devices by hardware address when
holding RTNL, similar to existing dev_getbyhwaddr_rcu(). This prevents
PROVE_LOCKING warnings when RTNL is held but RCU read lock is not.
Extract common address comparison logic into dev_comp_addr().
The context about this change could be found in the following
discussion:
Link: https://lore.kernel.org/all/20250206-scarlet-ermine-of-improvement-1fcac5@leitao/
Cc: kuniyu@...zon.com
Cc: ushankar@...estorage.com
Suggested-by: Eric Dumazet <edumazet@...gle.com>
Signed-off-by: Breno Leitao <leitao@...ian.org>
---
net/core/dev.c | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c41d1e1cbf62e0c5778c472cdb947b6f140f6064..75f0c533ff10e7188aa55345cd8140b88a7d09ca 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1121,6 +1121,16 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
return ret;
}
+static bool dev_comp_addr(struct net_device *dev,
+ unsigned short type,
+ const char *ha)
+{
+ if (dev->type == type && !memcmp(dev->dev_addr, ha, dev->addr_len))
+ return true;
+
+ return false;
+}
+
/**
* dev_getbyhwaddr_rcu - find a device by its hardware address
* @net: the applicable net namespace
@@ -1129,7 +1139,7 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
*
* Search for an interface by MAC address. Returns NULL if the device
* is not found or a pointer to the device.
- * The caller must hold RCU or RTNL.
+ * The caller must hold RCU.
* The returned device has not had its ref count increased
* and the caller must therefore be careful about locking
*
@@ -1141,14 +1151,37 @@ struct net_device *dev_getbyhwaddr_rcu(struct net *net, unsigned short type,
struct net_device *dev;
for_each_netdev_rcu(net, dev)
- if (dev->type == type &&
- !memcmp(dev->dev_addr, ha, dev->addr_len))
+ if (dev_comp_addr(dev, type, ha))
return dev;
return NULL;
}
EXPORT_SYMBOL(dev_getbyhwaddr_rcu);
+/**
+ * dev_getbyhwaddr_rtnl - find a device by its hardware address
+ * @net: the applicable net namespace
+ * @type: media type of device
+ * @ha: hardware address
+ *
+ * Similar to dev_getbyhwaddr_rcu(), but, the owner needs to hold
+ * RTNL.
+ *
+ */
+struct net_device *dev_getbyhwaddr_rtnl(struct net *net, unsigned short type,
+ const char *ha)
+{
+ struct net_device *dev;
+
+ ASSERT_RTNL();
+ for_each_netdev(net, dev)
+ if (dev_comp_addr(dev, type, ha))
+ return dev;
+
+ return NULL;
+}
+EXPORT_SYMBOL(dev_getbyhwaddr_rtnl);
+
struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
{
struct net_device *dev, *ret = NULL;
---
base-commit: 0d5248724ed8bc68c867c4c65dda625277f68fbc
change-id: 20250207-arm_fix_selftest-ee29dbc33a06
Best regards,
--
Breno Leitao <leitao@...ian.org>
Powered by blists - more mailing lists