LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH 6/6] IPVS: add debug functions

To: horms@xxxxxxxxxxxx, ja@xxxxxx, ebiederm@xxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx
Subject: [PATCH 6/6] IPVS: add debug functions
Cc: hans.schillstrom@xxxxxxxxxxxx, Hans Schillstrom <hans@xxxxxxxxxxxxxxx>
From: Hans Schillstrom <hans@xxxxxxxxxxxxxxx>
Date: Wed, 20 Apr 2011 20:33:54 +0200
Optional patch, but it is nice to have.

Signed-off-by: Hans Schillstrom <hans@xxxxxxxxxxxxxxx>
---
 net/netfilter/ipvs/ip_vs_ctl.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 34f05db..3b6c411 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -351,8 +351,11 @@ static int ip_vs_svc_unhash(struct ip_vs_service *svc)
        svc->flags &= ~IP_VS_SVC_F_HASHED;
        atomic_dec(&svc->refcnt);
        /* No more services then no need for input */
-       if (atomic_read(&svc->refcnt) == 0)
+       if (!atomic_read(&svc->refcnt)) {
                atomic_set(&net_ipvs(svc->net)->enable, 0);
+               IP_VS_DBG(2, "Last service removed in net(%d) input disabled\n",
+                            net_ipvs(svc->net)->gen);
+       }
        return 1;
 }

@@ -1222,6 +1225,10 @@ ip_vs_add_service(struct net *net, struct 
ip_vs_service_user_kern *u,
        write_unlock_bh(&__ip_vs_svc_lock);

        *svc_p = svc;
+       if (atomic_read(&ipvs->enable) == 0)
+               pr_info("netns(%d) enabled first service added\n",
+                        ipvs->gen);
+
        /* Now there is a service - full throttle */
        atomic_set(&ipvs->enable, 1);
        return 0;
@@ -3695,6 +3702,7 @@ int __net_init ip_vs_control_net_init(struct net *net)
        int idx;
        struct netns_ipvs *ipvs = net_ipvs(net);

+       EnterFunction(2);
        ipvs->rs_lock = __RW_LOCK_UNLOCKED(ipvs->rs_lock);

        /* Initialize rs_table */
@@ -3721,6 +3729,7 @@ int __net_init ip_vs_control_net_init(struct net *net)
        if (ip_vs_control_net_init_sysctl(net))
                goto err;

+       LeaveFunction(2);
        return 0;

 err:
@@ -3732,6 +3741,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net)
 {
        struct netns_ipvs *ipvs = net_ipvs(net);

+       EnterFunction(2);
        ip_vs_trash_cleanup(net);
        ip_vs_stop_estimator(net, &ipvs->tot_stats);
        ip_vs_control_net_cleanup_sysctl(net);
@@ -3739,6 +3749,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net)
        proc_net_remove(net, "ip_vs_stats");
        proc_net_remove(net, "ip_vs");
        free_percpu(ipvs->tot_stats.cpustats);
+       LeaveFunction(2);
 }

 int __init ip_vs_control_init(void)
--
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>