From nobody Thu Apr 2 23:54:49 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 8BD402DF134 for ; Sat, 14 Feb 2026 04:28:39 +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=1771043327; cv=none; b=utkW/YPRdEpFjT0CiXKloQCXpMLQgNV00u07yw+EgKLKOLkTX2zXcZ8zCSvvbtJXx4vu3eOGinWK0zvJ5LGZZyxiKq+S7u5oIc6vs8XMB//3n9CuzDsOoK/QOftG3mmH4fQ9Qmd8ivmrvuZm7UQ90ZNkMxmI2SbCk6pj4Z/y0zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; c=relaxed/simple; bh=I4AHBz96V+/FJikfTVqG2RFrtWnWfdWD2EWoX0HE45U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qIzRxc3AqeTzxEQZ32Ct/TCLXt6heoGYMrAf0e0CpVElUnUvAblLUKIzRfcNK2RbfUz2zY9oAHeiGiiReL2AOwJmcC65jUfy9vH3lhZ6tmCiCFZQzO/KWwwLsYYRfBm9144k8PobGiHdLC6N1zPX7G1FD21x01EAsq9CSfoPPqc= 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=COPBffal; 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="COPBffal" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-127380532eeso4212991c88.1 for ; Fri, 13 Feb 2026 20:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043317; x=1771648117; 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=vmQB6UPDuJJWXHBdsmsQAxC67O4gJkvSY/l87y/lKo8=; b=COPBffalkdHYiOKxQ7QAbcSngURXYrcYPDDHPcZGPIQaR9Rw2RUs0ZlwtQ6xe95JxS 9mJjZqnSfpgSAOYsREl48hzFVgy+DHk21vnwwMhv0b8axriu74cpD1ApSTXlNCWlECwz H5DmREcBQLPRwoByY8C35QSbwHC/QlsvPeanQMWqwHWYByfUdVIZWUHnsNarQ41FWrZf /950uwM2hLEV/LWTS2SaSOK71/jCGjPegpNnqu8c7PHcwkYrweSiEpS7Cq22zFxXEHY4 6c9zNvskG0887Q8p1oy+HCIQ9dP1LXc4xggwheWlG41BWlwxcNeU1P3cuPheRaKC00cF ecsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043317; x=1771648117; 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=vmQB6UPDuJJWXHBdsmsQAxC67O4gJkvSY/l87y/lKo8=; b=obC1zbNcY/t4w439PzK8jTHnsWy+KWe3aClWOON+vFmPd4RXVdieYichmuwY72Mlai J475QGzeXwVExTV/mxh0Lx8aFAdl3Z4QTTrRAk8iccG+Rk78rkoTUupyjXZiQV74yn2r vd3qIc9WY/axwvInZjdhduWO0zlkDKQYJ6jdYEV22Q8pYRYXTfHobCQI+ncF7AkeZPyE BUwEVi/UAroQgqRr5DBlDOipu4fqcSTT9DEdxJJZOlGHhSld+jUYCBG8WeIT1sAWcDzH GS/XKrBgg+O2A8zoZpu/uq4IDw04fXd2ZVj9XG7ZRW3futc6ip8kJr0DdByEfw35tYx8 uuhA== X-Forwarded-Encrypted: i=1; AJvYcCVt9Y76LCQFpFNTaiBV9rn5gLdBQjw7ykNor5lW7doYgEb6u5q9F8xMLL242gnhQgdTvL8Bm8CgsNCKwgQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzkmAmvqT7C575Wttv7+ByJC963u/5o0STulP92wL/k9Gg+4D1g aOdA7iKrHsN/QpjujRCjterdFJBprVYg+OO9yZX9/ndiIzCB5Z6Pzxrv1UgyLeBkzcY= X-Gm-Gg: AZuq6aIzko3s1rlYPXZoWC/mCp+ROaZpLrFGjyIrJGFhfuROqGy1P8vz63POUZ9rjyx 86cIeDintAbYGU8E28JhALvk4tKP7Gf8eZCvjCJqxFZATLRuLdl/W8B/tcEKVDj5M7vsH1rhFIT lI/vqexkp4TxIaSU+DWb8X5u2LKz0KKUHC5tSK11xmxiWVIJ+qvOtacu7SFV8fmJ2dWrvnlI9j/ 9ITV38EU2rLLG8+uJylLBKFHa0fZwTQitV0trP+Zt0vX+80dJ2710Tz/GBqRDx3KYip3kNTN+JG MFz87csGREqSKSFDqDwmHL65xPyEtAnKGSEMtbtgqngCPDtboCaw3eVxGnrf9yExXtadaaYqSji SslViz9b+v5VuqFVB4Blq/Q37gnG7aE4SygpeZjlfrmpaYPtbxkpZDjs6quA2cOIgj4z+xo09ds aHN9ZVVPsXlY/dibEcMXOU2n8aYekaOU+WNlwPjhucp7rKHg== X-Received: by 2002:a05:7022:2506:b0:11b:bf3f:5240 with SMTP id a92af1059eb24-1273adf2adcmr1795450c88.9.1771043316554; Fri, 13 Feb 2026 20:28:36 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:36 -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 19/21] nvme-tcp: Extend FENCING state per TP4129 on CCR failure Date: Fri, 13 Feb 2026 20:25:20 -0800 Message-ID: <20260214042753.4073668-20-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" If CCR operations fail and CQT is supported, we must defer the retry of inflight requests per TP4129. Update ctrl->fencing_work to schedule ctrl->fenced_work, effectively extending the FENCING state. This delay ensures that inflight requests are held until it is safe for them to be retired. Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/tcp.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 229cfdffd848..054e8a350d75 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -194,6 +194,7 @@ struct nvme_tcp_ctrl { struct nvme_ctrl ctrl; =20 struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct err_work; struct delayed_work connect_work; struct nvme_tcp_request async_req; @@ -2477,6 +2478,18 @@ static void nvme_tcp_reconnect_ctrl_work(struct work= _struct *work) nvme_tcp_reconnect_or_remove(ctrl, ret); } =20 +static void nvme_tcp_fenced_work(struct work_struct *work) +{ + struct nvme_tcp_ctrl *tcp_ctrl =3D container_of(to_delayed_work(work), + struct nvme_tcp_ctrl, fenced_work); + struct nvme_ctrl *ctrl =3D &tcp_ctrl->ctrl; + + dev_info(ctrl->device, "Time-based recovery finished\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_fencing_work(struct work_struct *work) { struct nvme_tcp_ctrl *tcp_ctrl =3D container_of(work, @@ -2485,23 +2498,40 @@ static void nvme_tcp_fencing_work(struct work_struc= t *work) unsigned long rem; =20 rem =3D nvme_fence_ctrl(ctrl); - if (rem) { + if (!rem) + goto done; + + if (!ctrl->cqt) { dev_info(ctrl->device, - "CCR failed, skipping time-based recovery\n"); + "CCR failed, CQT not supported, skip time-based recovery\n"); + goto done; } =20 + dev_info(ctrl->device, + "CCR failed, switch to time-based recovery, timeout =3D %ums\n", + jiffies_to_msecs(rem)); + queue_delayed_work(nvme_wq, &tcp_ctrl->fenced_work, rem); + return; + +done: 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); } =20 +static void nvme_tcp_flush_fencing_works(struct nvme_ctrl *ctrl) +{ + flush_work(&to_tcp_ctrl(ctrl)->fencing_work); + flush_delayed_work(&to_tcp_ctrl(ctrl)->fenced_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); + nvme_tcp_flush_fencing_works(ctrl); if (nvme_tcp_key_revoke_needed(ctrl)) nvme_auth_revoke_tls_key(ctrl); nvme_stop_keep_alive(ctrl); @@ -2544,7 +2574,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); + nvme_tcp_flush_fencing_works(ctrl); if (nvme_tcp_key_revoke_needed(ctrl)) nvme_auth_revoke_tls_key(ctrl); nvme_stop_ctrl(ctrl); @@ -2934,6 +2964,7 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(stru= ct device *dev, INIT_DELAYED_WORK(&ctrl->connect_work, nvme_tcp_reconnect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_tcp_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_tcp_fenced_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