net: rose: fix module unload issues
Subsystems (2)
cover net: rose: fix module unload issues
Bernard Pidoux reported that unloading rose module could lead to infamous "unregistered_netdevice:" issues.
First patch is the fix, stable candidate. Second patch is adding netdev ref tracker to af_rose.
I chose net-next to not inflict merge conflicts, because Jakub changed dev_put_track() to netdev_put_track() in net-next.
Eric Dumazet (2):
net: rose: fix netdev reference changes
net: rose: add netdev ref tracker to 'struct rose_sock'
include/net/rose.h | 3 ++- net/rose/af_rose.c | 17 +++++++++++++++-- net/rose/rose_route.c | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-)
Signature · 1 line
2.37.1.455.g008518b4e5-goog
PATCH 1/2 net: rose: fix netdev reference changes
Bernard reported that trying to unload rose module would lead to infamous messages:
unregistered_netdevice: waiting for rose0 to become free. Usage count = xx
This patch solves the issue, by making sure each socket referring to a netdevice holds a reference count on it, and properly releases it in rose_release().
rose_dev_first() is also fixed to take a device reference before leaving the rcu_read_locked section.
Following patch will add ref_tracker annotations to ease future bug hunting.
--- net/rose/af_rose.c | 11 +++++++++-- net/rose/rose_route.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-)
net/rose/af_rose.c +9 -2
@@ -192,6 +192,7 @@ static void rose_kill_by_device(struct net_device *dev)rose_disconnect (s,ENETUNREACH ,ROSE_OUT_OF_ORDER ,0 );if (rose->neighbour) rose->neighbour->use--; +dev_put (rose->device); rose->device =NULL ; } }
@@ -592,6 +593,8 @@ static struct sock *rose_make_new(struct sock *osk) rose->idle = orose->idle; rose->defer = orose->defer; rose->device = orose->device; +if (rose->device) +dev_hold (rose->device); rose->qbitincl = orose->qbitincl;return sk;
@@ -645,6 +648,7 @@ static int rose_release(struct socket *sock)break ; } +dev_put (rose->device); sock->sk =NULL ;release_sock (sk);sock_put (sk);
@@ -721,7 +725,6 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_lestruct rose_sock *rose =rose_sk (sk);struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;unsigned char cause, diagnostic; -struct net_device *dev;ax25_uid_assoc *user;int n, err =0 ;
@@ -778,9 +781,12 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le }if (sock_flag (sk,SOCK_ZAPPED )) {/* Must bind first - autobinding in this may or may not work */ +struct net_device *dev; +sock_reset_flag (sk,SOCK_ZAPPED ); -if ((dev =rose_dev_first ()) ==NULL ) { + dev =rose_dev_first (); +if (!dev) { err = -ENETUNREACH ; goto out_release; }
@@ -788,6 +794,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le user =ax25_findbyuid (current_euid ());if (!user) { err = -EINVAL ; +dev_put (dev); goto out_release; }
net/rose/rose_route.c +2 -0
@@ -615,6 +615,8 @@ struct net_device *rose_dev_first(void)if (first ==NULL ||strncmp (dev->name, first->name,3 ) <0 ) first = dev; } +if (first) +dev_hold (first);rcu_read_unlock ();return first;
Signature · 1 line
2.37.1.455.g008518b4e5-goog
PATCH 2/2 net: rose: add netdev ref tracker to 'struct rose_sock'
In reply to Eric DumazetThis will help debugging netdevice refcount problems with CONFIG_NET_DEV_REFCNT_TRACKER=y
--- include/net/rose.h | 3 ++- net/rose/af_rose.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
include/net/rose.h +2 -1
@@ -132,7 +132,8 @@ struct rose_sock {ax25_address source_digis[ROSE_MAX_DIGIS ];ax25_address dest_digis[ROSE_MAX_DIGIS ];struct rose_neigh *neighbour; -struct net_device *device; +struct net_device *device; +netdevice_tracker dev_tracker;unsigned int lci, rand;unsigned char state, condition, qbitincl, defer;unsigned char cause, diagnostic;
net/rose/af_rose.c +9 -3
@@ -192,7 +192,7 @@ static void rose_kill_by_device(struct net_device *dev)rose_disconnect (s,ENETUNREACH ,ROSE_OUT_OF_ORDER ,0 );if (rose->neighbour) rose->neighbour->use--; -dev_put (rose->device); +netdev_put (rose->device, &rose->dev_tracker); rose->device =NULL ; } }
@@ -594,7 +594,7 @@ static struct sock *rose_make_new(struct sock *osk) rose->defer = orose->defer; rose->device = orose->device;if (rose->device) -dev_hold (rose->device); +netdev_hold (rose->device, &rose->dev_tracker,GFP_ATOMIC ); rose->qbitincl = orose->qbitincl;return sk;
@@ -648,7 +648,7 @@ static int rose_release(struct socket *sock)break ; } -dev_put (rose->device); +netdev_put (rose->device, &rose->dev_tracker); sock->sk =NULL ;release_sock (sk);sock_put (sk);
@@ -700,6 +700,7 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) rose->source_addr = addr->srose_addr; rose->device = dev; +netdev_tracker_alloc (rose->device, &rose->dev_tracker,GFP_KERNEL ); rose->source_ndigis = addr->srose_ndigis;if (addr_len ==sizeof (struct full_sockaddr_rose )) {
@@ -801,6 +802,8 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_lememcpy (&rose->source_addr, dev->dev_addr,ROSE_ADDR_LEN ); rose->source_call = user->call; rose->device = dev; +netdev_tracker_alloc (rose->device, &rose->dev_tracker, +GFP_KERNEL );ax25_uid_put (user);rose_insert_socket (sk);/* Finish the bind */
@@ -1024,6 +1027,9 @@ int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct ros make_rose->source_digis[n] = facilities.source_digis[n]; make_rose->neighbour = neigh; make_rose->device = dev; +/* Caller got a reference for us. */ +netdev_tracker_alloc (make_rose->device, &make_rose->dev_tracker, +GFP_ATOMIC ); make_rose->facilities = facilities; make_rose->neighbour->use++;
Signature · 1 line
2.37.1.455.g008518b4e5-goog
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Fri, 29 Jul 2022 09:12:31 +0000 you wrote:
Bernard Pidoux reported that unloading rose module could lead to infamous "
unregistered_netdevice:" issues.First patch is the fix, stable candidate. Second patch is adding netdev ref tracker to
af_rose.I chose net-next to not inflict merge conflicts, because Jakub changed
dev_put_track()tonetdev_put_track()in net-next.[...]
Here is the summary with links:
- [net-next,1/2] net: rose: fix netdev reference changes
https://git.kernel.org/netdev/net-next/c/931027820e4d - [net-next,2/2] net: rose: add netdev ref tracker to 'struct rose_sock' https://git.kernel.org/netdev/net-next/c/2df91e397d85
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html