X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-proc.c;h=553e8f2c42016df1bd8c27f5a72bfa295d0cbf9a;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=ec6ab0c33b1e1ad44fae2f9bb29fcd997e9eca27;hpb=b60041da5bc668c18ac186081acb71a62f0a97d2;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
index ec6ab0c..553e8f2 100644
--- a/libcfs/libcfs/linux/linux-proc.c
+++ b/libcfs/libcfs/linux/linux-proc.c
@@ -103,6 +103,7 @@ enum {
         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
@@ -123,10 +124,11 @@ enum {
 #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,
@@ -157,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;
 
@@ -168,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;
 
@@ -182,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)
@@ -203,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)
@@ -223,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)
@@ -387,8 +393,8 @@ static cfs_sysctl_table_t lnet_table[] = {
         {
                 .ctl_name = PSDEV_DEBUG_PATH,
                 .procname = "debug_path",
-                .data     = debug_file_path_arr,
-                .maxlen   = sizeof(debug_file_path_arr),
+                .data     = libcfs_debug_file_path_arr,
+                .maxlen   = sizeof(libcfs_debug_file_path_arr),
                 .mode     = 0644,
                 .proc_handler = &proc_dostring,
         },
@@ -456,6 +462,16 @@ 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}
 };