History

inet: add net device refcount tracker to struct fib_nh_common

Eric Dumazet committed 4 years ago

Commit e44b14e1 parent 4fc003f3 files · +11 −5Browse files

Unified · Split

3 files
  1. include/net/ip_fib.h +2 −0
  2. net/ipv4/fib_semantics.c +7 −5
  3. net/ipv6/route.c +2 −0
include/net/ip_fib.h+2−0
@@ -79,6 +79,7 @@ struct fnhe_hash_bucket { · 78 unmodified lines
7979
8080 struct fib_nh_common {
8181 struct net_device *nhc_dev;
82+ netdevice_tracker nhc_dev_tracker;
8283 int nhc_oif;
8384 unsigned char nhc_scope;
8485 u8 nhc_family;
@@ -111,6 +112,7 @@ struct fib_nh { · 26 unmodified lines
111112 int nh_saddr_genid;
112113 #define fib_nh_family nh_common.nhc_family
113114 #define fib_nh_dev nh_common.nhc_dev
115+#define fib_nh_dev_tracker nh_common.nhc_dev_tracker
114116 #define fib_nh_oif nh_common.nhc_oif
115117 #define fib_nh_flags nh_common.nhc_flags
116118 #define fib_nh_lws nh_common.nhc_lwtstate
net/ipv4/fib_semantics.c+7−5
@@ -208,7 +208,7 @@ static void rt_fibinfo_free_cpus(struct rtable __rcu * __percpu *rtp) · 207 unmodified lines
208208
209209 void fib_nh_common_release(struct fib_nh_common *nhc)
210210 {
211− dev_put(nhc->nhc_dev);
211+ dev_put_track(nhc->nhc_dev, &nhc->nhc_dev_tracker);
212212 lwtstate_put(nhc->nhc_lwtstate);
213213 rt_fibinfo_free_cpus(nhc->nhc_pcpu_rth_output);
214214 rt_fibinfo_free(&nhc->nhc_rth_input);
@@ -1006,7 +1006,7 @@ static int fib_check_nh_v6_gw(struct net *net, struct fib_nh *nh, · 791 unmodified lines
10061006 err = ipv6_stub->fib6_nh_init(net, &fib6_nh, &cfg, GFP_KERNEL, extack);
10071007 if (!err) {
10081008 nh->fib_nh_dev = fib6_nh.fib_nh_dev;
1009− dev_hold(nh->fib_nh_dev);
1009+ dev_hold_track(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, GFP_KERNEL);
10101010 nh->fib_nh_oif = nh->fib_nh_dev->ifindex;
10111011 nh->fib_nh_scope = RT_SCOPE_LINK;
10121012
@@ -1090,7 +1090,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table, · 77 unmodified lines
10901090 if (!netif_carrier_ok(dev))
10911091 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
10921092 nh->fib_nh_dev = dev;
1093− dev_hold(dev);
1093+ dev_hold_track(dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
10941094 nh->fib_nh_scope = RT_SCOPE_LINK;
10951095 return 0;
10961096 }
@@ -1144,7 +1144,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table, · 47 unmodified lines
11441144 "No egress device for nexthop gateway");
11451145 goto out;
11461146 }
1147− dev_hold(dev);
1147+ dev_hold_track(dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
11481148 if (!netif_carrier_ok(dev))
11491149 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
11501150 err = (dev->flags & IFF_UP) ? 0 : -ENETDOWN;
@@ -1178,7 +1178,7 @@ static int fib_check_nh_nongw(struct net *net, struct fib_nh *nh, · 27 unmodified lines
11781178 }
11791179
11801180 nh->fib_nh_dev = in_dev->dev;
1181− dev_hold(nh->fib_nh_dev);
1181+ dev_hold_track(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
11821182 nh->fib_nh_scope = RT_SCOPE_HOST;
11831183 if (!netif_carrier_ok(nh->fib_nh_dev))
11841184 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
@@ -1508,6 +1508,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg, · 323 unmodified lines
15081508 err = -ENODEV;
15091509 if (!nh->fib_nh_dev)
15101510 goto failure;
1511+ netdev_tracker_alloc(nh->fib_nh_dev, &nh->fib_nh_dev_tracker,
1512+ GFP_KERNEL);
15111513 } else {
15121514 int linkdown = 0;
15131515
net/ipv6/route.c+2−0
@@ -3628,6 +3628,8 @@ pcpu_alloc: · 3627 unmodified lines
36283628 }
36293629
36303630 fib6_nh->fib_nh_dev = dev;
3631+ netdev_tracker_alloc(dev, &fib6_nh->fib_nh_dev_tracker, gfp_flags);
3632+
36313633 fib6_nh->fib_nh_oif = dev->ifindex;
36323634 err = 0;
36333635 out:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t