Commit 03f49f34 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: Make helper to get dst entry and "use" it 



There are many places that get the dst entry, increase the
__use counter and set the "lastuse" time stamp.

Make a helper for this.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1667609

include/net/dst.h

+7 −0
Original line number Diff line number Diff line
@@ -143,6 +143,13 @@ static inline void dst_hold(struct dst_entry * dst) 
	atomic_inc(&dst->__refcnt);

}



static inline void dst_use(struct dst_entry *dst, unsigned long time)

{

	dst_hold(dst);

	dst->__use++;

	dst->lastuse = time;

}



static inline

struct dst_entry * dst_clone(struct dst_entry * dst)

{

net/decnet/dn_route.c

+4 −12
Original line number Diff line number Diff line
@@ -293,9 +293,7 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route * 
					   dn_rt_hash_table[hash].chain);

			rcu_assign_pointer(dn_rt_hash_table[hash].chain, rth);



			rth->u.dst.__use++;

			dst_hold(&rth->u.dst);

			rth->u.dst.lastuse = now;

			dst_use(&rth->u.dst, now);

			spin_unlock_bh(&dn_rt_hash_table[hash].lock);



			dnrt_drop(rt);
@@ -308,9 +306,7 @@ static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route * 
	rcu_assign_pointer(rt->u.dst.dn_next, dn_rt_hash_table[hash].chain);

	rcu_assign_pointer(dn_rt_hash_table[hash].chain, rt);



	dst_hold(&rt->u.dst);

	rt->u.dst.__use++;

	rt->u.dst.lastuse = now;

	dst_use(&rt->u.dst, now);

	spin_unlock_bh(&dn_rt_hash_table[hash].lock);

	*rp = rt;

	return 0;
@@ -1182,9 +1178,7 @@ static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *fl 
			    (flp->mark == rt->fl.mark) &&

			    (rt->fl.iif == 0) &&

			    (rt->fl.oif == flp->oif)) {

				rt->u.dst.lastuse = jiffies;

				dst_hold(&rt->u.dst);

				rt->u.dst.__use++;

				dst_use(&rt->u.dst, jiffies);

				rcu_read_unlock_bh();

				*pprt = &rt->u.dst;

				return 0;
@@ -1456,9 +1450,7 @@ int dn_route_input(struct sk_buff *skb) 
		    (rt->fl.oif == 0) &&

		    (rt->fl.mark == skb->mark) &&

		    (rt->fl.iif == cb->iif)) {

			rt->u.dst.lastuse = jiffies;

			dst_hold(&rt->u.dst);

			rt->u.dst.__use++;

			dst_use(&rt->u.dst, jiffies);

			rcu_read_unlock();

			skb->dst = (struct dst_entry *)rt;

			return 0;

net/ipv4/route.c

+3 −9
Original line number Diff line number Diff line
@@ -851,9 +851,7 @@ static int rt_intern_hash(unsigned hash, struct rtable *rt, struct rtable **rp) 
			 */

			rcu_assign_pointer(rt_hash_table[hash].chain, rth);



			rth->u.dst.__use++;

			dst_hold(&rth->u.dst);

			rth->u.dst.lastuse = now;

			dst_use(&rth->u.dst, now);

			spin_unlock_bh(rt_hash_lock_addr(hash));



			rt_drop(rt);
@@ -1930,9 +1928,7 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
		    rth->fl.oif == 0 &&

		    rth->fl.mark == skb->mark &&

		    rth->fl.fl4_tos == tos) {

			rth->u.dst.lastuse = jiffies;

			dst_hold(&rth->u.dst);

			rth->u.dst.__use++;

			dst_use(&rth->u.dst, jiffies);

			RT_CACHE_STAT_INC(in_hit);

			rcu_read_unlock();

			skb->dst = (struct dst_entry*)rth;
@@ -2326,9 +2322,7 @@ int __ip_route_output_key(struct rtable **rp, const struct flowi *flp) 
		    rth->fl.mark == flp->mark &&

		    !((rth->fl.fl4_tos ^ flp->fl4_tos) &

			    (IPTOS_RT_MASK | RTO_ONLINK))) {

			rth->u.dst.lastuse = jiffies;

			dst_hold(&rth->u.dst);

			rth->u.dst.__use++;

			dst_use(&rth->u.dst, jiffies);

			RT_CACHE_STAT_INC(out_hit);

			rcu_read_unlock_bh();

			*rp = rth;

net/ipv6/route.c

+1 −5
Original line number Diff line number Diff line
@@ -544,12 +544,8 @@ static struct rt6_info *ip6_pol_route_lookup(struct fib6_table *table, 
	rt = rt6_device_match(rt, fl->oif, flags);

	BACKTRACK(&fl->fl6_src);

out:

	dst_hold(&rt->u.dst);

	dst_use(&rt->u.dst, jiffies);

	read_unlock_bh(&table->tb6_lock);



	rt->u.dst.lastuse = jiffies;

	rt->u.dst.__use++;



	return rt;



}