From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 0A1F5367B99 for ; Sun, 12 Jul 2026 02:25:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823136; cv=none; b=Ei9PwNskxpvccd8eazmbZ5YmIjm78K/NgbB8Sq6vSftOWQDWb3S05aO3fn1GvYU2QHfrE/5j5TxinUUYkEa0xTCzzszHusUXvMZ/7h16CKuZ2+HcIHNhV7bIcKKkIGbZM8TXfmfsN2mEaHffyqt01YLEtwPkhb5xODWqiPGoYsc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823136; c=relaxed/simple; bh=M4LDxvt3lbvbG89lj2/hr8mEoWuZXp+mwrSyHMc6V5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=To/ezntEjXJO/KSqB3m/ILs415Rwf8OreB/ddhnyeAZjfUzNYmcgv/QmMc+AReuFrtE8YJkDxd6dp9IlYUp41KQNKf5fnHj0BR5PnLzOroNEDxv4JxvLwqgdWIAsmGwIE+AQon6Oa0bqSEBpaUx97tBUyAosGOhPtopEw4iNmp8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=QS2q+xTz; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass 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="QS2q+xTz" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-848882fdb18so1157405b3a.0 for ; Sat, 11 Jul 2026 19:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823134; x=1784427934; 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:content-type; bh=g9uaSQKgRYycyhIZh4YO2D7JgllBA2edWOd9mXDhcfM=; b=QS2q+xTzuswuoa31MEDg3O6/wzD5ZfYFGkuFclDVysdnsPcFvGrdHwy3SZjNgrAIso v1BoVbMWcW4ch3z9eaJYtd+7Nq9x+14xMlhQ2NKU+H8SlWnSk9Fi6sFsd3Sh+mcnh78B McTPjEQ+lVF7qcyT72wZPaO2XwPAV9Fhyx7KKV3Bk4SGIa1hkJb/YJVtHWkbJEDrDJOZ pQ2mEvg0ftQ7OL3oA2Wu2YeMr9XlTEaBzgmdvCS3rOrkAGEYoKwzhu7WwgpvHCykbQ7L 1lxVhDq6L+9zv+jKJC0umcR+AFyZ1NUC7ClMSpZ/fz1FCq0VMm6f503Hcw5xB3tiv8EL Aogg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823134; x=1784427934; 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:content-type; bh=g9uaSQKgRYycyhIZh4YO2D7JgllBA2edWOd9mXDhcfM=; b=FYRkbQM3+9h1s8HYzJG9EJihp0Fen6zH3l3sBM2KwdEscK56qwuyBzYImbjkJli1av 1QBaJqs8dWNOa6PrJlaHACEU5UF4Jx6Ej8VSRcXic9kR2cSMVM5UrL7IrZj248aa3hPF hxTvm1E8mvFQR1bNHvyE4V7pIaqZ+FiK3Rqhik/hEG88P0hAm6ZiHzKk3kfUvVf8In3W uvK1EbrjMMo/h346oWh0CWJ29IbVsB9enFKwx45ECifHbv0dZv8EGSxgTgB29S5GnGP8 UgxowY9o76Zu7XUoJmuC2ItfDoEzRnVtuF2PSrWXlP6KG0ABYi596+YPsr7FXOJFVK2+ Pb3g== X-Forwarded-Encrypted: i=1; AHgh+RoEsO1Pa+AUff2lzQLK0aawfXpwUV4YAIux1h2XHg4C4yoWfJadBMphkKdoVXarNcxbTo7NQvlimosdtzw=@vger.kernel.org X-Gm-Message-State: AOJu0YzIemNuaDgSU4MfwJPJYHYIRPC2Ow6KtOaCnHE34Yz+eY6x4oAJ MPgQRVewlZ+VOiCw829qQKJeK8MaFcB3l/3OA6sMSucbip0D1uXvsxklwW7E0zLMFJU= X-Gm-Gg: AfdE7cmsyRgv4YVSxtJPAbubuvH1X+gePaPuQieDXvMh5cygxp1Eq68nEF2L5fzE04M zfNNhkZvnucoL7JehHMs+I14CyuL+odGMpzvkC8DeLZ4Zw/LGYsNtL4TorqZUiTZrpWqR0SVC7t lscYRNxPuQwycStyf/39kF/cZGv2zP7IDSpseQBO47/aWaIib+DZ4qIGvggT1uyIC94mjHc7ujX n0eJVrdZtb/bgNiPF31ZAJq2RsszRKaef1f01JC3lXOHuBJqdVDZBtai0X/1STyHlNfbPAN2ZT5 Jo5FqzNhsOhhOVi6Gi/fTSHiQhVbCwW2JCQE7TmDF/KZoUx/kybDhVq+4QOjg6bqrYUWShbNig5 pPddIr7liDPOYj58aDhtKMmepINOjjTWNg5V00ywD1Cnd4cGW7hq6GmCPSV/c5mdjDl5PmmFnY6 DP29rtj3QDP36940U= X-Received: by 2002:a05:6a21:6f12:b0:3bb:21ad:40d8 with SMTP id adf61e73a8af0-3c1108c79c7mr4770482637.39.1783823134207; Sat, 11 Jul 2026 19:25:34 -0700 (PDT) Received: from ceto.lan ([2607:fb90:9c20:2264::1c31]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm60704693eec.0.2026.07.11.19.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:33 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke , Randy Jennings , Dhaval Giani Cc: Aaron Dailey , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v5 10/16] nvme-tcp: Use CCR to recover controller that hits an error Date: Sat, 11 Jul 2026 19:23:31 -0700 Message-ID: <20260712022437.3743117-11-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260712022437.3743117-1-mkhalfella@purestorage.com> References: <20260712022437.3743117-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: 8bit 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 ba5c7b3e2a7c..a1711dd1d3c2 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -161,6 +161,7 @@ struct nvme_tcp_ctrl { struct sockaddr_storage src_addr; struct nvme_ctrl ctrl; + struct work_struct fencing_work; struct work_struct err_work; struct delayed_work connect_work; struct nvme_tcp_request async_req; @@ -605,6 +606,12 @@ static void nvme_tcp_init_recv_ctx(struct nvme_tcp_queue *queue) 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; @@ -2494,12 +2501,29 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work) nvme_tcp_reconnect_or_remove(ctrl, ret); } +static void nvme_tcp_fencing_work(struct work_struct *work) +{ + struct nvme_tcp_ctrl *tcp_ctrl = container_of(work, + struct nvme_tcp_ctrl, fencing_work); + struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl; + unsigned long rem; + + rem = nvme_fence_ctrl(ctrl); + if (rem) + dev_info(ctrl->device, "CCR failed, starting error recovery\n"); + + 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 = container_of(work, struct nvme_tcp_ctrl, err_work); struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl; + 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); @@ -2542,6 +2566,7 @@ static void nvme_reset_ctrl_work(struct work_struct *work) container_of(work, struct nvme_ctrl, reset_work); int ret; + 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); @@ -2667,13 +2692,15 @@ static enum blk_eh_timer_return nvme_tcp_timeout(struct request *rq) struct nvme_tcp_cmd_pdu *pdu = nvme_tcp_req_cmd_pdu(req); struct nvme_command *cmd = &pdu->cmd; int qid = nvme_tcp_queue_id(req->queue); + enum nvme_ctrl_state state; 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); - if (nvme_ctrl_state(ctrl) != NVME_CTRL_LIVE) { + state = nvme_ctrl_state(ctrl); + if (state != NVME_CTRL_LIVE && state != NVME_CTRL_FENCING) { /* * If we are resetting, connecting or deleting we should * complete immediately because we may block controller @@ -2928,6 +2955,7 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev, 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); -- 2.54.0