Commit bba54de5 authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: provide iph to schedulers 



Before now the schedulers needed access only to IP
addresses and it was easy to get them from skb by
using ip_vs_fill_iph_addr_only.

New changes for the SH scheduler will need the protocol
and ports which is difficult to get from skb for the
IPv6 case. As we have all the data in the iph structure,
to avoid the same slow lookups provide the iph to schedulers.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by: default avatarHans Schillstrom <hans@schillstrom.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 681f130f

include/net/ip_vs.h

+2 −26
Original line number Diff line number Diff line
@@ -197,31 +197,6 @@ ip_vs_fill_iph_skb(int af, const struct sk_buff *skb, struct ip_vs_iphdr *iphdr) 
	}

}



/* This function is a faster version of ip_vs_fill_iph_skb().

 * Where we only populate {s,d}addr (and avoid calling ipv6_find_hdr()).

 * This is used by the some of the ip_vs_*_schedule() functions.

 * (Mostly done to avoid ABI breakage of external schedulers)

 */

static inline void

ip_vs_fill_iph_addr_only(int af, const struct sk_buff *skb,

			 struct ip_vs_iphdr *iphdr)

{

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6) {

		const struct ipv6hdr *iph =

			(struct ipv6hdr *)skb_network_header(skb);

		iphdr->saddr.in6 = iph->saddr;

		iphdr->daddr.in6 = iph->daddr;

	} else

#endif

	{

		const struct iphdr *iph =

			(struct iphdr *)skb_network_header(skb);

		iphdr->saddr.ip = iph->saddr;

		iphdr->daddr.ip = iph->daddr;

	}

}



static inline void ip_vs_addr_copy(int af, union nf_inet_addr *dst,

				   const union nf_inet_addr *src)

{
@@ -814,7 +789,8 @@ struct ip_vs_scheduler { 


	/* selecting a server from the given service */

	struct ip_vs_dest* (*schedule)(struct ip_vs_service *svc,

				       const struct sk_buff *skb);

				       const struct sk_buff *skb,

				       struct ip_vs_iphdr *iph);

};



/* The persistence engine object */

net/netfilter/ipvs/ip_vs_core.c

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, 
		 * return *ignored=0 i.e. ICMP and NF_DROP

		 */

		sched = rcu_dereference(svc->scheduler);

		dest = sched->schedule(svc, skb);

		dest = sched->schedule(svc, skb, iph);

		if (!dest) {

			IP_VS_DBG(1, "p-schedule: no dest found.\n");

			kfree(param.pe_data);
@@ -452,7 +452,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, 
	}



	sched = rcu_dereference(svc->scheduler);

	dest = sched->schedule(svc, skb);

	dest = sched->schedule(svc, skb, iph);

	if (dest == NULL) {

		IP_VS_DBG(1, "Schedule: no dest found.\n");

		return NULL;

net/netfilter/ipvs/ip_vs_dh.c

+4 −6
Original line number Diff line number Diff line
@@ -214,18 +214,16 @@ static inline int is_overloaded(struct ip_vs_dest *dest) 
 *      Destination hashing scheduling

 */

static struct ip_vs_dest *

ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)

ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,

		  struct ip_vs_iphdr *iph)

{

	struct ip_vs_dest *dest;

	struct ip_vs_dh_state *s;

	struct ip_vs_iphdr iph;



	ip_vs_fill_iph_addr_only(svc->af, skb, &iph);



	IP_VS_DBG(6, "%s(): Scheduling...\n", __func__);



	s = (struct ip_vs_dh_state *) svc->sched_data;

	dest = ip_vs_dh_get(svc->af, s, &iph.daddr);

	dest = ip_vs_dh_get(svc->af, s, &iph->daddr);

	if (!dest

	    || !(dest->flags & IP_VS_DEST_F_AVAILABLE)

	    || atomic_read(&dest->weight) <= 0
@@ -235,7 +233,7 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	}



	IP_VS_DBG_BUF(6, "DH: destination IP address %s --> server %s:%d\n",

		      IP_VS_DBG_ADDR(svc->af, &iph.daddr),

		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),

		      IP_VS_DBG_ADDR(svc->af, &dest->addr),

		      ntohs(dest->port));

net/netfilter/ipvs/ip_vs_lblc.c

+5 −7
Original line number Diff line number Diff line
@@ -487,19 +487,17 @@ is_overloaded(struct ip_vs_dest *dest, struct ip_vs_service *svc) 
 *    Locality-Based (weighted) Least-Connection scheduling

 */

static struct ip_vs_dest *

ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)

ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,

		    struct ip_vs_iphdr *iph)

{

	struct ip_vs_lblc_table *tbl = svc->sched_data;

	struct ip_vs_iphdr iph;

	struct ip_vs_dest *dest = NULL;

	struct ip_vs_lblc_entry *en;



	ip_vs_fill_iph_addr_only(svc->af, skb, &iph);



	IP_VS_DBG(6, "%s(): Scheduling...\n", __func__);



	/* First look in our cache */

	en = ip_vs_lblc_get(svc->af, tbl, &iph.daddr);

	en = ip_vs_lblc_get(svc->af, tbl, &iph->daddr);

	if (en) {

		/* We only hold a read lock, but this is atomic */

		en->lastuse = jiffies;
@@ -529,12 +527,12 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	/* If we fail to create a cache entry, we'll just use the valid dest */

	spin_lock_bh(&svc->sched_lock);

	if (!tbl->dead)

		ip_vs_lblc_new(tbl, &iph.daddr, dest);

		ip_vs_lblc_new(tbl, &iph->daddr, dest);

	spin_unlock_bh(&svc->sched_lock);



out:

	IP_VS_DBG_BUF(6, "LBLC: destination IP address %s --> server %s:%d\n",

		      IP_VS_DBG_ADDR(svc->af, &iph.daddr),

		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),

		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));



	return dest;

net/netfilter/ipvs/ip_vs_lblcr.c

+5 −7
Original line number Diff line number Diff line
@@ -655,19 +655,17 @@ is_overloaded(struct ip_vs_dest *dest, struct ip_vs_service *svc) 
 *    Locality-Based (weighted) Least-Connection scheduling

 */

static struct ip_vs_dest *

ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)

ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,

		     struct ip_vs_iphdr *iph)

{

	struct ip_vs_lblcr_table *tbl = svc->sched_data;

	struct ip_vs_iphdr iph;

	struct ip_vs_dest *dest;

	struct ip_vs_lblcr_entry *en;



	ip_vs_fill_iph_addr_only(svc->af, skb, &iph);



	IP_VS_DBG(6, "%s(): Scheduling...\n", __func__);



	/* First look in our cache */

	en = ip_vs_lblcr_get(svc->af, tbl, &iph.daddr);

	en = ip_vs_lblcr_get(svc->af, tbl, &iph->daddr);

	if (en) {

		en->lastuse = jiffies;
@@ -718,12 +716,12 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	/* If we fail to create a cache entry, we'll just use the valid dest */

	spin_lock_bh(&svc->sched_lock);

	if (!tbl->dead)

		ip_vs_lblcr_new(tbl, &iph.daddr, dest);

		ip_vs_lblcr_new(tbl, &iph->daddr, dest);

	spin_unlock_bh(&svc->sched_lock);



out:

	IP_VS_DBG_BUF(6, "LBLCR: destination IP address %s --> server %s:%d\n",

		      IP_VS_DBG_ADDR(svc->af, &iph.daddr),

		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),

		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));



	return dest;

CRA Git | Maintained and supported by SUSTech CRA and CCSE