From patchwork Sun May 1 16:50:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Schillstrom X-Patchwork-Id: 93565 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 7A925B6FA1 for ; Mon, 2 May 2011 02:50:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761044Ab1EAQui (ORCPT ); Sun, 1 May 2011 12:50:38 -0400 Received: from smtp-gw11.han.skanova.net ([81.236.55.20]:42620 "EHLO smtp-gw11.han.skanova.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760992Ab1EAQu2 (ORCPT ); Sun, 1 May 2011 12:50:28 -0400 Received: from dmz.mlab.se (213.65.94.224) by smtp-gw11.han.skanova.net (8.5.133) id 4D651BF901DC765F; Sun, 1 May 2011 18:50:26 +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 p41GoO8W004500; Sun, 1 May 2011 18:50:24 +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 p41GoOmi018169; Sun, 1 May 2011 18:50:24 +0200 Received: (from hans@localhost) by quad.mlab.se (8.14.4/8.14.4/Submit) id p41GoOmP018168; Sun, 1 May 2011 18:50:24 +0200 From: Hans Schillstrom To: ja@ssi.bg, horms@verge.net.au, 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: [v4 PATCH 6/6] IPVS: add debug functions Date: Sun, 1 May 2011 18:50:18 +0200 Message-Id: <1304268618-18103-7-git-send-email-hans@schillstrom.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1304268618-18103-1-git-send-email-hans@schillstrom.com> References: <1304268618-18103-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 Signed-off-by: Hans Schillstrom --- 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 9074c5d..a1fab5b 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, no need for input */ - if (atomic_read(&svc->refcnt) == 0) + if (atomic_read(&svc->refcnt) == 0) { 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 (!ipvs->enable) + pr_info("netns(%d) enabled, first service added\n", + ipvs->gen); + /* Now there is a service - full throttle */ ipvs->enable = 1; return 0; @@ -3685,6 +3692,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 */ @@ -3711,6 +3719,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: @@ -3722,6 +3731,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); @@ -3729,6 +3739,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)