LU-1346 gnilnd: remove libcfs abstractions

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_modparams.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index 27a6112..5f900bd 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -52,11 +52,19 @@ static int timeout = 50;
 CFS_MODULE_PARM(timeout, "i", int, 0644,
                 "timeout (seconds)");
 
-static int ntx = 256;
+/* Number of threads in each scheduler pool which is percpt,
+ * we will estimate reasonable value based on CPUs if it's set to zero. */
+static int nscheds;
+CFS_MODULE_PARM(nscheds, "i", int, 0444,
+               "number of threads in each scheduler pool");
+
+/* NB: this value is shared by all CPTs, it can grow at runtime */
+static int ntx = 512;
 CFS_MODULE_PARM(ntx, "i", int, 0444,
-                "# of message descriptors");
+               "# of message descriptors allocated for each pool");
 
-static int credits = 64;
+/* NB: this value is shared by all CPTs */
+static int credits = 256;
 CFS_MODULE_PARM(credits, "i", int, 0444,
                 "# concurrent sends");
 
@@ -104,23 +112,45 @@ static int map_on_demand = 0;
 CFS_MODULE_PARM(map_on_demand, "i", int, 0444,
                 "map on demand");
 
+/* NB: this value is shared by all CPTs, it can grow at runtime */
 static int fmr_pool_size = 512;
 CFS_MODULE_PARM(fmr_pool_size, "i", int, 0444,
-                "size of the fmr pool (>= ntx / 4)");
+               "size of fmr pool on each CPT (>= ntx / 4)");
 
+/* NB: this value is shared by all CPTs, it can grow at runtime */
 static int fmr_flush_trigger = 384;
 CFS_MODULE_PARM(fmr_flush_trigger, "i", int, 0444,
-                "# dirty FMRs that triggers pool flush");
+               "# dirty FMRs that triggers pool flush");
 
 static int fmr_cache = 1;
 CFS_MODULE_PARM(fmr_cache, "i", int, 0444,
-                "non-zero to enable FMR caching");
+               "non-zero to enable FMR caching");
 
+/* NB: this value is shared by all CPTs, it can grow at runtime */
 static int pmr_pool_size = 512;
 CFS_MODULE_PARM(pmr_pool_size, "i", int, 0444,
-                "size of the MR cache pmr pool");
+               "size of MR cache pmr pool on each CPT");
+
+/*
+ * 0: disable failover
+ * 1: enable failover if necessary
+ * 2: force to failover (for debug)
+ */
+static int dev_failover = 0;
+CFS_MODULE_PARM(dev_failover, "i", int, 0444,
+               "HCA failover for bonding (0 off, 1 on, other values reserved)");
+
+
+static int require_privileged_port = 0;
+CFS_MODULE_PARM(require_privileged_port, "i", int, 0644,
+                "require privileged port when accepting connection");
+
+static int use_privileged_port = 1;
+CFS_MODULE_PARM(use_privileged_port, "i", int, 0644,
+                "use privileged port when initiating connection");
 
 kib_tunables_t kiblnd_tunables = {
+        .kib_dev_failover           = &dev_failover,
         .kib_service                = &service,
         .kib_cksum                  = &cksum,
         .kib_timeout                = &timeout,
@@ -141,6 +171,9 @@ kib_tunables_t kiblnd_tunables = {
         .kib_fmr_flush_trigger      = &fmr_flush_trigger,
         .kib_fmr_cache              = &fmr_cache,
         .kib_pmr_pool_size          = &pmr_pool_size,
+        .kib_require_priv_port      = &require_privileged_port,
+       .kib_use_priv_port          = &use_privileged_port,
+       .kib_nscheds                = &nscheds
 };
 
 #if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -169,7 +202,8 @@ enum {
         O2IBLND_FMR_POOL_SIZE,
         O2IBLND_FMR_FLUSH_TRIGGER,
         O2IBLND_FMR_CACHE,
-        O2IBLND_PMR_POOL_SIZE
+        O2IBLND_PMR_POOL_SIZE,
+        O2IBLND_DEV_FAILOVER
 };
 #else
 
@@ -193,10 +227,11 @@ enum {
 #define O2IBLND_FMR_FLUSH_TRIGGER CTL_UNNUMBERED
 #define O2IBLND_FMR_CACHE        CTL_UNNUMBERED
 #define O2IBLND_PMR_POOL_SIZE    CTL_UNNUMBERED
+#define O2IBLND_DEV_FAILOVER     CTL_UNNUMBERED
 
 #endif
 
-static cfs_sysctl_table_t kiblnd_ctl_table[] = {
+static struct ctl_table kiblnd_ctl_table[] = {
         {
                 .ctl_name = O2IBLND_SERVICE,
                 .procname = "service",
@@ -358,10 +393,18 @@ static cfs_sysctl_table_t kiblnd_ctl_table[] = {
                 .mode     = 0444,
                 .proc_handler = &proc_dointvec
         },
+        {
+                .ctl_name = O2IBLND_DEV_FAILOVER,
+                .procname = "dev_failover",
+                .data     = &dev_failover,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
         {0}
 };
 
-static cfs_sysctl_table_t kiblnd_top_ctl_table[] = {
+static struct ctl_table kiblnd_top_ctl_table[] = {
         {
                 .ctl_name = CTL_O2IBLND,
                 .procname = "o2iblnd",
@@ -383,21 +426,21 @@ kiblnd_initstrtunable(char *space, char *str, int size)
 void
 kiblnd_sysctl_init (void)
 {
-        kiblnd_initstrtunable(ipif_basename_space, ipif_name,
-                              sizeof(ipif_basename_space));
+       kiblnd_initstrtunable(ipif_basename_space, ipif_name,
+                             sizeof(ipif_basename_space));
 
-        kiblnd_tunables.kib_sysctl =
-                cfs_register_sysctl_table(kiblnd_top_ctl_table, 0);
+       kiblnd_tunables.kib_sysctl =
+               register_sysctl_table(kiblnd_top_ctl_table);
 
-        if (kiblnd_tunables.kib_sysctl == NULL)
-                CWARN("Can't setup /proc tunables\n");
+       if (kiblnd_tunables.kib_sysctl == NULL)
+               CWARN("Can't setup /proc tunables\n");
 }
 
 void
 kiblnd_sysctl_fini (void)
 {
-        if (kiblnd_tunables.kib_sysctl != NULL)
-                cfs_unregister_sysctl_table(kiblnd_tunables.kib_sysctl);
+       if (kiblnd_tunables.kib_sysctl != NULL)
+               unregister_sysctl_table(kiblnd_tunables.kib_sysctl);
 }
 
 #else