nvme: update keep alive interval when kato is modified
PATCH v3 1/1 nvme: update keep alive interval when kato is modified
Currently the connection between host and NVMe-oF target gets disconnected by keep-alive timeout when a user connects to a target with a relatively large kato value and then sets the smaller kato with a set features command (e.g. connects with 60 seconds kato value and then sets 10 seconds kato value).
The cause is that keep alive command interval on the host, which is defined as unsigned int kato in nvme_ctrl structure, does not follow the kato value changes.
This patch updates the keep alive interval in the following steps when the kato is modified by a set features command: stops the keep alive work queue, then sets the kato as new timer value and re-start the queue.
---
Changes since v1:
- Add nvme_update_keep_alive to update keep alive timer in core routine.
- Add nvme_user_cmd_post to call nvme_update_keep_alive in ioctl.c Changes since v2:
- Remove unnecessary comment
- Move DIV_ROUND_UP into nvme_update_keep_alive
- Call nvme_update_keep_alive from nvme_passthru_end in core routine.
drivers/nvme/host/core.c | 39 +++++++++++++++++++++++++++++++++++++--
1 file changed, 37 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +37 -2
@@ -116,6 +116,8 @@ static struct class *nvme_ns_chr_class;static void nvme_put_subsystem (struct nvme_subsystem *subsys);static void nvme_remove_invalid_namespaces (struct nvme_ctrl *ctrl,unsigned nsid); +static void nvme_update_keep_alive (struct nvme_ctrl *ctrl, +struct nvme_command *cmd);/* * Prepare a queue for teardown.
@@ -1155,7 +1157,8 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,return effects; } -static void nvme_passthru_end (struct nvme_ctrl *ctrl,u32 effects) +static void nvme_passthru_end (struct nvme_ctrl *ctrl,u32 effects, +struct nvme_command *cmd,int status) {if (effects &NVME_CMD_EFFECTS_CSE_MASK ) {nvme_unfreeze (ctrl);
@@ -1170,6 +1173,24 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)nvme_queue_scan (ctrl);flush_work (&ctrl->scan_work); } +switch (cmd->common.opcode) { +case nvme_admin_set_features: +switch (cmd->common.cdw10 &0xFF ) { +case NVME_FEAT_KATO : +/* +* Keep alive commands interval on the host should be updated +* when KATO is modified by Set Features commands. +*/ +if (!status) +nvme_update_keep_alive (ctrl, cmd); +break ; +default : +break ; + } +break ; +default : +break ; + } }int nvme_execute_passthru_rq (struct request *rq)
@@ -1184,7 +1205,7 @@ int nvme_execute_passthru_rq(struct request *rq) effects =nvme_passthru_start (ctrl, ns, cmd->common.opcode); ret =nvme_execute_rq (disk, rq, false);if (effects)/* nothing to be done for zero cmd effects */ -nvme_passthru_end (ctrl, effects); +nvme_passthru_end (ctrl, effects, cmd, ret);return ret; }
@@ -1263,6 +1284,20 @@ static void nvme_start_keep_alive(struct nvme_ctrl *ctrl)nvme_queue_keep_alive_work (ctrl); } +static void nvme_update_keep_alive (struct nvme_ctrl *ctrl, +struct nvme_command *cmd) +{ +unsigned int new_kato =DIV_ROUND_UP (cmd->common.cdw11,1000 ); + +dev_info (ctrl->device, +"keep alive commands interval on the host is updated from %u ms to %u ms\n" , + ctrl->kato *1000 /2 , new_kato *1000 /2 ); + +nvme_stop_keep_alive (ctrl); + ctrl->kato = new_kato; +nvme_start_keep_alive (ctrl); +} +void nvme_stop_keep_alive (struct nvme_ctrl *ctrl) {if (unlikely (ctrl->kato ==0 ))
Signature · 1 line
2.25.1
[email protected]
maintainerThanks,
applied to nvme-5.15 with a few cosmetic fixups, including making the From match the spelling of your name in the signoff to keep the commit vs signoff bots silent. I hope this ok, if you want a different spelling let me know.