Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754724Ab0LILdx (ORCPT ); Thu, 9 Dec 2010 06:33:53 -0500 Received: from imp01.mtu.ru ([62.5.255.10]:51259 "EHLO imp01.mtu.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752234Ab0LILdw (ORCPT ); Thu, 9 Dec 2010 06:33:52 -0500 Message-ID: <4D00BE59.4090109@pavlinux.ru> Date: Thu, 09 Dec 2010 14:32:41 +0300 From: Pavel Vasilyev Reply-To: pavel@pavlinux.ru Organization: Pavlinux. Inc. User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101026 SUSE/3.1.6 Thunderbird/3.1.6 MIME-Version: 1.0 To: =?ISO-8859-1?Q?Am=E9rico_Wang?= CC: LKML Subject: Re: [PATCH] Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC v.2 References: <4D004E42.7000807@pavlinux.ru> <20101209041310.GA5101@cr0.nay.redhat.com> In-Reply-To: <20101209041310.GA5101@cr0.nay.redhat.com> X-Enigmail-Version: 1.1.2 OpenPGP: id=03742489 Content-Type: multipart/mixed; boundary="------------060607010301070505040506" X-Spam-Flag: NO X-Spam-Yversion: Spamooborona-3.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3843 Lines: 129 This is a multi-part message in MIME format. --------------060607010301070505040506 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit On 09.12.2010 07:13, Am?rico Wang wrote: > On Thu, Dec 09, 2010 at 06:34:26AM +0300, Pavel Vasilyev wrote: >> Maybe something to add in Documentation/kernel-parameters.txt ? > > No, that is for boot parameters, you need to find something like > Documentation/networking/ip-sysctl.txt. > Thanks, added. -- Pavel. --------------060607010301070505040506 Content-Type: text/x-patch; name="sysctl.inflight_trigger_gc.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sysctl.inflight_trigger_gc.patch" Documentation/networking/ip-sysctl.txt | 4 ++++ include/net/af_unix.h | 1 + net/unix/garbage.c | 5 ++--- net/unix/sysctl_net_unix.c | 9 +++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 3c5e465..11e6adf 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1463,6 +1463,10 @@ max_dgram_qlen - INTEGER Default: 10 +inflight_trigger_gc - INTEGER + The maximal number of inflight sockets for force garbage collect. + + Default: 16000 UNDOCUMENTED: diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 18e5c3f..ea580e4 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -15,6 +15,7 @@ extern struct sock *unix_get_socket(struct file *filp); #define UNIX_HASH_SIZE 256 extern unsigned int unix_tot_inflight; +extern unsigned int sysctl_inflight_trigger_gc; struct unix_address { atomic_t refcnt; diff --git a/net/unix/garbage.c b/net/unix/garbage.c index f89f83b..c646c6b 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -94,7 +94,7 @@ static DEFINE_SPINLOCK(unix_gc_lock); static DECLARE_WAIT_QUEUE_HEAD(unix_gc_wait); unsigned int unix_tot_inflight; - +unsigned int sysctl_inflight_trigger_gc = 16000; struct sock *unix_get_socket(struct file *filp) { @@ -259,7 +259,6 @@ static void inc_inflight_move_tail(struct unix_sock *u) } static bool gc_in_progress = false; -#define UNIX_INFLIGHT_TRIGGER_GC 16000 void wait_for_unix_gc(void) { @@ -267,7 +266,7 @@ void wait_for_unix_gc(void) * If number of inflight sockets is insane, * force a garbage collect right now. */ - if (unix_tot_inflight > UNIX_INFLIGHT_TRIGGER_GC && !gc_in_progress) + if (unix_tot_inflight > sysctl_inflight_trigger_gc && !gc_in_progress) unix_gc(); wait_event(unix_gc_wait, gc_in_progress == false); } diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 397cffe..c807235 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -23,6 +23,13 @@ static ctl_table unix_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, + { + .procname = "inflight_trigger_gc", + .data = &sysctl_inflight_trigger_gc, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, { } }; @@ -41,6 +48,8 @@ int __net_init unix_sysctl_register(struct net *net) goto err_alloc; table[0].data = &net->unx.sysctl_max_dgram_qlen; + table[1].data = &sysctl_inflight_trigger_gc; + net->unx.ctl = register_net_sysctl_table(net, unix_path, table); if (net->unx.ctl == NULL) goto err_reg; --- Signed-off-by: Pavel Vasilyev --------------060607010301070505040506-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/