Whamcloud - gitweb
LU-4423 libcfs: Merge linux-proc.c into module.c 01/17201/6
authorMatthew Tyler <matt.tyler@flashics.com>
Tue, 5 Jan 2016 01:15:21 +0000 (20:15 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 14 Mar 2016 02:40:17 +0000 (02:40 +0000)
module.c was previously the sole exporter of symbols from linux-proc.c
This patch removes the global symbols by merging the two files

Linux-commit: 87643abf92484074937594897145bb53efc0e77e

Signed-off-by: Matthew Tyler <matt.tyler@flashics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I557efbfd37b5a23d2fdd8cd5a2aa399a7a494bc6
Reviewed-on: http://review.whamcloud.com/17201
Tested-by: Jenkins
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
libcfs/include/libcfs/libcfs_private.h
libcfs/libcfs/Makefile.in
libcfs/libcfs/linux/Makefile.am
libcfs/libcfs/linux/linux-proc.c [deleted file]
libcfs/libcfs/module.c

index 1bd885c..44704ea 100644 (file)
@@ -501,7 +501,4 @@ extern struct cfs_psdev_ops libcfs_psdev_ops;
 extern struct miscdevice libcfs_dev;
 extern struct cfs_wi_sched *cfs_sched_rehash;
 
-extern int insert_proc(void);
-extern void remove_proc(void);
-
 #endif
index 3a4e33a..04cd94d 100644 (file)
@@ -2,7 +2,7 @@ MODULES = libcfs
 
 libcfs-linux-objs := linux-tracefile.o linux-debug.o
 libcfs-linux-objs += linux-prim.o linux-cpu.o
-libcfs-linux-objs += linux-proc.o linux-curproc.o
+libcfs-linux-objs += linux-curproc.o
 libcfs-linux-objs += linux-module.o
 libcfs-linux-objs += linux-crypto.o linux-crypto-adler.o
 @HAVE_CRC32_TRUE@libcfs-linux-objs += linux-crypto-crc32.o
index eb18344..3e038a2 100644 (file)
@@ -1,5 +1,5 @@
 EXTRA_DIST = linux-debug.c linux-prim.c linux-tracefile.c      \
-       linux-proc.c linux-curproc.c linux-module.c linux-cpu.c \
+       linux-curproc.c linux-module.c linux-cpu.c              \
        linux-crypto.c linux-crypto-crc32.c linux-crypto-adler.c\
        linux-crypto-crc32pclmul.c linux-crypto-crc32c-pclmul.c \
        crc32-pclmul_asm.S crc32c-pcl-intel-asm_64.S inst.h
diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c
deleted file mode 100644 (file)
index 0397ecb..0000000
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2015, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * libcfs/libcfs/linux/linux-proc.c
- *
- * Author: Zach Brown <zab@zabbo.net>
- * Author: Peter J. Braam <braam@clusterfs.com>
- * Author: Phil Schwan <phil@clusterfs.com>
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <net/sock.h>
-#include <linux/uio.h>
-
-#include <asm/uaccess.h>
-
-#include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/stat.h>
-#include <linux/list.h>
-#include <asm/uaccess.h>
-
-#include <linux/proc_fs.h>
-#include <linux/sysctl.h>
-
-# define DEBUG_SUBSYSTEM S_LNET
-
-#include <libcfs/libcfs.h>
-#include <asm/div64.h>
-#include "tracefile.h"
-
-#ifdef CONFIG_SYSCTL
-static struct ctl_table_header *lnet_table_header = NULL;
-#endif
-
-int lprocfs_call_handler(void *data, int write, loff_t *ppos,
-                        void __user *buffer, size_t *lenp,
-                        int (*handler)(void *data, int write, loff_t pos,
-                                       void __user *buffer, int len))
-{
-        int rc = handler(data, write, *ppos, buffer, *lenp);
-
-        if (rc < 0)
-                return rc;
-
-        if (write) {
-                *ppos += *lenp;
-        } else {
-                *lenp = rc;
-                *ppos += rc;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(lprocfs_call_handler);
-
-static int __proc_dobitmasks(void *data, int write,
-                            loff_t pos, void __user *buffer, int nob)
-{
-        const int     tmpstrlen = 512;
-        char         *tmpstr;
-        int           rc;
-        unsigned int *mask = data;
-        int           is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0;
-        int           is_printk = (mask == &libcfs_printk) ? 1 : 0;
-
-        rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen);
-        if (rc < 0)
-                return rc;
-
-        if (!write) {
-                libcfs_debug_mask2str(tmpstr, tmpstrlen, *mask, is_subsys);
-                rc = strlen(tmpstr);
-
-                if (pos >= rc) {
-                        rc = 0;
-                } else {
-                        rc = cfs_trace_copyout_string(buffer, nob,
-                                                      tmpstr + pos, "\n");
-                }
-        } else {
-                rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob);
-               if (rc < 0) {
-                       cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
-                       return rc;
-               }
-
-                rc = libcfs_debug_str2mask(mask, tmpstr, is_subsys);
-                /* Always print LBUG/LASSERT to console, so keep this mask */
-                if (is_printk)
-                        *mask |= D_EMERG;
-        }
-
-        cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
-        return rc;
-}
-
-static int
-proc_dobitmasks(struct ctl_table *table, int write,
-               void __user *buffer, size_t *lenp, loff_t *ppos)
-{
-       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
-                                   __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 __user *buffer, int nob)
-{
-        if (!write)
-                return 0;
-
-        return cfs_trace_dump_debug_buffer_usrstr(buffer, nob);
-}
-
-static int
-proc_dump_kernel(struct ctl_table *table, int write, void __user *buffer,
-                size_t *lenp, loff_t *ppos)
-{
-       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
-                                   __proc_dump_kernel);
-}
-
-static int __proc_daemon_file(void *data, int write,
-                             loff_t pos, void __user *buffer, int nob)
-{
-        if (!write) {
-                int len = strlen(cfs_tracefile);
-
-                if (pos >= len)
-                        return 0;
-
-                return cfs_trace_copyout_string(buffer, nob,
-                                                cfs_tracefile + pos, "\n");
-        }
-
-        return cfs_trace_daemon_command_usrstr(buffer, nob);
-}
-
-static int
-proc_daemon_file(struct ctl_table *table, int write, void __user *buffer,
-                size_t *lenp, loff_t *ppos)
-{
-       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
-                                    __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 lprocfs_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)
-{
-       int rc, max_delay_cs;
-       struct ctl_table dummy = *table;
-       cfs_duration_t d;
-
-        dummy.data = &max_delay_cs;
-        dummy.proc_handler = &proc_dointvec;
-
-        if (!write) { /* read */
-                max_delay_cs = cfs_duration_sec(libcfs_console_max_delay * 100);
-               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-                return rc;
-        }
-
-        /* write */
-        max_delay_cs = 0;
-       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-        if (rc < 0)
-                return rc;
-        if (max_delay_cs <= 0)
-                return -EINVAL;
-
-        d = cfs_time_seconds(max_delay_cs) / 100;
-        if (d == 0 || d < libcfs_console_min_delay)
-                return -EINVAL;
-        libcfs_console_max_delay = d;
-
-        return rc;
-}
-
-static int
-proc_console_min_delay_cs(struct ctl_table *table, int write,
-                         void __user *buffer, size_t *lenp, loff_t *ppos)
-{
-       int rc, min_delay_cs;
-       struct ctl_table dummy = *table;
-       cfs_duration_t d;
-
-       dummy.data = &min_delay_cs;
-       dummy.proc_handler = &proc_dointvec;
-
-       if (!write) { /* read */
-               min_delay_cs = cfs_duration_sec(libcfs_console_min_delay * 100);
-               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-               return rc;
-       }
-
-       /* write */
-       min_delay_cs = 0;
-       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-       if (rc < 0)
-               return rc;
-       if (min_delay_cs <= 0)
-               return -EINVAL;
-
-       d = cfs_time_seconds(min_delay_cs) / 100;
-       if (d == 0 || d > libcfs_console_max_delay)
-               return -EINVAL;
-       libcfs_console_min_delay = d;
-
-       return rc;
-}
-
-static int
-proc_console_backoff(struct ctl_table *table, int write, void __user *buffer,
-                    size_t *lenp, loff_t *ppos)
-{
-       int rc, backoff;
-       struct ctl_table dummy = *table;
-
-       dummy.data = &backoff;
-       dummy.proc_handler = &proc_dointvec;
-
-       if (!write) { /* read */
-               backoff= libcfs_console_backoff;
-               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-               return rc;
-       }
-
-       /* write */
-       backoff = 0;
-       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
-       if (rc < 0)
-               return rc;
-       if (backoff <= 0)
-               return -EINVAL;
-
-       libcfs_console_backoff = backoff;
-
-       return rc;
-}
-
-static int
-libcfs_force_lbug(struct ctl_table *table, int write, void __user *buffer,
-                 size_t *lenp, loff_t *ppos)
-{
-        if (write)
-                LBUG();
-        return 0;
-}
-
-static int
-proc_fail_loc(struct ctl_table *table, int write, void __user *buffer,
-             size_t *lenp, loff_t *ppos)
-{
-       int rc;
-       long old_fail_loc = cfs_fail_loc;
-
-       rc = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
-       if (old_fail_loc != cfs_fail_loc)
-               wake_up(&cfs_race_waitq);
-       return rc;
-}
-
-static int __proc_cpt_table(void *data, int write,
-                           loff_t pos, void __user *buffer, int nob)
-{
-       char *buf = NULL;
-       int   len = 4096;
-       int   rc  = 0;
-
-       if (write)
-               return -EPERM;
-
-       LASSERT(cfs_cpt_table != NULL);
-
-       while (1) {
-               LIBCFS_ALLOC(buf, len);
-               if (buf == NULL)
-                       return -ENOMEM;
-
-               rc = cfs_cpt_table_print(cfs_cpt_table, buf, len);
-               if (rc >= 0)
-                       break;
-
-               if (rc == -EFBIG) {
-                       LIBCFS_FREE(buf, len);
-                       len <<= 1;
-                       continue;
-               }
-               goto out;
-       }
-
-       if (pos >= rc) {
-               rc = 0;
-               goto out;
-       }
-
-       rc = cfs_trace_copyout_string(buffer, nob, buf + pos, NULL);
- out:
-       if (buf != NULL)
-               LIBCFS_FREE(buf, len);
-       return rc;
-}
-
-static int
-proc_cpt_table(struct ctl_table *table, int write, void __user *buffer,
-              size_t *lenp, loff_t *ppos)
-{
-       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
-                                    __proc_cpt_table);
-}
-
-static struct ctl_table lnet_table[] = {
-       /*
-        * NB No .strategy entries have been provided since sysctl(8) prefers
-        * to go via /proc for portability.
-        */
-       {
-               INIT_CTL_NAME
-               .procname       = "debug",
-               .data           = &libcfs_debug,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dobitmasks,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "subsystem_debug",
-               .data           = &libcfs_subsystem_debug,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dobitmasks,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "printk",
-               .data           = &libcfs_printk,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dobitmasks,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "console_ratelimit",
-               .data           = &libcfs_console_ratelimit,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "console_max_delay_centisecs",
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_console_max_delay_cs
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "console_min_delay_centisecs",
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_console_min_delay_cs
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "console_backoff",
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_console_backoff
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "debug_path",
-               .data           = libcfs_debug_file_path_arr,
-               .maxlen         = sizeof(libcfs_debug_file_path_arr),
-               .mode           = 0644,
-               .proc_handler   = &proc_dostring,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "cpu_partition_table",
-               .maxlen         = 128,
-               .mode           = 0444,
-               .proc_handler   = &proc_cpt_table,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "upcall",
-               .data           = lnet_upcall,
-               .maxlen         = sizeof(lnet_upcall),
-               .mode           = 0644,
-               .proc_handler   = &proc_dostring,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "debug_log_upcall",
-               .data           = lnet_debug_log_upcall,
-               .maxlen         = sizeof(lnet_debug_log_upcall),
-               .mode           = 0644,
-               .proc_handler   = &proc_dostring,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "lnet_memused",
-               .data           = (int *)&libcfs_kmemory.counter,
-               .maxlen         = sizeof(int),
-               .mode           = 0444,
-               .proc_handler   = &proc_dointvec,
-               INIT_STRATEGY
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "catastrophe",
-               .data           = &libcfs_catastrophe,
-               .maxlen         = sizeof(int),
-               .mode           = 0444,
-               .proc_handler   = &proc_dointvec,
-               INIT_STRATEGY
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "panic_on_lbug",
-               .data           = &libcfs_panic_on_lbug,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
-               INIT_STRATEGY
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "dump_kernel",
-               .maxlen         = 256,
-               .mode           = 0200,
-               .proc_handler   = &proc_dump_kernel,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "daemon_file",
-               .mode           = 0644,
-               .maxlen         = 256,
-               .proc_handler   = &proc_daemon_file,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "debug_mb",
-               .mode           = 0644,
-               .proc_handler   = &proc_debug_mb,
-       },
-       {
-               INIT_CTL_NAME
-               .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,
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "force_lbug",
-               .data           = NULL,
-               .maxlen         = 0,
-               .mode           = 0200,
-               .proc_handler   = &libcfs_force_lbug
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "fail_loc",
-               .data           = &cfs_fail_loc,
-               .maxlen         = sizeof(cfs_fail_loc),
-               .mode           = 0644,
-               .proc_handler   = &proc_fail_loc
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "fail_val",
-               .data           = &cfs_fail_val,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
-       },
-       {
-               INIT_CTL_NAME
-               .procname       = "fail_err",
-               .data           = &cfs_fail_err,
-               .maxlen         = sizeof(cfs_fail_err),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
-       },
-       { 0 }
-};
-
-#ifdef CONFIG_SYSCTL
-static struct ctl_table top_table[] = {
-        {
-               INIT_CTL_NAME
-               .procname       = "lnet",
-               .mode           = 0555,
-               .data           = NULL,
-               .maxlen         = 0,
-               .child          = lnet_table,
-       },
-       { 0 }
-};
-#endif
-
-int insert_proc(void)
-{
-#ifdef CONFIG_SYSCTL
-       if (lnet_table_header == NULL)
-               lnet_table_header = register_sysctl_table(top_table);
-#endif
-       return 0;
-}
-
-void remove_proc(void)
-{
-#ifdef CONFIG_SYSCTL
-       if (lnet_table_header != NULL)
-               unregister_sysctl_table(lnet_table_header);
-
-       lnet_table_header = NULL;
-#endif
-}
index 694bbb4..cead0e3 100644 (file)
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/stat.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <net/sock.h>
+#include <linux/uio.h>
+#include <linux/uaccess.h>
+
+#include <linux/fs.h>
+#include <linux/file.h>
+#include <linux/list.h>
+
+#include <linux/sysctl.h>
+#include <linux/proc_fs.h>
+#include <asm/div64.h>
 
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>
 #include <lnet/lib-lnet.h>
+#include "tracefile.h"
+
+#ifdef CONFIG_SYSCTL
+static struct ctl_table_header *lnet_table_header;
+#endif
 
 static DECLARE_RWSEM(ioctl_list_sem);
 static LIST_HEAD(ioctl_list);
@@ -137,6 +160,525 @@ out:
        RETURN(err);
 }
 
+int
+lprocfs_call_handler(void *data, int write, loff_t *ppos,
+                    void __user *buffer, size_t *lenp,
+                    int (*handler)(void *data, int write, loff_t pos,
+                                   void __user *buffer, int len))
+{
+       int rc = handler(data, write, *ppos, buffer, *lenp);
+
+       if (rc < 0)
+               return rc;
+
+       if (write) {
+               *ppos += *lenp;
+       } else {
+               *lenp = rc;
+               *ppos += rc;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(lprocfs_call_handler);
+
+static int __proc_dobitmasks(void *data, int write,
+                            loff_t pos, void __user *buffer, int nob)
+{
+       const int     tmpstrlen = 512;
+       char         *tmpstr;
+       int           rc;
+       unsigned int *mask = data;
+       int           is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0;
+       int           is_printk = (mask == &libcfs_printk) ? 1 : 0;
+
+       rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen);
+       if (rc < 0)
+               return rc;
+
+       if (!write) {
+               libcfs_debug_mask2str(tmpstr, tmpstrlen, *mask, is_subsys);
+               rc = strlen(tmpstr);
+
+               if (pos >= rc) {
+                       rc = 0;
+               } else {
+                       rc = cfs_trace_copyout_string(buffer, nob,
+                                                     tmpstr + pos, "\n");
+               }
+       } else {
+               rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob);
+               if (rc < 0) {
+                       kfree(tmpstr);
+                       return rc;
+               }
+
+               rc = libcfs_debug_str2mask(mask, tmpstr, is_subsys);
+               /* Always print LBUG/LASSERT to console, so keep this mask */
+               if (is_printk)
+                       *mask |= D_EMERG;
+       }
+
+       kfree(tmpstr);
+       return rc;
+}
+
+static int
+proc_dobitmasks(struct ctl_table *table, int write,
+               void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+                                   __proc_dobitmasks);
+}
+
+static int min_watchdog_ratelimit;             /* 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 __user *buffer, int nob)
+{
+       if (!write)
+               return 0;
+
+       return cfs_trace_dump_debug_buffer_usrstr(buffer, nob);
+}
+
+static int
+proc_dump_kernel(struct ctl_table *table, int write, void __user *buffer,
+                size_t *lenp, loff_t *ppos)
+{
+       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+                                   __proc_dump_kernel);
+}
+
+static int __proc_daemon_file(void *data, int write,
+                             loff_t pos, void __user *buffer, int nob)
+{
+       if (!write) {
+               int len = strlen(cfs_tracefile);
+
+               if (pos >= len)
+                       return 0;
+
+               return cfs_trace_copyout_string(buffer, nob,
+                                               cfs_tracefile + pos, "\n");
+       }
+
+       return cfs_trace_daemon_command_usrstr(buffer, nob);
+}
+
+static int
+proc_daemon_file(struct ctl_table *table, int write, void __user *buffer,
+                size_t *lenp, loff_t *ppos)
+{
+       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+                                   __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 lprocfs_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)
+{
+       int rc, max_delay_cs;
+       struct ctl_table dummy = *table;
+       cfs_duration_t d;
+
+       dummy.data = &max_delay_cs;
+       dummy.proc_handler = &proc_dointvec;
+
+       if (!write) { /* read */
+               max_delay_cs = cfs_duration_sec(libcfs_console_max_delay * 100);
+               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+               return rc;
+       }
+
+       /* write */
+       max_delay_cs = 0;
+       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+       if (rc < 0)
+               return rc;
+       if (max_delay_cs <= 0)
+               return -EINVAL;
+
+       d = cfs_time_seconds(max_delay_cs) / 100;
+       if (d == 0 || d < libcfs_console_min_delay)
+               return -EINVAL;
+       libcfs_console_max_delay = d;
+
+       return rc;
+}
+
+static int
+proc_console_min_delay_cs(struct ctl_table *table, int write,
+                         void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+       int rc, min_delay_cs;
+       struct ctl_table dummy = *table;
+       cfs_duration_t d;
+
+       dummy.data = &min_delay_cs;
+       dummy.proc_handler = &proc_dointvec;
+
+       if (!write) { /* read */
+               min_delay_cs = cfs_duration_sec(libcfs_console_min_delay * 100);
+               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+               return rc;
+       }
+
+       /* write */
+       min_delay_cs = 0;
+       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+       if (rc < 0)
+               return rc;
+       if (min_delay_cs <= 0)
+               return -EINVAL;
+
+       d = cfs_time_seconds(min_delay_cs) / 100;
+       if (d == 0 || d > libcfs_console_max_delay)
+               return -EINVAL;
+       libcfs_console_min_delay = d;
+
+       return rc;
+}
+
+static int
+proc_console_backoff(struct ctl_table *table, int write, void __user *buffer,
+                    size_t *lenp, loff_t *ppos)
+{
+       int rc, backoff;
+       struct ctl_table dummy = *table;
+
+       dummy.data = &backoff;
+       dummy.proc_handler = &proc_dointvec;
+
+       if (!write) { /* read */
+               backoff = libcfs_console_backoff;
+               rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+               return rc;
+       }
+
+       /* write */
+       backoff = 0;
+       rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
+       if (rc < 0)
+               return rc;
+
+       if (backoff <= 0)
+               return -EINVAL;
+
+       libcfs_console_backoff = backoff;
+
+       return rc;
+}
+
+static int
+libcfs_force_lbug(struct ctl_table *table, int write, void __user *buffer,
+                 size_t *lenp, loff_t *ppos)
+{
+       if (write)
+               LBUG();
+       return 0;
+}
+
+static int
+proc_fail_loc(struct ctl_table *table, int write, void __user *buffer,
+             size_t *lenp, loff_t *ppos)
+{
+       int rc;
+       long old_fail_loc = cfs_fail_loc;
+
+       rc = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
+       if (old_fail_loc != cfs_fail_loc)
+               wake_up(&cfs_race_waitq);
+       return rc;
+}
+
+static int __proc_cpt_table(void *data, int write,
+                           loff_t pos, void __user *buffer, int nob)
+{
+       char *buf = NULL;
+       int   len = 4096;
+       int   rc  = 0;
+
+       if (write)
+               return -EPERM;
+
+       LASSERT(cfs_cpt_table != NULL);
+
+       while (1) {
+               LIBCFS_ALLOC(buf, len);
+               if (buf == NULL)
+                       return -ENOMEM;
+
+               rc = cfs_cpt_table_print(cfs_cpt_table, buf, len);
+               if (rc >= 0)
+                       break;
+
+               if (rc == -EFBIG) {
+                       LIBCFS_FREE(buf, len);
+                       len <<= 1;
+                       continue;
+               }
+               goto out;
+       }
+
+       if (pos >= rc) {
+               rc = 0;
+               goto out;
+       }
+
+       rc = cfs_trace_copyout_string(buffer, nob, buf + pos, NULL);
+out:
+       if (buf != NULL)
+               LIBCFS_FREE(buf, len);
+       return rc;
+}
+
+static int
+proc_cpt_table(struct ctl_table *table, int write, void __user *buffer,
+              size_t *lenp, loff_t *ppos)
+{
+       return lprocfs_call_handler(table->data, write, ppos, buffer, lenp,
+                                   __proc_cpt_table);
+}
+
+static struct ctl_table lnet_table[] = {
+       /*
+        * NB No .strategy entries have been provided since sysctl(8) prefers
+        * to go via /proc for portability.
+        */
+       {
+               INIT_CTL_NAME
+               .procname       = "debug",
+               .data           = &libcfs_debug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "subsystem_debug",
+               .data           = &libcfs_subsystem_debug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "printk",
+               .data           = &libcfs_printk,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_ratelimit",
+               .data           = &libcfs_console_ratelimit,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_max_delay_centisecs",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_max_delay_cs
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_min_delay_centisecs",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_min_delay_cs
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_backoff",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_backoff
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_path",
+               .data           = libcfs_debug_file_path_arr,
+               .maxlen         = sizeof(libcfs_debug_file_path_arr),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "cpu_partition_table",
+               .maxlen         = 128,
+               .mode           = 0444,
+               .proc_handler   = &proc_cpt_table,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "upcall",
+               .data           = lnet_upcall,
+               .maxlen         = sizeof(lnet_upcall),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_log_upcall",
+               .data           = lnet_debug_log_upcall,
+               .maxlen         = sizeof(lnet_debug_log_upcall),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "lnet_memused",
+               .data           = (int *)&libcfs_kmemory.counter,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "catastrophe",
+               .data           = &libcfs_catastrophe,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "panic_on_lbug",
+               .data           = &libcfs_panic_on_lbug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "dump_kernel",
+               .maxlen         = 256,
+               .mode           = 0200,
+               .proc_handler   = &proc_dump_kernel,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "daemon_file",
+               .mode           = 0644,
+               .maxlen         = 256,
+               .proc_handler   = &proc_daemon_file,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_mb",
+               .mode           = 0644,
+               .proc_handler   = &proc_debug_mb,
+       },
+       {
+               INIT_CTL_NAME
+               .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,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "force_lbug",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0200,
+               .proc_handler   = &libcfs_force_lbug
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fail_loc",
+               .data           = &cfs_fail_loc,
+               .maxlen         = sizeof(cfs_fail_loc),
+               .mode           = 0644,
+               .proc_handler   = &proc_fail_loc
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fail_val",
+               .data           = &cfs_fail_val,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fail_err",
+               .data           = &cfs_fail_err,
+               .maxlen         = sizeof(cfs_fail_err),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+       },
+       {
+       }
+};
+
+#ifdef CONFIG_SYSCTL
+static struct ctl_table top_table[] = {
+       {
+               INIT_CTL_NAME
+               .procname       = "lnet",
+               .mode           = 0555,
+               .data           = NULL,
+               .maxlen         = 0,
+               .child          = lnet_table,
+       },
+       { 0 }
+};
+#endif
+
+static int insert_proc(void)
+{
+#ifdef CONFIG_SYSCTL
+       if (lnet_table_header == NULL)
+               lnet_table_header = register_sysctl_table(top_table);
+#endif
+       return 0;
+}
+
+static void remove_proc(void)
+{
+#ifdef CONFIG_SYSCTL
+       if (lnet_table_header != NULL)
+               unregister_sysctl_table(lnet_table_header);
+
+       lnet_table_header = NULL;
+#endif
+}
+
 static int __init libcfs_init(void)
 {
        int rc;