From nobody Tue Dec 2 00:02:41 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 870AB308F0A for ; Wed, 26 Nov 2025 02:13:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764123205; cv=none; b=aDww0/gDshyRMWTEKnuxrkRwFyHvCtuttA/ZW7QqumcSqLtMBfJHE6JOOwC9OKIJsy/G08z/V+1m7XEdu8HtbEJXHvE67kR/WLAnMpDO2pTT1E1DLhQxVixEUEwRWLQl2QT0k8uCmYL2IlMbQbEfA/R+MW8S3YlDmOqrU+1WsK4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764123205; c=relaxed/simple; bh=lmifS86Sm5eDcpfc1j4bH8U5iF7UgFk8snitIQIqc+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RQiGZkv4q22FEDgLSPmI3rv5pJU1EU66CLh1uvO6EUm1yggwTVpOg1wr7rsXMduq6HTMCVzlbk9w4njRk7FaEf7lmUJrg+CjpUyOQAqmBlM0se3pUYDYNbW/ekGZifxqP8D28DYmHhtDIMwuwHb8rhaHkF4UdcssxwGFgCdHLJc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject 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=Ejlr/eeK; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject 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="Ejlr/eeK" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-298287a26c3so71846435ad.0 for ; Tue, 25 Nov 2025 18:13:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1764123203; x=1764728003; 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=+zJ+1UlEvFnxYO/+mlL/kPamED7cAsv3lc5btMMeFCc=; b=Ejlr/eeKQmuRROTiNRgJMvTLPvgspmW3FU1qb1Qt+3HjyUAum8hcg57NSDU7zvd4fv hn/abo5oDrEKL+QTpKGQpFA8MfYtOfFvaDN1ELRdDHGW1gmu0ddde5RmM6QFK+yV18ra ZbO63jGdqZ+LU0opSMf0ZqYrU50wolrL2zLykLjrp+V70YnhowEVBqHCR+GxT4uxEkvt qv1KiWBBdtJrRzutEFg5VgC9g2te8l7aeaf+6SpOzxwcajtNkHCp2W0q5OS7FoYJhbqO yG7CJXR8DyQmbj6ga3B54UqFbQW+Ueu+2Zn4H9QhfQTcwqaR7zdsRGhQa6bA4/QJveab 5ZSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764123203; x=1764728003; 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=+zJ+1UlEvFnxYO/+mlL/kPamED7cAsv3lc5btMMeFCc=; b=LYQqlTr9nvh9aQTu97ct2FWZztSKBhIMsuzKHOFsWeNigYWB9Xf4UAPM540Um4NvGt O2t8NxJUxxuU10BLadxiG6Fvf7Omcv7sBjlpwlYahXtSvzRl6HeHQ7qst4l73A9Xor9P fzHvG7VEpV9hm4Vsh9JeEUji3wvg3KWNSq4hDln4ma/WPdrCqGh6un5eqJVgztahr6DQ BPEywYqWGTpDfmnx1en7f0kgq6XZW3au/Q02gjBiVnh0FvOhjy5NxtZQrqnEss6U6m+O xssw+Z5uDdXByxF+ETV2HR+YDy3tXrZD4EnO7op0gfS5dajr7LxxyaH8o1mHnE25z8Xk IK4Q== X-Forwarded-Encrypted: i=1; AJvYcCWpV8SVG7RgjEL3U0izIHAKHwYkasokV5luxWQhGlzi39mfzctcDqFhTIHVGX1Pxkbl6nZJu7/uWKU3BjQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8HB7TQWdTt7irBKtAjkyMlXp3E3g644FlKzQJ1d40VpYAirCL uo/g0T8D/t966SX6TC7TVPzzenMXTpUn2yI6lC4T5aq5ZFc6riNVzH2lEmIKlh1SY40= X-Gm-Gg: ASbGncsCeB/GO332q7dHprkmV23rFNtRxblzXNYCXSoj4GfUyaqOoXCu1YCzZWTmoaE FOvqitNVkRNXT2AOlxLzLme+CyR+8y1G6W9+aa2HB2DqaJdmHDh9KhRZvMpHmtw4MoGo3SFGQM2 OVBkPp2qlsmR13WTvF3ae/+v/w7oohDxV7n+xiL+3HMO7zs2wMhm9CNi7l3dQ5IzKn2SJe/4jQy JsPav+q4HGB/SnlTcqMEYmH1wOFNTzoSfiX/vCyoOXBLqk9nHTNgjSFd3q14zg2bZfjH2p11AgL uy+T4gdU+41AkI4huFg5D68rWIIqYwMXHB1ZdsnAUbnPxyq0OYBMhQfXpy3/WMgN6zdCo/GRhfN aX+LSOkb0SybUkHvqOWl+BQmRuMaUS3tEw7IsY0xVG+7euYFDjcD9nIg6QOcI6FJWiGL5EKC1TR eaQnIw3K1lNToppncFr2Flfwgln+mOyMtZaAXAdhtQqFKy X-Google-Smtp-Source: AGHT+IH3R2YXscEDzBRGNgHJXNj5sRMpFq3GXf09IFZdkJCTqRDyWOlwHS19A1MouExGkMqjcKV+Kg== X-Received: by 2002:a05:7022:90f:b0:11b:9b98:aa4b with SMTP id a92af1059eb24-11c9d60ea32mr11119676c88.6.1764123202326; Tue, 25 Nov 2025 18:13:22 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-11cc631c236sm17922979c88.7.2025.11.25.18.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 18:13:22 -0800 (PST) From: Mohamed Khalfella To: Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg Cc: Aaron Dailey , Randy Jennings , John Meneghini , Hannes Reinecke , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [RFC PATCH 01/14] nvmet: Rapid Path Failure Recovery set controller identify fields Date: Tue, 25 Nov 2025 18:11:48 -0800 Message-ID: <20251126021250.2583630-2-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251126021250.2583630-1-mkhalfella@purestorage.com> References: <20251126021250.2583630-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 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 crated. 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. 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. Make the new fields available for IO controllers only since TP8028 is not very useful for discovery controllers. Signed-off-by: Mohamed Khalfella --- drivers/nvme/target/admin-cmd.c | 6 ++++++ drivers/nvme/target/core.c | 9 +++++++++ drivers/nvme/target/nvmet.h | 2 ++ include/linux/nvme.h | 15 ++++++++++++--- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cm= d.c index 3e378153a781..aaceb697e4d2 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -696,6 +696,12 @@ 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->cqt =3D NVMF_CQT_MS; + id->ciu =3D ctrl->uniquifier; + id->cirn =3D cpu_to_le64(ctrl->random); + 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 5d7d483bfbe3..409928202503 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -1393,6 +1393,10 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl) return; } =20 + if (!nvmet_is_disc_subsys(ctrl->subsys)) { + ctrl->uniquifier =3D ((u8)(ctrl->uniquifier + 1)) ? : 1; + ctrl->random =3D get_random_u64(); + } ctrl->csts =3D NVME_CSTS_RDY; =20 /* @@ -1662,6 +1666,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->uniquifier =3D get_random_u8() ? : 1; + ctrl->random =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 51df72f5e89b..4195c9eff1da 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -263,7 +263,9 @@ struct nvmet_ctrl { =20 uuid_t hostid; u16 cntlid; + u8 uniquifier; u32 kato; + u64 random; =20 struct nvmet_port *port; =20 diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 655d194f8e72..5135cdc3c120 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -21,6 +21,9 @@ #define NVMF_TRADDR_SIZE 256 #define NVMF_TSAS_SIZE 256 =20 +#define NVMF_CQT_MS 0 +#define NVMF_CCR_LIMIT 4 + #define NVME_DISC_SUBSYS_NAME "nqn.2014-08.org.nvmexpress.discovery" =20 #define NVME_NSID_ALL 0xffffffff @@ -328,7 +331,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; @@ -362,7 +368,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; @@ -389,7 +397,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.51.2