Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC
Subsystems (3)
PATCH 1/1 Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC
Convenient for testing.
Maybe something to add in Documentation/kernel-parameters.txt ?
--- cut ---
include/net/af_unix.h +1 -0
@@ -15,6 +15,7 @@ extern struct sock *unix_get_socket(struct file *filp);#define UNIX_HASH_SIZE 256extern unsigned int unix_tot_inflight; +extern unsigned int sysctl_inflight_trigger_gc;struct unix_address {atomic_t refcnt;
net/unix/garbage.c +2 -3
@@ -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 16000void 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);}
net/unix/sysctl_net_unix.c +9 -0
@@ -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;
--- end of cut ---
Quoted 1 line · Pavel Vasilyev
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.
Re: [PATCH] Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC v.2
Quoted 6 lines · Américo Wang
Quoted 1 line · Pavel Vasilyev
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.
Signature · 1 line
Pavel.
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(-)
Documentation/networking/ip-sysctl.txt +4 -0
@@ -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:
include/net/af_unix.h +1 -0
@@ -15,6 +15,7 @@ extern struct sock *unix_get_socket(struct file *filp);#define UNIX_HASH_SIZE 256extern unsigned int unix_tot_inflight; +extern unsigned int sysctl_inflight_trigger_gc;struct unix_address {atomic_t refcnt;
net/unix/garbage.c +2 -3
@@ -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 16000void 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); }
net/unix/sysctl_net_unix.c +9 -0
@@ -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;
---
Re: [PATCH] Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC v.2
Quoted 9 lines · On Thu, 09 Dec 2010 14:32:41 +0300 Pavel Vasilyev wrote:
Quoted 6 lines · Américo Wang
Quoted 1 line · Pavel Vasilyev
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.
Now you need to send this to [email protected] so that the netdev people can review it. Please.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH] Sysctl interface to UNIX_INFLIGHT_TRIGGER_GC v.2
Quoted 5 lines · Randy Dunlap
Quoted 4 lines · On Thu, 09 Dec 2010 14:32:41 +0300 Pavel Vasilyev wrote:
Quoted 3 lines
Quoted 1 line
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.
Quoted 7 lines
Quoted 1 line
Thanks, added.
Now you need to send this to [email protected] so that the netdev people can review it. Please.
---
~Randy
*** Remember to useDocumentation/SubmitChecklistwhen testing your code ***
http://www.spinics.net/lists/netdev/msg149397.html
Signature · 1 line
Pavel.