From nobody Thu Apr 2 15:41:49 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 46C49BE5E for ; Sat, 28 Mar 2026 00:45:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658753; cv=none; b=Prok2r/uRKr76dyHXGQ9wcjyBx1x/PgzZVpvct45JmSsnlH7eASt+W0yKRzEk+GbtLqSMnGIqJHLKrCUDgycqbrHmaW+2xS0R2sibA9jSRPQbAcTuYSDrg7hiK3g3qKsj/8trFJHBBgo/e31NGvkl7g+LcX1JpH8SLZZjT4/dSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658753; c=relaxed/simple; bh=cRgFapuyJhQj/+AjJmhgJtUnutaTHOiblX1w/1lxRfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q1OhvG9tAnFeMMR4Cxx2m7MSeUiJ9KN/RpXRbYmxrmOPEzfK+2hUKNIigFCvQlcfwHsz0qnPAd1pEW2LPXJg8HAibyOxFL2sZgv/oRhB96OkJuxEE+s4vE5/ChBTHaG/yvNq+DlYNWNnliiHCZ0WwTm3ScOhn+pYk2ruGYNlWPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=ExIE4MWC; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail 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="ExIE4MWC" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2b23f90f53aso5401655ad.0 for ; Fri, 27 Mar 2026 17:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658751; x=1775263551; 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; bh=I7azvsY2lfVVrUuxgtShy75bCL3D9ds2FfFrJhMe74c=; b=ExIE4MWCtX5hlY0v2t6WM7czt8/LtHQkC/y/Q495kZe0HaeiEYUF/GLfNwmqlICwBL cg4f/A67qq+66OJ0B9g0TR9j15vqkeaFpWTYikD1yRbwEkoDGP4nJYBvRSX5KY0Utn8T oltTPUK450klfCGMMw60SzWtjnzyLZx97mtRlVGnPIOCsqDnxHPNXwjjCpcyzJgXTMHT fSjsu9rbOnWXRTpEaLLgTUa2v6yFom9HkouiowO8FEMMb6JYykrMAOKFYdf9jYUlGOOI QkZ7MhV7q8P1LHkFOdY14dyEQ97mY1dREAIWa0Rc20HIdJ2jJU7uStIrnAFDScmK1tYP M1kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658751; x=1775263551; 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; bh=I7azvsY2lfVVrUuxgtShy75bCL3D9ds2FfFrJhMe74c=; b=f1ZEFcCRFvU/F67qgr80RRtHGDTmxQ2+x+oBrFPhTpjxW8791N8pqfaUAi3397NMY+ UulJ3yMaKHFAd3Iy+EtDzJETqKwONkMKXy8pkEcyldKWeZZNr4EQ977FRsFnaWc1ftAu uAWx4fAolCCzxH4fXzfBrN5iOBr40LcLDU221su1YD98jQ9Obdu+Dl5dBXOx5xXriPF2 RjdOABoCBoju6+ZPCO5AiULvvuUDvrALgJJEBXxWMOm53kqOobmkyj77lzHrWs9K7PMO o+Bdl7en1AcY1YoSd9fJ7lza+DscNKp2PVwygdp4Q17qffDZzJORyc3peie1Ix0HEfht PxfA== X-Forwarded-Encrypted: i=1; AJvYcCVdcsuOZYgVCxzlw0YnoCqD5PkAs6HPgMEWv+OaKYSYES0HEy/tM43Vc15diFgW+Oo49rZ0Nmol9MxiLGs=@vger.kernel.org X-Gm-Message-State: AOJu0YwfUG+6FEA/dZM3YvVaCeMIS2Balr9KcXgK2+A9n8KCt2zca0hs XRNp+rAsIR9JyOwG2PKPP/ux37Dp8HCdqkUgWgOrZoE47lC3YbBP6dfN7hTnpA+iVHU= X-Gm-Gg: ATEYQzyzVuJbfyH3wIruua2ls4GN0RY84VDjOHK6LkS8h9Y40g6uEYuj9jPJobzB11Z jd/bR14KGHF2BBVoUTZYT4gq3N0xE+QahtW+BKA4ejKErdX+dqtoVVMhM32yQXFIu3XnTeUMYEx DAD9nCGi188N5HctkQgG/KARRIhfp5B8nX370QChDq25zyqskuJjX7D96oOlOPxhpraYT+EyfVL kWTigobo0IWXfknF9ZdqX6m+VAtpitFQxhc4qTNcTF4How0H/LQebwxzeyWpVMililXkIsD3hAf f8RgL2V2XWZlQ4/1m4sdJ6ZlO/fLCihJ7lFSBvPbnB77B1V8HVWLerX9tjcH6Q76zAFXHTUrhiV IzsGEsCVsvnpX16cxdRi6lvwREhvSHnEmUABObL+HnJzErlCQYU6OPsPa+dslkUI6u8oDZXaOQ1 YSkeK8j+V4MQ1zyGwP2g== X-Received: by 2002:a17:903:46c6:b0:2b0:66bc:2282 with SMTP id d9443c01a7336-2b0cdc20726mr49307635ad.6.1774658751378; Fri, 27 Mar 2026 17:45:51 -0700 (PDT) Received: from ceto ([2601:640:8202:6fb0::9c63]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2b242683064sm5342705ad.33.2026.03.27.17.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:45:50 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke Cc: Aaron Dailey , Randy Jennings , Dhaval Giani , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v4 01/15] nvmet: Rapid Path Failure Recovery set controller identify fields Date: Fri, 27 Mar 2026 17:43:32 -0700 Message-ID: <20260328004518.1729186-2-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260328004518.1729186-1-mkhalfella@purestorage.com> References: <20260328004518.1729186-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 is expected to 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 is 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. 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-cm= d.c index ca5b08ce1211..ec09e30eca18 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -695,6 +695,11 @@ static void nvmet_execute_identify_ctrl(struct nvmet_r= eq *req) =20 id->cntlid =3D cpu_to_le16(ctrl->cntlid); id->ver =3D cpu_to_le32(ctrl->subsys->ver); + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + id->ciu =3D ctrl->ciu; + id->cirn =3D cpu_to_le64(ctrl->cirn); + id->ccrl =3D NVMF_CCR_LIMIT; + } =20 /* XXX: figure out what to do about RTD3R/RTD3 */ id->oaes =3D cpu_to_le32(NVMET_AEN_CFG_OPTIONAL); diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 9238e13bd480..e8b945a01f35 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -1396,6 +1396,10 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl) return; } =20 + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->ciu =3D ((u8)(ctrl->ciu + 1)) ? : 1; + ctrl->cirn =3D get_random_u64(); + } ctrl->csts =3D NVME_CSTS_RDY; =20 /* @@ -1661,6 +1665,11 @@ struct nvmet_ctrl *nvmet_alloc_ctrl(struct nvmet_all= oc_ctrl_args *args) } ctrl->cntlid =3D ret; =20 + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->ciu =3D get_random_u8() ? : 1; + ctrl->cirn =3D 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 319d6a5e9cf0..2181ac45ae7f 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -264,7 +264,9 @@ struct nvmet_ctrl { =20 uuid_t hostid; u16 cntlid; + u8 ciu; u32 kato; + u64 cirn; =20 struct nvmet_port *port; =20 diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 655d194f8e72..7746b6d30349 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 =20 +#define NVMF_CCR_LIMIT 4 + #define NVME_DISC_SUBSYS_NAME "nqn.2014-08.org.nvmexpress.discovery" =20 #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]; }; --=20 2.52.0