diff options
| author | Jamie Bainbridge <jamie.bainbridge@gmail.com> | 2015-11-07 22:13:49 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-13 10:34:09 +0000 |
| commit | 4ed805d143fbc9d5f2026405d7090301fad67066 (patch) | |
| tree | fc754b59ee6bdd6e137e5acd81dd87dc54439abb /fs | |
| parent | 0f2ed5d5f58037e83b57a6dab9738a207eb75d96 (diff) | |
| download | linux-4ed805d143fbc9d5f2026405d7090301fad67066.tar.gz linux-4ed805d143fbc9d5f2026405d7090301fad67066.tar.bz2 linux-4ed805d143fbc9d5f2026405d7090301fad67066.zip | |
cifs: Ratelimit kernel log messages
commit ec7147a99e33a9e4abad6fc6e1b40d15df045d53 upstream.
Under some conditions, CIFS can repeatedly call the cifs_dbg() logging
wrapper. If done rapidly enough, the console framebuffer can softlockup
or "rcu_sched self-detected stall". Apply the built-in log ratelimiters
to prevent such hangs.
Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
Signed-off-by: Steve French <smfrench@gmail.com>
[bwh: Backported to 3.2:
- cifs_dbg() and cifs_vfs_err() do not exist, but make similar changes
to cifsfyi(), cifswarn() and cifserror()]
- Include <linux/ratelimit.h> explicitly]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifs_debug.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/cifs/cifs_debug.h b/fs/cifs/cifs_debug.h index 8942b28cf807..3d55d720509d 100644 --- a/fs/cifs/cifs_debug.h +++ b/fs/cifs/cifs_debug.h @@ -23,6 +23,8 @@ #ifndef _H_CIFS_DEBUG #define _H_CIFS_DEBUG +#include <linux/ratelimit.h> + void cifs_dump_mem(char *label, void *data, int length); #ifdef CONFIG_CIFS_DEBUG2 #define DBG2 2 @@ -48,7 +50,7 @@ extern int cifsFYI; #define cifsfyi(fmt, arg...) \ do { \ if (cifsFYI & CIFS_INFO) \ - printk(KERN_DEBUG "%s: " fmt "\n", __FILE__, ##arg); \ + pr_debug_ratelimited("%s: " fmt "\n", __FILE__, ##arg); \ } while (0) #define cFYI(set, fmt, arg...) \ @@ -58,7 +60,7 @@ do { \ } while (0) #define cifswarn(fmt, arg...) \ - printk(KERN_WARNING fmt "\n", ##arg) + pr_warn_ratelimited(fmt "\n", ##arg) /* debug event message: */ extern int cifsERROR; @@ -73,7 +75,7 @@ do { \ #define cifserror(fmt, arg...) \ do { \ if (cifsERROR) \ - printk(KERN_ERR "CIFS VFS: " fmt "\n", ##arg); \ + pr_err_ratelimited("CIFS VFS: " fmt "\n", ##arg); \ } while (0) #define cERROR(set, fmt, arg...) \ |