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

Commit fbfe95a4 authored by David S. Miller's avatar David S. Miller
Browse files

inet: Create and use rt{,6}_get_peer_create(). 



There's a lot of places that open-code rt{,6}_get_peer() only because
they want to set 'create' to one.  So add an rt{,6}_get_peer_create()
for their sake.

There were also a few spots open-coding plain rt{,6}_get_peer() and
those are transformed here as well.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7123aaa3

include/net/ip6_route.h

+13 −4
Original line number Diff line number Diff line
@@ -53,18 +53,27 @@ static inline unsigned int rt6_flags2srcprefs(int flags) 
	return (flags >> 3) & 7;

}



extern void			rt6_bind_peer(struct rt6_info *rt,

					      int create);

extern void rt6_bind_peer(struct rt6_info *rt, int create);



static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)

static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create)

{

	if (rt->rt6i_peer)

		return rt->rt6i_peer;



	rt6_bind_peer(rt, 0);

	rt6_bind_peer(rt, create);

	return rt->rt6i_peer;

}



static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)

{

	return __rt6_get_peer(rt, 0);

}



static inline struct inet_peer *rt6_get_peer_create(struct rt6_info *rt)

{

	return __rt6_get_peer(rt, 1);

}



extern void			ip6_route_input(struct sk_buff *skb);



extern struct dst_entry *	ip6_route_output(struct net *net,

include/net/route.h

+12 −2
Original line number Diff line number Diff line
@@ -296,15 +296,25 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable 


extern void rt_bind_peer(struct rtable *rt, __be32 daddr, int create);



static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)

static inline struct inet_peer *__rt_get_peer(struct rtable *rt, __be32 daddr, int create)

{

	if (rt->peer)

		return rt->peer;



	rt_bind_peer(rt, daddr, 0);

	rt_bind_peer(rt, daddr, create);

	return rt->peer;

}



static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)

{

	return __rt_get_peer(rt, daddr, 0);

}



static inline struct inet_peer *rt_get_peer_create(struct rtable *rt, __be32 daddr)

{

	return __rt_get_peer(rt, daddr, 1);

}



static inline int inet_iif(const struct sk_buff *skb)

{

	return skb_rtable(skb)->rt_iif;

net/ipv4/icmp.c

+2 −3
Original line number Diff line number Diff line
@@ -253,9 +253,8 @@ static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, 


	/* Limit if icmp type is enabled in ratemask. */

	if ((1 << type) & net->ipv4.sysctl_icmp_ratemask) {

		if (!rt->peer)

			rt_bind_peer(rt, fl4->daddr, 1);

		rc = inet_peer_xrlim_allow(rt->peer,

		struct inet_peer *peer = rt_get_peer_create(rt, fl4->daddr);

		rc = inet_peer_xrlim_allow(peer,

					   net->ipv4.sysctl_icmp_ratelimit);

	}

out:

net/ipv4/route.c

+9 −26
Original line number Diff line number Diff line
@@ -162,10 +162,7 @@ static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old) 
	struct inet_peer *peer;

	u32 *p = NULL;



	if (!rt->peer)

		rt_bind_peer(rt, rt->rt_dst, 1);



	peer = rt->peer;

	peer = rt_get_peer_create(rt, rt->rt_dst);

	if (peer) {

		u32 *old_p = __DST_METRICS_PTR(old);

		unsigned long prev, new;
@@ -1364,14 +1361,13 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more) 
	struct rtable *rt = (struct rtable *) dst;



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

		if (rt->peer == NULL)

			rt_bind_peer(rt, rt->rt_dst, 1);

		struct inet_peer *peer = rt_get_peer_create(rt, rt->rt_dst);



		/* If peer is attached to destination, it is never detached,

		   so that we need not to grab a lock to dereference it.

		 */

		if (rt->peer) {

			iph->id = htons(inet_getid(rt->peer, more));

		if (peer) {

			iph->id = htons(inet_getid(peer, more));

			return;

		}

	} else if (!rt)
@@ -1481,10 +1477,7 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, 
				    rt->rt_gateway != old_gw)

					continue;



				if (!rt->peer)

					rt_bind_peer(rt, rt->rt_dst, 1);



				peer = rt->peer;

				peer = rt_get_peer_create(rt, rt->rt_dst);

				if (peer) {

					if (peer->redirect_learned.a4 != new_gw) {

						peer->redirect_learned.a4 = new_gw;
@@ -1579,9 +1572,7 @@ void ip_rt_send_redirect(struct sk_buff *skb) 
	log_martians = IN_DEV_LOG_MARTIANS(in_dev);

	rcu_read_unlock();



	if (!rt->peer)

		rt_bind_peer(rt, rt->rt_dst, 1);

	peer = rt->peer;

	peer = rt_get_peer_create(rt, rt->rt_dst);

	if (!peer) {

		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway);

		return;
@@ -1646,9 +1637,7 @@ static int ip_error(struct sk_buff *skb) 
		break;

	}



	if (!rt->peer)

		rt_bind_peer(rt, rt->rt_dst, 1);

	peer = rt->peer;

	peer = rt_get_peer_create(rt, rt->rt_dst);



	send = true;

	if (peer) {
@@ -1754,9 +1743,7 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu) 


	dst_confirm(dst);



	if (!rt->peer)

		rt_bind_peer(rt, rt->rt_dst, 1);

	peer = rt->peer;

	peer = rt_get_peer_create(rt, rt->rt_dst);

	if (peer) {

		unsigned long pmtu_expires = ACCESS_ONCE(peer->pmtu_expires);
@@ -1782,12 +1769,8 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu) 
static void ipv4_validate_peer(struct rtable *rt)

{

	if (rt->rt_peer_genid != rt_peer_genid()) {

		struct inet_peer *peer;



		if (!rt->peer)

			rt_bind_peer(rt, rt->rt_dst, 0);

		struct inet_peer *peer = rt_get_peer(rt, rt->rt_dst);



		peer = rt->peer;

		if (peer) {

			check_peer_pmtu(&rt->dst, peer);

net/ipv4/tcp_ipv4.c

+1 −3
Original line number Diff line number Diff line
@@ -1832,9 +1832,7 @@ struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it) 
		peer = inet_getpeer_v4(net, inet->inet_daddr, 1);

		*release_it = true;

	} else {

		if (!rt->peer)

			rt_bind_peer(rt, inet->inet_daddr, 1);

		peer = rt->peer;

		peer = rt_get_peer_create(rt, inet->inet_daddr);

		*release_it = false;

	}