Commit f1d9268e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add net device refcount tracker to struct packet_type 



Most notable changes are in af_packet, tipc ones are trivial.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Jon Maloy <jmaloy@redhat.com>
Cc: Ying Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab8c83cf

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -2533,6 +2533,7 @@ struct packet_type { 
	__be16			type;	/* This is really htons(ether_type). */

	bool			ignore_outgoing;

	struct net_device	*dev;	/* NULL is wildcarded here	     */

	netdevice_tracker	dev_tracker;

	int			(*func) (struct sk_buff *,

					 struct net_device *,

					 struct packet_type *,

net/packet/af_packet.c

+11 −3
Original line number Diff line number Diff line
@@ -3109,7 +3109,7 @@ static int packet_release(struct socket *sock) 
	packet_cached_dev_reset(po);



	if (po->prot_hook.dev) {

		dev_put(po->prot_hook.dev);

		dev_put_track(po->prot_hook.dev, &po->prot_hook.dev_tracker);

		po->prot_hook.dev = NULL;

	}

	spin_unlock(&po->bind_lock);
@@ -3217,18 +3217,25 @@ static int packet_do_bind(struct sock *sk, const char *name, int ifindex, 
		WRITE_ONCE(po->num, proto);

		po->prot_hook.type = proto;



		dev_put_track(dev_curr, &po->prot_hook.dev_tracker);

		dev_curr = NULL;



		if (unlikely(unlisted)) {

			dev_put(dev);

			po->prot_hook.dev = NULL;

			WRITE_ONCE(po->ifindex, -1);

			packet_cached_dev_reset(po);

		} else {

			if (dev)

				netdev_tracker_alloc(dev,

						     &po->prot_hook.dev_tracker,

						     GFP_ATOMIC);

			po->prot_hook.dev = dev;

			WRITE_ONCE(po->ifindex, dev ? dev->ifindex : 0);

			packet_cached_dev_assign(po, dev);

		}

	}

	dev_put(dev_curr);

	dev_put_track(dev_curr, &po->prot_hook.dev_tracker);



	if (proto == 0 || !need_rehook)

		goto out_unlock;
@@ -4138,7 +4145,8 @@ static int packet_notifier(struct notifier_block *this, 
				if (msg == NETDEV_UNREGISTER) {

					packet_cached_dev_reset(po);

					WRITE_ONCE(po->ifindex, -1);

					dev_put(po->prot_hook.dev);

					dev_put_track(po->prot_hook.dev,

						      &po->prot_hook.dev_tracker);

					po->prot_hook.dev = NULL;

				}

				spin_unlock(&po->bind_lock);

net/tipc/bearer.c

+2 −2
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ int tipc_attach_loopback(struct net *net) 
	if (!dev)

		return -ENODEV;



	dev_hold(dev);

	dev_hold_track(dev, &tn->loopback_pt.dev_tracker, GFP_KERNEL);

	tn->loopback_pt.dev = dev;

	tn->loopback_pt.type = htons(ETH_P_TIPC);

	tn->loopback_pt.func = tipc_loopback_rcv_pkt;
@@ -800,7 +800,7 @@ void tipc_detach_loopback(struct net *net) 
	struct tipc_net *tn = tipc_net(net);



	dev_remove_pack(&tn->loopback_pt);

	dev_put(net->loopback_dev);

	dev_put_track(net->loopback_dev, &tn->loopback_pt.dev_tracker);

}



/* Caller should hold rtnl_lock to protect the bearer */