From: israelr@mellanox.com (Israel Rukshin)
Subject: [PATCH] nvme-cli/fabrics: Add tos param to connect cmd
Date: Tue, 13 Aug 2019 16:17:26 +0300 [thread overview]
Message-ID: <1565702251-17198-2-git-send-email-israelr@mellanox.com> (raw)
In-Reply-To: <1565702251-17198-1-git-send-email-israelr@mellanox.com>
Added 'tos' to 'connect' command so users can specify the type of service.
usage examples:
nvme connect --tos=0 --transport=rdma --traddr=10.0.1.1 --nqn=test-nvme
nvme connect -T 0 -t rdma -a 10.0.1.1 -n test_nvme
Signed-off-by: Israel Rukshin <israelr at mellanox.com>
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
---
fabrics.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/fabrics.c b/fabrics.c
index 333669f..f952722 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -60,6 +60,7 @@ static struct config {
int keep_alive_tmo;
int reconnect_delay;
int ctrl_loss_tmo;
+ int tos;
char *raw;
char *device;
int duplicate_connect;
@@ -576,11 +577,12 @@ add_bool_argument(char **argstr, int *max_len, char *arg_str, bool arg)
}
static int
-add_int_argument(char **argstr, int *max_len, char *arg_str, int arg)
+add_int_argument(char **argstr, int *max_len, char *arg_str, int arg,
+ bool allow_zero)
{
int len;
- if (arg) {
+ if ((arg && !allow_zero) || (arg != -1 && allow_zero)) {
len = snprintf(*argstr, *max_len, ",%s=%d", arg_str, arg);
if (len < 0)
return -EINVAL;
@@ -640,21 +642,23 @@ static int build_options(char *argstr, int max_len, bool discover)
add_argument(&argstr, &max_len, "hostid", cfg.hostid)) ||
(!discover &&
add_int_argument(&argstr, &max_len, "nr_io_queues",
- cfg.nr_io_queues)) ||
+ cfg.nr_io_queues, false)) ||
add_int_argument(&argstr, &max_len, "nr_write_queues",
- cfg.nr_write_queues) ||
+ cfg.nr_write_queues, false) ||
add_int_argument(&argstr, &max_len, "nr_poll_queues",
- cfg.nr_poll_queues) ||
+ cfg.nr_poll_queues, false) ||
(!discover &&
add_int_argument(&argstr, &max_len, "queue_size",
- cfg.queue_size)) ||
+ cfg.queue_size, false)) ||
(!discover &&
add_int_argument(&argstr, &max_len, "keep_alive_tmo",
- cfg.keep_alive_tmo)) ||
+ cfg.keep_alive_tmo, false)) ||
add_int_argument(&argstr, &max_len, "reconnect_delay",
- cfg.reconnect_delay) ||
+ cfg.reconnect_delay, false) ||
add_int_argument(&argstr, &max_len, "ctrl_loss_tmo",
- cfg.ctrl_loss_tmo) ||
+ cfg.ctrl_loss_tmo, false) ||
+ add_int_argument(&argstr, &max_len, "tos",
+ cfg.tos, true) ||
add_bool_argument(&argstr, &max_len, "duplicate_connect",
cfg.duplicate_connect) ||
add_bool_argument(&argstr, &max_len, "disable_sqflow",
@@ -749,6 +753,13 @@ retry:
p += len;
}
+ if (cfg.tos != -1) {
+ len = sprintf(p, ",tos=%d", cfg.tos);
+ if (len < 0)
+ return -EINVAL;
+ p += len;
+ }
+
if (cfg.keep_alive_tmo && !discover) {
len = sprintf(p, ",keep_alive_tmo=%d", cfg.keep_alive_tmo);
if (len < 0)
@@ -1065,6 +1076,7 @@ int discover(const char *desc, int argc, char **argv, bool connect)
{"keep-alive-tmo", 'k', "LIST", CFG_INT, &cfg.keep_alive_tmo, required_argument, "keep alive timeout period in seconds" },
{"reconnect-delay", 'c', "LIST", CFG_INT, &cfg.reconnect_delay, required_argument, "reconnect timeout period in seconds" },
{"ctrl-loss-tmo", 'l', "LIST", CFG_INT, &cfg.ctrl_loss_tmo, required_argument, "controller loss timeout period in seconds" },
+ {"tos", 'T', "LIST", CFG_INT, &cfg.tos, required_argument, "type of service" },
{"hdr_digest", 'g', "", CFG_NONE, &cfg.hdr_digest, no_argument, "enable transport protocol header digest (TCP transport)" },
{"data_digest", 'G', "", CFG_NONE, &cfg.data_digest, no_argument, "enable transport protocol data digest (TCP transport)" },
{"nr-io-queues", 'i', "LIST", CFG_INT, &cfg.nr_io_queues, required_argument, "number of io queues to use (default is core count)" },
@@ -1076,6 +1088,7 @@ int discover(const char *desc, int argc, char **argv, bool connect)
{NULL},
};
+ cfg.tos = -1;
ret = argconfig_parse(argc, argv, desc, command_line_options, &cfg,
sizeof(cfg));
if (ret)
@@ -1122,6 +1135,7 @@ int connect(const char *desc, int argc, char **argv)
{"keep-alive-tmo", 'k', "LIST", CFG_INT, &cfg.keep_alive_tmo, required_argument, "keep alive timeout period in seconds" },
{"reconnect-delay", 'c', "LIST", CFG_INT, &cfg.reconnect_delay, required_argument, "reconnect timeout period in seconds" },
{"ctrl-loss-tmo", 'l', "LIST", CFG_INT, &cfg.ctrl_loss_tmo, required_argument, "controller loss timeout period in seconds" },
+ {"tos", 'T', "LIST", CFG_INT, &cfg.tos, required_argument, "type of service" },
{"duplicate_connect", 'D', "", CFG_NONE, &cfg.duplicate_connect, no_argument, "allow duplicate connections between same transport host and subsystem port" },
{"disable_sqflow", 'd', "", CFG_NONE, &cfg.disable_sqflow, no_argument, "disable controller sq flow control (default false)" },
{"hdr_digest", 'g', "", CFG_NONE, &cfg.hdr_digest, no_argument, "enable transport protocol header digest (TCP transport)" },
@@ -1129,6 +1143,7 @@ int connect(const char *desc, int argc, char **argv)
{NULL},
};
+ cfg.tos = -1;
ret = argconfig_parse(argc, argv, desc, command_line_options, &cfg,
sizeof(cfg));
if (ret)
--
1.8.3.1
next prev parent reply other threads:[~2019-08-13 13:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 13:17 [PATCH 0/5 V2] nvme: Add type of service (TOS) configuration Israel Rukshin
2019-08-13 13:17 ` Israel Rukshin [this message]
2019-08-13 16:43 ` [PATCH] nvme-cli/fabrics: Add tos param to connect cmd Sagi Grimberg
2019-08-14 7:42 ` Israel Rukshin
2019-08-13 13:17 ` [PATCH 1/5] nvme-fabrics: Add type of service (TOS) configuration Israel Rukshin
2019-08-13 16:40 ` Sagi Grimberg
2019-08-13 17:55 ` James Smart
2019-08-13 13:17 ` [PATCH 2/5] nvme-rdma: Add TOS for rdma transport Israel Rukshin
2019-08-13 16:40 ` Sagi Grimberg
2019-08-13 13:17 ` [PATCH 3/5] nvme-tcp: Use struct nvme_ctrl directly Israel Rukshin
2019-08-13 16:41 ` Sagi Grimberg
2019-08-13 13:17 ` [PATCH 4/5] nvme-tcp: Add TOS for tcp transport Israel Rukshin
2019-08-13 16:41 ` Sagi Grimberg
2019-08-13 13:17 ` [PATCH 5/5] nvmet-tcp: " Israel Rukshin
2019-08-13 16:41 ` Sagi Grimberg
-- strict thread matches above, loose matches on Subject: below --
2019-08-18 9:08 [PATCH 0/5 V5] nvme: Add type of service (TOS) configuration Israel Rukshin
2019-08-18 9:08 ` [PATCH] nvme-cli/fabrics: Add tos param to connect cmd Israel Rukshin
2019-08-15 13:33 [PATCH 0/5 V4] nvme: Add type of service (TOS) configuration Israel Rukshin
2019-08-15 13:33 ` [PATCH] nvme-cli/fabrics: Add tos param to connect cmd Israel Rukshin
2019-08-14 10:19 [PATCH 0/5 V3] nvme: Add type of service (TOS) configuration Israel Rukshin
2019-08-14 10:19 ` [PATCH] nvme-cli/fabrics: Add tos param to connect cmd Israel Rukshin
2019-08-14 17:08 ` Sagi Grimberg
2019-08-15 8:41 ` Max Gurtovoy
2019-08-15 15:18 ` James Smart
2019-08-15 17:13 ` Sagi Grimberg
2019-08-04 9:55 [PATCH 1/2] nvme-fabrics: Add type of service (TOS) configuration Israel Rukshin
2019-08-04 9:55 ` [PATCH] nvme-cli/fabrics: Add tos param to connect cmd Israel Rukshin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1565702251-17198-2-git-send-email-israelr@mellanox.com \
--to=israelr@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).