Commit e64e2b46 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Store ipvs not net in struct ip_vs_conn_param 



In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data.  So store a pointer to
struct netns_ipvs.

Update the accesses of param->net to access param->ipvs->net instead.

When lookup up struct ip_vs_conn in a hash table replace comparisons
of cp->net with comparisons of cp->ipvs which is possible
now that ipvs is present in ip_vs_conn_param.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 58dbc6f2

include/net/ip_vs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -545,7 +545,7 @@ struct ip_vs_proto_data *ip_vs_proto_data_get(struct net *net, 
					      unsigned short proto);

					      unsigned short proto);





struct ip_vs_conn_param {

struct ip_vs_conn_param {

	struct net			*net;

	struct netns_ipvs		*ipvs;

	const union nf_inet_addr	*caddr;

	const union nf_inet_addr	*caddr;

	const union nf_inet_addr	*vaddr;

	const union nf_inet_addr	*vaddr;

	__be16				cport;

	__be16				cport;
@@ -1208,7 +1208,7 @@ static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol, 
					 __be16 vport,

					 __be16 vport,

					 struct ip_vs_conn_param *p)

					 struct ip_vs_conn_param *p)

{

{

	p->net = net;

	p->ipvs = net_ipvs(net);

	p->af = af;

	p->af = af;

	p->protocol = protocol;

	p->protocol = protocol;

	p->caddr = caddr;

	p->caddr = caddr;

net/netfilter/ipvs/ip_vs_conn.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ static unsigned int ip_vs_conn_hashkey_param(const struct ip_vs_conn_param *p, 
		port = p->vport;

		port = p->vport;

	}

	}





	return ip_vs_conn_hashkey(p->net, p->af, p->protocol, addr, port);

	return ip_vs_conn_hashkey(p->ipvs->net, p->af, p->protocol, addr, port);

}

}





static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp)

static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp)
@@ -279,7 +279,7 @@ __ip_vs_conn_in_get(const struct ip_vs_conn_param *p) 
		    ip_vs_addr_equal(p->af, p->vaddr, &cp->vaddr) &&

		    ip_vs_addr_equal(p->af, p->vaddr, &cp->vaddr) &&

		    ((!p->cport) ^ (!(cp->flags & IP_VS_CONN_F_NO_CPORT))) &&

		    ((!p->cport) ^ (!(cp->flags & IP_VS_CONN_F_NO_CPORT))) &&

		    p->protocol == cp->protocol &&

		    p->protocol == cp->protocol &&

		    net_eq(cp->ipvs->net, p->net)) {

		    cp->ipvs == p->ipvs) {

			if (!__ip_vs_conn_get(cp))

			if (!__ip_vs_conn_get(cp))

				continue;

				continue;

			/* HIT */

			/* HIT */
@@ -359,7 +359,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p) 




	hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[hash], c_list) {

	hlist_for_each_entry_rcu(cp, &ip_vs_conn_tab[hash], c_list) {

		if (unlikely(p->pe_data && p->pe->ct_match)) {

		if (unlikely(p->pe_data && p->pe->ct_match)) {

			if (!net_eq(cp->ipvs->net, p->net))

			if (cp->ipvs != p->ipvs)

				continue;

				continue;

			if (p->pe == cp->pe && p->pe->ct_match(p, cp)) {

			if (p->pe == cp->pe && p->pe->ct_match(p, cp)) {

				if (__ip_vs_conn_get(cp))

				if (__ip_vs_conn_get(cp))
@@ -377,7 +377,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p) 
		    p->vport == cp->vport && p->cport == cp->cport &&

		    p->vport == cp->vport && p->cport == cp->cport &&

		    cp->flags & IP_VS_CONN_F_TEMPLATE &&

		    cp->flags & IP_VS_CONN_F_TEMPLATE &&

		    p->protocol == cp->protocol &&

		    p->protocol == cp->protocol &&

		    net_eq(cp->ipvs->net, p->net)) {

		    cp->ipvs == p->ipvs) {

			if (__ip_vs_conn_get(cp))

			if (__ip_vs_conn_get(cp))

				goto out;

				goto out;

		}

		}
@@ -418,7 +418,7 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p) 
		    ip_vs_addr_equal(p->af, p->vaddr, &cp->caddr) &&

		    ip_vs_addr_equal(p->af, p->vaddr, &cp->caddr) &&

		    ip_vs_addr_equal(p->af, p->caddr, &cp->daddr) &&

		    ip_vs_addr_equal(p->af, p->caddr, &cp->daddr) &&

		    p->protocol == cp->protocol &&

		    p->protocol == cp->protocol &&

		    net_eq(cp->ipvs->net, p->net)) {

		    cp->ipvs == p->ipvs) {

			if (!__ip_vs_conn_get(cp))

			if (!__ip_vs_conn_get(cp))

				continue;

				continue;

			/* HIT */

			/* HIT */
@@ -875,8 +875,8 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af, 
	       struct ip_vs_dest *dest, __u32 fwmark)

	       struct ip_vs_dest *dest, __u32 fwmark)

{

{

	struct ip_vs_conn *cp;

	struct ip_vs_conn *cp;

	struct netns_ipvs *ipvs = net_ipvs(p->net);

	struct netns_ipvs *ipvs = p->ipvs;

	struct ip_vs_proto_data *pd = ip_vs_proto_data_get(p->net,

	struct ip_vs_proto_data *pd = ip_vs_proto_data_get(p->ipvs->net,

							   p->protocol);

							   p->protocol);





	cp = kmem_cache_alloc(ip_vs_conn_cachep, GFP_ATOMIC);

	cp = kmem_cache_alloc(ip_vs_conn_cachep, GFP_ATOMIC);