mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-19 05:24:11 +00:00
nvme-fabrics: fix kato initialization
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> Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
78570f8873
commit
32feb6de47
1 changed files with 4 additions and 1 deletions
|
@ -630,7 +630,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
|
||||||
opts->queue_size = NVMF_DEF_QUEUE_SIZE;
|
opts->queue_size = NVMF_DEF_QUEUE_SIZE;
|
||||||
opts->nr_io_queues = num_online_cpus();
|
opts->nr_io_queues = num_online_cpus();
|
||||||
opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY;
|
opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY;
|
||||||
opts->kato = NVME_DEFAULT_KATO;
|
opts->kato = 0;
|
||||||
opts->duplicate_connect = false;
|
opts->duplicate_connect = false;
|
||||||
opts->fast_io_fail_tmo = NVMF_DEF_FAIL_FAST_TMO;
|
opts->fast_io_fail_tmo = NVMF_DEF_FAIL_FAST_TMO;
|
||||||
opts->hdr_digest = false;
|
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_write_queues = 0;
|
||||||
opts->nr_poll_queues = 0;
|
opts->nr_poll_queues = 0;
|
||||||
opts->duplicate_connect = true;
|
opts->duplicate_connect = true;
|
||||||
|
} else {
|
||||||
|
if (!opts->kato)
|
||||||
|
opts->kato = NVME_DEFAULT_KATO;
|
||||||
}
|
}
|
||||||
if (ctrl_loss_tmo < 0) {
|
if (ctrl_loss_tmo < 0) {
|
||||||
opts->max_reconnects = -1;
|
opts->max_reconnects = -1;
|
||||||
|
|
Loading…
Add table
Reference in a new issue