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

Commit 76ad94fc authored by Michael Maxim's avatar Michael Maxim Committed by Pablo Neira Ayuso
Browse files

IPVS: Modify the SH scheduler to use weights 



Modify the algorithm to build the source hashing hash table to add
extra slots for destinations with higher weight. This has the effect
of allowing an IPVS SH user to give more connections to hosts that
have been configured to have a higher weight.

The reason for the Kconfig change is because the size of the hash table
becomes more relevant/important if you decide to use the weights in the
manner this patch lets you. It would be conceivable that someone might
need to increase the size of that table to accommodate their
configuration, so it will be handy to be able to do that through the
regular configuration system instead of editing the source.

Signed-off-by: default avatarMichael Maxim <mike@okcupid.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e26f9a48

net/netfilter/ipvs/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -232,6 +232,21 @@ config IP_VS_NQ 
	  If you want to compile it in kernel, say Y. To compile it as a

	  module, choose M here. If unsure, say N.



comment 'IPVS SH scheduler'



config IP_VS_SH_TAB_BITS

	int "IPVS source hashing table size (the Nth power of 2)"

	range 4 20

	default 8

	---help---

	  The source hashing scheduler maps source IPs to destinations

	  stored in a hash table. This table is tiled by each destination

	  until all slots in the table are filled. When using weights to

	  allow destinations to receive more connections, the table is

	  tiled an amount proportional to the weights specified. The table

	  needs to be large enough to effectively fit all the destinations

	  multiplied by their respective weights.



comment 'IPVS application helper'



config	IP_VS_FTP

net/netfilter/ipvs/ip_vs_sh.c

+17 −1
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
 * server is dead or overloaded, the load balancer can bypass the cache

 * server and send requests to the original server directly.

 *

 * The weight destination attribute can be used to control the

 * distribution of connections to the destinations in servernode. The

 * greater the weight, the more connections the destination

 * will receive.

 *

 */



#define KMSG_COMPONENT "IPVS"
@@ -99,9 +104,11 @@ ip_vs_sh_assign(struct ip_vs_sh_bucket *tbl, struct ip_vs_service *svc) 
	struct ip_vs_sh_bucket *b;

	struct list_head *p;

	struct ip_vs_dest *dest;

	int d_count;



	b = tbl;

	p = &svc->destinations;

	d_count = 0;

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

		if (list_empty(p)) {

			b->dest = NULL;
@@ -113,7 +120,16 @@ ip_vs_sh_assign(struct ip_vs_sh_bucket *tbl, struct ip_vs_service *svc) 
			atomic_inc(&dest->refcnt);

			b->dest = dest;



			IP_VS_DBG_BUF(6, "assigned i: %d dest: %s weight: %d\n",

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

				      atomic_read(&dest->weight));



			/* Don't move to next dest until filling weight */

			if (++d_count >= atomic_read(&dest->weight)) {

				p = p->next;

				d_count = 0;

			}



		}

		b++;

	}