Commit 2df91e39 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: rose: add netdev ref tracker to 'struct rose_sock' 



This will help debugging netdevice refcount problems with
CONFIG_NET_DEV_REFCNT_TRACKER=y

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Tested-by: Bernard Pidoux <f6bvp@free.fr>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 93102782

include/net/rose.h

+2 −1
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct rose_sock { 
	ax25_address		dest_digis[ROSE_MAX_DIGIS];

	struct rose_neigh	*neighbour;

	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
Original line number Diff line number Diff line
@@ -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_le 
		memcpy(&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++;