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
79 79
80struct fib_nh_common {80struct fib_nh_common {
81 struct net_device *nhc_dev;81 struct net_device *nhc_dev;
82 netdevice_tracker nhc_dev_tracker;
82 int nhc_oif;83 int nhc_oif;
83 unsigned char nhc_scope;84 unsigned char nhc_scope;
84 u8 nhc_family;85 u8 nhc_family;
@@ -111,6 +112,7 @@ struct fib_nh { · 26 unmodified lines
111 int nh_saddr_genid;112 int nh_saddr_genid;
112#define fib_nh_family nh_common.nhc_family113#define fib_nh_family nh_common.nhc_family
113#define fib_nh_dev nh_common.nhc_dev114#define fib_nh_dev nh_common.nhc_dev
115#define fib_nh_dev_tracker nh_common.nhc_dev_tracker
114#define fib_nh_oif nh_common.nhc_oif116#define fib_nh_oif nh_common.nhc_oif
115#define fib_nh_flags nh_common.nhc_flags117#define fib_nh_flags nh_common.nhc_flags
116#define fib_nh_lws nh_common.nhc_lwtstate118#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
208 208
209void fib_nh_common_release(struct fib_nh_common *nhc)209void fib_nh_common_release(struct fib_nh_common *nhc)
210{210{
211 dev_put(nhc->nhc_dev);211 dev_put_track(nhc->nhc_dev, &nhc->nhc_dev_tracker);
212 lwtstate_put(nhc->nhc_lwtstate);212 lwtstate_put(nhc->nhc_lwtstate);
213 rt_fibinfo_free_cpus(nhc->nhc_pcpu_rth_output);213 rt_fibinfo_free_cpus(nhc->nhc_pcpu_rth_output);
214 rt_fibinfo_free(&nhc->nhc_rth_input);214 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
1006 err = ipv6_stub->fib6_nh_init(net, &fib6_nh, &cfg, GFP_KERNEL, extack);1006 err = ipv6_stub->fib6_nh_init(net, &fib6_nh, &cfg, GFP_KERNEL, extack);
1007 if (!err) {1007 if (!err) {
1008 nh->fib_nh_dev = fib6_nh.fib_nh_dev;1008 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);
1010 nh->fib_nh_oif = nh->fib_nh_dev->ifindex;1010 nh->fib_nh_oif = nh->fib_nh_dev->ifindex;
1011 nh->fib_nh_scope = RT_SCOPE_LINK;1011 nh->fib_nh_scope = RT_SCOPE_LINK;
1012 1012
@@ -1090,7 +1090,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table, · 77 unmodified lines
1090 if (!netif_carrier_ok(dev))1090 if (!netif_carrier_ok(dev))
1091 nh->fib_nh_flags |= RTNH_F_LINKDOWN;1091 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
1092 nh->fib_nh_dev = dev;1092 nh->fib_nh_dev = dev;
1093 dev_hold(dev);1093 dev_hold_track(dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
1094 nh->fib_nh_scope = RT_SCOPE_LINK;1094 nh->fib_nh_scope = RT_SCOPE_LINK;
1095 return 0;1095 return 0;
1096 }1096 }
@@ -1144,7 +1144,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table, · 47 unmodified lines
1144 "No egress device for nexthop gateway");1144 "No egress device for nexthop gateway");
1145 goto out;1145 goto out;
1146 }1146 }
1147 dev_hold(dev);1147 dev_hold_track(dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
1148 if (!netif_carrier_ok(dev))1148 if (!netif_carrier_ok(dev))
1149 nh->fib_nh_flags |= RTNH_F_LINKDOWN;1149 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
1150 err = (dev->flags & IFF_UP) ? 0 : -ENETDOWN;1150 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
1178 }1178 }
1179 1179
1180 nh->fib_nh_dev = in_dev->dev;1180 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);
1182 nh->fib_nh_scope = RT_SCOPE_HOST;1182 nh->fib_nh_scope = RT_SCOPE_HOST;
1183 if (!netif_carrier_ok(nh->fib_nh_dev))1183 if (!netif_carrier_ok(nh->fib_nh_dev))
1184 nh->fib_nh_flags |= RTNH_F_LINKDOWN;1184 nh->fib_nh_flags |= RTNH_F_LINKDOWN;
@@ -1508,6 +1508,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg, · 323 unmodified lines
1508 err = -ENODEV;1508 err = -ENODEV;
1509 if (!nh->fib_nh_dev)1509 if (!nh->fib_nh_dev)
1510 goto failure;1510 goto failure;
1511 netdev_tracker_alloc(nh->fib_nh_dev, &nh->fib_nh_dev_tracker,
1512 GFP_KERNEL);
1511 } else {1513 } else {
1512 int linkdown = 0;1514 int linkdown = 0;
1513 1515
net/ipv6/route.c+2−0
@@ -3628,6 +3628,8 @@ pcpu_alloc: · 3627 unmodified lines
3628 }3628 }
3629 3629
3630 fib6_nh->fib_nh_dev = dev;3630 fib6_nh->fib_nh_dev = dev;
3631 netdev_tracker_alloc(dev, &fib6_nh->fib_nh_dev_tracker, gfp_flags);
3632
3631 fib6_nh->fib_nh_oif = dev->ifindex;3633 fib6_nh->fib_nh_oif = dev->ifindex;
3632 err = 0;3634 err = 0;
3633out:3635out:

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