From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95F2851EE18 for ; Fri, 18 Sep 2026 18:17:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789755440; cv=none; b=ErNdppWEUDxHhk0TCTfEIAXcUSFxVjfDJV+vtz3trNAXg9a2ks4StusKDwMyfdh6HixZe4EEyiwvOhAp8Dt/w50DrqPRzYEUVgb0F/ebTy1a3Cxnna7bKoGP5dnhrZpVyiqqsUBacI+1DdlmPSHoh5dD6gsaxB5pISNHZ3feZnk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789755440; c=relaxed/simple; bh=N3TrYKj63SGboRNWu/OysoGDNr/HzP5uaLhsWM3pZ+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CoGmhoaWkXwKIZiDys/WjgvS1jrzWif7hvKY3Ah888jQZZU4ihcvncjIWYHOIhs1ReciYVgdeRIb38kpNz4y0gkTqBzEZUz5gvzi/gqbMXnNvwtY3F86Ix0qMFGKLpkJcKMRWYhtYiTxucLgjcRgfBc1tu4jOfy0uFd8K59w6sU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=aOSEnO6s; arc=none smtp.client-ip=74.125.227.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="aOSEnO6s" Received: by mail-pj2-f12.google.com with SMTP id 98e67ed59e1d1-396ccd78e6eso399835a91.0 for ; Fri, 18 Sep 2026 11:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1789755438; x=1790360238; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=xpEVTaDIEqTTyPgj4k8QhiOl8bbLm2x6tGVGdtqRrPM=; b=aOSEnO6soKUMY2vwaWIIPtM8IjcKwrYaRnhS+dNCTON5wjxlCq8zuURg/aYAsPBnso nJJgd78sD9YSJnjXJ3kqJQgaoxZBMm1VqF2b5Mx7AA2zVdf9W4QH7KD/y63Yo8BkfQhx tjL5Q/iW+sNuUlZ+lIxSfCsC0sMVQ92pYr7nqCigFZeHZIm+hE06Z9yozfHJ29mXdls/ DaN1xb0aQhhbvk5cpSORUkfi91ptsBK9yA81rh+ErYw4+V0XSYp72YSw3h29CSvbNF/U yGeAZ7ZrDRR7NEdCcEJpGZJSN7SJguzBwGnNwaDDPqktALHfC4VeqUfcVbiXHhb46JGo tP0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789755438; x=1790360238; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=xpEVTaDIEqTTyPgj4k8QhiOl8bbLm2x6tGVGdtqRrPM=; b=jr0jttoCnXnY2+F2+o6bpTrwsV4DFxnNoNlqXvXW9BDkllJdKpNUEzDwtMR8f2N3un +GH5aBeLYBpV7ByAPV5Jy6w4tKCeCE+v26bQQYsWk1GukKqeX0hVdKl7/CAJ697Zlof/ srDeLUMsTw5KJPLKYFkXprpCtg6pD9FjUkP8/jFxBREvcK0gkAFxH4FszBCJH7HmDxJ0 Alxk4+OjLu+qZ6hZQf+p4SCA1Rz4846rjGjh9vJePvzyzxpSLdGj391FPyN8V7ORz7NP vvz06rce4AnSdzbPaymsKrYOyh8MdoA0JsQipMjPfG6fDFPPgqzYNQmeZ7+l1N6oOW3m 5zSQ== X-Forwarded-Encrypted: i=1; AKwUvBytR+Oik2YeGY/APv3V0DKmD1k1e/LuF4dsptftl8WF/7M3gZ9cWRyONADeC/0cLlNQ1Y9G8MRD9NRve9E=@vger.kernel.org X-Gm-Message-State: AFuF++m8afVUNvmxQ/hvGKNq71lGBFqW7gfskhj9N5bsHccKqKD+AyTI k5iTeeSAV8A6sOQUcZQwv0mU89AKUkjZRWuEcZeAhpqouO98PXB+tHKCmatzLGZQrpw= X-Gm-Gg: AYBFou1ZnXXNzNy1+TxMhZsrH4gYNeFKYSogTenocVODeK0F5NA203HQOBqJFHXG1vz ACs45kjwcsiXdKj8ZWSzuyd5d3rqWrGqcH27zsmuEYsqnnLQKQpzNdVH4yfezi8G6RKdjBm+Ybs CotR29MNAvNTbe79exWWBqJ4uf2Bta29/lUSBjN1sfRENVPEj9JagImqjLbpcrTsOqzSbnn2/XR 7XsS6bX4rxvfavSKAownjqqb26QSfGXKnWiW0YTeCv2Wm9TQ5S3Rr1F8Ya1a3st8YCaczZVVjK1 bNRUrtsfazhrY1/H72RZMhp8wZbwHw+77XlO8tMW/Wg7rWS9gwQ/BtnScWBVYlglO1/pXnJeUlR E1korI3KU4uG+a0hsf1uGKMZfYcr/jT3bATD7OOKLLU4WT6lGu51uIDTxtvTC8gC8VwPTKsxTwj 18IErQIiiGwyhuDaSMUIEQhWse8iTROExVvvXjffyyb33OmU+xsqQ7YnGH6HQIsFWtl0k5DxaUL Fq9oa1U82DOFb5jTbsOaBb/6ToGKjc+ X-Received: by 2002:a17:90b:38c8:b0:39e:6a7f:6187 with SMTP id 98e67ed59e1d1-39e6a7f6404mr766298a91.24.1789755437763; Fri, 18 Sep 2026 11:17:17 -0700 (PDT) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-33c331aeeddsm335107eec.24.2026.09.18.11.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 11:17:17 -0700 (PDT) From: Mohamed Khalfella To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Justin Tee , Naresh Gottumukkala , Paul Ely , Hannes Reinecke , Chaitanya Kulkarni , James Smart , Randy Jennings , Mohamed Khalfella , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 17/18] nvme: Add support for CQT to nvme host Date: Fri, 18 Sep 2026 11:14:17 -0700 Message-ID: <20260918181614.3947933-18-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260918181614.3947933-1-mkhalfella@purestorage.com> References: <20260918181614.3947933-1-mkhalfella@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit TP4129 KATO Corrections and Clarifications defined CQT (Command Quiesce Time) which is used along with KATO (Keep Alive Timeout) to set an upper limit for attempting Cross-Controller Recovery. Add ctrl->cqt, read its value from controller identify response, expose it via sysfs, and have nvme_fence_timeout_ms() account for it. Use CQT to drive time-based recovery in fc, rdma, and tcp transports. Add a fenced_work delayed work to each transport controller. If CCR fails, fencing_work switches to error recovery immediately if CQT is not supported. Otherwise it schedules fenced_work after the remaining fence timeout, which also switches to error recovery when scheduled. Signed-off-by: Mohamed Khalfella Reviewed-by: Hannes Reinecke Reviewed-by: Sagi Grimberg --- drivers/nvme/host/core.c | 1 + drivers/nvme/host/fc.c | 33 +++++++++++++++++++++++++++++++-- drivers/nvme/host/nvme.h | 5 +++-- drivers/nvme/host/rdma.c | 32 ++++++++++++++++++++++++++++++-- drivers/nvme/host/sysfs.c | 2 ++ drivers/nvme/host/tcp.c | 32 ++++++++++++++++++++++++++++++-- 6 files changed, 97 insertions(+), 8 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5509b58b51db..dc44e3af5f14 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3844,6 +3844,7 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->ciu = id->ciu; ctrl->cirn = le64_to_cpu(id->cirn); ctrl->ccrl = id->ccrl; + ctrl->cqt = le16_to_cpu(id->cqt); ctrl->oacs = le16_to_cpu(id->oacs); ctrl->oncs = le16_to_cpu(id->oncs); diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index a6e0fa2dc341..3db111accd0c 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -167,6 +167,7 @@ struct nvme_fc_ctrl { struct blk_mq_tag_set tag_set; struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct ioerr_work; struct delayed_work connect_work; @@ -1882,6 +1883,19 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *ctrl, return ret; } +static void nvme_fc_fenced_work(struct work_struct *work) +{ + struct nvme_fc_ctrl *fc_ctrl = container_of(to_delayed_work(work), + struct nvme_fc_ctrl, fenced_work); + struct nvme_ctrl *ctrl = &fc_ctrl->ctrl; + + dev_info(ctrl->device, "Time-based recovery finished\n"); + nvme_fc_flush_held_requests(fc_ctrl); + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &fc_ctrl->ioerr_work); +} + static void nvme_fc_fencing_work(struct work_struct *work) { struct nvme_fc_ctrl *fc_ctrl = @@ -1899,9 +1913,22 @@ static void nvme_fc_fencing_work(struct work_struct *work) __nvme_fc_teardown_association(fc_ctrl); rem = nvme_fence_ctrl(ctrl); - if (rem) - dev_info(ctrl->device, "CCR failed, starting error recovery\n"); + if (!rem) + goto done; + if (!ctrl->cqt) { + dev_info(ctrl->device, + "CCR failed, CQT not supported, skip time-based recovery\n"); + goto done; + } + + dev_info(ctrl->device, + "CCR failed, switch to time-based recovery, timeout = %ums\n", + jiffies_to_msecs(rem)); + queue_delayed_work(nvme_wq, &fc_ctrl->fenced_work, rem); + return; + +done: nvme_fc_flush_held_requests(fc_ctrl); nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) @@ -2541,6 +2568,7 @@ static void nvme_fc_stop_ctrl(struct nvme_ctrl *nctrl) { flush_work(&to_fc_ctrl(nctrl)->fencing_work); + flush_delayed_work(&to_fc_ctrl(nctrl)->fenced_work); } /* @@ -3661,6 +3689,7 @@ nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, INIT_WORK(&ctrl->ctrl.reset_work, nvme_fc_reset_ctrl_work); INIT_DELAYED_WORK(&ctrl->connect_work, nvme_fc_connect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_fc_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_fc_fenced_work); INIT_WORK(&ctrl->ioerr_work, nvme_fc_ctrl_ioerr_work); spin_lock_init(&ctrl->lock); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 7096f1e4f84e..bcecaaf06f7e 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -401,6 +401,7 @@ struct nvme_ctrl { u32 max_zone_append; #endif u16 crdt[3]; + u16 cqt; u16 oncs; u8 dmrl; u8 ciu; @@ -1360,8 +1361,8 @@ static inline bool nvme_multi_css(struct nvme_ctrl *ctrl) static inline unsigned long nvme_fence_timeout_ms(struct nvme_ctrl *ctrl) { if (ctrl->ctratt & NVME_CTRL_ATTR_TBKAS) - return 3 * ctrl->kato * 1000; - return 2 * ctrl->kato * 1000; + return 3 * ctrl->kato * 1000 + ctrl->cqt; + return 2 * ctrl->kato * 1000 + ctrl->cqt; } #endif /* _NVME_H */ diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 9c50421d79c4..8ff5aa312377 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -120,6 +120,7 @@ struct nvme_rdma_ctrl { /* other member variables */ struct blk_mq_tag_set tag_set; struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct err_work; struct nvme_rdma_qe async_event_sqe; @@ -994,6 +995,7 @@ static void nvme_rdma_stop_ctrl(struct nvme_ctrl *nctrl) struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl); flush_work(&ctrl->fencing_work); + flush_delayed_work(&ctrl->fenced_work); flush_work(&ctrl->err_work); cancel_delayed_work_sync(&ctrl->reconnect_work); } @@ -1155,6 +1157,18 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) nvme_rdma_reconnect_or_remove(ctrl, ret); } +static void nvme_rdma_fenced_work(struct work_struct *work) +{ + struct nvme_rdma_ctrl *rdma_ctrl = container_of(to_delayed_work(work), + struct nvme_rdma_ctrl, fenced_work); + struct nvme_ctrl *ctrl = &rdma_ctrl->ctrl; + + dev_info(ctrl->device, "Time-based recovery finished\n"); + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &rdma_ctrl->err_work); +} + static void nvme_rdma_fencing_work(struct work_struct *work) { struct nvme_rdma_ctrl *rdma_ctrl = container_of(work, @@ -1163,9 +1177,22 @@ static void nvme_rdma_fencing_work(struct work_struct *work) unsigned long rem; rem = nvme_fence_ctrl(ctrl); - if (rem) - dev_info(ctrl->device, "CCR failed, starting error recovery\n"); + if (!rem) + goto done; + + if (!ctrl->cqt) { + dev_info(ctrl->device, + "CCR failed, CQT not supported, skip time-based recovery\n"); + goto done; + } + + dev_info(ctrl->device, + "CCR failed, switch to time-based recovery, timeout = %ums\n", + jiffies_to_msecs(rem)); + queue_delayed_work(nvme_wq, &rdma_ctrl->fenced_work, rem); + return; +done: nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) queue_work(nvme_reset_wq, &rdma_ctrl->err_work); @@ -2354,6 +2381,7 @@ static struct nvme_rdma_ctrl *nvme_rdma_alloc_ctrl(struct device *dev, INIT_DELAYED_WORK(&ctrl->reconnect_work, nvme_rdma_reconnect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_rdma_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_rdma_fenced_work); INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work); diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index 3a12b07149d2..e8dad4722347 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -486,6 +486,7 @@ nvme_show_int_function(numa_node); nvme_show_int_function(queue_count); nvme_show_int_function(sqsize); nvme_show_int_function(kato); +nvme_show_int_function(cqt); static ssize_t nvme_sysfs_ciu_show(struct device *dev, struct device_attribute *attr, @@ -966,6 +967,7 @@ static struct attribute *nvme_dev_attrs[] = { &dev_attr_sqsize.attr, &dev_attr_ciu.attr, &dev_attr_cirn.attr, + &dev_attr_cqt.attr, &dev_attr_hostnqn.attr, &dev_attr_hostid.attr, &dev_attr_ctrl_loss_tmo.attr, diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index febbe8954473..7b1d9e2cb00d 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -168,6 +168,7 @@ struct nvme_tcp_ctrl { struct nvme_ctrl ctrl; struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct err_work; struct delayed_work connect_work; struct nvme_tcp_request async_req; @@ -2565,6 +2566,18 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work) nvme_tcp_reconnect_or_remove(ctrl, ret); } +static void nvme_tcp_fenced_work(struct work_struct *work) +{ + struct nvme_tcp_ctrl *tcp_ctrl = container_of(to_delayed_work(work), + struct nvme_tcp_ctrl, fenced_work); + struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl; + + dev_info(ctrl->device, "Time-based recovery finished\n"); + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &tcp_ctrl->err_work); +} + static void nvme_tcp_fencing_work(struct work_struct *work) { struct nvme_tcp_ctrl *tcp_ctrl = container_of(work, @@ -2573,9 +2586,22 @@ static void nvme_tcp_fencing_work(struct work_struct *work) unsigned long rem; rem = nvme_fence_ctrl(ctrl); - if (rem) - dev_info(ctrl->device, "CCR failed, starting error recovery\n"); + if (!rem) + goto done; + + if (!ctrl->cqt) { + dev_info(ctrl->device, + "CCR failed, CQT not supported, skip time-based recovery\n"); + goto done; + } + dev_info(ctrl->device, + "CCR failed, switch to time-based recovery, timeout = %ums\n", + jiffies_to_msecs(rem)); + queue_delayed_work(nvme_wq, &tcp_ctrl->fenced_work, rem); + return; + +done: nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) queue_work(nvme_reset_wq, &tcp_ctrl->err_work); @@ -2657,6 +2683,7 @@ static void nvme_reset_ctrl_work(struct work_struct *work) static void nvme_tcp_stop_ctrl(struct nvme_ctrl *ctrl) { flush_work(&to_tcp_ctrl(ctrl)->fencing_work); + flush_delayed_work(&to_tcp_ctrl(ctrl)->fenced_work); flush_work(&to_tcp_ctrl(ctrl)->err_work); cancel_delayed_work_sync(&to_tcp_ctrl(ctrl)->connect_work); } @@ -3023,6 +3050,7 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev, INIT_DELAYED_WORK(&ctrl->connect_work, nvme_tcp_reconnect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_tcp_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_tcp_fenced_work); INIT_WORK(&ctrl->err_work, nvme_tcp_error_recovery_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_reset_ctrl_work); -- 2.55.0