Commit 4ed805d1 authored by Jamie Bainbridge's avatar Jamie Bainbridge Committed by Ben Hutchings

cifs: Ratelimit kernel log messages

commit ec7147a9 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: default avatarJamie Bainbridge <jamie.bainbridge@gmail.com>
Signed-off-by: default avatarSteve 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: default avatarBen Hutchings <ben@decadent.org.uk>
parent 0f2ed5d5
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#ifndef _H_CIFS_DEBUG #ifndef _H_CIFS_DEBUG
#define _H_CIFS_DEBUG #define _H_CIFS_DEBUG
#include <linux/ratelimit.h>
void cifs_dump_mem(char *label, void *data, int length); void cifs_dump_mem(char *label, void *data, int length);
#ifdef CONFIG_CIFS_DEBUG2 #ifdef CONFIG_CIFS_DEBUG2
#define DBG2 2 #define DBG2 2
...@@ -48,7 +50,7 @@ extern int cifsFYI; ...@@ -48,7 +50,7 @@ extern int cifsFYI;
#define cifsfyi(fmt, arg...) \ #define cifsfyi(fmt, arg...) \
do { \ do { \
if (cifsFYI & CIFS_INFO) \ if (cifsFYI & CIFS_INFO) \
printk(KERN_DEBUG "%s: " fmt "\n", __FILE__, ##arg); \ pr_debug_ratelimited("%s: " fmt "\n", __FILE__, ##arg); \
} while (0) } while (0)
#define cFYI(set, fmt, arg...) \ #define cFYI(set, fmt, arg...) \
...@@ -58,7 +60,7 @@ do { \ ...@@ -58,7 +60,7 @@ do { \
} while (0) } while (0)
#define cifswarn(fmt, arg...) \ #define cifswarn(fmt, arg...) \
printk(KERN_WARNING fmt "\n", ##arg) pr_warn_ratelimited(fmt "\n", ##arg)
/* debug event message: */ /* debug event message: */
extern int cifsERROR; extern int cifsERROR;
...@@ -73,7 +75,7 @@ do { \ ...@@ -73,7 +75,7 @@ do { \
#define cifserror(fmt, arg...) \ #define cifserror(fmt, arg...) \
do { \ do { \
if (cifsERROR) \ if (cifsERROR) \
printk(KERN_ERR "CIFS VFS: " fmt "\n", ##arg); \ pr_err_ratelimited("CIFS VFS: " fmt "\n", ##arg); \
} while (0) } while (0)
#define cERROR(set, fmt, arg...) \ #define cERROR(set, fmt, arg...) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment