Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2217 build: fix 'NULL pointer dereference' errors
[fs/lustre-release.git]
/
lnet
/
klnds
/
mxlnd
/
mxlnd_modparams.c
diff --git
a/lnet/klnds/mxlnd/mxlnd_modparams.c
b/lnet/klnds/mxlnd/mxlnd_modparams.c
index
c583838
..
72d1c33
100644
(file)
--- a/
lnet/klnds/mxlnd/mxlnd_modparams.c
+++ b/
lnet/klnds/mxlnd/mxlnd_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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* 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) 2006 Myricom, Inc.
* Use is subject to license terms.
*
* Copyright (C) 2006 Myricom, Inc.
@@
-47,9
+45,10
@@
static int n_waitd = MXLND_N_SCHED;
CFS_MODULE_PARM(n_waitd, "i", int, 0444,
"# of completion daemons");
CFS_MODULE_PARM(n_waitd, "i", int, 0444,
"# of completion daemons");
+/* this was used to allocate global rxs which are no londer used */
static int max_peers = MXLND_MAX_PEERS;
CFS_MODULE_PARM(max_peers, "i", int, 0444,
static int max_peers = MXLND_MAX_PEERS;
CFS_MODULE_PARM(max_peers, "i", int, 0444,
- "maximum number of peers that may connect");
+ "
Unused - was
maximum number of peers that may connect");
static int cksum = MXLND_CKSUM;
CFS_MODULE_PARM(cksum, "i", int, 0644,
static int cksum = MXLND_CKSUM;
CFS_MODULE_PARM(cksum, "i", int, 0644,
@@
-59,9
+58,14
@@
static int ntx = MXLND_NTX;
CFS_MODULE_PARM(ntx, "i", int, 0444,
"# of total tx message descriptors");
CFS_MODULE_PARM(ntx, "i", int, 0444,
"# of total tx message descriptors");
-static int credits = MXLND_MSG_QUEUE_DEPTH;
+/* this duplicates ntx */
+static int credits = MXLND_NTX;
CFS_MODULE_PARM(credits, "i", int, 0444,
CFS_MODULE_PARM(credits, "i", int, 0444,
- "# concurrent sends");
+ "Unused - was # concurrent sends to all peers");
+
+static int peercredits = MXLND_MSG_QUEUE_DEPTH;
+CFS_MODULE_PARM(peercredits, "i", int, 0444,
+ "# concurrent sends to one peer");
static int board = MXLND_MX_BOARD;
CFS_MODULE_PARM(board, "i", int, 0444,
static int board = MXLND_MX_BOARD;
CFS_MODULE_PARM(board, "i", int, 0444,
@@
-88,6
+92,7
@@
kmx_tunables_t kmxlnd_tunables = {
.kmx_cksum = &cksum,
.kmx_ntx = &ntx,
.kmx_credits = &credits,
.kmx_cksum = &cksum,
.kmx_ntx = &ntx,
.kmx_credits = &credits,
+ .kmx_peercredits = &peercredits,
.kmx_board = &board,
.kmx_ep_id = &ep_id,
.kmx_default_ipif = &ipif_name,
.kmx_board = &board,
.kmx_ep_id = &ep_id,
.kmx_default_ipif = &ipif_name,
@@
-168,6
+173,14
@@
static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
},
{
.ctl_name = 6,
},
{
.ctl_name = 6,
+ .procname = "peercredits",
+ .data = &peercredits,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 7,
.procname = "board",
.data = &board,
.maxlen = sizeof(int),
.procname = "board",
.data = &board,
.maxlen = sizeof(int),
@@
-175,7
+188,7
@@
static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
.proc_handler = &proc_dointvec
},
{
.proc_handler = &proc_dointvec
},
{
- .ctl_name =
7
,
+ .ctl_name =
8
,
.procname = "ep_id",
.data = &ep_id,
.maxlen = sizeof(int),
.procname = "ep_id",
.data = &ep_id,
.maxlen = sizeof(int),
@@
-183,7
+196,7
@@
static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
.proc_handler = &proc_dointvec
},
{
.proc_handler = &proc_dointvec
},
{
- .ctl_name =
8
,
+ .ctl_name =
9
,
.procname = "ipif_name",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
.procname = "ipif_name",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
@@
-191,7
+204,7
@@
static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
.proc_handler = &proc_dostring
},
{
.proc_handler = &proc_dostring
},
{
- .ctl_name =
9
,
+ .ctl_name =
10
,
.procname = "polling",
.data = &polling,
.maxlen = sizeof(int),
.procname = "polling",
.data = &polling,
.maxlen = sizeof(int),