From 9829f0a5c6d450d3af44dc8ba55ab49b54e3d0b4 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 3 Feb 2004 18:40:22 -0800 Subject: [PATCH] [PATCH] printk_ratelimit() tweaks From: Anton Blanchard I made a few changes, basically the burst parameter is now in units of messages, makes much more sense than the old net ratelimit one. I also screwed up adding a sysctl_jiffies strategy for the burst parameter. --- Documentation/sysctl/kernel.txt | 4 ++-- kernel/sysctl.c | 1 - net/core/sysctl_net_core.c | 3 +-- net/core/utils.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index a079f0120f70d..9a193fc865383 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -254,8 +254,8 @@ the different loglevels. printk_ratelimit: Some warning messages are rate limited. printk_ratelimit specifies -the minimum length of time between these messages, by default we -allow one every 5 seconds. +the minimum length of time between these messages (in jiffies), by +default we allow one every 5 seconds. A value of 0 will disable rate limiting. diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 059bd643f39fd..89f7c28b7ed13 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -598,7 +598,6 @@ static ctl_table kern_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec, - .strategy = &sysctl_jiffies, }, { .ctl_name = 0 } }; diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 642ef77a28244..6889e4306f94b 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -155,8 +155,7 @@ ctl_table core_table[] = { .data = &net_msg_burst, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_dointvec_jiffies, - .strategy = &sysctl_jiffies, + .proc_handler = &proc_dointvec, }, { .ctl_name = NET_CORE_OPTMEM_MAX, diff --git a/net/core/utils.c b/net/core/utils.c index 7399804e1517b..995f2b5168c24 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -38,7 +38,7 @@ void net_srandom(unsigned long entropy) } int net_msg_cost = 5*HZ; -int net_msg_burst = 10*5*HZ; +int net_msg_burst = 10; /* * This enforces a rate limit: not more than one kernel message -- 2.53.0