| Message ID | 20250104082149.48493-2-kuniyu@amazon.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7bd72a4aa226c3ef752bcd6b33c54f6e85efcc60 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1,net-next,1/2] rtnetlink: Add rtnl_net_lock_killable(). | expand |
On Sat, Jan 4, 2025 at 9:22 AM Kuniyuki Iwashima <kuniyu@amazon.com> wrote: > > rtnl_lock_killable() is used only in register_netdev() > and will be converted to per-netns RTNL. > > Let's unexport it and add the corresponding helper. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Eric Dumazet <edumazet@google.com>
Hello: This series was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Sat, 4 Jan 2025 17:21:48 +0900 you wrote: > rtnl_lock_killable() is used only in register_netdev() > and will be converted to per-netns RTNL. > > Let's unexport it and add the corresponding helper. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> > > [...] Here is the summary with links: - [v1,net-next,1/2] rtnetlink: Add rtnl_net_lock_killable(). https://git.kernel.org/netdev/net-next/c/7bd72a4aa226 - [v1,net-next,2/2] dev: Hold per-netns RTNL in (un)?register_netdev(). https://git.kernel.org/netdev/net-next/c/00fb9823939e You are awesome, thank you!
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 3b9d132cbc9e..4bc2ee0b10b0 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -102,6 +102,7 @@ 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_killable(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); @@ -138,6 +139,11 @@ static inline int rtnl_net_trylock(struct net *net) return rtnl_trylock(); } +static inline int rtnl_net_lock_killable(struct net *net) +{ + return rtnl_lock_killable(); +} + static inline void ASSERT_RTNL_NET(struct net *net) { ASSERT_RTNL(); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 6b745096809d..1f4d4b5570ab 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -84,7 +84,6 @@ int rtnl_lock_killable(void) { return mutex_lock_killable(&rtnl_mutex); } -EXPORT_SYMBOL(rtnl_lock_killable); static struct sk_buff *defer_kfree_skb_list; void rtnl_kfree_skbs(struct sk_buff *head, struct sk_buff *tail) @@ -221,6 +220,16 @@ int rtnl_net_trylock(struct net *net) } EXPORT_SYMBOL(rtnl_net_trylock); +int rtnl_net_lock_killable(struct net *net) +{ + int ret = rtnl_lock_killable(); + + if (!ret) + __rtnl_net_lock(net); + + return ret; +} + static int rtnl_net_cmp_locks(const struct net *net_a, const struct net *net_b) { if (net_eq(net_a, net_b))
rtnl_lock_killable() is used only in register_netdev() and will be converted to per-netns RTNL. Let's unexport it and add the corresponding helper. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> --- include/linux/rtnetlink.h | 6 ++++++ net/core/rtnetlink.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)