2023-08-08 18:18:59

by Daniel Wagner

Subject: [PATCH libnvme v3 0/2] Do not pass disable_sqflow if not supported

Follow up on the discussion in [1]

[1] https://lore.kernel.org/linux-nvme/[email protected]/

changes:
v3:
- do not even try to use disable_sqflow if when it not supported
v2:
- use cached options table
v1
- initial verison

Sagi Grimberg (2):
fabrics: Read the supported options lazy
fabrics: Do not pass disable_sqflow if not supported

src/nvme/fabrics.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)

--
2.41.0

2023-08-08 18:54:25

by Daniel Wagner

Subject: [PATCH libnvme v3 1/2] fabrics: Read the supported options lazy

From: Sagi Grimberg <[email protected]>

Read the options in when we need the for the first time.

Signed-off-by: Sagi Grimberg <[email protected]>
Signed-off-by: Daniel Wagner <[email protected]>
---
src/nvme/fabrics.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
index 800293e2a8e7..9725eeb3cda8 100644
--- a/src/nvme/fabrics.c
+++ b/src/nvme/fabrics.c
@@ -357,10 +357,18 @@ static int __add_argument(char **argstr, const char *tok, const char *arg)
return 0;
}

+static int __nvmf_supported_options(nvme_root_t r);
+#define nvmf_check_option(r, tok) \
+({ \
+ if (!(r)->options) \
+ __nvmf_supported_options(r); \
+ (r)->options->tok; \
+})
+
#define add_bool_argument(o, argstr, tok, arg) \
({ \
int ret; \
- if (r->options->tok) { \
+ if (nvmf_check_option(r, tok)) { \
ret = __add_bool_argument(argstr, \
stringify(tok), \
arg); \
@@ -376,7 +384,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg)
#define add_int_argument(o, argstr, tok, arg, allow_zero) \
({ \
int ret; \
- if (r->options->tok) { \
+ if (nvmf_check_option(r, tok)) { \
ret = __add_int_argument(argstr, \
stringify(tok), \
arg, \
@@ -393,7 +401,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg)
#define add_int_or_minus_one_argument(o, argstr, tok, arg) \
({ \
int ret; \
- if (r->options->tok) { \
+ if (nvmf_check_option(r, tok)) { \
ret = __add_int_or_minus_one_argument(argstr, \
stringify(tok), \
arg); \
@@ -409,7 +417,7 @@ static int __add_argument(char **argstr, const char *tok, const char *arg)
#define add_argument(r, argstr, tok, arg) \
({ \
int ret; \
- if (r->options->tok) { \
+ if (nvmf_check_option(r, tok)) { \
ret = __add_argument(argstr, \
stringify(tok), \
arg); \
@@ -913,9 +921,6 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
free(traddr);
}

- ret = __nvmf_supported_options(h->r);
- if (ret)
- return ret;
ret = build_options(h, c, &argstr);
if (ret)
return ret;
--
2.41.0

2023-08-08 19:03:31

by Daniel Wagner

Subject: [PATCH libnvme v3 2/2] fabrics: Do not pass disable_sqflow if not supported

From: Sagi Grimberg <[email protected]>

Only retry a connect attempt with disable_sqflow if the kernel
actually supports this option.

Reported-by: Sagi Grimberg <[email protected]>
Signed-off-by: Daniel Wagner <[email protected]>
---
src/nvme/fabrics.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
index 9725eeb3cda8..11d99580072a 100644
--- a/src/nvme/fabrics.c
+++ b/src/nvme/fabrics.c
@@ -1031,8 +1031,11 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h,
return NULL;
}

- if (e->treq & NVMF_TREQ_DISABLE_SQFLOW)
+ if (e->treq & NVMF_TREQ_DISABLE_SQFLOW &&
+ nvmf_check_option(h->r, disable_sqflow))
c->cfg.disable_sqflow = true;
+ else
+ c->cfg.disable_sqflow = false;

if (e->trtype == NVMF_TRTYPE_TCP &&
(e->treq & NVMF_TREQ_REQUIRED ||
--
2.41.0