openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvmet: fix false keep-alive timeout when a controller is torn down 

Controller teardown flow may take some time in case it has many I/O
queues, and the host may not send us keep-alive during this period.
Hence reset the traffic based keep-alive timer so we don't trigger
a controller teardown as a result of a keep-alive expiration.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Sagi Grimberg 2021-05-25 08:49:05 -07:00 committed by Christoph Hellwig
parent 25df1acd2d
commit aaeadd7075
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/nvme/target/core.c
View File

@ -388,10 +388,10 @@ static void nvmet_keep_alive_timer(struct work_struct *work)
{ {
struct nvmet_ctrl *ctrl = container_of(to_delayed_work(work), struct nvmet_ctrl *ctrl = container_of(to_delayed_work(work),
struct nvmet_ctrl, ka_work); struct nvmet_ctrl, ka_work);
bool cmd_seen = ctrl->cmd_seen; bool reset_tbkas = ctrl->reset_tbkas;
ctrl->cmd_seen = false; ctrl->reset_tbkas = false;
if (cmd_seen) { if (reset_tbkas) {
pr_debug("ctrl %d reschedule traffic based keep-alive timer\n", pr_debug("ctrl %d reschedule traffic based keep-alive timer\n",
ctrl->cntlid); ctrl->cntlid);
schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ); schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
@ -804,6 +804,13 @@ void nvmet_sq_destroy(struct nvmet_sq *sq)
percpu_ref_exit(&sq->ref); percpu_ref_exit(&sq->ref);
if (ctrl) { if (ctrl) {
/*
* The teardown flow may take some time, and the host may not
* send us keep-alive during this period, hence reset the
* traffic based keep-alive timer so we don't trigger a
* controller teardown as a result of a keep-alive expiration.
*/
ctrl->reset_tbkas = true;
nvmet_ctrl_put(ctrl); nvmet_ctrl_put(ctrl);
sq->ctrl = NULL; /* allows reusing the queue later */ sq->ctrl = NULL; /* allows reusing the queue later */
} }
@ -952,7 +959,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,
} }
if (sq->ctrl) if (sq->ctrl)
sq->ctrl->cmd_seen = true; sq->ctrl->reset_tbkas = true;
return true; return true;

2
drivers/nvme/target/nvmet.h
View File

@ -167,7 +167,7 @@ struct nvmet_ctrl {
struct nvmet_subsys *subsys; struct nvmet_subsys *subsys;
struct nvmet_sq **sqs; struct nvmet_sq **sqs;
bool cmd_seen; bool reset_tbkas;
struct mutex lock; struct mutex lock;
u64 cap; u64 cap;