Whamcloud - gitweb
b=23076 fix for o2iblnd reconnect
[fs/lustre-release.git] / lnet / klnds / iiblnd / iiblnd_modparams.c
index 94fb1af..010337c 100644 (file)
@@ -1,24 +1,41 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2004 Cluster File Systems, Inc.
- *   Author: Eric Barton <eric@bartonsoftware.com>
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * 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.
  *
- *   Lustre 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 for more details.
+ * 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
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lnet/klnds/iiblnd/iiblnd_modparams.c
+ *
+ * Author: Eric Barton <eric@bartonsoftware.com>
  */
 
 #include "iiblnd.h"
@@ -37,39 +54,39 @@ CFS_MODULE_PARM(service_number, "i", int, 0444,
 
 static int min_reconnect_interval = 1;
 CFS_MODULE_PARM(min_reconnect_interval, "i", int, 0644,
-               "minimum connection retry interval (seconds)");
+                "minimum connection retry interval (seconds)");
 
 static int max_reconnect_interval = 60;
 CFS_MODULE_PARM(max_reconnect_interval, "i", int, 0644,
-               "maximum connection retry interval (seconds)");
+                "maximum connection retry interval (seconds)");
 
 static int concurrent_peers = 1152;
 CFS_MODULE_PARM(concurrent_peers, "i", int, 0444,
-               "maximum number of peers that may connect");
+                "maximum number of peers that may connect");
 
 static int cksum = 0;
 CFS_MODULE_PARM(cksum, "i", int, 0644,
-               "set non-zero to enable message (not RDMA) checksums");
+                "set non-zero to enable message (not RDMA) checksums");
 
 static int timeout = 50;
 CFS_MODULE_PARM(timeout, "i", int, 0644,
-               "timeout (seconds)");
+                "timeout (seconds)");
 
 static int ntx = 256;
 CFS_MODULE_PARM(ntx, "i", int, 0444,
-               "# of message descriptors");
+                "# of message descriptors");
 
 static int credits = 128;
 CFS_MODULE_PARM(credits, "i", int, 0444,
-               "# concurrent sends");
+                "# concurrent sends");
 
 static int peer_credits = 8;
 CFS_MODULE_PARM(peer_credits, "i", int, 0444,
-               "# concurrent sends to 1 peer");
+                "# concurrent sends to 1 peer");
 
 static int sd_retries = 8;
 CFS_MODULE_PARM(sd_retries, "i", int, 0444,
-               "# times to retry SD queries");
+                "# times to retry SD queries");
 
 static int keepalive = 100;
 CFS_MODULE_PARM(keepalive, "i", int, 0644,
@@ -86,7 +103,7 @@ kib_tunables_t kibnal_tunables = {
         .kib_min_reconnect_interval = &min_reconnect_interval,
         .kib_max_reconnect_interval = &max_reconnect_interval,
         .kib_concurrent_peers       = &concurrent_peers,
-       .kib_cksum                  = &cksum,
+        .kib_cksum                  = &cksum,
         .kib_timeout                = &timeout,
         .kib_keepalive              = &keepalive,
         .kib_ntx                    = &ntx,
@@ -96,71 +113,200 @@ kib_tunables_t kibnal_tunables = {
         .kib_concurrent_sends       = &concurrent_sends,
 };
 
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
 
 /* NB max_size specified for proc_dostring entries only needs to be big enough
  * not to truncate the printout; it only needs to be the actual size of the
  * string buffer if we allow writes (and we don't) */
 
-static ctl_table kibnal_ctl_table[] = {
-       {1, "ipif_basename", &ipif_basename, 
-         1024, 0444, NULL, &proc_dostring},
-       {2, "service_name", &service_name, 
-         1024, 0444, NULL, &proc_dostring},
-       {3, "service_number", &service_number, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {4, "min_reconnect_interval", &min_reconnect_interval, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {5, "max_reconnect_interval", &max_reconnect_interval, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {6, "concurrent_peers", &concurrent_peers, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {7, "cksum", &cksum, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {8, "timeout", &timeout, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {9, "ntx", &ntx, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {10, "credits", &credits, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {11, "peer_credits", &peer_credits, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {12, "sd_retries", &sd_retries, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {13, "keepalive", &keepalive, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {14, "concurrent_sends", &concurrent_sends, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {0}
+#ifdef HAVE_SYSCTL_UNNUMBERED
+
+enum {
+        IIBLND_IPIF_BASENAME = 1,
+        IIBLND_SERVICE_NAME,
+        IIBLND_SERVICE_NUMBER,
+        IIBLND_RECONNECT_MIN,
+        IIBLND_RECONNECT_MAX,
+        IIBLND_CONCURRENT_PEERS,
+        IIBLND_CKSUM,
+        IIBLND_TIMEOUT,
+        IIBLND_NTX,
+        IIBLND_CREDITS,
+        IIBLND_PEER_CREDITS,
+        IIBLND_SD_RETRIES,
+        IIBLND_KEEPALIVE,
+        IIBLND_CONCURRENT_SENDS
+};
+
+#else
+
+#define IIBLND_IPIF_BASENAME    CTL_UNNUMBERED
+#define IIBLND_SERVICE_NAME     CTL_UNNUMBERED
+#define IIBLND_SERVICE_NUMBER   CTL_UNNUMBERED
+#define IIBLND_RECONNECT_MIN    CTL_UNNUMBERED
+#define IIBLND_RECONNECT_MAX    CTL_UNNUMBERED
+#define IIBLND_CONCURRENT_PEERS CTL_UNNUMBERED
+#define IIBLND_CKSUM            CTL_UNNUMBERED
+#define IIBLND_TIMEOUT          CTL_UNNUMBERED
+#define IIBLND_NTX              CTL_UNNUMBERED
+#define IIBLND_CREDITS          CTL_UNNUMBERED
+#define IIBLND_PEER_CREDITS     CTL_UNNUMBERED
+#define IIBLND_SD_RETRIES       CTL_UNNUMBERED
+#define IIBLND_KEEPALIVE        CTL_UNNUMBERED
+#define IIBLND_CONCURRENT_SENDS CTL_UNNUMBERED
+
+#endif
+
+static cfs_sysctl_table_t kibnal_ctl_table[] = {
+        {
+                .ctl_name = IBBLND_IPIF_BASENAME,
+                .procname = "ipif_basename",
+                .data     = &ipif_basename,
+                .maxlen   = 1024,
+                .mode     = 0444,
+                .proc_handler = &proc_dostring
+        },
+        {
+                .ctl_name = IIBLND_SERVICE_NAME,
+                .procname = "service_name",
+                .data     = &service_name,
+                .maxlen   = 1024,
+                .mode     = 0444,
+                .proc_handler = &proc_dostring
+        },
+        {
+                .ctl_name = IIBLND_SERVICE_NUMBER,
+                .procname = "service_number",
+                .data     = &service_number,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_RECONNECT_MIN,
+                .procname = "min_reconnect_interval",
+                .data     = &min_reconnect_interval,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_RECONNECT_MAX,
+                .procname = "max_reconnect_interval",
+                .data     = &max_reconnect_interval,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_CONCURRENT_PEERS,
+                .procname = "concurrent_peers",
+                .data     = &concurrent_peers,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_CKSUM,
+                .procname = "cksum",
+                .data     = &cksum,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_TIMEOUT,
+                .procname = "timeout",
+                .data     = &timeout,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_NTX,
+                .procname = "ntx",
+                .data     = &ntx,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_CREDITS,
+                .procname = "credits",
+                .data     = &credits,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_PEER_CREDITS,
+                .procname = "peer_credits",
+                .data     = &peer_credits,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_SD_RETRIES,
+                .procname = "sd_retries",
+                .data     = &sd_retries,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_KEEPALIVE,
+                .procname = "keepalive",
+                .data     = &keepalive,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = IIBLND_CONCURRENT_SENDS,
+                .procname = "concurrent_sends",
+                .data     = &concurrent_sends,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {0}
 };
 
-static ctl_table kibnal_top_ctl_table[] = {
-       {203, "openibnal", NULL, 0, 0555, kibnal_ctl_table},
-       {0}
+static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
+        {
+                .ctl_name = CTL_IIBLND,
+                .procname = "iibnal",
+                .data     = NULL,
+                .maxlen   = 0,
+                .mode     = 0555,
+                .child    = kibnal_ctl_table
+        },
+        {0}
 };
 
 int
 kibnal_tunables_init ()
 {
-       kibnal_tunables.kib_sysctl =
-               cfs_register_sysctl_table(kibnal_top_ctl_table, 0);
-       
-       if (kibnal_tunables.kib_sysctl == NULL)
-               CWARN("Can't setup /proc tunables\n");
+        kibnal_tunables.kib_sysctl =
+                cfs_register_sysctl_table(kibnal_top_ctl_table, 0);
+
+        if (kibnal_tunables.kib_sysctl == NULL)
+                CWARN("Can't setup /proc tunables\n");
 
         if (*kibnal_tunables.kib_concurrent_sends > IBNAL_RX_MSGS)
                 *kibnal_tunables.kib_concurrent_sends = IBNAL_RX_MSGS;
         if (*kibnal_tunables.kib_concurrent_sends < IBNAL_MSG_QUEUE_SIZE)
                 *kibnal_tunables.kib_concurrent_sends = IBNAL_MSG_QUEUE_SIZE;
 
-       return 0;
+        return 0;
 }
 
 void
 kibnal_tunables_fini ()
 {
-       if (kibnal_tunables.kib_sysctl != NULL)
-               cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
+        if (kibnal_tunables.kib_sysctl != NULL)
+                cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
 }
 
 #else
@@ -168,7 +314,7 @@ kibnal_tunables_fini ()
 int
 kibnal_tunables_init ()
 {
-       return 0;
+        return 0;
 }
 
 void