2023-08-08 17:50:23

by Sagi Grimberg

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

> 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 | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
> index 9725eeb3cda8..f0e85d3b766d 100644
> --- a/src/nvme/fabrics.c
> +++ b/src/nvme/fabrics.c
> @@ -1043,7 +1043,8 @@ nvme_ctrl_t nvmf_connect_disc_entry(nvme_host_t h,
> if (!ret)
> return c;
>
> - if (errno == EINVAL && c->cfg.disable_sqflow) {
> + if (errno == EINVAL && c->cfg.disable_sqflow &&
> + nvmf_check_option(h->r, disable_sqflow)) {
> errno = 0;
> /* disable_sqflow is unrecognized option on older kernels */
> nvme_msg(h->r, LOG_INFO, "failed to connect controller, "

I think you want to check this before the initial call
and avoid the retry altogether.
--
- 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 ||
--

2023-08-08 18:55:55

by Daniel Wagner

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

On Tue, Aug 08, 2023 at 11:47:14AM +0300, Sagi Grimberg wrote:
> I think you want to check this before the initial call
> and avoid the retry altogether.
> --
> - 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 ||

Yep, makes sense.