leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvme: allocate the keep alive request using BLK_MQ_REQ_NOWAIT

Browse Source 
To avoid an error recovery deadlock where the keep alive work is waiting
for a request and thus can't be flushed to make progress for tearing down
the controller.  Also print the error code returned from
blk_mq_alloc_request to help debugging any future issues in this code.

Based on an earlier patch from Hannes Reinecke <hare@suse.de>.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
This commit is contained in:
Christoph Hellwig 2021-03-03 13:51:47 +01:00
parent 06c3c3365b
commit 985c5a329d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvme/host/core.c
View File

@ -1242,10 +1242,10 @@ static void nvme_keep_alive_work(struct work_struct *work)
} }
rq = nvme_alloc_request(ctrl->admin_q, &ctrl->ka_cmd, rq = nvme_alloc_request(ctrl->admin_q, &ctrl->ka_cmd,
BLK_MQ_REQ_RESERVED); BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
/* allocation failure, reset the controller */ /* allocation failure, reset the controller */
dev_err(ctrl->device, "keep-alive failed\n"); dev_err(ctrl->device, "keep-alive failed: %ld\n", PTR_ERR(rq));
nvme_reset_ctrl(ctrl); nvme_reset_ctrl(ctrl);
return; return;
} }