From nobody Thu Apr 2 23:54:46 2026 Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (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 7171F2E719C for ; Sat, 14 Feb 2026 04:28:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; cv=none; b=CaeuaFyLfM8W5n+lKuN6/dWh8GHzjGCYUEuNqSx85hILIy4YGptsLPxtv8xWkXeqyTDCqgnu4RvKOKqCMXajKCWCLT0/8yK9LGLPAcSnzHiRNU8oecjuL+dOxJOeMamgBhSCecuU1aM/9YRVsmWTiITIRbBR8PSPR2V5Vyx1phI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; c=relaxed/simple; bh=KMYzIlB9TeyHaa/kPYwm2oQAzVvcnTKFz1aAtoHyI+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z644hhjCdqxhDG01kWjp3QaWXuubOuYxJUQjFOFcvT4dPqYhb5D5H+99T02vF8WSlCedqb3k0z8ksbL8OzBYPhhub1H5eigrhYPk8Rb991C5lBqU6FKw7s69NSQRMzIreyFsadcRMDGk/fH11H2L2DHb1KDagKeqRWu9u3R5c+Y= 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=WFG3w7kT; arc=none smtp.client-ip=74.125.82.47 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="WFG3w7kT" Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-1270be4d125so3698429c88.1 for ; Fri, 13 Feb 2026 20:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043318; x=1771648118; 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=AyBlaNKrUhJxF0JOHaXwDus/gth9nfmpIZXXREVAOz0=; b=WFG3w7kTCXvwtLWgavCJHXvtRqlIixHY1yqKU75ihVy3AyEJ6iojBaGZC3l0hVxqxZ VljZYYRkr7kkKtK92m88bamT6vloEBlFfWqHzcJZ3WnYYFA+WKsyWO12+POxci44D1BN b83PI0YkG1OSFRKwix+QYa0JammKI66WyVhSr8BCbE2VWmf9yEKuGeDoiXJYk+85NWwG BuLH443mbTk6wvI3axkxfi2Py6DEtpY3b5rGf9HEDrsQFwR2f5ghXzHZ7ny4yTgdvhrB Zg7MyhwBfzT5m2vUkSoyJFMMSSKuivLDX1bx576hZicnWubv2ENLCnB7hkhTGRY5Sj4Y LtYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043318; x=1771648118; 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=AyBlaNKrUhJxF0JOHaXwDus/gth9nfmpIZXXREVAOz0=; b=Vm/UOqK3qxzMbozOFu5B9rNHoacXnfSGJCaYNUN2TfKGHejqCy/oSUAmy2uIaDDZQR c7BoVycS3a2g+haUCy4FNUlPsG+0fs2rUbRYQlFpwi+/RcKDRpZhy6W0qXlOMmI9LBhZ Wko+XBKPLRZkKVwEO3aSARmFJugqY2q0Ow1pgh2Cy0znwYDPngiTrrvInqPFyah8b2JP 8y54ImTmrEbP/+0qd08isEw3h2s31/DgrHTNf/kI2aKRnyqZCGYM90a3kT6cUlXIb1BH BGyu+PHncF7QcT0PJ2b3ct9po1LYY5NScEgZBoWzSBK6IyV4KgzRHcoVKocbOs7S38fS bcCA== X-Forwarded-Encrypted: i=1; AJvYcCWm24qSQrwuEgu4lZqY6TSeY6ZkINSUjiDf36MwyKyzqIlEeEbuIr6ZfWUgO3kBDpvfJ0K7+cyk45zSEvg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2A26IGQbYugnfZwzu8yZFqtx59zQAtQ1ZfmK2YsmNtuH4qhVo eOKathJ8l2VFedey8B07caFU6BScJCvGIyg38XLbPr8q8iul3UGYlrA43RwY4/wQmG4= X-Gm-Gg: AZuq6aKbBBtBOPXWpTDO8LCZZ+pmvQnG9MuxbdnMfvKvGkZfZ9nw8gp/KL02Q7CI9MY B6f1Y+1+5hhYKcDGKVlWmCJDd/1JXNGE7W+DgOTEW1x/2yJTTedjbMMcoTofFv7owJTxFqkvEiC NyUZTO3uBsOetsiqe5suNxZdhE3VDQPHC7dJuwxWimAES70VwTWY7Ge+wYQJEU+b/l046mYZVUF 7kLflJG8oWKZuRGHWc/RJB008aKglQS3V0IdxPNvfkTjFEPzUjbnp822fGeFpZ+c4lsY6XWAVnu 8R0JrO1m+T9EQWDpBgDIOThVxunKOCt03BgsOwRt8AqDln2u2HMWJf1oJL0XPVpU9H+h8sqT9QG tleOhdDNcQRAJhWpgRpFeSJocJRb5PG3Px1evee7qSITpMAmH1jT6H3WWc/j1jU0O19newc7hea C8irwA1dKvtShaMPeWS5v2JDxY8qT5n7u+lGhAzXcbXh9DRA== X-Received: by 2002:a05:7022:45a8:b0:11d:c91e:3b58 with SMTP id a92af1059eb24-12741bd2c33mr759110c88.39.1771043317436; Fri, 13 Feb 2026 20:28:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:37 -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 20/21] nvme-rdma: Extend FENCING state per TP4129 on CCR failure Date: Fri, 13 Feb 2026 20:25:21 -0800 Message-ID: <20260214042753.4073668-21-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/rdma.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 2fb47f41215f..4f48780c3b19 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -107,6 +107,7 @@ struct nvme_rdma_ctrl { /* other member variables */ struct blk_mq_tag_set tag_set; struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct err_work; =20 struct nvme_rdma_qe async_event_sqe; @@ -1121,6 +1122,18 @@ static void nvme_rdma_reconnect_ctrl_work(struct wor= k_struct *work) nvme_rdma_reconnect_or_remove(ctrl, ret); } =20 +static void nvme_rdma_fenced_work(struct work_struct *work) +{ + struct nvme_rdma_ctrl *rdma_ctrl =3D container_of(to_delayed_work(work), + struct nvme_rdma_ctrl, fenced_work); + struct nvme_ctrl *ctrl =3D &rdma_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, &rdma_ctrl->err_work); +} + static void nvme_rdma_fencing_work(struct work_struct *work) { struct nvme_rdma_ctrl *rdma_ctrl =3D container_of(work, @@ -1129,22 +1142,39 @@ static void nvme_rdma_fencing_work(struct work_stru= ct *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, &rdma_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, &rdma_ctrl->err_work); } =20 +static void nvme_rdma_flush_fencing_works(struct nvme_rdma_ctrl *ctrl) +{ + flush_work(&ctrl->fencing_work); + flush_delayed_work(&ctrl->fenced_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_rdma_flush_fencing_works(ctrl); nvme_stop_keep_alive(&ctrl->ctrl); flush_work(&ctrl->ctrl.async_event_work); nvme_rdma_teardown_io_queues(ctrl, false); @@ -2197,7 +2227,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_rdma_flush_fencing_works(ctrl); nvme_stop_ctrl(&ctrl->ctrl); nvme_rdma_shutdown_ctrl(ctrl, false); =20 @@ -2311,6 +2341,7 @@ static struct nvme_rdma_ctrl *nvme_rdma_alloc_ctrl(st= ruct device *dev, INIT_DELAYED_WORK(&ctrl->reconnect_work, nvme_rdma_reconnect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_rdma_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_rdma_fenced_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