From nobody Thu Apr 2 23:54:48 2026 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (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 4157B23F26A for ; Sat, 14 Feb 2026 04:28:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043319; cv=none; b=ukyQ7zytkM5k3GrzTUhR2Ggq+9iNV3SI9TtSt6IB5TRqw40UrAYIlZ6ZNYPnoWyl1a4QhnLw3TJjucv+weM3PaPh42aqg8P28DB5wzpXt51qjaLX16XOv6o0xQvaV8GiwjQ5FwGMuVDhcdUkHtNAWPzAiZkWV5nB5Fu3nKj1TiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043319; c=relaxed/simple; bh=+81Jh/gtkA5pFA50hWxQakUUjWRYlu80DgxczS1fSOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ggIds26KegakNDyqWkHZ2iildtcmFFrxfbOKORabr+X/pJjjEjjdaFHWcbb5+AVYtEkFwKNx4/xhq5lsyvBXsXS485OTAN9diuQ9mxmC6R+dCs4oHT7YVVMiRW4lzvBMJqz/ipO5Fo4pxNUpUTiPsIQxCvquuVWgkXlNOxkMslU= 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=UquK9oMS; arc=none smtp.client-ip=74.125.82.45 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="UquK9oMS" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-1271195d2a7so1945492c88.0 for ; Fri, 13 Feb 2026 20:28:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043310; x=1771648110; 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=B78xagprpyBVY7dOisWT+DL2wEB4yi6Dl89xT/FMHaI=; b=UquK9oMS6if/BAznjwH3JZ32ou2Yr5T0jX/bsWs6CpUyoMVN+Cc4/U1tqOgUfrqjjH kFcoqODLxeSwRJaz7SZhmOaQ/6KR36MY44cy15sgFcyLu7YQB8Bh8vmgJtZfsRAMOfrj +hIu3WM7SXeu7Y/x7fuqPNr+xfu9Ig3rFsN4alS8uTP6Vm++EQvwK8BfXxiLUjFIYrgC lJg0fwMzKGVCOMA/HDSmxIiUSlUY4r+jl3qv6jLY4anOj1msE3Yt7i8ukp5lXEivQjVf AKLu46OJtlcKLYjw3j7oAplRGOkJ+kyyV5RjFcwgoEuk3F+kALasfd+BvKrTBwfhPTk1 bkkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043310; x=1771648110; 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=B78xagprpyBVY7dOisWT+DL2wEB4yi6Dl89xT/FMHaI=; b=QY1aya3gi/sUXSjbNmTlaZctD5UpjqsU/rLSi16vkPWFTuIrhFkWWlNS87G9zUnSSI WEWnsDPeOl1BRj6r4yFF3ubuqy5FOs8LYi6n61q9vKsgqdM7R0dUxeCR73C56Ka25GP7 MVp93jqRObDjHAN3pG/nsC0BQ7ZfExyFJocwbh02BJ2KmYsK1VyfcAhQ7RtS0tQqAXeA r1sMkz4/jexryWtckox8CHqNYDxNq57gOiQWBdR8dtt2vb24GxDF1RgTxbJvPoKX6fLz Q/YlMKDl1A0ChJQmWcHldEGOChQgbsVRROaRgwmdIlJzSL5g81EzHFxzcriv2dNb0h43 Fp7w== X-Forwarded-Encrypted: i=1; AJvYcCWmJ1YXPK18xs885gkM94RH/E2TmJ3QJG9ytAZ2uf3AX4d+COsQSk8eV+zsGJh6V2YrINbWzpJMC/Wo+3I=@vger.kernel.org X-Gm-Message-State: AOJu0YyaVDKP0/kopLcJMH50G+ZztKGyLYd9GgOQPQmx7GEdGCg6oM1L +9xjZdIKARtBsZda0QyI4XhswCqM+w6F/+Nf+c4HDRKtxf8SPPlcN3/V7JfqP6l1WG4= X-Gm-Gg: AZuq6aLrNxAZPvJXRHUr/23dy6tRMBoHfAJxRga41Ei7zEQ+MtRFTFvlZzoWKCOUT8J 590zNv6/iop8v11Qt4upGsNsz9CaibtT1pNR8Qjrb8jWVX20ZcH+NK97tgtHgtnYo0AmjBva4Du 9qaVWzgiC7MDhngsfh7kvcQYWGkDmDWLPMm4IJPRCuZbXeR9ADPXDYcQD8Ogd9Sw4APDNNgPmIp rK0l2RE+w0e1DJLtdPHlMHxpP8FhHsl12ijPq7wlviL9pTGGnX8ZJ7KsSWoXcfNDvZ1AfRLgIXT 8TZy/46ZnjDgmQLaWReo87wVSKgMdqDgqYCumuuYpAv9xhv3swMqffd2cspefRwFISvuqEbIsd7 3hwdQW7oFENI6fa1yH0xZ5zWvLn89FSRptGHl9NClNGB8KqhpX+UmLwWNBTe8ZiWJ16YLnSqRLT zPeEKE2Jj9qlZBUbnDsP6COmmh88f5YsXRZ1ZAaZyfFAAZPw== X-Received: by 2002:a05:7022:6183:b0:123:3bba:fc4c with SMTP id a92af1059eb24-12741bd1a97mr687392c88.38.1771043310143; Fri, 13 Feb 2026 20:28:30 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-12742cbc900sm1021042c88.14.2026.02.13.20.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:29 -0800 (PST) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , 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 v3 11/21] nvme-rdma: Use CCR to recover controller that hits an error Date: Fri, 13 Feb 2026 20:25:12 -0800 Message-ID: <20260214042753.4073668-12-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214042753.4073668-1-mkhalfella@purestorage.com> References: <20260214042753.4073668-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" An alive nvme controller that hits an error now will move to FENCING state instead of RESETTING state. ctrl->fencing_work attempts CCR to terminate inflight IOs. Regardless of the success or failure of CCR operation the controller is transitioned to RESETTING state to continue error recovery process. Signed-off-by: Mohamed Khalfella Reviewed-by: Hannes Reinecke --- drivers/nvme/host/rdma.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 35c0822edb2d..2fb47f41215f 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -106,6 +106,7 @@ struct nvme_rdma_ctrl { =20 /* other member variables */ struct blk_mq_tag_set tag_set; + struct work_struct fencing_work; struct work_struct err_work; =20 struct nvme_rdma_qe async_event_sqe; @@ -1120,11 +1121,30 @@ static void nvme_rdma_reconnect_ctrl_work(struct wo= rk_struct *work) nvme_rdma_reconnect_or_remove(ctrl, ret); } =20 +static void nvme_rdma_fencing_work(struct work_struct *work) +{ + struct nvme_rdma_ctrl *rdma_ctrl =3D container_of(work, + struct nvme_rdma_ctrl, fencing_work); + struct nvme_ctrl *ctrl =3D &rdma_ctrl->ctrl; + unsigned long rem; + + rem =3D nvme_fence_ctrl(ctrl); + if (rem) { + dev_info(ctrl->device, + "CCR failed, skipping time-based recovery\n"); + } + + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &rdma_ctrl->err_work); +} + static void nvme_rdma_error_recovery_work(struct work_struct *work) { struct nvme_rdma_ctrl *ctrl =3D container_of(work, struct nvme_rdma_ctrl, err_work); =20 + flush_work(&ctrl->fencing_work); nvme_stop_keep_alive(&ctrl->ctrl); flush_work(&ctrl->ctrl.async_event_work); nvme_rdma_teardown_io_queues(ctrl, false); @@ -1147,6 +1167,12 @@ static void nvme_rdma_error_recovery_work(struct wor= k_struct *work) =20 static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl) { + if (nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_FENCING)) { + dev_warn(ctrl->ctrl.device, "starting controller fencing\n"); + queue_work(nvme_wq, &ctrl->fencing_work); + return; + } + if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING)) return; =20 @@ -1957,13 +1983,15 @@ static enum blk_eh_timer_return nvme_rdma_timeout(s= truct request *rq) struct nvme_rdma_ctrl *ctrl =3D queue->ctrl; struct nvme_command *cmd =3D req->req.cmd; int qid =3D nvme_rdma_queue_idx(queue); + enum nvme_ctrl_state state; =20 dev_warn(ctrl->ctrl.device, "I/O tag %d (%04x) opcode %#x (%s) QID %d timeout\n", rq->tag, nvme_cid(rq), cmd->common.opcode, nvme_fabrics_opcode_str(qid, cmd), qid); =20 - if (nvme_ctrl_state(&ctrl->ctrl) !=3D NVME_CTRL_LIVE) { + state =3D nvme_ctrl_state(&ctrl->ctrl); + if (state !=3D NVME_CTRL_LIVE && state !=3D NVME_CTRL_FENCING) { /* * If we are resetting, connecting or deleting we should * complete immediately because we may block controller @@ -2169,6 +2197,7 @@ static void nvme_rdma_reset_ctrl_work(struct work_str= uct *work) container_of(work, struct nvme_rdma_ctrl, ctrl.reset_work); int ret; =20 + flush_work(&ctrl->fencing_work); nvme_stop_ctrl(&ctrl->ctrl); nvme_rdma_shutdown_ctrl(ctrl, false); =20 @@ -2281,6 +2310,7 @@ static struct nvme_rdma_ctrl *nvme_rdma_alloc_ctrl(st= ruct device *dev, =20 INIT_DELAYED_WORK(&ctrl->reconnect_work, nvme_rdma_reconnect_ctrl_work); + INIT_WORK(&ctrl->fencing_work, nvme_rdma_fencing_work); INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work); =20 --=20 2.52.0