IPVS: Move IPVS to net/netfilter/ipvs
Julius Volz [Fri, 19 Sep 2008 10:32:57 +0000 (12:32 +0200)]
Since IPVS now has partial IPv6 support, this patch moves IPVS from
net/ipv4/ipvs to net/netfilter/ipvs. It's a result of:

$ git mv net/ipv4/ipvs net/netfilter

and adapting the relevant Kconfigs/Makefiles to the new path.

Signed-off-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

29 files changed:
net/ipv4/Kconfig
net/ipv4/Makefile
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/ipvs/Kconfig [moved from net/ipv4/ipvs/Kconfig with 100% similarity]
net/netfilter/ipvs/Makefile [moved from net/ipv4/ipvs/Makefile with 100% similarity]
net/netfilter/ipvs/ip_vs_app.c [moved from net/ipv4/ipvs/ip_vs_app.c with 100% similarity]
net/netfilter/ipvs/ip_vs_conn.c [moved from net/ipv4/ipvs/ip_vs_conn.c with 100% similarity]
net/netfilter/ipvs/ip_vs_core.c [moved from net/ipv4/ipvs/ip_vs_core.c with 100% similarity]
net/netfilter/ipvs/ip_vs_ctl.c [moved from net/ipv4/ipvs/ip_vs_ctl.c with 100% similarity]
net/netfilter/ipvs/ip_vs_dh.c [new file with mode: 0644]
net/netfilter/ipvs/ip_vs_est.c [moved from net/ipv4/ipvs/ip_vs_est.c with 100% similarity]
net/netfilter/ipvs/ip_vs_ftp.c [moved from net/ipv4/ipvs/ip_vs_ftp.c with 100% similarity]
net/netfilter/ipvs/ip_vs_lblc.c [moved from net/ipv4/ipvs/ip_vs_lblc.c with 100% similarity]
net/netfilter/ipvs/ip_vs_lblcr.c [moved from net/ipv4/ipvs/ip_vs_lblcr.c with 100% similarity]
net/netfilter/ipvs/ip_vs_lc.c [moved from net/ipv4/ipvs/ip_vs_lc.c with 100% similarity]
net/netfilter/ipvs/ip_vs_nq.c [moved from net/ipv4/ipvs/ip_vs_nq.c with 100% similarity]
net/netfilter/ipvs/ip_vs_proto.c [moved from net/ipv4/ipvs/ip_vs_proto.c with 100% similarity]
net/netfilter/ipvs/ip_vs_proto_ah_esp.c [moved from net/ipv4/ipvs/ip_vs_proto_ah_esp.c with 100% similarity]
net/netfilter/ipvs/ip_vs_proto_tcp.c [moved from net/ipv4/ipvs/ip_vs_proto_tcp.c with 100% similarity]
net/netfilter/ipvs/ip_vs_proto_udp.c [moved from net/ipv4/ipvs/ip_vs_proto_udp.c with 100% similarity]
net/netfilter/ipvs/ip_vs_rr.c [moved from net/ipv4/ipvs/ip_vs_rr.c with 100% similarity]
net/netfilter/ipvs/ip_vs_sched.c [moved from net/ipv4/ipvs/ip_vs_sched.c with 100% similarity]
net/netfilter/ipvs/ip_vs_sed.c [moved from net/ipv4/ipvs/ip_vs_sed.c with 100% similarity]
net/netfilter/ipvs/ip_vs_sh.c [moved from net/ipv4/ipvs/ip_vs_sh.c with 100% similarity]
net/netfilter/ipvs/ip_vs_sync.c [moved from net/ipv4/ipvs/ip_vs_sync.c with 100% similarity]
net/netfilter/ipvs/ip_vs_wlc.c [moved from net/ipv4/ipvs/ip_vs_wlc.c with 100% similarity]
net/netfilter/ipvs/ip_vs_wrr.c [moved from net/ipv4/ipvs/ip_vs_wrr.c with 100% similarity]
net/netfilter/ipvs/ip_vs_xmit.c [moved from net/ipv4/ipvs/ip_vs_xmit.c with 100% similarity]

index 591ea23..691268f 100644 (file)
@@ -630,5 +630,3 @@ config TCP_MD5SIG
 
          If unsure, say N.
 
-source "net/ipv4/ipvs/Kconfig"
-
index ad40ef3..80ff87c 100644 (file)
@@ -33,7 +33,6 @@ obj-$(CONFIG_INET_XFRM_MODE_TRANSPORT) += xfrm4_mode_transport.o
 obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o
 obj-$(CONFIG_IP_PNP) += ipconfig.o
 obj-$(CONFIG_NETFILTER)        += netfilter.o netfilter/
-obj-$(CONFIG_IP_VS) += ipvs/
 obj-$(CONFIG_INET_DIAG) += inet_diag.o 
 obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o
 obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o
index ee898e7..73f9378 100644 (file)
@@ -838,3 +838,5 @@ config NETFILTER_XT_MATCH_HASHLIMIT
 
 endmenu
 
+source "net/netfilter/ipvs/Kconfig"
+
index 3bd2cc5..cf75055 100644 (file)
@@ -83,3 +83,6 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
 obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
+
+# IPVS
+obj-$(CONFIG_IP_VS) += ipvs/
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
new file mode 100644 (file)
index 0000000..a16943f
--- /dev/null
@@ -0,0 +1,261 @@
+/*
+ * IPVS:        Destination Hashing scheduling module
+ *
+ * Authors:     Wensong Zhang <wensong@gnuchina.org>
+ *
+ *              Inspired by the consistent hashing scheduler patch from
+ *              Thomas Proell <proellt@gmx.de>
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * Changes:
+ *
+ */
+
+/*
+ * The dh algorithm is to select server by the hash key of destination IP
+ * address. The pseudo code is as follows:
+ *
+ *       n <- servernode[dest_ip];
+ *       if (n is dead) OR
+ *          (n is overloaded) OR (n.weight <= 0) then
+ *                 return NULL;
+ *
+ *       return n;
+ *
+ * Notes that servernode is a 256-bucket hash table that maps the hash
+ * index derived from packet destination IP address to the current server
+ * array. If the dh scheduler is used in cache cluster, it is good to
+ * combine it with cache_bypass feature. When the statically assigned
+ * server is dead or overloaded, the load balancer can bypass the cache
+ * server and send requests to the original server directly.
+ *
+ */
+
+#include <linux/ip.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+
+#include <net/ip_vs.h>
+
+
+/*
+ *      IPVS DH bucket
+ */
+struct ip_vs_dh_bucket {
+       struct ip_vs_dest       *dest;          /* real server (cache) */
+};
+
+/*
+ *     for IPVS DH entry hash table
+ */
+#ifndef CONFIG_IP_VS_DH_TAB_BITS
+#define CONFIG_IP_VS_DH_TAB_BITS        8
+#endif
+#define IP_VS_DH_TAB_BITS               CONFIG_IP_VS_DH_TAB_BITS
+#define IP_VS_DH_TAB_SIZE               (1 << IP_VS_DH_TAB_BITS)
+#define IP_VS_DH_TAB_MASK               (IP_VS_DH_TAB_SIZE - 1)
+
+
+/*
+ *     Returns hash value for IPVS DH entry
+ */
+static inline unsigned ip_vs_dh_hashkey(__be32 addr)
+{
+       return (ntohl(addr)*2654435761UL) & IP_VS_DH_TAB_MASK;
+}
+
+
+/*
+ *      Get ip_vs_dest associated with supplied parameters.
+ */
+static inline struct ip_vs_dest *
+ip_vs_dh_get(struct ip_vs_dh_bucket *tbl, __be32 addr)
+{
+       return (tbl[ip_vs_dh_hashkey(addr)]).dest;
+}
+
+
+/*
+ *      Assign all the hash buckets of the specified table with the service.
+ */
+static int
+ip_vs_dh_assign(struct ip_vs_dh_bucket *tbl, struct ip_vs_service *svc)
+{
+       int i;
+       struct ip_vs_dh_bucket *b;
+       struct list_head *p;
+       struct ip_vs_dest *dest;
+
+       b = tbl;
+       p = &svc->destinations;
+       for (i=0; i<IP_VS_DH_TAB_SIZE; i++) {
+               if (list_empty(p)) {
+                       b->dest = NULL;
+               } else {
+                       if (p == &svc->destinations)
+                               p = p->next;
+
+                       dest = list_entry(p, struct ip_vs_dest, n_list);
+                       atomic_inc(&dest->refcnt);
+                       b->dest = dest;
+
+                       p = p->next;
+               }
+               b++;
+       }
+       return 0;
+}
+
+
+/*
+ *      Flush all the hash buckets of the specified table.
+ */
+static void ip_vs_dh_flush(struct ip_vs_dh_bucket *tbl)
+{
+       int i;
+       struct ip_vs_dh_bucket *b;
+
+       b = tbl;
+       for (i=0; i<IP_VS_DH_TAB_SIZE; i++) {
+               if (b->dest) {
+                       atomic_dec(&b->dest->refcnt);
+                       b->dest = NULL;
+               }
+               b++;
+       }
+}
+
+
+static int ip_vs_dh_init_svc(struct ip_vs_service *svc)
+{
+       struct ip_vs_dh_bucket *tbl;
+
+       /* allocate the DH table for this service */
+       tbl = kmalloc(sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE,
+                     GFP_ATOMIC);
+       if (tbl == NULL) {
+               IP_VS_ERR("ip_vs_dh_init_svc(): no memory\n");
+               return -ENOMEM;
+       }
+       svc->sched_data = tbl;
+       IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) allocated for "
+                 "current service\n",
+                 sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
+
+       /* assign the hash buckets with the updated service */
+       ip_vs_dh_assign(tbl, svc);
+
+       return 0;
+}
+
+
+static int ip_vs_dh_done_svc(struct ip_vs_service *svc)
+{
+       struct ip_vs_dh_bucket *tbl = svc->sched_data;
+
+       /* got to clean up hash buckets here */
+       ip_vs_dh_flush(tbl);
+
+       /* release the table itself */
+       kfree(svc->sched_data);
+       IP_VS_DBG(6, "DH hash table (memory=%Zdbytes) released\n",
+                 sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE);
+
+       return 0;
+}
+
+
+static int ip_vs_dh_update_svc(struct ip_vs_service *svc)
+{
+       struct ip_vs_dh_bucket *tbl = svc->sched_data;
+
+       /* got to clean up hash buckets here */
+       ip_vs_dh_flush(tbl);
+
+       /* assign the hash buckets with the updated service */
+       ip_vs_dh_assign(tbl, svc);
+
+       return 0;
+}
+
+
+/*
+ *      If the dest flags is set with IP_VS_DEST_F_OVERLOAD,
+ *      consider that the server is overloaded here.
+ */
+static inline int is_overloaded(struct ip_vs_dest *dest)
+{
+       return dest->flags & IP_VS_DEST_F_OVERLOAD;
+}
+
+
+/*
+ *      Destination hashing scheduling
+ */
+static struct ip_vs_dest *
+ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
+{
+       struct ip_vs_dest *dest;
+       struct ip_vs_dh_bucket *tbl;
+       struct iphdr *iph = ip_hdr(skb);
+
+       IP_VS_DBG(6, "ip_vs_dh_schedule(): Scheduling...\n");
+
+       tbl = (struct ip_vs_dh_bucket *)svc->sched_data;
+       dest = ip_vs_dh_get(tbl, iph->daddr);
+       if (!dest
+           || !(dest->flags & IP_VS_DEST_F_AVAILABLE)
+           || atomic_read(&dest->weight) <= 0
+           || is_overloaded(dest)) {
+               return NULL;
+       }
+
+       IP_VS_DBG(6, "DH: destination IP address %u.%u.%u.%u "
+                 "--> server %u.%u.%u.%u:%d\n",
+                 NIPQUAD(iph->daddr),
+                 NIPQUAD(dest->addr.ip),
+                 ntohs(dest->port));
+
+       return dest;
+}
+
+
+/*
+ *      IPVS DH Scheduler structure
+ */
+static struct ip_vs_scheduler ip_vs_dh_scheduler =
+{
+       .name =                 "dh",
+       .refcnt =               ATOMIC_INIT(0),
+       .module =               THIS_MODULE,
+       .n_list =               LIST_HEAD_INIT(ip_vs_dh_scheduler.n_list),
+#ifdef CONFIG_IP_VS_IPV6
+       .supports_ipv6 =        0,
+#endif
+       .init_service =         ip_vs_dh_init_svc,
+       .done_service =         ip_vs_dh_done_svc,
+       .update_service =       ip_vs_dh_update_svc,
+       .schedule =             ip_vs_dh_schedule,
+};
+
+
+static int __init ip_vs_dh_init(void)
+{
+       return register_ip_vs_scheduler(&ip_vs_dh_scheduler);
+}
+
+
+static void __exit ip_vs_dh_cleanup(void)
+{
+       unregister_ip_vs_scheduler(&ip_vs_dh_scheduler);
+}
+
+
+module_init(ip_vs_dh_init);
+module_exit(ip_vs_dh_cleanup);
+MODULE_LICENSE("GPL");