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

nvmet: support for traffic based keep-alive

Browse Source 
A controller that supports traffic based keep-alive can restart the keep
alive timer even when no keep-alive was not received in the kato period
as long as other admin or I/O commands were received.  For each command
set ctrl->cmd_seen to true, and when keep-alive timer expires, if any
commands were seen, resched ka_work instead of escalating to a fatal
error.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Sagi Grimberg 2018-11-02 10:28:13 -07:00 committed by Jens Axboe
parent 6e3ca03ee9
commit c09305ae49
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/nvme/target/admin-cmd.c
View File

@ -304,7 +304,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
/* XXX: figure out what to do about RTD3R/RTD3 */ /* XXX: figure out what to do about RTD3R/RTD3 */
id->oaes = cpu_to_le32(NVMET_AEN_CFG_OPTIONAL); id->oaes = cpu_to_le32(NVMET_AEN_CFG_OPTIONAL);
id->ctratt = cpu_to_le32(NVME_CTRL_ATTR_HID_128_BIT); id->ctratt = cpu_to_le32(NVME_CTRL_ATTR_HID_128_BIT |
NVME_CTRL_ATTR_TBKAS);
id->oacs = 0; id->oacs = 0;

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

@ -299,6 +299,15 @@ 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;
ctrl->cmd_seen = false;
if (cmd_seen) {
pr_debug("ctrl %d reschedule traffic based keep-alive timer\n",
ctrl->cntlid);
schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
return;
}
pr_err("ctrl %d keep-alive timer (%d seconds) expired!\n", pr_err("ctrl %d keep-alive timer (%d seconds) expired!\n",
ctrl->cntlid, ctrl->kato); ctrl->cntlid, ctrl->kato);
@ -801,6 +810,9 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,
goto fail; goto fail;
} }
if (sq->ctrl)
sq->ctrl->cmd_seen = true;
return true; return true;
fail: fail:

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

@ -163,6 +163,8 @@ struct nvmet_ctrl {
struct nvmet_cq **cqs; struct nvmet_cq **cqs;
struct nvmet_sq **sqs; struct nvmet_sq **sqs;
bool cmd_seen;
struct mutex lock; struct mutex lock;
u64 cap; u64 cap;
u32 cc; u32 cc;