core/printk for v2.6.33
Subsystems (3)
Linus,
Please pull the latest core-printk-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-printk-for-linus
Thanks,
Ingo
------------------>
Christian Borntraeger (1):
ratelimit: Make suppressed output messages more useful
Ingo Molnar (3):
ratelimit: Use per ratelimit context locking
ratelimit: Fix/allow use in atomic contexts
printk: Remove ratelimit.h from kernel.h
include/linux/kernel.h | 5 +-- include/linux/net.h | 1 + include/linux/ratelimit.h | 33 +++++++++++++++++++++---------- kernel/printk.c | 7 +++-- kernel/sysctl.c | 3 ++ lib/ratelimit.c | 45 ++++++++++++++++++++++++------------------- net/core/sysctl_net_core.c | 2 + net/core/utils.c | 2 + 8 files changed, 61 insertions(+), 37 deletions(-)
include/linux/kernel.h +2 -3
@@ -15,7 +15,6 @@#include <linux/bitops.h> #include <linux/log2.h> #include <linux/typecheck.h> -#include <linux/ratelimit.h> #include <linux/dynamic_debug.h> #include <asm/byteorder.h> #include <asm/bug.h>
@@ -241,8 +240,8 @@ asmlinkage int vprintk(const char *fmt, va_list args) asmlinkage int printk(const char * fmt, ...) __attribute__ ((format (printf,1 ,2 )))__cold ; -extern struct ratelimit_state printk_ratelimit_state; -extern int printk_ratelimit (void ); +extern int __printk_ratelimit (const char *func); +#define printk_ratelimit () __printk_ratelimit(__func__)extern bool printk_timed_ratelimit (unsigned long *caller_jiffies,unsigned int interval_msec);
include/linux/net.h +1 -0
@@ -358,6 +358,7 @@ static const struct proto_ops name##_ops = { \#ifdef CONFIG_SYSCTL #include <linux/sysctl.h> +#include <linux/ratelimit.h> extern struct ratelimit_state net_ratelimit_state;#endif
include/linux/ratelimit.h +22 -11
@@ -1,20 +1,31 @@#ifndef _LINUX_RATELIMIT_H#define _LINUX_RATELIMIT_H +#include <linux/param.h> +#include <linux/spinlock_types.h> -#define DEFAULT_RATELIMIT_INTERVAL (5 * HZ) -#define DEFAULT_RATELIMIT_BURST 10 +#define DEFAULT_RATELIMIT_INTERVAL (5 * HZ) +#define DEFAULT_RATELIMIT_BURST 10struct ratelimit_state { -int interval; -int burst; -int printed; -int missed; -unsigned long begin; +spinlock_t lock;/* protect the state */ + +int interval; +int burst; +int printed; +int missed; +unsigned long begin; }; -#define DEFINE_RATELIMIT_STATE (name, interval, burst) \ - struct ratelimit_state name = {interval, burst,} +#define DEFINE_RATELIMIT_STATE (name, interval_init, burst_init) \ + \ + struct ratelimit_state name = { \ + .lock = __SPIN_LOCK_UNLOCKED(name.lock), \ + .interval = interval_init, \ + .burst = burst_init, \ + } + +extern int ___ratelimit (struct ratelimit_state *rs,const char *func); +#define __ratelimit (state) ___ratelimit(state, __func__) -extern int __ratelimit (struct ratelimit_state *rs); -#endif +#endif /* _LINUX_RATELIMIT_H */
kernel/printk.c +4 -3
@@ -33,6 +33,7 @@#include <linux/bootmem.h> #include <linux/syscalls.h> #include <linux/kexec.h> +#include <linux/ratelimit.h> #include <asm/uaccess.h>
@@ -1363,11 +1364,11 @@ late_initcall(disable_boot_consoles);*/ DEFINE_RATELIMIT_STATE (printk_ratelimit_state,5 *HZ ,10 ); -int printk_ratelimit (void ) +int __printk_ratelimit (const char *func) { -return __ratelimit (&printk_ratelimit_state); +return ___ratelimit (&printk_ratelimit_state, func); } -EXPORT_SYMBOL (printk_ratelimit); +EXPORT_SYMBOL (__printk_ratelimit);/** * printk_timed_ratelimit - caller-controlled printk ratelimiting
kernel/sysctl.c +3 -0
@@ -37,6 +37,7 @@#include <linux/sysrq.h> #include <linux/highuid.h> #include <linux/writeback.h> +#include <linux/ratelimit.h> #include <linux/hugetlb.h> #include <linux/initrd.h> #include <linux/key.h>
@@ -155,6 +156,8 @@ extern int no_unaligned_warning;extern int unaligned_dump_stack;#endif +extern struct ratelimit_state printk_ratelimit_state; +#ifdef CONFIG_RT_MUTEXES extern int max_lock_depth;#endif
lib/ratelimit.c +25 -20
75 lines not on this page · raw message
net/core/sysctl_net_core.c +2 -0
@@ -10,7 +10,9 @@#include <linux/module.h> #include <linux/socket.h> #include <linux/netdevice.h> +#include <linux/ratelimit.h> #include <linux/init.h> +#include <net/ip.h> #include <net/sock.h>
net/core/utils.c +2 -0
@@ -24,6 +24,8 @@#include <linux/types.h> #include <linux/percpu.h> #include <linux/init.h> +#include <linux/ratelimit.h> +#include <net/sock.h> #include <asm/byteorder.h>