[PATCH RFC 5/5] nvme: use per controller timeout waits over depending on global default

[Mohamed Khalfella]

On Thu 2026-02-12 13:09:51 +0100, Maurizio Lombardi wrote:
> Instead of passing NVME_IO_TIMEOUT as a parameter with every call to
> nvme_wait_freeze_timeout, use the controller's preferred timeout.
> 
> Signed-off-by: Maurizio Lombardi <mlombard at redhat.com>

Reviewed-by: Mohamed Khalfella <mkhalfella at purestorage.com>

> ---
>  drivers/nvme/host/apple.c | 2 +-
>  drivers/nvme/host/core.c  | 5 +++--
>  drivers/nvme/host/nvme.h  | 2 +-
>  drivers/nvme/host/pci.c   | 2 +-
>  drivers/nvme/host/rdma.c  | 2 +-
>  drivers/nvme/host/tcp.c   | 2 +-
>  6 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
> index e9bb64e3ec9c..c29c1f45f73a 100644
> --- a/drivers/nvme/host/apple.c
> +++ b/drivers/nvme/host/apple.c
> @@ -858,7 +858,7 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown)
>  	 * doing a safe shutdown.
>  	 */
>  	if (!dead && shutdown && freeze)
> -		nvme_wait_freeze_timeout(&anv->ctrl, NVME_IO_TIMEOUT);
> +		nvme_wait_freeze_timeout(&anv->ctrl);
>  
>  	nvme_quiesce_io_queues(&anv->ctrl);
>  
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index cc7d725bd6ff..c1b1a5d08838 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -5215,16 +5215,17 @@ void nvme_unfreeze(struct nvme_ctrl *ctrl)
>  }
>  EXPORT_SYMBOL_GPL(nvme_unfreeze);
>  
> -int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout)
> +int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl)
>  {
>  	struct nvme_ns *ns;
>  	int srcu_idx;
> +	unsigned long timeout = ctrl->io_timeout;

nit: Maybe move this to the top before ns?

>  
>  	srcu_idx = srcu_read_lock(&ctrl->srcu);
>  	list_for_each_entry_srcu(ns, &ctrl->namespaces, list,
>  				 srcu_read_lock_held(&ctrl->srcu)) {
>  		timeout = blk_mq_freeze_queue_wait_timeout(ns->queue, timeout);
> -		if (timeout <= 0)
> +		if (!timeout)
>  			break;
>  	}
>  	srcu_read_unlock(&ctrl->srcu, srcu_idx);
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index ef390a020d8d..c59228895bf0 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -840,7 +840,7 @@ void nvme_sync_queues(struct nvme_ctrl *ctrl);
>  void nvme_sync_io_queues(struct nvme_ctrl *ctrl);
>  void nvme_unfreeze(struct nvme_ctrl *ctrl);
>  void nvme_wait_freeze(struct nvme_ctrl *ctrl);
> -int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl, long timeout);
> +int nvme_wait_freeze_timeout(struct nvme_ctrl *ctrl);
>  void nvme_start_freeze(struct nvme_ctrl *ctrl);
>  
>  static inline enum req_op nvme_req_op(struct nvme_command *cmd)
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 853cd57e4480..0bd533ddc07c 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -3096,7 +3096,7 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
>  		 * if doing a safe shutdown.
>  		 */
>  		if (!dead && shutdown)
> -			nvme_wait_freeze_timeout(&dev->ctrl, NVME_IO_TIMEOUT);
> +			nvme_wait_freeze_timeout(&dev->ctrl);
>  	}
>  
>  	nvme_quiesce_io_queues(&dev->ctrl);
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 35c0822edb2d..c8859367ffff 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -888,7 +888,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
>  	if (!new) {
>  		nvme_start_freeze(&ctrl->ctrl);
>  		nvme_unquiesce_io_queues(&ctrl->ctrl);
> -		if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
> +		if (!nvme_wait_freeze_timeout(&ctrl->ctrl)) {
>  			/*
>  			 * If we timed out waiting for freeze we are likely to
>  			 * be stuck.  Fail the controller initialization just
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 69cb04406b47..0f78fa8f1cbc 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -2193,7 +2193,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)
>  	if (!new) {
>  		nvme_start_freeze(ctrl);
>  		nvme_unquiesce_io_queues(ctrl);
> -		if (!nvme_wait_freeze_timeout(ctrl, NVME_IO_TIMEOUT)) {
> +		if (!nvme_wait_freeze_timeout(ctrl)) {
>  			/*
>  			 * If we timed out waiting for freeze we are likely to
>  			 * be stuck.  Fail the controller initialization just
> -- 
> 2.53.0
> 
>