Lustre: remaining bits of sysctl debugfs migration
cover Lustre: remaining bits of sysctl debugfs migration
From: Oleg Drokin <[email protected]>
Rediffed the last few patches as per Greg's instructions. Also Added a folow on fix for the uint_min_max param to properly take into account kstrtouint range of error return values.
Please consider.
Dmitry Eremin (2):
staging/lustre/libcfs: get rid of
debugfs/lnet/console_{min,max}_delay_centisecs
staging/lustre/libcfs: remove unused portal_enter_debugger variable
Oleg Drokin (2):
staging/lustre/libcfs: get rid of debugfs/lnet/debug_mb staging/lustre/libcfs: Fix kstrtouint return value check fix
drivers/staging/lustre/lustre/libcfs/debug.c | 114 ++++++++++++++++++++--- drivers/staging/lustre/lustre/libcfs/module.c | 114 ++--------------------- drivers/staging/lustre/lustre/libcfs/tracefile.c | 12 --- drivers/staging/lustre/lustre/libcfs/tracefile.h | 1 - 4 files changed, 109 insertions(+), 132 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/4 staging/lustre/libcfs: get rid of debugfs/lnet/debug_mb
From: Oleg Drokin <[email protected]>
It's just a fancy libcfs_debug_mb module parameter wrapper, so just add debug buffer size check and resizing and the same functionality now would be accessible via /sys/module/libcfs/parameters/libcfs_debug_mb
Also add a symlink for backwards compatibility.
--- drivers/staging/lustre/lustre/libcfs/debug.c | 40 ++++++++++++++++++++++-- drivers/staging/lustre/lustre/libcfs/module.c | 32 ++----------------- drivers/staging/lustre/lustre/libcfs/tracefile.c | 12 ------- drivers/staging/lustre/lustre/libcfs/tracefile.h | 1 - 4 files changed, 40 insertions(+), 45 deletions(-)
drivers/staging/lustre/lustre/libcfs/debug.c +38 -2
@@ -57,8 +57,42 @@ module_param(libcfs_debug, int, 0644);MODULE_PARM_DESC (libcfs_debug,"Lustre kernel debug mask" );EXPORT_SYMBOL (libcfs_debug); +static int libcfs_param_debug_mb_set (const char *val, +const struct kernel_param *kp) +{ +int rc; +unsigned num; + + rc =kstrtouint (val,0 , &num); +if (rc <0 ) +return rc; + +if (!*((unsigned int *)kp->arg)) { + *((unsigned int *)kp->arg) = num; +return 0 ; + } + + rc =cfs_trace_set_debug_mb (num); + +if (!rc) + *((unsigned int *)kp->arg) =cfs_trace_get_debug_mb (); + +return rc; +} + +/* While debug_mb setting look like unsigned int, in fact +* it needs quite a bunch of extra processing, so we define special +* debugmb parameter type with corresponding methods to handle this case */ +static struct kernel_param_ops param_ops_debugmb = { + .set = libcfs_param_debug_mb_set, + .get = param_get_uint, +}; + +#define param_check_debugmb (name, p) \ + __param_check(name, p, unsigned int) +static unsigned int libcfs_debug_mb; -module_param (libcfs_debug_mb, uint,0644 ); +module_param (libcfs_debug_mb, debugmb,0644 );MODULE_PARM_DESC (libcfs_debug_mb,"Total debug buffer size." );EXPORT_SYMBOL (libcfs_debug_mb);
@@ -437,8 +471,10 @@ int libcfs_debug_init(unsigned long bufsize) } rc =cfs_tracefile_init (max); -if (rc ==0 ) +if (rc ==0 ) {libcfs_register_panic_notifier (); + libcfs_debug_mb =cfs_trace_get_debug_mb (); + }return rc; }
drivers/staging/lustre/lustre/libcfs/module.c +2 -30
@@ -550,31 +550,6 @@ static int proc_daemon_file(struct ctl_table *table, int write, __proc_daemon_file); } -static int __proc_debug_mb (void *data,int write, -loff_t pos,void __user *buffer,int nob) -{ -if (!write) { -char tmpstr[32 ]; -int len =snprintf (tmpstr,sizeof (tmpstr),"%d" , -cfs_trace_get_debug_mb ()); - -if (pos >= len) -return 0 ; - -return cfs_trace_copyout_string (buffer, nob, tmpstr + pos, -"\n" ); - } - -return cfs_trace_set_debug_mb_usrstr (buffer, nob); -} - -static int proc_debug_mb (struct ctl_table *table,int write, -void __user *buffer,size_t *lenp,loff_t *ppos) -{ -return proc_call_handler (table->data, write, ppos, buffer, lenp, - __proc_debug_mb); -} -static int proc_console_max_delay_cs (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -790,11 +765,6 @@ static struct ctl_table lnet_table[] = { .proc_handler = &proc_daemon_file, }, { - .procname = "debug_mb", - .mode = 0644, - .proc_handler = &proc_debug_mb, - }, - { .procname = "force_lbug", .data = NULL, .maxlen = 0,
@@ -833,6 +803,8 @@ struct lnet_debugfs_symlink_def lnet_debugfs_symlinks[] = { "/sys/module/libcfs/parameters/libcfs_panic_on_lbug"}, {"libcfs_console_backoff" , "/sys/module/libcfs/parameters/libcfs_console_backoff"}, + { "debug_mb", + "/sys/module/libcfs/parameters/libcfs_debug_mb"}, {}, };
drivers/staging/lustre/lustre/libcfs/tracefile.c +0 -12
@@ -937,18 +937,6 @@ int cfs_trace_set_debug_mb(int mb)return 0 ; } -int cfs_trace_set_debug_mb_usrstr (void __user *usr_str,int usr_str_nob) -{ -char str[32 ]; -int rc; - - rc =cfs_trace_copyin_string (str,sizeof (str), usr_str, usr_str_nob); -if (rc <0 ) -return rc; - -return cfs_trace_set_debug_mb (simple_strtoul (str,NULL ,0 )); -} -int cfs_trace_get_debug_mb (void ) {int i;
drivers/staging/lustre/lustre/libcfs/tracefile.h +0 -1
@@ -77,7 +77,6 @@ int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob);int cfs_trace_daemon_command (char *str);int cfs_trace_daemon_command_usrstr (void __user *usr_str,int usr_str_nob);int cfs_trace_set_debug_mb (int mb); -int cfs_trace_set_debug_mb_usrstr (void __user *usr_str,int usr_str_nob);int cfs_trace_get_debug_mb (void );extern void libcfs_debug_dumplog_internal (void *arg);
Signature · 1 line
2.1.0
PATCH 2/4 staging/lustre/libcfs: get rid of debugfs/lnet/console_{min,max}_delay_centisecs
In reply to [email protected]From: Dmitry Eremin <[email protected]>
They are just fancy module parameters wrappers,
so just the same functionality now would be accessible via /sys/module/libcfs/parameters/libcfs_console_{min,max}_delay
Also install compatibility symlinks
--- drivers/staging/lustre/lustre/libcfs/debug.c | 69 ++++++++++++++++++++-- drivers/staging/lustre/lustre/libcfs/module.c | 82 ++------------------------- 2 files changed, 68 insertions(+), 83 deletions(-)
drivers/staging/lustre/lustre/libcfs/debug.c +64 -5
@@ -106,16 +106,75 @@ module_param(libcfs_console_ratelimit, uint, 0644);MODULE_PARM_DESC (libcfs_console_ratelimit,"Lustre kernel debug console ratelimit (0 to disable)" );EXPORT_SYMBOL (libcfs_console_ratelimit); +static int param_set_delay_minmax (const char *val, +const struct kernel_param *kp, +long min,long max) +{ +long d; +int sec; +int rc; + + rc =kstrtoint (val,0 , &sec); +if (rc) +return -EINVAL ; + + d =cfs_time_seconds (sec) /100 ; +if (d < min || d > max) +return -EINVAL ; + + *((unsigned int *)kp->arg) = d; + +return 0 ; +} + +static int param_get_delay (char *buffer,const struct kernel_param *kp) +{ +unsigned int d = *(unsigned int *)kp->arg; + +return sprintf (buffer,"%u" , (unsigned int )cfs_duration_sec (d *100 )); +} +unsigned int libcfs_console_max_delay; -module_param (libcfs_console_max_delay, uint,0644 ); -MODULE_PARM_DESC (libcfs_console_max_delay,"Lustre kernel debug console max delay (jiffies)" );EXPORT_SYMBOL (libcfs_console_max_delay); -unsigned int libcfs_console_min_delay; -module_param (libcfs_console_min_delay, uint,0644 ); -MODULE_PARM_DESC (libcfs_console_min_delay,"Lustre kernel debug console min delay (jiffies)" );EXPORT_SYMBOL (libcfs_console_min_delay); +static int param_set_console_max_delay (const char *val, +const struct kernel_param *kp) +{ +return param_set_delay_minmax (val, kp, + libcfs_console_min_delay,INT_MAX ); +} + +static struct kernel_param_ops param_ops_console_max_delay = { + .set = param_set_console_max_delay, + .get = param_get_delay, +}; + +#define param_check_console_max_delay (name, p) \ + __param_check(name, p, unsigned int) + +module_param (libcfs_console_max_delay, console_max_delay,0644 ); +MODULE_PARM_DESC (libcfs_console_max_delay,"Lustre kernel debug console max delay (jiffies)" ); + +static int param_set_console_min_delay (const char *val, +const struct kernel_param *kp) +{ +return param_set_delay_minmax (val, kp, +1 , libcfs_console_max_delay); +} + +static struct kernel_param_ops param_ops_console_min_delay = { + .set = param_set_console_min_delay, + .get = param_get_delay, +}; + +#define param_check_console_min_delay (name, p) \ + __param_check(name, p, unsigned int) + +module_param (libcfs_console_min_delay, console_min_delay,0644 ); +MODULE_PARM_DESC (libcfs_console_min_delay,"Lustre kernel debug console min delay (jiffies)" ); +static int param_set_uint_minmax (const char *val,const struct kernel_param *kp,unsigned int min,unsigned int max)
drivers/staging/lustre/lustre/libcfs/module.c +4 -78
100 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 3/4 staging/lustre/libcfs: remove unused portal_enter_debugger variable
In reply to [email protected]From: Dmitry Eremin <[email protected]>
Remove portal_enter_debugger because it's not used any more.
--- drivers/staging/lustre/lustre/libcfs/debug.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/lustre/lustre/libcfs/debug.c +0 -3
@@ -215,9 +215,6 @@ EXPORT_SYMBOL(libcfs_debug_binary);unsigned int libcfs_stack =3 *THREAD_SIZE /4 ;EXPORT_SYMBOL (libcfs_stack); -static unsigned int portal_enter_debugger; -EXPORT_SYMBOL (portal_enter_debugger); -unsigned int libcfs_catastrophe;EXPORT_SYMBOL (libcfs_catastrophe);
Signature · 1 line
2.1.0
PATCH 4/4 staging/lustre/libcfs: Fix kstrtouint return value check fix
In reply to [email protected]From: Oleg Drokin <[email protected]>
Apparently kstrtouint could return not just -EINVAL, but also -ERANGE, so make sure we just check the return value for something negative.
Noticed by Dan Carpenter <[email protected]>
--- drivers/staging/lustre/lustre/libcfs/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/libcfs/debug.c +1 -1
@@ -185,7 +185,7 @@ static int param_set_uint_minmax(const char *val,if (!val)return -EINVAL ; ret =kstrtouint (val,0 , &num); -if (ret == -EINVAL || num < min || num > max) +if (ret <0 || num < min || num > max)return -EINVAL ; *((unsigned int *)kp->arg) = num;return 0 ;
Signature · 1 line
2.1.0