ipvs: rename functions related to dst_cache reset

[mirror_ubuntu-zesty-kernel.git] / net / netfilter / ipvs / ip_vs_ctl.c

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index c68198bf9128abfb695571faed1e0390b036a4bb..5265eaa7b42b35564523ff38fe379ecea0de75de 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -271,16 +271,18 @@ ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto,
 {
        register unsigned int porth = ntohs(port);
        __be32 addr_fold = addr->ip;
+       __u32 ahash;
 
 #ifdef CONFIG_IP_VS_IPV6
        if (af == AF_INET6)
                addr_fold = addr->ip6[0]^addr->ip6[1]^
                            addr->ip6[2]^addr->ip6[3];
 #endif
-       addr_fold ^= ((size_t)net>>8);
+       ahash = ntohl(addr_fold);
+       ahash ^= ((size_t) net >> 8);
 
-       return (proto^ntohl(addr_fold)^(porth>>IP_VS_SVC_TAB_BITS)^porth)
-               & IP_VS_SVC_TAB_MASK;
+       return (proto ^ ahash ^ (porth >> IP_VS_SVC_TAB_BITS) ^ porth) &
+              IP_VS_SVC_TAB_MASK;
 }
 
 /*
@@ -639,6 +641,17 @@ struct ip_vs_dest *ip_vs_find_dest(struct net  *net, int af,
        return dest;
 }
 
+/* Release dst_cache for dest in user context */
+static void __ip_vs_dst_cache_reset(struct ip_vs_dest *dest)
+{
+       struct dst_entry *old_dst;
+
+       old_dst = dest->dst_cache;
+       dest->dst_cache = NULL;
+       dst_release(old_dst);
+       dest->dst_saddr.ip = 0;
+}
+
 /*
  *  Lookup dest by {svc,addr,port} in the destination trash.
  *  The destination trash is used to hold the destinations that are removed
@@ -688,7 +701,7 @@ ip_vs_trash_get_dest(struct ip_vs_service *svc, const union nf_inet_addr *daddr,
                                      IP_VS_DBG_ADDR(svc->af, &dest->addr),
                                      ntohs(dest->port));
                        list_del(&dest->n_list);
-                       ip_vs_dst_reset(dest);
+                       __ip_vs_dst_cache_reset(dest);
                        __ip_vs_unbind_svc(dest);
                        free_percpu(dest->stats.cpustats);
                        kfree(dest);
@@ -715,7 +728,7 @@ static void ip_vs_trash_cleanup(struct net *net)
 
        list_for_each_entry_safe(dest, nxt, &ipvs->dest_trash, n_list) {
                list_del(&dest->n_list);
-               ip_vs_dst_reset(dest);
+               __ip_vs_dst_cache_reset(dest);
                __ip_vs_unbind_svc(dest);
                free_percpu(dest->stats.cpustats);
                kfree(dest);
@@ -809,7 +822,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
        dest->l_threshold = udest->l_threshold;
 
        spin_lock_bh(&dest->dst_lock);
-       ip_vs_dst_reset(dest);
+       __ip_vs_dst_cache_reset(dest);
        spin_unlock_bh(&dest->dst_lock);
 
        if (add)
@@ -1035,7 +1048,7 @@ static void __ip_vs_del_dest(struct net *net, struct ip_vs_dest *dest)
                              dest->vfwmark,
                              IP_VS_DBG_ADDR(dest->af, &dest->addr),
                              ntohs(dest->port));
-               ip_vs_dst_reset(dest);
+               __ip_vs_dst_cache_reset(dest);
                /* simply decrease svc->refcnt here, let the caller check
                   and release the service if nobody refers to it.
                   Only user context can release destination and service,
@@ -1494,11 +1507,10 @@ void ip_vs_service_net_cleanup(struct net *net)
        mutex_unlock(&__ip_vs_mutex);
        LeaveFunction(2);
 }
-/*
- * Release dst hold by dst_cache
- */
+
+/* Put all references for device (dst_cache) */
 static inline void
-__ip_vs_dev_reset(struct ip_vs_dest *dest, struct net_device *dev)
+ip_vs_forget_dev(struct ip_vs_dest *dest, struct net_device *dev)
 {
        spin_lock_bh(&dest->dst_lock);
        if (dest->dst_cache && dest->dst_cache->dev == dev) {
@@ -1507,15 +1519,13 @@ __ip_vs_dev_reset(struct ip_vs_dest *dest, struct net_device *dev)
                              IP_VS_DBG_ADDR(dest->af, &dest->addr),
                              ntohs(dest->port),
                              atomic_read(&dest->refcnt));
-               ip_vs_dst_reset(dest);
+               __ip_vs_dst_cache_reset(dest);
        }
        spin_unlock_bh(&dest->dst_lock);
 
 }
-/*
- * Netdev event receiver
- * Currently only NETDEV_UNREGISTER is handled, i.e. if we hold a reference to
- * a device that is "unregister" it must be released.
+/* Netdev event receiver
+ * Currently only NETDEV_DOWN is handled to release refs to cached dsts
  */
 static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
                            void *ptr)
@@ -1527,7 +1537,7 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
        struct ip_vs_dest *dest;
        unsigned int idx;
 
-       if (event != NETDEV_UNREGISTER || !ipvs)
+       if (event != NETDEV_DOWN || !ipvs)
                return NOTIFY_DONE;
        IP_VS_DBG(3, "%s() dev=%s\n", __func__, dev->name);
        EnterFunction(2);
@@ -1537,7 +1547,7 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
                        if (net_eq(svc->net, net)) {
                                list_for_each_entry(dest, &svc->destinations,
                                                    n_list) {
-                                       __ip_vs_dev_reset(dest, dev);
+                                       ip_vs_forget_dev(dest, dev);
                                }
                        }
                }
@@ -1546,7 +1556,7 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
                        if (net_eq(svc->net, net)) {
                                list_for_each_entry(dest, &svc->destinations,
                                                    n_list) {
-                                       __ip_vs_dev_reset(dest, dev);
+                                       ip_vs_forget_dev(dest, dev);
                                }
                        }
 
@@ -1554,7 +1564,7 @@ static int ip_vs_dst_event(struct notifier_block *this, unsigned long event,
        }
 
        list_for_each_entry(dest, &ipvs->dest_trash, n_list) {
-               __ip_vs_dev_reset(dest, dev);
+               ip_vs_forget_dev(dest, dev);
        }
        mutex_unlock(&__ip_vs_mutex);
        LeaveFunction(2);
@@ -1808,6 +1818,12 @@ static struct ctl_table vs_vars[] = {
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
+       {
+               .procname       = "backup_only",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec,
+       },
 #ifdef CONFIG_IP_VS_DEBUG
        {
                .procname       = "debug_level",
@@ -3741,6 +3757,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
        tbl[idx++].data = &ipvs->sysctl_nat_icmp_send;
        ipvs->sysctl_pmtu_disc = 1;
        tbl[idx++].data = &ipvs->sysctl_pmtu_disc;
+       tbl[idx++].data = &ipvs->sysctl_backup_only;
 
 
        ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);