#define DEFAULT_PEER_CREDITS 8
#define DEFAULT_CREDITS 256
+/* default number of connections per peer */
+#define DEFAULT_CONNS_PER_PEER 1
+
#ifdef HAVE_KERN_SOCK_GETNAME_2ARGS
#define lnet_kernel_getpeername(sock, addr, addrlen) \
kernel_getpeername(sock, addr)
#define IOC_LIBCFS_GET_UDSP _IOWR(IOC_LIBCFS_TYPE, 108, IOCTL_CONFIG_SIZE)
#define IOC_LIBCFS_GET_CONST_UDSP_INFO _IOWR(IOC_LIBCFS_TYPE, 109, IOCTL_CONFIG_SIZE)
#define IOC_LIBCFS_RESET_LNET_STATS _IOWR(IOC_LIBCFS_TYPE, 110, IOCTL_CONFIG_SIZE)
-#define IOC_LIBCFS_MAX_NR 110
+#define IOC_LIBCFS_SET_CONNS_PER_PEER _IOWR(IOC_LIBCFS_TYPE, 111, IOCTL_CONFIG_SIZE)
+#define IOC_LIBCFS_MAX_NR 111
extern int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);
__u16 lnd_ntx;
};
+struct lnet_ioctl_config_socklnd_tunables {
+ __u32 lnd_version;
+ __u16 lnd_conns_per_peer;
+ __u16 lnd_pad;
+};
+
struct lnet_lnd_tunables {
union {
struct lnet_ioctl_config_o2iblnd_tunables lnd_o2ib;
+ struct lnet_ioctl_config_socklnd_tunables lnd_sock;
} lnd_tun_u;
};
lnet_nid_t rh_nid;
};
+struct lnet_ioctl_reset_conns_per_peer_cfg {
+ struct libcfs_ioctl_hdr rcpp_hdr;
+ __u16 rcpp_all:1;
+ __s16 rcpp_value;
+ lnet_nid_t rcpp_nid;
+};
+
struct lnet_ioctl_recovery_list {
struct libcfs_ioctl_hdr rlst_hdr;
enum lnet_health_type rlst_type:32;
* Author: Eric Barton <eric@bartonsoftware.com>
*/
+#include <linux/ethtool.h>
#include <linux/inetdevice.h>
#include "socklnd.h"
#include <linux/sunrpc/addr.h>
conn_cb->ksnr_ctrl_conn_count = 0;
conn_cb->ksnr_blki_conn_count = 0;
conn_cb->ksnr_blko_conn_count = 0;
+ conn_cb->ksnr_max_conns = 0;
return conn_cb;
}
return count;
}
+static unsigned int
+ksocknal_get_conns_per_peer(struct ksock_peer_ni *peer_ni)
+{
+ struct lnet_ni *ni = peer_ni->ksnp_ni;
+ struct lnet_ioctl_config_socklnd_tunables *tunables;
+
+ LASSERT(ni);
+
+ tunables = &ni->ni_lnd_tunables.lnd_tun_u.lnd_sock;
+
+ return tunables->lnd_conns_per_peer;
+}
+
static void
ksocknal_incr_conn_count(struct ksock_conn_cb *conn_cb,
int type)
break;
case SOCKLND_CONN_BULK_IN:
conn_cb->ksnr_blki_conn_count++;
- if (conn_cb->ksnr_blki_conn_count >=
- *ksocknal_tunables.ksnd_conns_per_peer)
+ if (conn_cb->ksnr_blki_conn_count >= conn_cb->ksnr_max_conns)
conn_cb->ksnr_connected |= BIT(type);
break;
case SOCKLND_CONN_BULK_OUT:
conn_cb->ksnr_blko_conn_count++;
- if (conn_cb->ksnr_blko_conn_count >=
- *ksocknal_tunables.ksnd_conns_per_peer)
+ if (conn_cb->ksnr_blko_conn_count >= conn_cb->ksnr_max_conns)
conn_cb->ksnr_connected |= BIT(type);
break;
case SOCKLND_CONN_ANY:
- if (conn_cb->ksnr_conn_count >=
- *ksocknal_tunables.ksnd_conns_per_peer)
+ if (conn_cb->ksnr_conn_count >= conn_cb->ksnr_max_conns)
conn_cb->ksnr_connected |= BIT(type);
break;
default:
LBUG();
break;
-
}
- CDEBUG(D_NET, "Add conn type %d, ksnr_connected %x conns_per_peer %d\n",
- type, conn_cb->ksnr_connected, *ksocknal_tunables.ksnd_conns_per_peer);
+ CDEBUG(D_NET, "Add conn type %d, ksnr_connected %x ksnr_max_conns %d\n",
+ type, conn_cb->ksnr_connected, conn_cb->ksnr_max_conns);
}
static void
ksocknal_add_conn_cb_locked(peer_ni, conn_cb);
+ /* Remember conns_per_peer setting at the time
+ * of connection initiation. It will define the
+ * max number of conns per type for this conn_cb
+ * while it's in use.
+ */
+ conn_cb->ksnr_max_conns = ksocknal_get_conns_per_peer(peer_ni);
+
write_unlock_bh(&ksocknal_data.ksnd_global_lock);
return 0;
continue;
num_dup++;
- if (num_dup < *ksocknal_tunables.ksnd_conns_per_peer)
+ /* If max conns per type is not registered in conn_cb
+ * as ksnr_max_conns, use ni's conns_per_peer
+ */
+ if ((peer_ni->ksnp_conn_cb &&
+ num_dup < peer_ni->ksnp_conn_cb->ksnr_max_conns) ||
+ (!peer_ni->ksnp_conn_cb &&
+ num_dup < ksocknal_get_conns_per_peer(peer_ni)))
continue;
/* Reply on a passive connection attempt so the peer_ni
* of the given type got created
*/
if (ksocknal_get_conn_count_by_type(conn_cb, conn->ksnc_type) ==
- *ksocknal_tunables.ksnd_conns_per_peer)
+ conn_cb->ksnr_max_conns)
LASSERT((conn_cb->ksnr_connected &
BIT(conn->ksnc_type)) != 0);
ksocknal_startup(struct lnet_ni *ni)
{
struct ksock_net *net;
- struct lnet_ioctl_config_lnd_cmn_tunables *net_tunables;
struct ksock_interface *ksi = NULL;
struct lnet_inetdev *ifaces = NULL;
struct sockaddr_in *sa;
goto fail_0;
net->ksnn_incarnation = ktime_get_real_ns();
ni->ni_data = net;
- net_tunables = &ni->ni_net->net_tunables;
- if (net_tunables->lct_peer_timeout == -1)
- net_tunables->lct_peer_timeout =
- *ksocknal_tunables.ksnd_peertimeout;
-
- if (net_tunables->lct_max_tx_credits == -1)
- net_tunables->lct_max_tx_credits =
- *ksocknal_tunables.ksnd_credits;
-
- if (net_tunables->lct_peer_tx_credits == -1)
- net_tunables->lct_peer_tx_credits =
- *ksocknal_tunables.ksnd_peertxcredits;
-
- if (net_tunables->lct_peer_tx_credits >
- net_tunables->lct_max_tx_credits)
- net_tunables->lct_peer_tx_credits =
- net_tunables->lct_max_tx_credits;
-
- if (net_tunables->lct_peer_rtr_credits == -1)
- net_tunables->lct_peer_rtr_credits =
- *ksocknal_tunables.ksnd_peerrtrcredits;
+
+ ksocknal_tunables_setup(ni);
rc = lnet_inet_enumerate(&ifaces, ni->ni_net_ns);
if (rc < 0)
unsigned int ksnr_blki_conn_count:8;
unsigned int ksnr_blko_conn_count:8;
int ksnr_conn_count;/* total # conns for this cb */
-
+ unsigned int ksnr_max_conns; /* conns_per_peer at peer
+ * creation
+ */
};
#define SOCKNAL_KEEPALIVE_PING 1 /* cookie for keepalive ping */
int *rxmem, int *nagle);
extern int ksocknal_tunables_init(void);
+extern void ksocknal_tunables_setup(struct lnet_ni *ni);
extern void ksocknal_lib_csum_tx(struct ksock_tx *tx);
#include <asm/hypervisor.h>
#endif
+#define CURRENT_LND_VERSION 1
+
static int sock_timeout;
module_param(sock_timeout, int, 0644);
MODULE_PARM_DESC(sock_timeout, "dead socket timeout (seconds)");
module_param(zc_recv_min_nfrags, int, 0644);
MODULE_PARM_DESC(zc_recv_min_nfrags, "minimum # of fragments to enable ZC recv");
-static unsigned int conns_per_peer = 1;
-module_param(conns_per_peer, uint, 0444);
+static unsigned int conns_per_peer = DEFAULT_CONNS_PER_PEER;
+module_param(conns_per_peer, uint, 0644);
MODULE_PARM_DESC(conns_per_peer, "number of connections per peer");
#ifdef SOCKNAL_BACKOFF
}
struct ksock_tunables ksocknal_tunables;
+static struct lnet_ioctl_config_socklnd_tunables default_tunables;
int ksocknal_tunables_init(void)
{
+ default_tunables.lnd_version = CURRENT_LND_VERSION;
+ default_tunables.lnd_conns_per_peer = conns_per_peer;
+
/* initialize ksocknal_tunables structure */
ksocknal_tunables.ksnd_timeout = &sock_timeout;
ksocknal_tunables.ksnd_nscheds = &nscheds;
*ksocknal_tunables.ksnd_zc_min_payload = (16 << 20) + 1;
return 0;
-};
+}
+
+void ksocknal_tunables_setup(struct lnet_ni *ni)
+{
+ struct lnet_ioctl_config_socklnd_tunables *tunables;
+ struct lnet_ioctl_config_lnd_cmn_tunables *net_tunables;
+
+ /* If no tunables specified, setup default tunables */
+ if (!ni->ni_lnd_tunables_set)
+ memcpy(&ni->ni_lnd_tunables.lnd_tun_u.lnd_sock,
+ &default_tunables, sizeof(*tunables));
+
+ tunables = &ni->ni_lnd_tunables.lnd_tun_u.lnd_sock;
+
+ /* Current API version */
+ tunables->lnd_version = CURRENT_LND_VERSION;
+
+ net_tunables = &ni->ni_net->net_tunables;
+
+ if (net_tunables->lct_peer_timeout == -1)
+ net_tunables->lct_peer_timeout =
+ *ksocknal_tunables.ksnd_peertimeout;
+
+ if (net_tunables->lct_max_tx_credits == -1)
+ net_tunables->lct_max_tx_credits =
+ *ksocknal_tunables.ksnd_credits;
+
+ if (net_tunables->lct_peer_tx_credits == -1)
+ net_tunables->lct_peer_tx_credits =
+ *ksocknal_tunables.ksnd_peertxcredits;
+
+ if (net_tunables->lct_peer_tx_credits >
+ net_tunables->lct_max_tx_credits)
+ net_tunables->lct_peer_tx_credits =
+ net_tunables->lct_max_tx_credits;
+
+ if (net_tunables->lct_peer_rtr_credits == -1)
+ net_tunables->lct_peer_rtr_credits =
+ *ksocknal_tunables.ksnd_peerrtrcredits;
+
+ if (!tunables->lnd_conns_per_peer)
+ tunables->lnd_conns_per_peer = (conns_per_peer) ?
+ conns_per_peer : DEFAULT_CONNS_PER_PEER;
+}
#ifdef HAVE_SCHED_HEADERS
#include <linux/sched/signal.h>
#endif
-
#include <lnet/udsp.h>
#include <lnet/lib-lnet.h>
lnet_net_unlock(LNET_LOCK_EX);
}
+static void
+lnet_ni_set_conns_per_peer(lnet_nid_t nid, int value, bool all)
+{
+ struct lnet_net *net;
+ struct lnet_ni *ni;
+
+ lnet_net_lock(LNET_LOCK_EX);
+ list_for_each_entry(net, &the_lnet.ln_nets, net_list) {
+ list_for_each_entry(ni, &net->net_ni_list, ni_netlist) {
+ if (ni->ni_nid != nid && !all)
+ continue;
+ if (LNET_NETTYP(net->net_id) == SOCKLND)
+ ni->ni_lnd_tunables.lnd_tun_u.lnd_sock.lnd_conns_per_peer = value;
+ else if (LNET_NETTYP(net->net_id) == O2IBLND)
+ ni->ni_lnd_tunables.lnd_tun_u.lnd_o2ib.lnd_conns_per_peer = value;
+ if (!all) {
+ lnet_net_unlock(LNET_LOCK_EX);
+ return;
+ }
+ }
+ }
+ lnet_net_unlock(LNET_LOCK_EX);
+}
+
static int
lnet_get_local_ni_hstats(struct lnet_ioctl_local_ni_hstats *stats)
{
return 0;
}
+ case IOC_LIBCFS_SET_CONNS_PER_PEER: {
+ struct lnet_ioctl_reset_conns_per_peer_cfg *cfg = arg;
+ int value;
+
+ if (cfg->rcpp_hdr.ioc_len < sizeof(*cfg))
+ return -EINVAL;
+ if (cfg->rcpp_value < 0)
+ value = 1;
+ else
+ value = cfg->rcpp_value;
+ CDEBUG(D_NET,
+ "Setting conns_per_peer to %d for %s. all = %d\n",
+ value, libcfs_nid2str(cfg->rcpp_nid), cfg->rcpp_all);
+ mutex_lock(&the_lnet.ln_api_mutex);
+ lnet_ni_set_conns_per_peer(cfg->rcpp_nid, value, cfg->rcpp_all);
+ mutex_unlock(&the_lnet.ln_api_mutex);
+ return 0;
+ }
+
case IOC_LIBCFS_NOTIFY_ROUTER: {
time64_t deadline = ktime_get_real_seconds() - data->ioc_u64[0];
struct cfs_expr_list *global_cpts,
char *ip2net,
struct lnet_ioctl_config_lnd_tunables *tunables,
- int seq_no, struct cYAML **err_rc)
+ long int cpp, int seq_no, struct cYAML **err_rc)
{
char *data = NULL;
struct lnet_ioctl_config_ni *conf;
goto out;
}
+ if (LNET_NETTYP(nw_descr->nw_id) == SOCKLND && (cpp > -1))
+ tunables->lt_tun.lnd_tun_u.lnd_sock.lnd_conns_per_peer = cpp;
+ else if (LNET_NETTYP(nw_descr->nw_id) == O2IBLND && (cpp > -1))
+ tunables->lt_tun.lnd_tun_u.lnd_o2ib.lnd_conns_per_peer = cpp;
+
rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids,
err_str, sizeof(err_str));
if (rc != 0) {
return rc;
}
+
+static int
+lustre_lnet_config_conns_per_peer(int value, bool all, lnet_nid_t nid,
+ char *name, int seq_no,
+ struct cYAML **err_rc)
+{
+ struct lnet_ioctl_reset_conns_per_peer_cfg data;
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
+
+ LIBCFS_IOC_INIT_V2(data, rcpp_hdr);
+ data.rcpp_all = all;
+ data.rcpp_value = value;
+ data.rcpp_nid = nid;
+
+ if (value < 0 || value > 127) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str),
+ "\"Valid values are: 0-127\"");
+ } else {
+
+ rc = l_ioctl(LNET_DEV_ID,
+ IOC_LIBCFS_SET_CONNS_PER_PEER, &data);
+ if (rc != 0) {
+ rc = -errno;
+ snprintf(err_str,
+ sizeof(err_str),
+ "Can not configure conns_per_peer value: %s",
+ strerror(errno));
+ }
+ }
+ cYAML_build_error(rc, seq_no, ADD_CMD, name, err_str, err_rc);
+
+ return rc;
+}
+
int lustre_lnet_config_ni_healthv(int value, bool all, char *ni_nid, int seq_no,
struct cYAML **err_rc)
{
"peer_ni healthv", seq_no, err_rc);
}
+int lustre_lnet_config_ni_conns_per_peer(int value, bool all, char *ni_nid,
+ int seq_no, struct cYAML **err_rc)
+{
+ lnet_nid_t nid;
+
+ if (ni_nid)
+ nid = libcfs_str2nid(ni_nid);
+ else
+ nid = LNET_NID_ANY;
+ return lustre_lnet_config_conns_per_peer(value, all, nid,
+ "ni conns_per_peer",
+ seq_no, err_rc);
+}
+
static bool
add_msg_stats_to_yaml_blk(struct cYAML *yaml,
struct lnet_ioctl_comm_count *counts)
if (rc != LUSTRE_CFG_RC_NO_ERR)
goto out;
- rc = lustre_ni_show_tunables(tunables, LNET_NETTYP(rc_net),
- &lnd->lt_tun);
- if (rc != LUSTRE_CFG_RC_NO_ERR &&
- rc != LUSTRE_CFG_RC_NO_MATCH)
- goto out;
-
if (rc != LUSTRE_CFG_RC_NO_MATCH) {
tunables = cYAML_create_object(item,
"lnd tunables");
goto out;
}
+ rc = lustre_ni_show_tunables(tunables,
+ LNET_NETTYP(rc_net),
+ &lnd->lt_tun);
+ if (rc != LUSTRE_CFG_RC_NO_ERR &&
+ rc != LUSTRE_CFG_RC_NO_MATCH)
+ goto out;
+
if (!backup &&
cYAML_create_number(item, "dev cpt",
ni_data->lic_dev_cpt) == NULL)
LNET_NETTYP(nw_descr.nw_id));
seq_no = cYAML_get_object_item(tree, "seq_no");
- rc = lustre_lnet_config_ni(&nw_descr,
- global_cpts,
+ rc = lustre_lnet_config_ni(&nw_descr, global_cpts,
(ip2net) ? ip2net->cy_valuestring : NULL,
- (found) ? &tunables: NULL,
+ (found) ? &tunables : NULL, -1,
(seq_no) ? seq_no->cy_valueint : -1,
err_rc);
struct cfs_expr_list *global_cpts,
char *ip2net,
struct lnet_ioctl_config_lnd_tunables *tunables,
- int seq_no, struct cYAML **err_rc);
+ long int cpp, int seq_no, struct cYAML **err_rc);
/*
* lustre_lnet_del_ni
int lustre_lnet_config_ni_healthv(int value, bool all, char *ni_nid,
int seq_no, struct cYAML **err_rc);
+
+/* lustre_lnet_config_ni_conns_per_peer
+ * set the conns_per_peer value of the NI. Valid range is specific to
+ * network type.
+ *
+ * value: conns_per_peer value to set.
+ * all: true to set all local NIs to that value.
+ * ni_nid: NI NID to set its conns_per_peer value. 'all' parameter always
+ * takes precedence
+ * seq_no - sequence number of the request
+ * err_rc - [OUT] struct cYAML tree describing the error. Freed by
+ * caller
+ */
+int lustre_lnet_config_ni_conns_per_peer(int value, bool all, char *ni_nid,
+ int seq_no, struct cYAML **err_rc);
+
/*
* lustre_lnet_config_peer_ni_healthv
* set the health value of the peer NI. -1 resets the value to maximum.
return LUSTRE_CFG_RC_NO_ERR;
}
+
+static int
+lustre_socklnd_show_tun(struct cYAML *lndparams,
+ struct lnet_ioctl_config_socklnd_tunables *lnd_cfg)
+{
+ if (cYAML_create_number(lndparams, "conns_per_peer",
+ lnd_cfg->lnd_conns_per_peer) == NULL)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ return LUSTRE_CFG_RC_NO_ERR;
+}
+
int
lustre_net_show_tunables(struct cYAML *tunables,
struct lnet_ioctl_config_lnd_cmn_tunables *cmn)
{
-
-
if (cYAML_create_number(tunables, "peer_timeout",
cmn->lct_peer_timeout)
== NULL)
if (net_type == O2IBLND)
rc = lustre_o2iblnd_show_tun(lnd_tunables,
&lnd->lnd_tun_u.lnd_o2ib);
+ else if (net_type == SOCKLND)
+ rc = lustre_socklnd_show_tun(lnd_tunables,
+ &lnd->lnd_tun_u.lnd_sock);
return rc;
}
conns_per_peer = cYAML_get_object_item(lndparams, "conns_per_peer");
lnd_cfg->lnd_conns_per_peer =
(conns_per_peer) ? conns_per_peer->cy_valueint : 1;
+
}
+static void
+yaml_extract_sock_tun(struct cYAML *tree,
+ struct lnet_ioctl_config_socklnd_tunables *lnd_cfg)
+{
+ struct cYAML *conns_per_peer = NULL, *lndparams = NULL;
+
+ lndparams = cYAML_get_object_item(tree, "lnd tunables");
+ if (!lndparams)
+ return;
+
+ conns_per_peer = cYAML_get_object_item(lndparams, "conns_per_peer");
+ lnd_cfg->lnd_conns_per_peer =
+ (conns_per_peer) ? conns_per_peer->cy_valueint : 1;
+}
+
void
lustre_yaml_extract_lnd_tunables(struct cYAML *tree,
__u32 net_type,
if (net_type == O2IBLND)
yaml_extract_o2ib_tun(tree,
&tun->lnd_tun_u.lnd_o2ib);
+ else if (net_type == SOCKLND)
+ yaml_extract_sock_tun(tree,
+ &tun->lnd_tun_u.lnd_sock);
}
command_t cmd_list[] = {
{"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"},
{"route", jt_route, 0, "route {add | del | show | help}"},
- {"net", jt_net, 0, "net {add | del | show | help}"},
+ {"net", jt_net, 0, "net {add | del | show | set | help}"},
{"routing", jt_routing, 0, "routing {show | help}"},
{"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers"
" | routing | numa_range | max_interfaces"
{"stats", jt_stats, 0, "stats {show | help}"},
{"debug", jt_debug, 0, "debug recovery {local | peer}"},
{"global", jt_global, 0, "global {show | help}"},
- {"peer", jt_peers, 0, "peer {add | del | show | help}"},
+ {"peer", jt_peers, 0, "peer {add | del | show | list | set | help}"},
{"ping", jt_ping, 0, "ping nid,[nid,...]"},
{"discover", jt_discover, 0, "discover nid[,nid,...]"},
{"service-id", jt_calc_service_id, 0, "Calculate IB Lustre service ID\n"},
"\t--peer-credits: define the max number of inflight messages\n"
"\t--peer-buffer-credits: the number of buffer credits per peer\n"
"\t--credits: Network Interface credits\n"
- "\t--cpt: CPU Partitions configured net uses (e.g. [0,1]\n"},
+ "\t--cpt: CPU Partitions configured net uses (e.g. [0,1]\n"
+ "\t--conns-per-peer: number of connections per peer\n"},
{"del", jt_del_ni, 0, "delete a network\n"
"\t--net: net name (e.g. tcp0)\n"
"\t--if: physical interface (e.g. eth0)\n"},
{"set", jt_set_ni_value, 0, "set local NI specific parameter\n"
"\t--nid: NI NID to set the\n"
"\t--health: specify health value to set\n"
+ "\t--conns-per-peer: number of connections per peer\n"
"\t--all: set all NIs value to the one specified\n"},
{ 0, 0, 0, NULL }
};
static int jt_add_ni(int argc, char **argv)
{
char *ip2net = NULL;
- long int pto = -1, pc = -1, pbc = -1, cre = -1;
+ long int pto = -1, pc = -1, pbc = -1, cre = -1, cpp = -1;
struct cYAML *err_rc = NULL;
int rc, opt, cpt_rc = -1;
struct lnet_dlc_network_descr nw_descr;
memset(&tunables, 0, sizeof(tunables));
lustre_lnet_init_nw_descr(&nw_descr);
- const char *const short_options = "n:i:p:t:c:b:r:s:";
+ const char *const short_options = "b:c:i:m:n:p:r:s:t:";
static const struct option long_options[] = {
- { .name = "net", .has_arg = required_argument, .val = 'n' },
- { .name = "if", .has_arg = required_argument, .val = 'i' },
- { .name = "ip2net", .has_arg = required_argument, .val = 'p' },
- { .name = "peer-timeout", .has_arg = required_argument, .val = 't' },
- { .name = "peer-credits", .has_arg = required_argument, .val = 'c' },
{ .name = "peer-buffer-credits",
.has_arg = required_argument, .val = 'b' },
+ { .name = "peer-credits", .has_arg = required_argument, .val = 'c' },
+ { .name = "if", .has_arg = required_argument, .val = 'i' },
+ { .name = "conns-per-peer",
+ .has_arg = required_argument, .val = 'm' },
+ { .name = "net", .has_arg = required_argument, .val = 'n' },
+ { .name = "ip2net", .has_arg = required_argument, .val = 'p' },
{ .name = "credits", .has_arg = required_argument, .val = 'r' },
{ .name = "cpt", .has_arg = required_argument, .val = 's' },
+ { .name = "peer-timeout", .has_arg = required_argument, .val = 't' },
{ .name = NULL } };
rc = check_cmd(net_cmds, "net", "add", 0, argc, argv);
while ((opt = getopt_long(argc, argv, short_options,
long_options, NULL)) != -1) {
switch (opt) {
- case 'n':
- nw_descr.nw_id = libcfs_str2net(optarg);
- break;
- case 'i':
- rc = lustre_lnet_parse_interfaces(optarg, &nw_descr);
- if (rc != 0) {
- cYAML_build_error(-1, -1, "ni", "add",
- "bad interface list",
- &err_rc);
- goto failed;
- }
- break;
- case 'p':
- ip2net = optarg;
- break;
- case 't':
- rc = parse_long(optarg, &pto);
+ case 'b':
+ rc = parse_long(optarg, &pbc);
if (rc != 0) {
/* ignore option */
- pto = -1;
+ pbc = -1;
continue;
}
break;
continue;
}
break;
- case 'b':
- rc = parse_long(optarg, &pbc);
+ case 'i':
+ rc = lustre_lnet_parse_interfaces(optarg, &nw_descr);
+ if (rc != 0) {
+ cYAML_build_error(-1, -1, "ni", "add",
+ "bad interface list",
+ &err_rc);
+ goto failed;
+ }
+ break;
+ case 'm':
+ rc = parse_long(optarg, &cpp);
if (rc != 0) {
/* ignore option */
- pbc = -1;
+ cpp = -1;
continue;
}
break;
+
+ case 'n':
+ nw_descr.nw_id = libcfs_str2net(optarg);
+ break;
+ case 'p':
+ ip2net = optarg;
+ break;
case 'r':
rc = parse_long(optarg, &cre);
if (rc != 0) {
strlen(optarg), 0,
UINT_MAX, &global_cpts);
break;
+ case 't':
+ rc = parse_long(optarg, &pto);
+ if (rc != 0) {
+ /* ignore option */
+ pto = -1;
+ continue;
+ }
+ break;
case '?':
print_help(net_cmds, "net", "add");
default:
}
}
- if (pto > 0 || pc > 0 || pbc > 0 || cre > 0) {
+ if (pto > 0 || pc > 0 || pbc > 0 || cre > 0 || cpp > -1) {
tunables.lt_cmn.lct_peer_timeout = pto;
tunables.lt_cmn.lct_peer_tx_credits = pc;
tunables.lt_cmn.lct_peer_rtr_credits = pbc;
rc = lustre_lnet_config_ni(&nw_descr,
(cpt_rc == 0) ? global_cpts: NULL,
ip2net, (found) ? &tunables : NULL,
- -1, &err_rc);
+ cpp, -1, &err_rc);
if (global_cpts != NULL)
cfs_expr_list_free(global_cpts);
static int jt_set_ni_value(int argc, char **argv)
{
- return set_value_helper(argc, argv, lustre_lnet_config_ni_healthv);
+ char *nid = NULL;
+ long int healthv = -1, cpp = -1;
+ bool all = false;
+ int rc, opt;
+ struct cYAML *err_rc = NULL;
+
+ const char *const short_options = "a:m:n:t:";
+ static const struct option long_options[] = {
+ { .name = "all", .has_arg = no_argument, .val = 'a' },
+ { .name = "conns-per-peer", .has_arg = required_argument, .val = 'm' },
+ { .name = "nid", .has_arg = required_argument, .val = 'n' },
+ { .name = "health", .has_arg = required_argument, .val = 't' },
+ { .name = NULL } };
+
+ rc = check_cmd(net_cmds, "net", "set", 0, argc, argv);
+ if (rc)
+ return rc;
+
+ while ((opt = getopt_long(argc, argv, short_options,
+ long_options, NULL)) != -1) {
+ switch (opt) {
+ case 'a':
+ all = true;
+ break;
+ case 'm':
+ rc = parse_long(optarg, &cpp);
+ if (rc != 0) {
+ /* ignore option */
+ cpp = -1;
+ continue;
+ }
+ break;
+ case 'n':
+ nid = optarg;
+ break;
+ case 't':
+ if (parse_long(optarg, &healthv) != 0) {
+ /* ignore option */
+ healthv = -1;
+ continue;
+ }
+ break;
+ default:
+ return 0;
+ }
+ }
+
+ if (cpp > -1)
+ rc = lustre_lnet_config_ni_conns_per_peer(cpp, all, nid,
+ -1, &err_rc);
+ if (healthv > -1)
+ rc = lustre_lnet_config_ni_healthv(healthv, all, nid,
+ -1, &err_rc);
+
+ if (rc != LUSTRE_CFG_RC_NO_ERR)
+ cYAML_print_tree2file(stderr, err_rc);
+
+ cYAML_free_tree(err_rc);
+
+ return rc;
}
static int jt_set_peer_ni_value(int argc, char **argv)
peer_credits: 8
peer_buffer_credits: 0
credits: 256
+ lnd tunables:
+ conns_per_peer: 1
route:
- net: tcp7
gateway: 7.7.7.7@tcp
peer_credits: 8
peer_buffer_credits: 0
credits: 256
+ lnd tunables:
+ conns_per_peer: 1
route:
- net: tcp8
gateway: 8.8.8.10@tcp
}
run_test 213 "Check LNetDist calculation for multiple local NIDs"
+test_230() {
+ # LU-12815
+ have_interface "eth0" || skip "Need eth0 interface with ipv4 configured"
+
+ echo "Check valid values; Should succeed"
+ local i
+ local lnid
+ for ((i = 4; i < 16; i+=4)); do
+ reinit_dlc || return $?
+ add_net "tcp" "eth0" || return $?
+ do_lnetctl net set --all --conns-per-peer $i ||
+ error "should have succeeded $?"
+ $LNETCTL net show -v 1 | grep -q "conns_per_peer: $i" ||
+ error "failed to set conns-per-peer to $i"
+ lnid="$(lctl list_nids | head -n 1)"
+ do_lnetctl ping "$lnid" ||
+ error "failed to ping myself"
+ printf 'network tcp\nconn_list\n' | lctl | grep -c "$lnid" | grep -q $((2+i*2)) ||
+ error "expected number of tcp connections $((2+i*2))"
+ done
+
+ reinit_dlc || return $?
+ add_net "tcp" "eth0" || return $?
+ echo "Set > 127; Should fail"
+ do_lnetctl net set --all --conns-per-peer 128 &&
+ error "should have failed $?"
+
+ reinit_dlc || return $?
+ add_net "tcp" "eth0" || return $?
+ echo "Set < 0; Should be ignored"
+ do_lnetctl net set --all --conns-per-peer -1 ||
+ error "should have succeeded $?"
+ $LNETCTL net show -v 1 | grep -q "conns_per_peer: 1" ||
+ error "Did not stay at default"
+}
+run_test 230 "Test setting conns-per-peer"
+
test_300() {
# LU-13274
local header
git://git.whamcloud.com / fs / lustre-release.git / commitdiff