diff options
| author |   Eric Dumazet <edumazet@google.com> | 2021-12-04 20:22:17 -0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-12-06 16:06:02 -0800 |
| commit | 5fa5ae605821e0e10ee489d9a6e331fd287ccc57 (patch) | |
| tree | 54ecbe3957c2a4ea0edf2134b2a7272546fdd9ce | |
| parent | ipmr, ip6mr: add net device refcount tracker to struct vif_device (diff) | |
| download | linux-dev-5fa5ae605821e0e10ee489d9a6e331fd287ccc57.tar.xz linux-dev-5fa5ae605821e0e10ee489d9a6e331fd287ccc57.zip | |
netpoll: add net device refcount tracker to struct netpoll
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/netconsole.c | 2 | ||||
| -rw-r--r-- | include/linux/netpoll.h | 1 | ||||
| -rw-r--r-- | net/core/netpoll.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index ccecba908ded..ab8cd5551020 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -721,7 +721,7 @@ restart: __netpoll_cleanup(&nt->np); spin_lock_irqsave(&target_list_lock, flags); - dev_put(nt->np.dev); + dev_put_track(nt->np.dev, &nt->np.dev_tracker); nt->np.dev = NULL; nt->enabled = false; stopped = true; diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index e6a2d72e0dc7..bd19c4b91e31 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -24,6 +24,7 @@ union inet_addr { struct netpoll { struct net_device *dev; + netdevice_tracker dev_tracker; char dev_name[IFNAMSIZ]; const char *name; diff --git a/net/core/netpoll.c b/net/core/netpoll.c index edfc0f8011f8..db724463e7cd 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -776,7 +776,7 @@ put_noaddr: err = __netpoll_setup(np, ndev); if (err) goto put; - + netdev_tracker_alloc(ndev, &np->dev_tracker, GFP_KERNEL); rtnl_unlock(); return 0; @@ -853,7 +853,7 @@ void netpoll_cleanup(struct netpoll *np) if (!np->dev) goto out; __netpoll_cleanup(np); - dev_put(np->dev); + dev_put_track(np->dev, &np->dev_tracker); np->dev = NULL; out: rtnl_unlock(); |