From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 8B9EB361DA9 for ; Sun, 12 Jul 2026 02:25:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823120; cv=none; b=GZgqT7wpf5JMqiTlciZKLvZSMYXS67+2sorJWV+VXjg9DlKfJRfJYugCjAxCQra0+eypgDeSeVpyvGJiWiZj6pn74gHDrL5qF72ZWNUi+pjeA+Xv2shjkhJBGLoWBH0i2k7vqmuDa+cMfHxGnSumrZC8J32tegWOryi5vf58P4o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823120; c=relaxed/simple; bh=P/4m2s9rdRNozdt8E8GYkOJJzykSv3TCSg6iPO9OhUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SfbE4Rh4sKfbeJlNvJZNfOCbDCbwKWBpMSz7Ygxw80PWHU1zbxkTwqKoDB1iNz5j26CNaLiBM/GybiMSE6K2LPOKSDPq0cR3jrMalMzb1r/z3/56cVD2v/3M4V9QnRRLbB3qwY+c/DXOtH3fsigoj9EVPckUvBQJ9LpItaKxHeY= 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=BWhwo1qy; arc=none smtp.client-ip=209.85.216.53 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="BWhwo1qy" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-384930ca5e2so2377071a91.3 for ; Sat, 11 Jul 2026 19:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823118; x=1784427918; 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=LJ3eqT5MrrmAjHbEtV8wOhzni/tkslB66Zt2m3a2DuU=; b=BWhwo1qyhr5Y253CKVzn6E29UfnjcyCNEAL65OnRgFglyXl5HyVgQTWMS5P/b5rgoh Hpw74c6GM8T2UDxkypStlbBqTFPpmDFCcib0cLKzmepxyJMeK5ZBEGvTNZ4aqwzdeqG5 WnBZCsRH4fmr76lvf89AmM/wGS4+2caC/Xy8jUkPrJB5ZdGD343vdqnfoPQeaoN3hL8p ZamVJkN+fbT8dxdlB2LYwAl2uqLpNNbhoLJaHwMBUOyamIvHR9xd6KaJswEkn36SaEsg sn4WJ2zjpSK1ypKDl22FVYgBr+If0h7LPHwVwY1RTslqstY4UNXxVVHUU/jFM0yWqYPY HIMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823118; x=1784427918; 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=LJ3eqT5MrrmAjHbEtV8wOhzni/tkslB66Zt2m3a2DuU=; b=nIZGzW2fzNWJzpfBo9AFVgcbUQ0rvvRu1OkIy7un8xyZ03fEzOkEfzeI70Y2PO5dL9 /5h4qFdXuNHq6lFLTn3pOLcznnSNyvF3uqGE3+WXmMKA1Zr68Ak9sE9SfKnR7s1WBL4b bXmjNqpRduO7TBFVC65cuks6nRv9ulBidmV6bshJ5DghBc8odK876Ea/nJK+sQpRm8B0 PsFA1XP7YLLeU+T2VCfZrArjw6S2UyL6KDxa6wftefwDulo+7v9TP9u9aycLtKYi13oE h/ofDzHg4IedWcNc1/w6Pk1dnlG3+0LLcDfVnz7GDq4Yxs/TTa+g3pAaS4+NwGUlHPY7 kVNA== X-Forwarded-Encrypted: i=1; AHgh+RruvYdM/y0be/ryH+dUEFTGhR+WTCFR7wdvKIbKGUnf8EHEDN9Dnk8yNLckV7znv2wf/6kohvspKUPLxWo=@vger.kernel.org X-Gm-Message-State: AOJu0YwGZoUPhCPTJmvfa8wnriRaKrfE4h5BJ4udGjwlD32CMSykfD5a Rfmgf0EH2mCr0M2uUVJPTu/HRaIk1fqa/vwHV5LG10/VVPjDiUFb3oAlx1BPH1PXi3A= X-Gm-Gg: AfdE7clNxVV9wtM5sPlY15+4hUmgx1p7piKCu+fg7IT2aZX8CfdB9xNlzi/8H1u+J// hY7NfkmItnWYxnyg3DL6IvcmvQGU0qIrmv6oTTqsxbd+cPeNQ6ffUWPD0ordryz8Hui6U3lIuuY zm4jHbTkX1u6FWqTI/7dFZYU/NKO7WlhTpevWg3y3WsYjeUb3uGJf70brPfuH9f/O32+yiXX17L HTlnTQFyB98dd9KFVGVNWpLFL8b/haOiRPTN1jrFCD1gLFE413uHxrEkc6r5iAyeouQivjfPeST 3Q//mLvNm5h54b6ALUrLI6axNOoDZqpCM07dTYsc8jppuHyETJYLU8LHSpUN8AaynX+Vv+QxXBF vB5a20SHFf/A8LrV5c91c7IqRhyrGmJtSlKcLqICvDiyFis8gEdgHhn2VUCObSjUsHVRkBNtw8Z rGUyN/ X-Received: by 2002:a17:90b:5585:b0:37f:db06:229c with SMTP id 98e67ed59e1d1-38dc777b895mr4349898a91.22.1783823117600; Sat, 11 Jul 2026 19:25:17 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:16 -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 01/16] nvmet: Rapid Path Failure Recovery set controller identify fields Date: Sat, 11 Jul 2026 19:23:22 -0700 Message-ID: <20260712022437.3743117-2-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 TP8028 Rapid Path Failure Recovery defined new fields in controller identify response. The newly defined fields are: - CIU (Controller Instance Uniquifier): is an 8bit non-zero value that is assigned a random value when controller is first created. The value will be incremented when RDY bit in CSTS register is asserted. - CIRN (Controller Instance Random Number): is 64bit random value that gets generated when controller is created. CIRN is regenerated everytime RDY bit in CSTS register is asserted. - CCRL (Cross-Controller Reset Limit): is an 8bit value that defines the maximum number of in-progress controller reset operations. CCRL is hardcoded to 4 as recommended by TP8028. These fields are set for non-discovery subsystems only. Signed-off-by: Mohamed Khalfella Reviewed-by: Hannes Reinecke --- drivers/nvme/target/admin-cmd.c | 5 +++++ drivers/nvme/target/core.c | 9 +++++++++ drivers/nvme/target/nvmet.h | 2 ++ include/linux/nvme.h | 10 ++++++++-- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 01b799e92ae6..81988b40d5d5 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -691,6 +691,11 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->mdts = nvmet_ctrl_mdts(req); id->cntlid = cpu_to_le16(ctrl->cntlid); id->ver = cpu_to_le32(ctrl->subsys->ver); + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + id->ciu = ctrl->ciu; + id->cirn = cpu_to_le64(ctrl->cirn); + id->ccrl = NVMF_CCR_LIMIT; + } /* XXX: figure out what to do about RTD3R/RTD3 */ id->oaes = cpu_to_le32(NVMET_AEN_CFG_OPTIONAL); diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index a2403a808360..d42421420be6 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -1406,6 +1406,10 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl) return; } + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->ciu = ((u8)(ctrl->ciu + 1)) ? : 1; + ctrl->cirn = get_random_u64(); + } ctrl->csts = NVME_CSTS_RDY; /* @@ -1671,6 +1675,11 @@ struct nvmet_ctrl *nvmet_alloc_ctrl(struct nvmet_alloc_ctrl_args *args) } ctrl->cntlid = ret; + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->ciu = get_random_u8() ? : 1; + ctrl->cirn = get_random_u64(); + } + /* * Discovery controllers may use some arbitrary high value * in order to cleanup stale discovery sessions diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index c672c9bf3053..9c98833e8f3a 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -268,7 +268,9 @@ struct nvmet_ctrl { uuid_t hostid; u16 cntlid; + u8 ciu; u32 kato; + u64 cirn; struct nvmet_port *port; diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 91ce434a7e8d..cbaf02b0cf07 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -21,6 +21,8 @@ #define NVMF_TRADDR_SIZE 256 #define NVMF_TSAS_SIZE 256 +#define NVMF_CCR_LIMIT 4 + #define NVME_DISC_SUBSYS_NAME "nqn.2014-08.org.nvmexpress.discovery" #define NVME_NSID_ALL 0xffffffff @@ -328,7 +330,10 @@ struct nvme_id_ctrl { __le16 crdt1; __le16 crdt2; __le16 crdt3; - __u8 rsvd134[122]; + __u8 rsvd134[1]; + __u8 ciu; + __le64 cirn; + __u8 rsvd144[112]; __le16 oacs; __u8 acl; __u8 aerl; @@ -389,7 +394,8 @@ struct nvme_id_ctrl { __u8 msdbd; __u8 rsvd1804[2]; __u8 dctype; - __u8 rsvd1807[241]; + __u8 ccrl; + __u8 rsvd1808[240]; struct nvme_id_power_state psd[32]; __u8 vs[1024]; }; -- 2.54.0