X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-proc.c;h=553e8f2c42016df1bd8c27f5a72bfa295d0cbf9a;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=e4580ff14fa181c7fe39018eae8962b813bdd80c;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c index e4580ff..553e8f2 100644 --- a/libcfs/libcfs/linux/linux-proc.c +++ b/libcfs/libcfs/linux/linux-proc.c @@ -78,8 +78,13 @@ static cfs_sysctl_table_header_t *lnet_table_header = NULL; extern char lnet_upcall[1024]; +/** + * The path of debug log dump upcall script. + */ +extern char lnet_debug_log_upcall[1024]; -#define PSDEV_LNET (0x100) +#ifndef HAVE_SYSCTL_UNNUMBERED +#define CTL_LNET (0x100) enum { PSDEV_DEBUG = 1, /* control debugging */ PSDEV_SUBSYSTEM_DEBUG, /* control debugging */ @@ -97,11 +102,35 @@ enum { PSDEV_LNET_DUMP_KERNEL, /* snapshot kernel debug buffer to file */ PSDEV_LNET_DAEMON_FILE, /* spool kernel debug buffer to file */ PSDEV_LNET_DEBUG_MB, /* size of debug buffer */ + PSDEV_LNET_DEBUG_LOG_UPCALL, /* debug log upcall script */ + PSDEV_LNET_WATCHDOG_RATELIMIT, /* ratelimit watchdog messages */ }; +#else +#define CTL_LNET CTL_UNNUMBERED +#define PSDEV_DEBUG CTL_UNNUMBERED +#define PSDEV_SUBSYSTEM_DEBUG CTL_UNNUMBERED +#define PSDEV_PRINTK CTL_UNNUMBERED +#define PSDEV_CONSOLE_RATELIMIT CTL_UNNUMBERED +#define PSDEV_CONSOLE_MAX_DELAY_CS CTL_UNNUMBERED +#define PSDEV_CONSOLE_MIN_DELAY_CS CTL_UNNUMBERED +#define PSDEV_CONSOLE_BACKOFF CTL_UNNUMBERED +#define PSDEV_DEBUG_PATH CTL_UNNUMBERED +#define PSDEV_DEBUG_DUMP_PATH CTL_UNNUMBERED +#define PSDEV_LNET_UPCALL CTL_UNNUMBERED +#define PSDEV_LNET_MEMUSED CTL_UNNUMBERED +#define PSDEV_LNET_CATASTROPHE CTL_UNNUMBERED +#define PSDEV_LNET_PANIC_ON_LBUG CTL_UNNUMBERED +#define PSDEV_LNET_DUMP_KERNEL CTL_UNNUMBERED +#define PSDEV_LNET_DAEMON_FILE CTL_UNNUMBERED +#define PSDEV_LNET_DEBUG_MB CTL_UNNUMBERED +#define PSDEV_LNET_DEBUG_LOG_UPCALL CTL_UNNUMBERED +#define PSDEV_LNET_WATCHDOG_RATELIMIT CTL_UNNUMBERED +#endif -static int -proc_call_handler(void *data, int write, - loff_t *ppos, void *buffer, size_t *lenp, + +int +proc_call_handler(void *data, int write, + loff_t *ppos, void *buffer, size_t *lenp, int (*handler)(void *data, int write, loff_t pos, void *buffer, int len)) { @@ -118,19 +147,9 @@ proc_call_handler(void *data, int write, } return 0; } +EXPORT_SYMBOL(proc_call_handler); -#define DECLARE_PROC_HANDLER(name) \ -static int \ -LL_PROC_PROTO(name) \ -{ \ - DECLARE_LL_PROC_PPOS_DECL; \ - \ - return proc_call_handler(table->data, write, \ - ppos, buffer, lenp, \ - __##name); \ -} - -static int __proc_dobitmasks(void *data, int write, +static int __proc_dobitmasks(void *data, int write, loff_t pos, void *buffer, int nob) { const int tmpstrlen = 512; @@ -140,7 +159,7 @@ static int __proc_dobitmasks(void *data, int write, int is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0; int is_printk = (mask == &libcfs_printk) ? 1 : 0; - rc = trace_allocate_string_buffer(&tmpstr, tmpstrlen); + rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen); if (rc < 0) return rc; @@ -151,11 +170,11 @@ static int __proc_dobitmasks(void *data, int write, if (pos >= rc) { rc = 0; } else { - rc = trace_copyout_string(buffer, nob, - tmpstr + pos, "\n"); + rc = cfs_trace_copyout_string(buffer, nob, + tmpstr + pos, "\n"); } } else { - rc = trace_copyin_string(tmpstr, tmpstrlen, buffer, nob); + rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob); if (rc < 0) return rc; @@ -165,19 +184,22 @@ static int __proc_dobitmasks(void *data, int write, *mask |= D_EMERG; } - trace_free_string_buffer(tmpstr, tmpstrlen); + cfs_trace_free_string_buffer(tmpstr, tmpstrlen); return rc; } DECLARE_PROC_HANDLER(proc_dobitmasks) +static int min_watchdog_ratelimit = 0; /* disable ratelimiting */ +static int max_watchdog_ratelimit = (24*60*60); /* limit to once per day */ + static int __proc_dump_kernel(void *data, int write, loff_t pos, void *buffer, int nob) { if (!write) return 0; - - return trace_dump_debug_buffer_usrstr(buffer, nob); + + return cfs_trace_dump_debug_buffer_usrstr(buffer, nob); } DECLARE_PROC_HANDLER(proc_dump_kernel) @@ -186,16 +208,16 @@ static int __proc_daemon_file(void *data, int write, loff_t pos, void *buffer, int nob) { if (!write) { - int len = strlen(tracefile); - + int len = strlen(cfs_tracefile); + if (pos >= len) return 0; - - return trace_copyout_string(buffer, nob, - tracefile + pos, "\n"); + + return cfs_trace_copyout_string(buffer, nob, + cfs_tracefile + pos, "\n"); } - - return trace_daemon_command_usrstr(buffer, nob); + + return cfs_trace_daemon_command_usrstr(buffer, nob); } DECLARE_PROC_HANDLER(proc_daemon_file) @@ -206,15 +228,16 @@ static int __proc_debug_mb(void *data, int write, if (!write) { char tmpstr[32]; int len = snprintf(tmpstr, sizeof(tmpstr), "%d", - trace_get_debug_mb()); + cfs_trace_get_debug_mb()); if (pos >= len) return 0; - - return trace_copyout_string(buffer, nob, tmpstr + pos, "\n"); + + return cfs_trace_copyout_string(buffer, nob, tmpstr + pos, + "\n"); } - - return trace_set_debug_mb_usrstr(buffer, nob); + + return cfs_trace_set_debug_mb_usrstr(buffer, nob); } DECLARE_PROC_HANDLER(proc_debug_mb) @@ -319,7 +342,7 @@ static cfs_sysctl_table_t lnet_table[] = { .data = &libcfs_debug, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_dobitmasks + .proc_handler = &proc_dobitmasks, }, { .ctl_name = PSDEV_SUBSYSTEM_DEBUG, @@ -327,7 +350,7 @@ static cfs_sysctl_table_t lnet_table[] = { .data = &libcfs_subsystem_debug, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_dobitmasks + .proc_handler = &proc_dobitmasks, }, { .ctl_name = PSDEV_PRINTK, @@ -335,7 +358,7 @@ static cfs_sysctl_table_t lnet_table[] = { .data = &libcfs_printk, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_dobitmasks + .proc_handler = &proc_dobitmasks, }, { .ctl_name = PSDEV_CONSOLE_RATELIMIT, @@ -370,8 +393,8 @@ static cfs_sysctl_table_t lnet_table[] = { { .ctl_name = PSDEV_DEBUG_PATH, .procname = "debug_path", - .data = debug_file_path, - .maxlen = sizeof(debug_file_path), + .data = libcfs_debug_file_path_arr, + .maxlen = sizeof(libcfs_debug_file_path_arr), .mode = 0644, .proc_handler = &proc_dostring, }, @@ -385,12 +408,21 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dostring, }, { + .ctl_name = PSDEV_LNET_DEBUG_LOG_UPCALL, + .procname = "debug_log_upcall", + .data = lnet_debug_log_upcall, + .maxlen = sizeof(lnet_debug_log_upcall), + .mode = 0644, + .proc_handler = &proc_dostring, + }, + { .ctl_name = PSDEV_LNET_MEMUSED, .procname = "memused", .data = (int *)&libcfs_kmemory.counter, .maxlen = sizeof(int), .mode = 0444, - .proc_handler = &proc_dointvec + .proc_handler = &proc_dointvec, + .strategy = &sysctl_intvec, }, { .ctl_name = PSDEV_LNET_CATASTROPHE, @@ -398,7 +430,8 @@ static cfs_sysctl_table_t lnet_table[] = { .data = &libcfs_catastrophe, .maxlen = sizeof(int), .mode = 0444, - .proc_handler = &proc_dointvec + .proc_handler = &proc_dointvec, + .strategy = &sysctl_intvec, }, { .ctl_name = PSDEV_LNET_PANIC_ON_LBUG, @@ -406,11 +439,13 @@ static cfs_sysctl_table_t lnet_table[] = { .data = &libcfs_panic_on_lbug, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_dointvec + .proc_handler = &proc_dointvec, + .strategy = &sysctl_intvec, }, { .ctl_name = PSDEV_LNET_DUMP_KERNEL, .procname = "dump_kernel", + .maxlen = 256, .mode = 0200, .proc_handler = &proc_dump_kernel, }, @@ -418,6 +453,7 @@ static cfs_sysctl_table_t lnet_table[] = { .ctl_name = PSDEV_LNET_DAEMON_FILE, .procname = "daemon_file", .mode = 0644, + .maxlen = 256, .proc_handler = &proc_daemon_file, }, { @@ -426,19 +462,31 @@ static cfs_sysctl_table_t lnet_table[] = { .mode = 0644, .proc_handler = &proc_debug_mb, }, + { + .ctl_name = PSDEV_LNET_WATCHDOG_RATELIMIT, + .procname = "watchdog_ratelimit", + .data = &libcfs_watchdog_ratelimit, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec_minmax, + .extra1 = &min_watchdog_ratelimit, + .extra2 = &max_watchdog_ratelimit, + }, {0} }; -static cfs_sysctl_table_t top_table[2] = { +static cfs_sysctl_table_t top_table[] = { { - .ctl_name = PSDEV_LNET, + .ctl_name = CTL_LNET, .procname = "lnet", + .mode = 0555, .data = NULL, .maxlen = 0, - .mode = 0555, - .child = lnet_table + .child = lnet_table, }, - {0} + { + .ctl_name = 0 + } }; int insert_proc(void)