nvmet: avoid queuing keep-alive timer if it is disabled
Subsystems (2)
PATCH v2 1/1 nvmet: avoid queuing keep-alive timer if it is disabled
Issue following command:
nvme set-feature -f 0xf -v 0 /dev/nvme1n1 # disable keep-alive timer nvme admin-passthru -o 0x18 /dev/nvme1n1 # send keep-alive command will make keep-alive timer fired and thus delete the controller like below:
[247459.907635] nvmet: ctrl 1 keep-alive timer (0 seconds) expired! [247459.930294] nvmet: ctrl 1 fatal error occurred!
Avoid this by not queuing delayed keep-alive if it is disabled when keep-alive command is received from the admin queue.
Signed-off-by Hou Pu <[email protected]>
Tested-by Chaitanya Kulkarni <[email protected]>
---
v2:
Simplify code suggested by Chaitanya Kulkarni.
Add Tested-by Tested-by: Chaitanya Kulkarni <[email protected]>
--- drivers/nvme/target/admin-cmd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/nvme/target/admin-cmd.c +8 -2
@@ -919,15 +919,21 @@ void nvmet_execute_async_event(struct nvmet_req *req)void nvmet_execute_keep_alive (struct nvmet_req *req) {struct nvmet_ctrl *ctrl = req->sq->ctrl; +u16 status =0 ;if (!nvmet_check_transfer_len (req,0 ))return ; +if (!ctrl->kato) { + status =NVME_SC_KA_TIMEOUT_INVALID ; + goto out; + } +pr_debug ("ctrl %d update keep-alive timer for %d secs\n" , ctrl->cntlid, ctrl->kato); -mod_delayed_work (system_wq, &ctrl->ka_work, ctrl->kato *HZ ); -nvmet_req_complete (req,0 ); +out: +nvmet_req_complete (req, status); }u16 nvmet_parse_admin_cmd (struct nvmet_req *req)
Signature · 7 lines
2.28.0 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.13.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme