Remove DST_HOST
Subsystems (5)
PATCH 1/1 Remove DST_HOST
Previous changes to the IP routing code have removed all the tests for the DS_HOST route flag.
Remove the flags and all the code that sets it.
---
AFAICT the DST_HOST flag in route table entries hasn't been looked at since v4.2-rc1.
A quick search failed to find the commit that removed the tests for it from ipv6/route.c
I suspect other changes got added on top.
NB this may need rebasing.
drivers/net/vrf.c | 4 ++-- include/net/dst.h | 1 - include/net/ip6_fib.h | 3 +-- include/net/route.h | 2 +- net/decnet/dn_route.c | 4 ++-- net/ipv4/route.c | 13 +++++-------- net/ipv6/route.c | 6 ------ net/xfrm/xfrm_policy.c | 3 +-- 8 files changed, 12 insertions(+), 24 deletions(-)
drivers/net/vrf.c +2 -2
@@ -504,7 +504,7 @@ static void vrf_rt6_release(struct net_device *dev, struct net_vrf *vrf)static int vrf_rt6_create (struct net_device *dev) { -int flags =DST_HOST |DST_NOPOLICY |DST_NOXFRM ; +int flags =DST_NOPOLICY |DST_NOXFRM ;struct net_vrf *vrf =netdev_priv (dev);struct net *net =dev_net (dev);struct rt6_info *rt6;
@@ -739,7 +739,7 @@ static int vrf_rtable_create(struct net_device *dev)return -ENOMEM ;/* create a dst for routing packets out through a VRF device */ - rth =rt_dst_alloc (dev,0 ,RTN_UNICAST ,1 ,1 ,0 ); + rth =rt_dst_alloc (dev,0 ,RTN_UNICAST ,1 ,1 );if (!rth)return -ENOMEM ;
include/net/dst.h +0 -1
@@ -35,7 +35,6 @@ struct dst_entry {int (*output)(struct net *net,struct sock *sk,struct sk_buff *skb);unsigned short flags; -#define DST_HOST 0x0001#define DST_NOXFRM 0x0002#define DST_NOPOLICY 0x0004#define DST_NOCOUNT 0x0008
include/net/ip6_fib.h +1 -2
@@ -165,9 +165,8 @@ struct fib6_info { u8 should_flush:1, dst_nocount:1, dst_nopolicy:1, - dst_host:1, fib6_destroying:1, - unused:3; + unused:4;struct rcu_head rcu;struct nexthop *nh;
include/net/route.h +1 -1
@@ -221,7 +221,7 @@ unsigned int inet_addr_type_dev_table(struct net *net,void ip_rt_get_source (u8 *src,struct sk_buff *skb,struct rtable *rt);struct rtable *rt_dst_alloc (struct net_device *dev,unsigned int flags,u16 type, -bool nopolicy,bool noxfrm,bool will_cache); +bool nopolicy,bool noxfrm);struct rtable *rt_dst_clone (struct net_device *dev,struct rtable *rt);struct in_ifaddr ;
net/decnet/dn_route.c +2 -2
@@ -1171,7 +1171,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *oif (dev_out->flags &IFF_LOOPBACK ) flags |=RTCF_LOCAL ; - rt =dst_alloc (&dn_dst_ops, dev_out,0 ,DST_OBSOLETE_NONE ,DST_HOST ); + rt =dst_alloc (&dn_dst_ops, dev_out,0 ,DST_OBSOLETE_NONE ,0 );if (rt ==NULL ) goto e_nobufs;
@@ -1437,7 +1437,7 @@ static int dn_route_input_slow(struct sk_buff *skb) } make_route: - rt =dst_alloc (&dn_dst_ops, out_dev,1 ,DST_OBSOLETE_NONE ,DST_HOST ); + rt =dst_alloc (&dn_dst_ops, out_dev,1 ,DST_OBSOLETE_NONE ,0 );if (rt ==NULL ) goto e_nobufs;
net/ipv4/route.c +5 -8
@@ -1618,12 +1618,11 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,struct rtable *rt_dst_alloc (struct net_device *dev,unsigned int flags,u16 type, -bool nopolicy,bool noxfrm,bool will_cache) +bool nopolicy,bool noxfrm) {struct rtable *rt; rt =dst_alloc (&ipv4_dst_ops, dev,1 ,DST_OBSOLETE_FORCE_CHK , - (will_cache ?0 :DST_HOST ) | (nopolicy ?DST_NOPOLICY :0 ) | (noxfrm ?DST_NOXFRM :0 ));
@@ -1671,7 +1670,6 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt) new_rt->rt_gw6 = rt->rt_gw6;INIT_LIST_HEAD (&new_rt->rt_uncached); - new_rt->dst.flags |=DST_HOST ; new_rt->dst.input = rt->dst.input; new_rt->dst.output = rt->dst.output; new_rt->dst.error = rt->dst.error;
@@ -1731,7 +1729,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, flags |=RTCF_LOCAL ; rth =rt_dst_alloc (dev_net (dev)->loopback_dev, flags,RTN_MULTICAST , -IN_DEV_CONF_GET (in_dev,NOPOLICY ), false, false); +IN_DEV_CONF_GET (in_dev,NOPOLICY ), false);if (!rth)return -ENOBUFS ;
@@ -1848,7 +1846,7 @@ static int __mkroute_input(struct sk_buff *skb, rth =rt_dst_alloc (out_dev->dev,0 , res->type,IN_DEV_CONF_GET (in_dev,NOPOLICY ), -IN_DEV_CONF_GET (out_dev,NOXFRM ), do_cache); +IN_DEV_CONF_GET (out_dev,NOXFRM ));if (!rth) { err = -ENOBUFS ; goto cleanup;
@@ -2177,7 +2175,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, rth =rt_dst_alloc (l3mdev_master_dev_rcu (dev) ? : net->loopback_dev, flags |RTCF_LOCAL , res->type, -IN_DEV_CONF_GET (in_dev,NOPOLICY ), false, do_cache); +IN_DEV_CONF_GET (in_dev,NOPOLICY ), false);if (!rth) goto e_nobufs;
@@ -2401,8 +2399,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res, add: rth =rt_dst_alloc (dev_out, flags, type,IN_DEV_CONF_GET (in_dev,NOPOLICY ), -IN_DEV_CONF_GET (in_dev,NOXFRM ), - do_cache); +IN_DEV_CONF_GET (in_dev,NOXFRM ));if (!rth)return ERR_PTR (-ENOBUFS );
net/ipv6/route.c +0 -6
@@ -1060,8 +1060,6 @@ static unsigned short fib6_info_dst_flags(struct fib6_info *rt) flags |=DST_NOCOUNT ;if (rt->dst_nopolicy) flags |=DST_NOPOLICY ; -if (rt->dst_host) - flags |=DST_HOST ;return flags; }
@@ -1347,7 +1345,6 @@ static struct rt6_info *ip6_rt_cache_alloc(const struct fib6_result *res,ip6_rt_copy_init (rt, res); rt->rt6i_flags |=RTF_CACHE ; - rt->dst.flags |=DST_HOST ; rt->rt6i_dst.addr = *daddr; rt->rt6i_dst.plen =128 ;
@@ -3137,7 +3134,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, goto out; } - rt->dst.flags |=DST_HOST ; rt->dst.input = ip6_input; rt->dst.output = ip6_output; rt->rt6i_gateway = fl6->daddr;
@@ -3640,8 +3636,6 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,ipv6_addr_prefix (&rt->fib6_dst.addr, &cfg->fc_dst, cfg->fc_dst_len); rt->fib6_dst.plen = cfg->fc_dst_len; -if (rt->fib6_dst.plen ==128 ) - rt->dst_host = true;#ifdef CONFIG_IPV6_SUBTREES ipv6_addr_prefix (&rt->fib6_src.addr, &cfg->fc_src, cfg->fc_src_len);
net/xfrm/xfrm_policy.c +1 -2
@@ -2610,7 +2610,6 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, xdst->xfrm_genid = xfrm[i]->genid; dst1->obsolete =DST_OBSOLETE_FORCE_CHK ; - dst1->flags |=DST_HOST ; dst1->lastuse = now; dst1->input = dst_discard;
@@ -2896,7 +2895,7 @@ static struct xfrm_dst *xfrm_create_dummy_bundle(struct net *net,dst_copy_metrics (dst1, dst); dst1->obsolete =DST_OBSOLETE_FORCE_CHK ; - dst1->flags |=DST_HOST |DST_XFRM_QUEUE ; + dst1->flags |=DST_XFRM_QUEUE ; dst1->lastuse = jiffies; dst1->input = dst_discard;
Signature · 5 lines
1.8.1.2 - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Quoted 8 lines · David Laight
Previous changes to the IP routing code have removed all the tests for the
DS_HOSTroute flag.
Remove the flags and all the code that sets it.Signed-off-by David Laight <[email protected]>---
AFAICT theDST_HOSTflag in route table entries hasn't been looked at since v4.2-rc1.
even back in 4.14 it was set and only checked in one spot - fib6_commit_metrics.
Quoted 4 lines
A quick search failed to find the commit that removed the tests for it from
ipv6/route.c
I suspect other changes got added on top.
been on my to-do list to verify it was no longer needed. thanks for sending.
From: David Ahern
Quoted 15 lines
Sent: 23 March 2020 16:15
Quoted 8 lines · David Laight
Previous changes to the IP routing code have removed all the tests for the
DS_HOSTroute flag.
Remove the flags and all the code that sets it.Signed-off-by David Laight <[email protected]>---
AFAICT theDST_HOSTflag in route table entries hasn't been looked at since v4.2-rc1.even back in 4.14 it was set and only checked in one spot -
fib6_commit_metrics.Quoted 1 line
Quoted 5 lines
Quoted 3 lines
A quick search failed to find the commit that removed the tests for it from
ipv6/route.c
I suspect other changes got added on top.been on my to-do list to verify it was no longer needed. thanks for sending.
I was trying to unravel that code a bit to find out whether raw sockets with 'hdrincl' looked up the correct route (ie the one from the sendto 'destination address' rather than anything in the supplied ip header).
The temporary 'dst' structures are expensive'.
If nothing else they can be freed immediately rather than after rcu.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
From: David Laight <[email protected]>
Date: Mon, 23 Mar 2020 14:31:19 +0000
Quoted 5 lines
Previous changes to the IP routing code have removed all the tests for the
DS_HOSTroute flag.
Remove the flags and all the code that sets it.Signed-off-by David Laight <[email protected]>
Applied, thanks.
Quoted 1 line
NB this may need rebasing.
It wasn't too bad.
From: David Miller
Quoted 8 lines
Sent: 24 March 2020 04:58
From: David Laight <[email protected]>
Date: Mon, 23 Mar 2020 14:31:19 +0000Quoted 4 lines
Previous changes to the IP routing code have removed all the tests for the
DS_HOSTroute flag.
Remove the flags and all the code that sets it.
Quoted 7 lines
Quoted 1 line
Signed-off-by David Laight <[email protected]>Applied, thanks.
Quoted 1 line
NB this may need rebasing.
It wasn't too bad.
Thanks.
I need to generate a clean git tree agian.
Then try to add some of my patches.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)