/* -*- 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 2008 Sun Microsystems, Inc. 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/openiblnd/openiblnd_modparams.c
+ *
+ * Author: Eric Barton <eric@bartonsoftware.com>
*/
#include "openiblnd.h"
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 = 384;
CFS_MODULE_PARM(ntx, "i", int, 0444,
- "# of message descriptors");
+ "# of message descriptors");
static int credits = 256;
CFS_MODULE_PARM(credits, "i", int, 0444,
- "# concurrent sends");
+ "# concurrent sends");
static int peer_credits = 16;
CFS_MODULE_PARM(peer_credits, "i", int, 0444,
- "# concurrent sends to 1 peer");
+ "# concurrent sends to 1 peer");
static int keepalive = 100;
CFS_MODULE_PARM(keepalive, "i", int, 0644,
kib_tunables_t kibnal_tunables = {
.kib_ipif_basename = &ipif_basename,
- .kib_n_connd = &n_connd,
+ .kib_n_connd = &n_connd,
.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_ntx = &ntx,
.kib_credits = &credits,
.kib_keepalive = &keepalive,
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
-
-static ctl_table kibnal_ctl_table[] = {
- {1, "ipif_basename", &ipif_basename,
- 1024, 0444, NULL, &proc_dostring},
- {2, "n_connd", &n_connd,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {3, "min_reconnect_interval", &min_reconnect_interval,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {4, "max_reconnect_interval", &max_reconnect_interval,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {5, "concurrent_peers", &concurrent_peers,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {6, "cksum", &cksum,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {7, "timeout", &timeout,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {8, "ntx", &ntx,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {9, "credits", &credits,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {10, "peer_credits", &peer_credits,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {11, "keepalive", &keepalive,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {0}
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
+
+#ifndef HAVE_SYSCTL_UNNUMBERED
+enum {
+ KIBNAL_IPIF_BASENAME = 1,
+ KIBNAL_N_CONND,
+ KIBNAL_RECONNECT_MIN,
+ KIBNAL_RECONNECT_MAX,
+ KIBNAL_CONCURRENT_PEERS,
+ KIBNAL_CKSUM,
+ KIBNAL_TIMEOUT,
+ KIBNAL_NTX,
+ KIBNAL_CREDITS,
+ KIBNAL_PEER_CREDITS,
+ KIBNAL_KEEPALIVE
};
+#else
-static ctl_table kibnal_top_ctl_table[] = {
- {203, "openibnal", NULL, 0, 0555, kibnal_ctl_table},
- {0}
+#define KIBNAL_IPIF_BASENAME CTL_UNNUMBERED
+#define KIBNAL_N_CONND CTL_UNNUMBERED
+#define KIBNAL_RECONNECT_MIN CTL_UNNUMBERED
+#define KIBNAL_RECONNECT_MAX CTL_UNNUMBERED
+#define KIBNAL_CONCURRENT_PEERS CTL_UNNUMBERED
+#define KIBNAL_CKSUM CTL_UNNUMBERED
+#define KIBNAL_TIMEOUT CTL_UNNUMBERED
+#define KIBNAL_NTX CTL_UNNUMBERED
+#define KIBNAL_CREDITS CTL_UNNUMBERED
+#define KIBNAL_PEER_CREDITS CTL_UNNUMBERED
+#define KIBNAL_KEEPALIVE CTL_UNNUMBERED
+
+#endif
+
+static cfs_sysctl_table_t kibnal_ctl_table[] = {
+ {
+ .ctl_name = KIBNAL_IPIF_BASENAME,
+ .procname = "ipif_basename",
+ .data = &ipif_basename,
+ .maxlen = 1024,
+ .mode = 0444,
+ .proc_handler = &proc_dostring
+ },
+ {
+ .ctl_name = KIBNAL_N_CONND,
+ .procname = "n_connd",
+ .data = &n_connd,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_RECONNECT_MIN,
+ .procname = "min_reconnect_interval",
+ .data = &min_reconnect_interval,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_RECONNECT_MAX,
+ .procname = "max_reconnect_interval",
+ .data = &max_reconnect_interval,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_CONCURRENT_PEERS,
+ .procname = "concurrent_peers",
+ .data = &concurrent_peers,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_CKSUM,
+ .procname = "cksum",
+ .data = &cksum,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_TIMEOUT,
+ .procname = "timeout",
+ .data = &timeout,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_NTX,
+ .procname = "ntx",
+ .data = &ntx,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_CREDITS,
+ .procname = "credits",
+ .data = &credits,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_PEER_CREDITS,
+ .procname = "peer_credits",
+ .data = &peer_credits,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = KIBNAL_KEEPALIVE,
+ .procname = "keepalive",
+ .data = &keepalive,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {0}
+};
+
+static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
+ {
+ .ctl_name = CTL_KIBNAL,
+ .procname = "openibnal",
+ .data = NULL,
+ .maxlen = 0,
+ .mode = 0555,
+ .child = kibnal_ctl_table
+ },
+ {0}
};
int
kibnal_tunables_init ()
{
- kibnal_tunables.kib_sysctl =
- 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");
- return 0;
+ return 0;
}
void
kibnal_tunables_fini ()
{
- if (kibnal_tunables.kib_sysctl != NULL)
- unregister_sysctl_table(kibnal_tunables.kib_sysctl);
+ if (kibnal_tunables.kib_sysctl != NULL)
+ cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
}
#else
int
kibnal_tunables_init ()
{
- return 0;
+ return 0;
}
void
git://git.whamcloud.com / fs / lustre-release.git / blobdiff