Do not pass disable_sqflow if not supported
v4 cover 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:
v4:
- updated commit message
- updated author
v3:
- do not even try to use disable_sqflow if when it not supported
v2:
- use cached options table
v1
- initial verison
Daniel Wagner (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(-)
Signature · 1 line
2.41.0
PATCH v4 1/2 fabrics: Read the supported options lazy
Read the options in when we need the for the first time.
--- src/nvme/fabrics.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
src/nvme/fabrics.c +12 -7
@@ -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;
Signature · 1 line
2.41.0
Re: [PATCH libnvme v4 1/2] fabrics: Read the supported options lazy
Quoted 5 lines · Daniel Wagner
Read the options in when we need the for the first time.
Reported-by Sagi Grimberg <[email protected]>Signed-off-by Daniel Wagner <[email protected]>---
I believe blktests is passing with this, with that.
-ck
Re: [PATCH libnvme v4 1/2] fabrics: Read the supported options lazy
In reply to Daniel WagnerQuoted 13 lines · Daniel Wagner
Read the options in when we need the for the first time.
Reported-by Sagi Grimberg <[email protected]>Signed-off-by Daniel Wagner <[email protected]>--- src/nvme/fabrics.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)src/nvme/fabrics.c +0
-0
src/nvme/fabrics.c static int __add_argument(char **argstr, const char *tok, const char *arg) · line 364
Quoted 8 lines
src/nvme/fabrics.c +5
-0@@ -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); \
I'm adding a check if __nvmf_support_options() returns an error. Feedback from Caleb.
PATCH v4 2/2 fabrics: Do not pass disable_sqflow if not supported
In reply to Daniel WagnerDo not try to use disable_sqflow if the kernel actually supports this option.
--- src/nvme/fabrics.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
src/nvme/fabrics.c +4 -1
@@ -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 ||
Signature · 1 line
2.41.0
Re: [PATCH libnvme v4 2/2] fabrics: Do not pass disable_sqflow if not supported
Quoted 6 lines · Daniel Wagner
Do not try to use
disable_sqflowif the kernel actually supports this option.Reported-by Sagi Grimberg <[email protected]>Signed-off-by Daniel Wagner <[email protected]>---
I believe blktests is passing with this, with that.
-ck
||