From: Hannes Reinecke <hare@suse.de>
To: linux-nvme@lists.infradead.org
Subject: Re: [PATCH] nvme-fabrics: fix kato initialization
Date: Fri, 19 Feb 2021 17:42:56 +0100 [thread overview]
Message-ID: <03826110-0d9c-8b25-9975-b427036ec2cc@suse.de> (raw)
In-Reply-To: <20210218100443.5854-1-marting@netapp.com>
On 2/18/21 11:04 AM, Martin George wrote:
> Currently kato is initialized to NVME_DEFAULT_KATO for both
> discovery & i/o controllers. This is a problem specifically
> for non-persistent discovery controllers since it always ends
> up with a non-zero kato value. Fix this by initializing kato
> to zero instead, and ensuring various controllers are assigned
> appropriate kato values as follows:
>
> non-persistent controllers - kato set to zero
> persistent controllers - kato set to NVMF_DEV_DISC_TMO
> (or any positive int via nvme-cli)
> i/o controllers - kato set to NVME_DEFAULT_KATO
> (or any positive int via nvme-cli)
>
> Signed-off-by: Martin George <marting@netapp.com>
> ---
> drivers/nvme/host/fabrics.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
> index 5dfd806fc2d2..604ab0e5a2ad 100644
> --- a/drivers/nvme/host/fabrics.c
> +++ b/drivers/nvme/host/fabrics.c
> @@ -630,7 +630,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
> opts->queue_size = NVMF_DEF_QUEUE_SIZE;
> opts->nr_io_queues = num_online_cpus();
> opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY;
> - opts->kato = NVME_DEFAULT_KATO;
> + opts->kato = 0;
> opts->duplicate_connect = false;
> opts->fast_io_fail_tmo = NVMF_DEF_FAIL_FAST_TMO;
> opts->hdr_digest = false;
> @@ -893,6 +893,9 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
> opts->nr_write_queues = 0;
> opts->nr_poll_queues = 0;
> opts->duplicate_connect = true;
> + } else {
> + if (!opts->kato)
> + opts->kato = NVME_DEFAULT_KATO;
> }
> if (ctrl_loss_tmo < 0) {
> opts->max_reconnects = -1;
>
Can't you merge this with the previous patch 'ensure zero-kato ..'?
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-02-19 16:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 10:04 [PATCH] nvme-fabrics: fix kato initialization Martin George
2021-02-19 16:42 ` Hannes Reinecke [this message]
2021-02-20 8:41 ` George, Martin
2021-02-20 14:59 ` Hannes Reinecke
[not found] <20210211175826.4821-1-marting@netapp.com>
2021-02-24 9:14 ` Christoph Hellwig
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=03826110-0d9c-8b25-9975-b427036ec2cc@suse.de \
--to=hare@suse.de \
--cc=linux-nvme@lists.infradead.org \
/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