summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPaolo Abeni2024-10-29 11:55:28 +0100
committerPaolo Abeni2024-10-29 11:55:29 +0100
commitdd1b082f015317091034bee815b97d911d7a2195 (patch)
treee6bb3dcd48a5665699fb5dcf4825407a5e3f518b /include/linux
parentab101c553bc1f76a839163d1dc0d1e715ad6bb4e (diff)
parent7ed8da17bfb2b033e42afa842ca22641821e231c (diff)
Merge branch 'ipv4-convert-rtm_-new-del-addr-and-more-to-per-netns-rtnl'
Kuniyuki Iwashima says: ==================== ipv4: Convert RTM_{NEW,DEL}ADDR and more to per-netns RTNL. The IPv4 address hash table and GC are already namespacified. This series converts RTM_NEWADDR/RTM_DELADDR and some more RTNL users to per-netns RTNL. Changes: v2: * Add patch 1 to address sparse warning for CONFIG_DEBUG_NET_SMALL_RTNL=n * Add Eric's tags to patch 2-12 v1: https://lore.kernel.org/netdev/20241018012225.90409-1-kuniyu@amazon.com/ ==================== Link: https://patch.msgid.link/20241021183239.79741-1-kuniyu@amazon.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/inetdevice.h9
-rw-r--r--include/linux/rtnetlink.h25
2 files changed, 20 insertions, 14 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index d9c690c8c80b..5730ba6b1cfa 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -226,6 +226,10 @@ static __inline__ bool bad_mask(__be32 mask, __be32 addr)
for (ifa = rtnl_dereference((in_dev)->ifa_list); ifa; \
ifa = rtnl_dereference(ifa->ifa_next))
+#define in_dev_for_each_ifa_rtnl_net(net, ifa, in_dev) \
+ for (ifa = rtnl_net_dereference(net, (in_dev)->ifa_list); ifa; \
+ ifa = rtnl_net_dereference(net, ifa->ifa_next))
+
#define in_dev_for_each_ifa_rcu(ifa, in_dev) \
for (ifa = rcu_dereference((in_dev)->ifa_list); ifa; \
ifa = rcu_dereference(ifa->ifa_next))
@@ -252,6 +256,11 @@ static inline struct in_device *__in_dev_get_rtnl(const struct net_device *dev)
return rtnl_dereference(dev->ip_ptr);
}
+static inline struct in_device *__in_dev_get_rtnl_net(const struct net_device *dev)
+{
+ return rtnl_net_dereference(dev_net(dev), dev->ip_ptr);
+}
+
/* called with rcu_read_lock or rtnl held */
static inline bool ip_ignore_linkdown(const struct net_device *dev)
{
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 8468a4ce8510..14b88f551920 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -101,6 +101,7 @@ void __rtnl_net_lock(struct net *net);
void __rtnl_net_unlock(struct net *net);
void rtnl_net_lock(struct net *net);
void rtnl_net_unlock(struct net *net);
+int rtnl_net_trylock(struct net *net);
int rtnl_net_lock_cmp_fn(const struct lockdep_map *a, const struct lockdep_map *b);
bool rtnl_net_is_locked(struct net *net);
@@ -132,26 +133,22 @@ static inline void rtnl_net_unlock(struct net *net)
rtnl_unlock();
}
-static inline void ASSERT_RTNL_NET(struct net *net)
-{
- ASSERT_RTNL();
-}
-
-static inline void *rcu_dereference_rtnl_net(struct net *net, void *p)
+static inline int rtnl_net_trylock(struct net *net)
{
- return rcu_dereference_rtnl(p);
+ return rtnl_trylock();
}
-static inline void *rtnl_net_dereference(struct net *net, void *p)
+static inline void ASSERT_RTNL_NET(struct net *net)
{
- return rtnl_dereference(p);
+ ASSERT_RTNL();
}
-static inline void *rcu_replace_pointer_rtnl_net(struct net *net,
- void *rp, void *p)
-{
- return rcu_replace_pointer_rtnl(rp, p);
-}
+#define rcu_dereference_rtnl_net(net, p) \
+ rcu_dereference_rtnl(p)
+#define rtnl_net_dereference(net, p) \
+ rtnl_dereference(p)
+#define rcu_replace_pointer_rtnl_net(net, rp, p) \
+ rcu_replace_pointer_rtnl(rp, p)
#endif
static inline struct netdev_queue *dev_ingress_queue(struct net_device *dev)