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

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

Merge branch 'vrf-inetpeer' 



David Ahern says:

====================
net: Refactor inetpeer cache and add support for VRFs

Per Dave's comment on the version 1 patch adding VRF support to inetpeer
cache by explicitly making the address + index a key. Refactored the
inetpeer code in the process; mostly impacts the use by tcp_metrics.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8f58336d 192132b9

include/net/inetpeer.h

+59 −10
Original line number Diff line number Diff line
@@ -15,16 +15,20 @@ 
#include <net/ipv6.h>

#include <linux/atomic.h>



struct inetpeer_addr_base {

	union {

		__be32			a4;

		__be32			a6[4];

		struct in6_addr		in6;

	};

/* IPv4 address key for cache lookups */

struct ipv4_addr_key {

	__be32	addr;

	int	vif;

};



#define INETPEER_MAXKEYSZ   (sizeof(struct in6_addr) / sizeof(u32))



struct inetpeer_addr {

	struct inetpeer_addr_base	addr;

	union {

		struct ipv4_addr_key	a4;

		struct in6_addr		a6;

		u32			key[INETPEER_MAXKEYSZ];

	};

	__u16				family;

};
@@ -71,6 +75,29 @@ void inet_initpeers(void) __init; 


#define INETPEER_METRICS_NEW	(~(u32) 0)



static inline void inetpeer_set_addr_v4(struct inetpeer_addr *iaddr, __be32 ip)

{

	iaddr->a4.addr = ip;

	iaddr->family = AF_INET;

}



static inline __be32 inetpeer_get_addr_v4(struct inetpeer_addr *iaddr)

{

	return iaddr->a4.addr;

}



static inline void inetpeer_set_addr_v6(struct inetpeer_addr *iaddr,

					struct in6_addr *in6)

{

	iaddr->a6 = *in6;

	iaddr->family = AF_INET6;

}



static inline struct in6_addr *inetpeer_get_addr_v6(struct inetpeer_addr *iaddr)

{

	return &iaddr->a6;

}



/* can be called with or without local BH being disabled */

struct inet_peer *inet_getpeer(struct inet_peer_base *base,

			       const struct inetpeer_addr *daddr,
@@ -78,11 +105,12 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base, 


static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,

						__be32 v4daddr,

						int create)

						int vif, int create)

{

	struct inetpeer_addr daddr;



	daddr.addr.a4 = v4daddr;

	daddr.a4.addr = v4daddr;

	daddr.a4.vif = vif;

	daddr.family = AF_INET;

	return inet_getpeer(base, &daddr, create);

}
@@ -93,11 +121,32 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base, 
{

	struct inetpeer_addr daddr;



	daddr.addr.in6 = *v6daddr;

	daddr.a6 = *v6daddr;

	daddr.family = AF_INET6;

	return inet_getpeer(base, &daddr, create);

}



static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a,

				    const struct inetpeer_addr *b)

{

	int i, n;



	if (a->family == AF_INET)

		n = sizeof(a->a4) / sizeof(u32);

	else

		n = sizeof(a->a6) / sizeof(u32);



	for (i = 0; i < n; i++) {

		if (a->key[i] == b->key[i])

			continue;

		if (a->key[i] < b->key[i])

			return -1;

		return 1;

	}



	return 0;

}



/* can be called from BH context or outside */

void inet_putpeer(struct inet_peer *p);

bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);

include/net/ip.h

+5 −0
Original line number Diff line number Diff line
@@ -458,6 +458,11 @@ static __inline__ void inet_reset_saddr(struct sock *sk) 


#endif



static inline unsigned int ipv4_addr_hash(__be32 ip)

{

	return (__force unsigned int) ip;

}



bool ip_call_ra_chain(struct sk_buff *skb);



/*

net/ipv4/icmp.c

+2 −1
Original line number Diff line number Diff line
@@ -309,9 +309,10 @@ static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, 


	rc = false;

	if (icmp_global_allow()) {

		int vif = vrf_master_ifindex(dst->dev);

		struct inet_peer *peer;



		peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, 1);

		peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif, 1);

		rc = inet_peer_xrlim_allow(peer,

					   net->ipv4.sysctl_icmp_ratelimit);

		if (peer)

net/ipv4/inetpeer.c

+2 −18
Original line number Diff line number Diff line
@@ -157,22 +157,6 @@ void __init inet_initpeers(void) 
	INIT_DEFERRABLE_WORK(&gc_work, inetpeer_gc_worker);

}



static int addr_compare(const struct inetpeer_addr *a,

			const struct inetpeer_addr *b)

{

	int i, n = (a->family == AF_INET ? 1 : 4);



	for (i = 0; i < n; i++) {

		if (a->addr.a6[i] == b->addr.a6[i])

			continue;

		if ((__force u32)a->addr.a6[i] < (__force u32)b->addr.a6[i])

			return -1;

		return 1;

	}



	return 0;

}



#define rcu_deref_locked(X, BASE)				\

	rcu_dereference_protected(X, lockdep_is_held(&(BASE)->lock.lock))
@@ -188,7 +172,7 @@ static int addr_compare(const struct inetpeer_addr *a, 
	*stackptr++ = &_base->root;				\

	for (u = rcu_deref_locked(_base->root, _base);		\

	     u != peer_avl_empty;) {				\

		int cmp = addr_compare(_daddr, &u->daddr);	\

		int cmp = inetpeer_addr_cmp(_daddr, &u->daddr);	\

		if (cmp == 0)					\

			break;					\

		if (cmp == -1)					\
@@ -215,7 +199,7 @@ static struct inet_peer *lookup_rcu(const struct inetpeer_addr *daddr, 
	int count = 0;



	while (u != peer_avl_empty) {

		int cmp = addr_compare(daddr, &u->daddr);

		int cmp = inetpeer_addr_cmp(daddr, &u->daddr);

		if (cmp == 0) {

			/* Before taking a reference, check if this entry was

			 * deleted (refcnt=-1)

net/ipv4/ip_fragment.c

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a) 
	qp->vif = arg->vif;

	qp->user = arg->user;

	qp->peer = sysctl_ipfrag_max_dist ?

		inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL;

		inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, arg->vif, 1) :

		NULL;

}



static void ip4_frag_free(struct inet_frag_queue *q)