diff options
| author | Hannes Reinecke <hare@suse.de> | 2023-10-24 08:13:37 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2023-11-06 18:16:10 +0100 |
| commit | 4733b65d82bdb19bca5ba47ff6c9b24bce1b3f9f (patch) | |
| tree | c2d3939d800b043c2e030d356e48987f27c997ae /drivers/nvme/host/fc.c | |
| parent | nvme-loop: always quiesce and cancel commands before destroying admin q (diff) | |
| download | linux-4733b65d82bdb19bca5ba47ff6c9b24bce1b3f9f.tar.xz linux-4733b65d82bdb19bca5ba47ff6c9b24bce1b3f9f.zip | |
nvme: start keep-alive after admin queue setup
Setting up I/O queues might take quite some time on larger and/or
busy setups, so KATO might expire before all I/O queues could be
set up.
Fix this by start keep alive from the ->init_ctrl_finish() callback,
and stopping it when calling nvme_cancel_admin_tagset().
Signed-off-by: Hannes Reinecke <hare@suse.de>
Tested-by: Mark O'Donovan <shiftee@posteo.net>
[fixed nvme-fc compile error]
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme/host/fc.c')
| -rw-r--r-- | drivers/nvme/host/fc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index a15b37750d6e..49c3e46eaa1e 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2530,6 +2530,12 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) * clean up the admin queue. Same thing as above. */ nvme_quiesce_admin_queue(&ctrl->ctrl); + + /* + * Open-coding nvme_cancel_admin_tagset() as fc + * is not using nvme_cancel_request(). + */ + nvme_stop_keep_alive(&ctrl->ctrl); blk_sync_queue(ctrl->ctrl.admin_q); blk_mq_tagset_busy_iter(&ctrl->admin_tag_set, nvme_fc_terminate_exchange, &ctrl->ctrl); |