From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 CA9CD368D4B for ; Sun, 12 Jul 2026 02:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823146; cv=none; b=F3rmQZqwTHr6c5k8zRIELO35mFFuO+jRrFbVGn4de81LD7SwUNbxMNlLlOZYTDZbJG+r8r9k8wPUX+Devr7rvJ3cQSmgjb9r78s82SJ+L6w1Q2EmGrsUi6UgUe/JquIKtMebNTqtGqTehvjCW/jT9hHvcsc71CKJPKEhfdaJVLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823146; c=relaxed/simple; bh=Qn3ESBJqlUky1m3kpQ1XGD/ekrSFBNk/L2EU2hC/V4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E6LDM11o4r2jDB4EDUfTVEnAHFL7nw7SD2V0n/Fkjzm31Rq3zFolhHESFoyqnluh6DKFz7QeOvrP8h9jMhN26RloSX8kzgsKmHNJ1oDA7SDaKn3DdUOMsIpKXtH/rNMnVA5orIzGwSKTN8I5SbyIPZ4kO/PBqtP/xFhnvLbUywQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=aDiDcrR/; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="aDiDcrR/" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cc6dd436c6so24501045ad.2 for ; Sat, 11 Jul 2026 19:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823144; x=1784427944; 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=1rYDxzyuopFsvKHCSX2IcMInl87/tUE3AM2EYHgQ9pk=; b=aDiDcrR/LDTq2/e/Lb2GGanzMpsi2RrJY7T3A19vsugENZlMoCv5tV3PCAVXaRuRhI fTCwS8/ffWX2bKEut11/0seFZkJCdSujWgaworaBlmIqxITrsFxYNm2W0vd5FBKiuK0c kX12Aqcfl94V1mkahZqM1t5rQiKZmmqydVe0NIZc0bYj5HUbGfG92M6iMh9CH0r0fKzT PKg7ITenNGa2lpA5oTMxZ6wLOfZWHO2JdJG2PBt4vDK82UFDVYcdQzLs/PGb+LkzVB8b h+zBFzoV/m2L2sQeAEI0Qd7rdUxhebo4o5bkzD9P4TFUPdtiRUWObujdHTnWldZGSV+A pZ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823144; x=1784427944; 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=1rYDxzyuopFsvKHCSX2IcMInl87/tUE3AM2EYHgQ9pk=; b=Q7vHI+Kv4ViTbCg2Gi4Ueim8gGS0k0T4uUjMkblrg+ZaNTJ49s1RTNpOqDgdZ87km1 MbU+fKdunYT/W40wRyN+m6Q8nZJm7eDChzgQ6FltOTIjA6zY3QKoIatPBRnILWtvG5DY mUkBcSdMjaVqoRs8bhBIn+Xqs8DYE1JSiEcNyEo3Q2H9t1wLCfHyJBDYOwv5gVPKuHVZ ysthhBFW9VdNItb1Ea128IU++EujJAydpEgiJW8UnTzkF1C+FpDRlSQ/AxQA94xXHmTH 5RuWVG5rAIRdBwZv9cpfpFdyvSODWtONqDceSAp3Vr36g5HSX48OxusGuAkJ2OKF6ZNG SiMA== X-Forwarded-Encrypted: i=1; AHgh+RpKTtCYJdrVpKsuLPbETXftrrkbtmOP+nXge3N6+r9fS/DNmYkF/BBxthAUQoPIkae+aFxL606yeo1Wk6o=@vger.kernel.org X-Gm-Message-State: AOJu0YzbFftIvNqpj+/dlZt0xaCbLK9SwzREnSCCnG1PNEfB2ogQlTxC DR6tnQHSl328C6MqwMq1CpYOMziOaVr/W9Gcq2nTMTunu1Na9KQu2DxzLnECRQ+4n/0= X-Gm-Gg: AfdE7clXBDcTEoUY+qUZX66jGuQLoNIRn7a5nnW8CllRB5BEfAPsQURxcmHkb2/u+KF ra0oFqAAkgMHChxKgOMm7wvoHrnPgkzGqQW8wA2zjtOSn4j06nbbxnYy3HhFfkwY49A/dpfgwGx osmW8THWsxDKoLMkngnndBm3/6r1U0ceU+5gjADcGJP38LDuv6w5AbeUjGTPF+6QYdAXaYObfvP KHuJm0HHBWVqnO7PNRuvuCAbaY+rDMmiEozDHeYDfGY7Nv6hzEJ6WKtqPs+MWJct7iFi01YL1Aj u60sF3l4sRVwnbqAK1Xs5+xxIs6r1+7z5tiFsQh/77xyOpaTu09PRtyZ9Pp0tsnGJ6LHIH75xpp OynG8jeaBDfPHMwFZiryQLU3ImzROQjNMBXV7mnfh9U7LZx5UHvYS7FrogWG2b2/pHfCtok6uWV GqBHxV93/yeJbrCcXMnpKfkRcOuw== X-Received: by 2002:a17:90b:3a81:b0:37f:e1b6:4c7d with SMTP id 98e67ed59e1d1-38dc782ab92mr4293115a91.6.1783823143929; Sat, 11 Jul 2026 19:25:43 -0700 (PDT) Received: from ceto.lan ([2607:fb90:9c20:2264::1c31]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm60704693eec.0.2026.07.11.19.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:43 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke , Randy Jennings , Dhaval Giani Cc: Aaron Dailey , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v5 15/16] nvmet: Add support for CQT to nvme target Date: Sat, 11 Jul 2026 19:23:36 -0700 Message-ID: <20260712022437.3743117-16-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260712022437.3743117-1-mkhalfella@purestorage.com> References: <20260712022437.3743117-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 time limit for attempting Cross-Controller Recovery. CQT is added as a subsystem attribute that defaults to 0 to maintain the current behavior. Signed-off-by: Mohamed Khalfella --- drivers/nvme/target/admin-cmd.c | 1 + drivers/nvme/target/configfs.c | 36 +++++++++++++++++++++++++++++++++ drivers/nvme/target/core.c | 3 +++ drivers/nvme/target/nvmet.h | 2 ++ include/linux/nvme.h | 5 ++++- 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index ea2566a9b83f..fbfc226c9830 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -737,6 +737,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->cntlid = cpu_to_le16(ctrl->cntlid); id->ver = cpu_to_le32(ctrl->subsys->ver); if (!nvmet_is_disc_subsys(ctrl->subsys)) { + id->cqt = cpu_to_le16(ctrl->cqt); id->ciu = ctrl->ciu; id->cirn = cpu_to_le64(ctrl->cirn); id->ccrl = NVMF_CCR_LIMIT; diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index 2b69ffcfc8df..b99f31c0a640 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -1661,6 +1661,41 @@ static ssize_t nvmet_subsys_attr_pi_enable_store(struct config_item *item, CONFIGFS_ATTR(nvmet_subsys_, attr_pi_enable); #endif +static ssize_t nvmet_subsys_attr_cqt_show(struct config_item *item, + char *page) +{ + return snprintf(page, PAGE_SIZE, "%u\n", to_subsys(item)->cqt); +} + +static ssize_t nvmet_subsys_attr_cqt_store(struct config_item *item, + const char *page, size_t cnt) +{ + struct nvmet_subsys *subsys = to_subsys(item); + struct nvmet_ctrl *ctrl; + u16 cqt; + + if (nvmet_is_disc_subsys(subsys)) + return -EINVAL; + + if (sscanf(page, "%hu\n", &cqt) != 1) + return -EINVAL; + + down_write(&nvmet_config_sem); + mutex_lock(&subsys->lock); + if (subsys->cqt == cqt) + goto out; + + subsys->cqt = cqt; + /* Force reconnect */ + list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) + ctrl->ops->delete_ctrl(ctrl); +out: + mutex_unlock(&subsys->lock); + up_write(&nvmet_config_sem); + return cnt; +} +CONFIGFS_ATTR(nvmet_subsys_, attr_cqt); + static ssize_t nvmet_subsys_attr_qid_max_show(struct config_item *item, char *page) { @@ -1701,6 +1736,7 @@ static struct configfs_attribute *nvmet_subsys_attrs[] = { &nvmet_subsys_attr_attr_vendor_id, &nvmet_subsys_attr_attr_subsys_vendor_id, &nvmet_subsys_attr_attr_model, + &nvmet_subsys_attr_attr_cqt, &nvmet_subsys_attr_attr_qid_max, &nvmet_subsys_attr_attr_ieee_oui, &nvmet_subsys_attr_attr_firmware, diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 9b16b15f5093..e59026ca449f 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -1729,6 +1729,7 @@ struct nvmet_ctrl *nvmet_alloc_ctrl(struct nvmet_alloc_ctrl_args *args) ctrl->cntlid = ret; if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->cqt = subsys->cqt; ctrl->ciu = get_random_u8() ? : 1; ctrl->cirn = get_random_u64(); } @@ -1969,10 +1970,12 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn, switch (type) { case NVME_NQN_NVME: + subsys->cqt = NVMF_CQT_MS; subsys->max_qid = NVMET_NR_QUEUES; break; case NVME_NQN_DISC: case NVME_NQN_CURR: + subsys->cqt = 0; subsys->max_qid = 0; break; default: diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index da80377c3795..4ff458c3ccdc 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -269,6 +269,7 @@ struct nvmet_ctrl { uuid_t hostid; u16 cntlid; + u16 cqt; u8 ciu; u32 kato; u64 cirn; @@ -346,6 +347,7 @@ struct nvmet_subsys { #ifdef CONFIG_NVME_TARGET_DEBUGFS struct dentry *debugfs_dir; #endif + u16 cqt; u16 max_qid; u64 ver; diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 3757d11ffea3..0b69ed53f347 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -21,6 +21,7 @@ #define NVMF_TRADDR_SIZE 256 #define NVMF_TSAS_SIZE 256 +#define NVMF_CQT_MS 0 #define NVMF_CCR_LIMIT 4 #define NVMF_CCR_PER_PAGE 511 @@ -368,7 +369,9 @@ struct nvme_id_ctrl { __u8 anacap; __le32 anagrpmax; __le32 nanagrpid; - __u8 rsvd352[160]; + __u8 rsvd352[34]; + __le16 cqt; + __u8 rsvd388[124]; __u8 sqes; __u8 cqes; __le16 maxcmd; -- 2.54.0