diff options
| author |   Eric Dumazet <edumazet@google.com> | 2021-12-04 20:22:12 -0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-12-06 16:05:11 -0800 |
| commit | c04438f58d140723e58050fcb9d33d84cb39e9e9 (patch) | |
| tree | 776866202b6b1eebc771ab7c2e5b4c23e35c4903 | |
| parent | ipv6: add net device refcount tracker to struct inet6_dev (diff) | |
| download | wireguard-linux-c04438f58d140723e58050fcb9d33d84cb39e9e9.tar.xz wireguard-linux-c04438f58d140723e58050fcb9d33d84cb39e9e9.zip | |
ipv4: add net device refcount tracker to struct in_device
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/linux/inetdevice.h | 2 | ||||
| -rw-r--r-- | net/ipv4/devinet.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index 518b484a7f07..674aeead6260 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -24,6 +24,8 @@ struct ipv4_devconf { struct in_device { struct net_device *dev; + netdevice_tracker dev_tracker; + refcount_t refcnt; int dead; struct in_ifaddr __rcu *ifa_list;/* IP ifaddr chain */ diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 323e622ff9b7..fba2bffd65f7 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -243,7 +243,7 @@ void in_dev_finish_destroy(struct in_device *idev) #ifdef NET_REFCNT_DEBUG pr_debug("%s: %p=%s\n", __func__, idev, dev ? dev->name : "NIL"); #endif - dev_put(dev); + dev_put_track(dev, &idev->dev_tracker); if (!idev->dead) pr_err("Freeing alive in_device %p\n", idev); else @@ -271,7 +271,7 @@ static struct in_device *inetdev_init(struct net_device *dev) if (IPV4_DEVCONF(in_dev->cnf, FORWARDING)) dev_disable_lro(dev); /* Reference in_dev->dev */ - dev_hold(dev); + dev_hold_track(dev, &in_dev->dev_tracker, GFP_KERNEL); /* Account for reference dev->ip_ptr (below) */ refcount_set(&in_dev->refcnt, 1); |