From patchwork Wed Apr 20 18:33:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Schillstrom X-Patchwork-Id: 92270 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D220B1007E0 for ; Thu, 21 Apr 2011 04:34:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755505Ab1DTSeK (ORCPT ); Wed, 20 Apr 2011 14:34:10 -0400 Received: from smtp-gw11.han.skanova.net ([81.236.55.20]:32908 "EHLO smtp-gw11.han.skanova.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754238Ab1DTSeE (ORCPT ); Wed, 20 Apr 2011 14:34:04 -0400 Received: from dmz.mlab.se (213.65.94.224) by smtp-gw11.han.skanova.net (8.5.133) id 4D651BF901A588B7; Wed, 20 Apr 2011 20:34:00 +0200 Received: from quad.mlab.se (quad.mlab.se [172.24.1.70]) by dmz.mlab.se (8.13.8/8.13.8) with ESMTP id p3KIY0h8029117; Wed, 20 Apr 2011 20:34:00 +0200 Received: from quad.mlab.se (localhost.localdomain [127.0.0.1]) by quad.mlab.se (8.14.4/8.14.4) with ESMTP id p3KIY0ci014088; Wed, 20 Apr 2011 20:34:00 +0200 Received: (from hans@localhost) by quad.mlab.se (8.14.4/8.14.4/Submit) id p3KIXxV3014087; Wed, 20 Apr 2011 20:33:59 +0200 From: Hans Schillstrom To: horms@verge.net.au, ja@ssi.bg, ebiederm@xmission.com, lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: hans.schillstrom@ericsson.com, Hans Schillstrom Subject: [PATCH 6/6] IPVS: add debug functions Date: Wed, 20 Apr 2011 20:33:54 +0200 Message-Id: <1303324434-14024-7-git-send-email-hans@schillstrom.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303324434-14024-1-git-send-email-hans@schillstrom.com> References: <1303324434-14024-1-git-send-email-hans@schillstrom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Optional patch, but it is nice to have. Signed-off-by: Hans Schillstrom --- net/netfilter/ipvs/ip_vs_ctl.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)