Skip to content

Commit 774a963

Browse files
ps-ushankarkeithbusch
authored andcommitted
nvme: check IO start time when deciding to defer KA
When a command completes, we set a flag which will skip sending a keep alive at the next run of nvme_keep_alive_work when TBKAS is on. However, if the command was submitted long ago, it's possible that the controller may have also restarted its keep alive timer (as a result of receiving the command) long ago. The following trace demonstrates the issue, assuming TBKAS is on and KATO = 8 for simplicity: 1. t = 0: submit I/O commands A, B, C, D, E 2. t = 0.5: commands A, B, C, D, E reach controller, restart its keep alive timer 3. t = 1: A completes 4. t = 2: run nvme_keep_alive_work, see recent completion, do nothing 5. t = 3: B completes 6. t = 4: run nvme_keep_alive_work, see recent completion, do nothing 7. t = 5: C completes 8. t = 6: run nvme_keep_alive_work, see recent completion, do nothing 9. t = 7: D completes 10. t = 8: run nvme_keep_alive_work, see recent completion, do nothing 11. t = 9: E completes At this point, 8.5 seconds have passed without restarting the controller's keep alive timer, so the controller will detect a keep alive timeout. Fix this by checking the IO start time when deciding to defer sending a keep alive command. Only set comp_seen if the command started after the most recent run of nvme_keep_alive_work. With this change, the completions of B, C, and D will not set comp_seen and the run of nvme_keep_alive_work at t = 4 will send a keep alive. Reported-by: Costa Sapuntzakis <costa@purestorage.com> Reported-by: Randy Jennings <randyj@purestorage.com> Signed-off-by: Uday Shankar <ushankar@purestorage.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent ea4d453 commit 774a963

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

drivers/nvme/host/core.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,16 @@ void nvme_complete_rq(struct request *req)
397397
trace_nvme_complete_rq(req);
398398
nvme_cleanup_cmd(req);
399399

400-
if (ctrl->kas)
400+
/*
401+
* Completions of long-running commands should not be able to
402+
* defer sending of periodic keep alives, since the controller
403+
* may have completed processing such commands a long time ago
404+
* (arbitrarily close to command submission time).
405+
* req->deadline - req->timeout is the command submission time
406+
* in jiffies.
407+
*/
408+
if (ctrl->kas &&
409+
req->deadline - req->timeout >= ctrl->ka_last_check_time)
401410
ctrl->comp_seen = true;
402411

403412
switch (nvme_decide_disposition(req)) {
@@ -1200,6 +1209,7 @@ static enum rq_end_io_ret nvme_keep_alive_end_io(struct request *rq,
12001209
return RQ_END_IO_NONE;
12011210
}
12021211

1212+
ctrl->ka_last_check_time = jiffies;
12031213
ctrl->comp_seen = false;
12041214
spin_lock_irqsave(&ctrl->lock, flags);
12051215
if (ctrl->state == NVME_CTRL_LIVE ||
@@ -1218,6 +1228,8 @@ static void nvme_keep_alive_work(struct work_struct *work)
12181228
bool comp_seen = ctrl->comp_seen;
12191229
struct request *rq;
12201230

1231+
ctrl->ka_last_check_time = jiffies;
1232+
12211233
if ((ctrl->ctratt & NVME_CTRL_ATTR_TBKAS) && comp_seen) {
12221234
dev_dbg(ctrl->device,
12231235
"reschedule traffic based keep-alive timer\n");

drivers/nvme/host/nvme.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ struct nvme_ctrl {
328328
struct delayed_work ka_work;
329329
struct delayed_work failfast_work;
330330
struct nvme_command ka_cmd;
331+
unsigned long ka_last_check_time;
331332
struct work_struct fw_act_work;
332333
unsigned long events;
333334

0 commit comments

Comments
 (0)