Skip to content

Commit 77a23b1

Browse files
edumazetkuba-moo
authored andcommitted
net: add net device refcount tracker to struct pneigh_entry
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 85662c9 commit 77a23b1

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/net/neighbour.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ struct pneigh_entry {
174174
struct pneigh_entry *next;
175175
possible_net_t net;
176176
struct net_device *dev;
177+
netdevice_tracker dev_tracker;
177178
u32 flags;
178179
u8 protocol;
179180
u8 key[];

net/core/neighbour.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -771,10 +771,10 @@ struct pneigh_entry * pneigh_lookup(struct neigh_table *tbl,
771771
write_pnet(&n->net, net);
772772
memcpy(n->key, pkey, key_len);
773773
n->dev = dev;
774-
dev_hold(dev);
774+
dev_hold_track(dev, &n->dev_tracker, GFP_KERNEL);
775775

776776
if (tbl->pconstructor && tbl->pconstructor(n)) {
777-
dev_put(dev);
777+
dev_put_track(dev, &n->dev_tracker);
778778
kfree(n);
779779
n = NULL;
780780
goto out;
@@ -806,7 +806,7 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey,
806806
write_unlock_bh(&tbl->lock);
807807
if (tbl->pdestructor)
808808
tbl->pdestructor(n);
809-
dev_put(n->dev);
809+
dev_put_track(n->dev, &n->dev_tracker);
810810
kfree(n);
811811
return 0;
812812
}
@@ -839,7 +839,7 @@ static int pneigh_ifdown_and_unlock(struct neigh_table *tbl,
839839
n->next = NULL;
840840
if (tbl->pdestructor)
841841
tbl->pdestructor(n);
842-
dev_put(n->dev);
842+
dev_put_track(n->dev, &n->dev_tracker);
843843
kfree(n);
844844
}
845845
return -ENOENT;

0 commit comments

Comments
 (0)