Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c2fd7f authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

net: remove DST_NOCACHE flag 



DST_NOCACHE flag check has been removed from dst_release() and
dst_hold_safe() in a previous patch because all the dst are now ref
counted properly and can be released based on refcnt only.
Looking at the rest of the DST_NOCACHE use, all of them can now be
removed or replaced with other checks.
So this patch gets rid of all the DST_NOCACHE usage and remove this flag
completely.

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2a9c0ed

drivers/net/vrf.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,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 | DST_NOCACHE;

	int flags = DST_HOST | DST_NOPOLICY | DST_NOXFRM;

	struct net_vrf *vrf = netdev_priv(dev);

	struct net *net = dev_net(dev);

	struct fib6_table *rt6i_table;

include/net/dst.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct dst_entry { 
#define DST_HOST		0x0001

#define DST_NOXFRM		0x0002

#define DST_NOPOLICY		0x0004

#define DST_NOCACHE		0x0010

#define DST_NOCOUNT		0x0020

#define DST_FAKE_RTABLE		0x0040

#define DST_XFRM_TUNNEL		0x0080

include/net/ip6_fib.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout) 
static inline u32 rt6_get_cookie(const struct rt6_info *rt)

{

	if (rt->rt6i_flags & RTF_PCPU ||

	    (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from))

	    (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->dst.from))

		rt = (struct rt6_info *)(rt->dst.from);



	return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;

net/core/dst.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void __metadata_dst_init(struct metadata_dst *md_dst, u8 optslen) 


	dst = &md_dst->dst;

	dst_init(dst, &md_dst_ops, NULL, 1, DST_OBSOLETE_NONE,

		 DST_METADATA | DST_NOCACHE | DST_NOCOUNT);

		 DST_METADATA | DST_NOCOUNT);



	dst->input = dst_md_discard;

	dst->output = dst_md_discard_out;

net/ipv4/route.c

+11 −12
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ static struct fib_nh_exception *find_exception(struct fib_nh *nh, __be32 daddr) 
}



static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,

			      __be32 daddr)

			      __be32 daddr, const bool do_cache)

{

	bool ret = false;
@@ -1328,7 +1328,7 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe, 
		if (!rt->rt_gateway)

			rt->rt_gateway = daddr;



		if (!(rt->dst.flags & DST_NOCACHE)) {

		if (do_cache) {

			dst_hold(&rt->dst);

			rcu_assign_pointer(*porig, rt);

			if (orig) {
@@ -1441,7 +1441,8 @@ static bool rt_cache_valid(const struct rtable *rt) 
static void rt_set_nexthop(struct rtable *rt, __be32 daddr,

			   const struct fib_result *res,

			   struct fib_nh_exception *fnhe,

			   struct fib_info *fi, u16 type, u32 itag)

			   struct fib_info *fi, u16 type, u32 itag,

			   const bool do_cache)

{

	bool cached = false;
@@ -1462,8 +1463,8 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr, 
#endif

		rt->dst.lwtstate = lwtstate_get(nh->nh_lwtstate);

		if (unlikely(fnhe))

			cached = rt_bind_exception(rt, fnhe, daddr);

		else if (!(rt->dst.flags & DST_NOCACHE))

			cached = rt_bind_exception(rt, fnhe, daddr, do_cache);

		else if (do_cache)

			cached = rt_cache_route(nh, rt);

		if (unlikely(!cached)) {

			/* Routes we intend to cache in nexthop exception or
@@ -1471,7 +1472,6 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr, 
			 * However, if we are unsuccessful at storing this

			 * route into the cache we really need to set it.

			 */

			rt->dst.flags |= DST_NOCACHE;

			if (!rt->rt_gateway)

				rt->rt_gateway = daddr;

			rt_add_uncached_list(rt);
@@ -1494,7 +1494,7 @@ struct rtable *rt_dst_alloc(struct net_device *dev, 
	struct rtable *rt;



	rt = dst_alloc(&ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK,

		       (will_cache ? 0 : (DST_HOST | DST_NOCACHE)) |

		       (will_cache ? 0 : DST_HOST) |

		       (nopolicy ? DST_NOPOLICY : 0) |

		       (noxfrm ? DST_NOXFRM : 0));
@@ -1738,7 +1738,8 @@ static int __mkroute_input(struct sk_buff *skb, 


	rth->dst.input = ip_forward;



	rt_set_nexthop(rth, daddr, res, fnhe, res->fi, res->type, itag);

	rt_set_nexthop(rth, daddr, res, fnhe, res->fi, res->type, itag,

		       do_cache);

	set_lwt_redirect(rth);

	skb_dst_set(skb, &rth->dst);

out:
@@ -2026,11 +2027,9 @@ out: return err; 
			rth->dst.input = lwtunnel_input;

		}



		if (unlikely(!rt_cache_route(nh, rth))) {

			rth->dst.flags |= DST_NOCACHE;

		if (unlikely(!rt_cache_route(nh, rth)))

			rt_add_uncached_list(rth);

	}

	}

	skb_dst_set(skb, &rth->dst);

	err = 0;

	goto out;
@@ -2260,7 +2259,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
#endif

	}



	rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0);

	rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0, do_cache);

	set_lwt_redirect(rth);



	return rth;