From nobody Thu Apr 2 15:41:46 2026 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 683B721576E for ; Sat, 28 Mar 2026 00:45:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658758; cv=none; b=CX8E72OUEKHPnbFNnY1krmi/rksIWTWfqVKxT8Tq12uQO1V074w8Msbi6AvKaW1jKRDOvDtcbz+IndZNausK/iSKlNHXTCCiSE6xtLG8PevYAdPDuIp33S796d1r2aorSrJ10AA9nWR0Gjii6ccY9sy7STAXyjb+Ncc89K5GgM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658758; c=relaxed/simple; bh=pVia+VbYshhdCkgCTVvcSNQ38rlKKVfk7qYdyS488wI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ki6gpJL8p6p+hoUQ7c3zmdsrBcAcEOzmXEcJO047Bjwsdh99NfFcYx5MSP0sklSwxvlU7m6vPOYz4JpVC3upLzPi3NdZzV1z/tbrA8iQcwDo2+8XaBVIg4qIePzmKSGJv2QOYyXX+aCFTy1FcPlY9TtCGXJv0c9oL9nppHXaGkA= 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=ABOVx8G1; arc=none smtp.client-ip=209.85.215.174 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="ABOVx8G1" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c76682834a3so1123253a12.3 for ; Fri, 27 Mar 2026 17:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658756; x=1775263556; 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=nERYj0eATMlhf7gB6O2MeYTzi4vYF6Jp5+hxczBe0L0=; b=ABOVx8G1qN0dP5vooCBECTN3bP2cwO13MU5cAfYPoyJ+wlWaSvfZFm5KYjyOgxLIHj k2k+f1STVqHKa0GWHsSVG3AyMbF4gOFNsGFUDZHs8JQe8ubmVAzPIsPe4jitO4/274EG 9atI8BSrt3Bnn+r6yRVwW/m47QGynivuWryEUS6wTj5ZL6In5cWH+fic9NMtD3ZddreC UaNUBxwB5aRaqkHKj4qd+JgcoK13iYcn2RZcoh1Bc2uWJBRx0hn6ID8Y+/awzSvJko01 Vuwm9e9sgC7DMMpz/dPYwIOvnqeQwQCDGqBcHRdfAzmcfapnKGEg/sYhHvvLavOYLDs7 34Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658756; x=1775263556; 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=nERYj0eATMlhf7gB6O2MeYTzi4vYF6Jp5+hxczBe0L0=; b=oNBm/e8guIkHHQsQuJ+mQ/JsbF75sRaOFB81r+ebj4DgZW4Gn4zu8udwQxrjyNMnCo WxWh28uTEPP2Np9934LnBHaPsAwE8Bhd9M9UtbHhmUAu+UqJHX8+VMYW4fzPszFq0Qua ceb9WNdRMn4EdzjMeGtV/NBv1ZEhlreas1J6wYrq9OP+z9iYjNTH+7uYLDantvOfnuzG AUZK5dMPEQmt/xo9PWwnEpI78Fu3Qw00fY9wIGO2ySydxXh5rf66V0ioByTMA08raKVX zfOOfCu7mG9JvFk+ZYRZygCQjeA//+Tzh3TcSx9uAmWNWwRNCNYCzowd1WiBrnxhy/Eo /49A== X-Forwarded-Encrypted: i=1; AJvYcCVgy92oST3M/DmbSh35tMJxECYlrOJn1DFO7BIOLe+xBr1FDmJin4Olmu5Hg3gjhf2oXnEYtdY5+plhBp8=@vger.kernel.org X-Gm-Message-State: AOJu0YyKGgg8gYoshZwuJ/9xjH5xl9ZjC1UaoMKDJYDcmMFYPIB+p405 sHn+G484WJ+gtMV/zuioBq8q5KIzFirtlvReMFUpGuGHvEK3OsLdb0iMsbY/VOC0m2w= X-Gm-Gg: ATEYQzzbjAKL7B5PRKKzxu/0G3S6+53BJqY7YdBG4gm/7wc6uWCr/ZVRn/lM0LBxKe0 12F+pm0bT6Xl7zF78YzPLbIBvMkXYt/tfoiVhSRG86Unflp8ZSzIsOO7URu1QCJOE+yK122pw2S nrDQapNNHoIFYHSP0JYRNjO13MtaX9Thnixfkne0vps6x2ZzE75Ht/fxjEUEq+h5Cp2M9CZnASQ bMut1TJsBXj5iEbZYrOjiYVSo4izil2hvO9IFnmk6q/8jNusuj84KrYrv4SoqlzIciLWUPgexck 2oYpzTvnmHXUjIfwNu+UV0vTDYCyPhv+JQo2L+rAeiJDma3MxOwKKfLcqtT+eUfz/AzTdZqe9Lr t6W6Tm3fduVXQg/qUHUV23PAb72v5Zj65wyvnjZGMk3tWbhAy+ZNtsSio6LE+2w+gylGj2RbLea LYOnk2kqM= X-Received: by 2002:a17:903:4b2b:b0:2ae:5e75:3821 with SMTP id d9443c01a7336-2b0cdc2c4d1mr41101815ad.18.1774658755568; Fri, 27 Mar 2026 17:45:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:45:55 -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 04/15] nvmet: Implement CCR logpage Date: Fri, 27 Mar 2026 17:43:35 -0700 Message-ID: <20260328004518.1729186-5-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" Defined by TP8028 Rapid Path Failure Recovery, CCR (Cross-Controller Reset) log page contains an entry for each CCR request submitted to source controller. Implement CCR logpage for nvme linux target. Signed-off-by: Mohamed Khalfella Reviewed-by: Hannes Reinecke Reviewed-by: Sagi Grimberg --- drivers/nvme/target/admin-cmd.c | 44 +++++++++++++++++++++++++++++++++ include/linux/nvme.h | 29 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cm= d.c index 0a37c0eeebb5..305a5d9b5450 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -220,6 +220,7 @@ static void nvmet_execute_get_supported_log_pages(struc= t nvmet_req *req) logs->lids[NVME_LOG_FEATURES] =3D cpu_to_le32(NVME_LIDS_LSUPP); logs->lids[NVME_LOG_RMI] =3D cpu_to_le32(NVME_LIDS_LSUPP); logs->lids[NVME_LOG_RESERVATION] =3D cpu_to_le32(NVME_LIDS_LSUPP); + logs->lids[NVME_LOG_CCR] =3D cpu_to_le32(NVME_LIDS_LSUPP); =20 status =3D nvmet_copy_to_sgl(req, 0, logs, sizeof(*logs)); kfree(logs); @@ -607,6 +608,47 @@ static void nvmet_execute_get_log_page_features(struct= nvmet_req *req) nvmet_req_complete(req, status); } =20 +static void nvmet_execute_get_log_page_ccr(struct nvmet_req *req) +{ + struct nvmet_ctrl *ctrl =3D req->sq->ctrl; + struct nvmet_ccr *ccr; + struct nvme_ccr_log *log; + int index =3D 0; + u16 status; + + log =3D kzalloc(sizeof(*log), GFP_KERNEL); + if (!log) { + status =3D NVME_SC_INTERNAL; + goto out; + } + + mutex_lock(&ctrl->lock); + list_for_each_entry(ccr, &ctrl->ccr_list, entry) { + u8 flags =3D NVME_CCR_FLAGS_VALIDATED | NVME_CCR_FLAGS_INITIATED; + u8 status =3D ccr->ctrl ? NVME_CCR_STATUS_IN_PROGRESS : + NVME_CCR_STATUS_SUCCESS; + + log->entries[index].icid =3D cpu_to_le16(ccr->icid); + log->entries[index].ciu =3D ccr->ciu; + log->entries[index].acid =3D cpu_to_le16(0xffff); + log->entries[index].ccrs =3D status; + log->entries[index].ccrf =3D flags; + index++; + } + + /* Cleanup completed CCRs if requested */ + if (req->cmd->get_log_page.lsp & 0x1) + nvmet_ctrl_cleanup_ccrs(ctrl, false); + mutex_unlock(&ctrl->lock); + + log->ne =3D cpu_to_le16(index); + nvmet_clear_aen_bit(req, NVME_AEN_BIT_CCR_COMPLETE); + status =3D nvmet_copy_to_sgl(req, 0, log, sizeof(*log)); + kfree(log); +out: + nvmet_req_complete(req, status); +} + static void nvmet_execute_get_log_page(struct nvmet_req *req) { if (!nvmet_check_transfer_len(req, nvmet_get_log_page_len(req->cmd))) @@ -640,6 +682,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req= *req) return nvmet_execute_get_log_page_rmi(req); case NVME_LOG_RESERVATION: return nvmet_execute_get_log_page_resv(req); + case NVME_LOG_CCR: + return nvmet_execute_get_log_page_ccr(req); } pr_debug("unhandled lid %d on qid %d\n", req->cmd->get_log_page.lid, req->sq->qid); diff --git a/include/linux/nvme.h b/include/linux/nvme.h index bd3b3f2a5377..b792d488f72e 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -1432,6 +1432,7 @@ enum { NVME_LOG_FDP_CONFIGS =3D 0x20, NVME_LOG_DISC =3D 0x70, NVME_LOG_RESERVATION =3D 0x80, + NVME_LOG_CCR =3D 0x1E, NVME_FWACT_REPL =3D (0 << 3), NVME_FWACT_REPL_ACTV =3D (1 << 3), NVME_FWACT_ACTV =3D (2 << 3), @@ -1455,6 +1456,34 @@ enum { NVME_FIS_CSCPE =3D 1 << 21, }; =20 +/* NVMe Cross-Controller Reset Status */ +enum { + NVME_CCR_STATUS_IN_PROGRESS, + NVME_CCR_STATUS_SUCCESS, + NVME_CCR_STATUS_FAILED, +}; + +/* NVMe Cross-Controller Reset Flags */ +enum { + NVME_CCR_FLAGS_VALIDATED =3D 0x01, + NVME_CCR_FLAGS_INITIATED =3D 0x02, +}; + +struct nvme_ccr_log_entry { + __le16 icid; + __u8 ciu; + __u8 rsvd3; + __le16 acid; + __u8 ccrs; + __u8 ccrf; +}; + +struct nvme_ccr_log { + __le16 ne; + __u8 rsvd2[6]; + struct nvme_ccr_log_entry entries[NVMF_CCR_PER_PAGE]; +}; + /* NVMe Namespace Write Protect State */ enum { NVME_NS_NO_WRITE_PROTECT =3D 0, --=20 2.52.0