*/
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 */
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 */
+ PSDEV_LNET_FORCE_LBUG, /* hook to force an LBUG */
};
+#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
+int
proc_call_handler(void *data, int write,
loff_t *ppos, void *buffer, size_t *lenp,
int (*handler)(void *data, int write,
}
return 0;
}
-
-#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); \
-}
+EXPORT_SYMBOL(proc_call_handler);
static int __proc_dobitmasks(void *data, int write,
loff_t pos, void *buffer, int nob)
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;
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;
*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)
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)
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)
return rc;
}
+int LL_PROC_PROTO(libcfs_force_lbug)
+{
+ if (write)
+ LBUG();
+ return 0;
+}
+
static cfs_sysctl_table_t lnet_table[] = {
/*
* NB No .strategy entries have been provided since sysctl(8) prefers
.data = &libcfs_debug,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_dobitmasks
+ .proc_handler = &proc_dobitmasks,
},
{
.ctl_name = PSDEV_SUBSYSTEM_DEBUG,
.data = &libcfs_subsystem_debug,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_dobitmasks
+ .proc_handler = &proc_dobitmasks,
},
{
.ctl_name = PSDEV_PRINTK,
.data = &libcfs_printk,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_dobitmasks
+ .proc_handler = &proc_dobitmasks,
},
{
.ctl_name = PSDEV_CONSOLE_RATELIMIT,
{
.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,
},
.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,
.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,
.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,
},
.ctl_name = PSDEV_LNET_DAEMON_FILE,
.procname = "daemon_file",
.mode = 0644,
+ .maxlen = 256,
.proc_handler = &proc_daemon_file,
},
{
.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,
+ },
+ { .ctl_name = PSDEV_LNET_FORCE_LBUG,
+ .procname = "force_lbug",
+ .data = NULL,
+ .maxlen = 0,
+ .mode = 0200,
+ .proc_handler = &libcfs_force_lbug
+ },
{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)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff