From nobody Thu Apr 2 15:36:29 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 3BE7E288D2 for ; Sat, 28 Mar 2026 00:46:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658766; cv=none; b=jV2+iYcfNQaKpNy9ueyEwDCDjP6yvok6ZmAPiVhR2Sz5N4oYzlst9r6Pp8oCy4eJxVMtbTXEiTZ5bclJzXmfM5uKa8cmfbrIHVWsciSKxfrLdxKavZcYGx4G23gaayW+WI+/fjefmjR8IM/OH9w2/uWaUSZHA7/kh+Uq+IWwo78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658766; c=relaxed/simple; bh=AEuUeb/ACJ7hnfuQqcIGJ3IK9iaR++KVTnnr4J79dUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hqLIV6+D+DBvl6+KAZQcfnI0KhXM2DMHCWYkae2pBrwjhv2v7eV/e5IH+ojAhHE+NzAHdmHlm/2ZjK9yONcFzA4uFr/3IUFQoqgTN5uwurQi/RpUqap9Jtaw22ckUEZm52Qd+aUv/amgl+3dE8FoaatXV3bIVWNxG+GY4qCccN4= 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=OZuWiEpp; arc=none smtp.client-ip=209.85.215.169 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="OZuWiEpp" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c742d7c8acfso1246801a12.1 for ; Fri, 27 Mar 2026 17:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658764; x=1775263564; 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=D4p3ffVPEhhvzgCSyBZ1x+AvHTOlODCgnogumXFocGc=; b=OZuWiEppRjd065LRk8q2Aus5ZewQPyzlKXJ5PBzw5SXUnTj53tvblIaNSi2Sw5gq+8 cG6Uo50jk0qBsCXxwNipNP4ujzXZm6WbtV8yjDmjbacUp4bVuCtocSjjtnpahsI14lSm iyfiYTiVFvLHtPUvM63Xi1B4yL46ptTHzFiigDJ6J/ToDw1+E6C/QZyFuN09G583jPI6 JOGS11NKg6F7/He/+g/W4FksYl1BdFlwlWvvYLwZbsHcvISQBqjrLZADaKPhe489Fy5U BnVzjyvNXAfVuXbAozZVK9Y50LOZxbf5M412sNVoZ+Prlpc4BVXMZGAXVDYtCaqNvygY DFjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658764; x=1775263564; 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=D4p3ffVPEhhvzgCSyBZ1x+AvHTOlODCgnogumXFocGc=; b=Yz7o7t7JCW6u6n5sKRcbVnZ9SDkj0SlCVjWPjhRiTCZs7FEO6bIKDv1jPg065IYE+q 5WUahDrPBKdZIB7dQIPq0Cinsf63CM/8pxIJs1SI8gVaVw2l1wbsvaPFeSHuAIpbKzst ocGiUTpTgVo84eELLE1ft4W4e31YEwPWw9D0+wPkwnRZopV8dUV9RMPO61KjZIA3MH5M cqozIbKMy0ecbZZI8i24G0BwAB0phNphylFAg8TzIKeXpDAwiZ+6dw7oV6Sk6GgqFa43 4KwauyotqXeKWUdzuhZBC+tbkVW18Cod/wKnD55tf8EWI+E273uwBKgrdVCypnj0tX1J eGWA== X-Forwarded-Encrypted: i=1; AJvYcCXDUYgwWTXyOQ/zblIMzN6LYPFqIRnDikNg3ZRUZtdzz7rfN+q3PJkWZwFpmyEbNa6DHP01UXKO18Wh6rs=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+TK+G6FV708/1s6+jq+UNy81w8lNVKu20yzjk+eY7DmyFIC1I zYCyLwuUJZqX3qGUovHQlDl3rnvNkm8snALfkvkYbC0i9/Gm6lLQi+/479QyALlgT/M= X-Gm-Gg: ATEYQzzt+fPoZqnpsoJC8xMdH+8Po9F14Kz2oe9/hCglsmscwIoaNNMyUnpNfGvkX3t lrkzVYx8oC4C0SQAkvcx/w9nsxfPcyHA0n7IAOisiu0H1IWKZp5jIeKHHojQkbaUPwe1t3ChNTw VMp0lM79upoxZqXwR2zRZxqFhb6kxeCOk4QXdUN2hMSFmMKJ83SKF74UbD5tYHsd91ZJyTO5/qH kOa+mrvWOHWMY2hCzlBjKFnr5+E8TTZnumK5ftYbp7fjhpzEyvs99R2wimIXwLfd3dSR7hCq4hK dBbEB7nQOyfRICNQ0TST1A75j76jTj85CMt2vtDbR/oQ12K0jRrnnzu/6ZaQMtVWa6bhA7S/81+ wo4GE3RPiQ5FB+M0SrYV6KoXzMJmN/sUG7kDMTyr0cJ88m53rhcTFZg0SMkNDFXYDW4im7Rck/G JTxfBitqw= X-Received: by 2002:a17:903:2f87:b0:2ae:7f84:79e3 with SMTP id d9443c01a7336-2b0cdc40b8cmr45255945ad.16.1774658764354; Fri, 27 Mar 2026 17:46:04 -0700 (PDT) Received: from ceto ([2601:640:8202:6fb0::9c63]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2b242683064sm5342705ad.33.2026.03.27.17.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:46:04 -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 10/15] nvme-tcp: Use CCR to recover controller that hits an error Date: Fri, 27 Mar 2026 17:43:41 -0700 Message-ID: <20260328004518.1729186-11-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" 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 --- drivers/nvme/host/tcp.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 243dab830dc8..6393ec2b3b55 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -194,6 +194,7 @@ struct nvme_tcp_ctrl { struct sockaddr_storage src_addr; struct nvme_ctrl ctrl; =20 + struct work_struct fencing_work; struct work_struct err_work; struct delayed_work connect_work; struct nvme_tcp_request async_req; @@ -612,6 +613,12 @@ static void nvme_tcp_init_recv_ctx(struct nvme_tcp_que= ue *queue) =20 static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl) { + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCING)) { + dev_warn(ctrl->device, "starting controller fencing\n"); + queue_work(nvme_wq, &to_tcp_ctrl(ctrl)->fencing_work); + return; + } + if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) return; =20 @@ -2471,12 +2478,29 @@ static void nvme_tcp_reconnect_ctrl_work(struct wor= k_struct *work) nvme_tcp_reconnect_or_remove(ctrl, ret); } =20 +static void nvme_tcp_fencing_work(struct work_struct *work) +{ + struct nvme_tcp_ctrl *tcp_ctrl =3D container_of(work, + struct nvme_tcp_ctrl, fencing_work); + struct nvme_ctrl *ctrl =3D &tcp_ctrl->ctrl; + int ret; + + ret =3D nvme_fence_ctrl(ctrl); + if (ret) + dev_info(ctrl->device, "CCR failed with error %d\n", ret); + + nvme_change_ctrl_state(ctrl, NVME_CTRL_FENCED); + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) + queue_work(nvme_reset_wq, &tcp_ctrl->err_work); +} + static void nvme_tcp_error_recovery_work(struct work_struct *work) { struct nvme_tcp_ctrl *tcp_ctrl =3D container_of(work, struct nvme_tcp_ctrl, err_work); struct nvme_ctrl *ctrl =3D &tcp_ctrl->ctrl; =20 + flush_work(&to_tcp_ctrl(ctrl)->fencing_work); if (nvme_tcp_key_revoke_needed(ctrl)) nvme_auth_revoke_tls_key(ctrl); nvme_stop_keep_alive(ctrl); @@ -2519,6 +2543,7 @@ static void nvme_reset_ctrl_work(struct work_struct *= work) container_of(work, struct nvme_ctrl, reset_work); int ret; =20 + flush_work(&to_tcp_ctrl(ctrl)->fencing_work); if (nvme_tcp_key_revoke_needed(ctrl)) nvme_auth_revoke_tls_key(ctrl); nvme_stop_ctrl(ctrl); @@ -2644,13 +2669,15 @@ static enum blk_eh_timer_return nvme_tcp_timeout(st= ruct request *rq) struct nvme_tcp_cmd_pdu *pdu =3D nvme_tcp_req_cmd_pdu(req); struct nvme_command *cmd =3D &pdu->cmd; int qid =3D nvme_tcp_queue_id(req->queue); + enum nvme_ctrl_state state; =20 dev_warn(ctrl->device, "I/O tag %d (%04x) type %d opcode %#x (%s) QID %d timeout\n", rq->tag, nvme_cid(rq), pdu->hdr.type, cmd->common.opcode, nvme_fabrics_opcode_str(qid, cmd), qid); =20 - if (nvme_ctrl_state(ctrl) !=3D NVME_CTRL_LIVE) { + state =3D nvme_ctrl_state(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 @@ -2905,6 +2932,7 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(stru= ct device *dev, =20 INIT_DELAYED_WORK(&ctrl->connect_work, nvme_tcp_reconnect_ctrl_work); + INIT_WORK(&ctrl->fencing_work, nvme_tcp_fencing_work); INIT_WORK(&ctrl->err_work, nvme_tcp_error_recovery_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_reset_ctrl_work); =20 --=20 2.52.0