From nobody Thu Apr 2 23:54:51 2026 Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53]) (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 73D782BEFF6 for ; Sat, 14 Feb 2026 04:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; cv=none; b=szZOmEIVhFVjvNqL/6f+seYCQAkuUN3zVuVY7Ptklb6+JS1bEDOxrSV8CUtIEbz8g580SfhN+C7GLFK31VunhZRA8JQwpV7ntpX0Ttj9Iz/v7ix6bSgwjzOepjZ7ToSsfrKUfLudm8OUaA6k65vc4drATzYBuDQWw97PwKbeWIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; c=relaxed/simple; bh=FSiED3HyNT8AthJzBZqLtfYzOa/KWw3tAdsNyvPTlew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o0DsXLzuewvs6hDL4ZiS1lvl2YQVuDQjfcoAZzXSzCc4MM/ks9wF879baVNeQ3qDJSAYF5Qgl9OHML27T+rmeiBudNvJb+fIpp4eE8CG1quDdgfvFTxvMoPBbjrBFMvge8l0XohJmM3941MfxV6HAsBXFkq/CN3OEgtbnKJziZI= 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=H2B6k+eI; arc=none smtp.client-ip=74.125.82.53 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="H2B6k+eI" Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-124899ee9d3so1154893c88.0 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=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=/3PZZpvojr3QJ+1nB0s8EMVY3OCbXeX5sFwA3G15rFM=; b=H2B6k+eIre2qSRDwEQ/Lr11Gevgo08fioPkIiDuUsOjsoSQ6b5LfsoZGR2wlIC6RKd TucPATPmotu8EaEfU4uTuczH6YAa+yIOp7Ysx74iQuGu3j5hRRdYaIRKs3FhA/Jcd8i6 4y2FqYbMIuwzKeTRhBStMKRAqsltH/iagWrhmLMSMjGTZXUwRWrjnLZnjW2bTDOcotHP R9SWBDeJ/D1rjSMuK9z9e2lk+mMdbDXq2QhjlzO/lXcpBL9L++teaX++7LRRu81tMAXU qqsiuAMdcpIYGAUoE+6a5BK/pORkgbh3BcF861Rr4nf2xhLpaWqejMDb/ioennPcqoVf WMsA== 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=/3PZZpvojr3QJ+1nB0s8EMVY3OCbXeX5sFwA3G15rFM=; b=iUHnJm5SxS2ARroXfn9d3nC/a8Hi6THCOx5+SJ8EcU8y8Gnfd8lZueWuDoETB/rrV1 5741fGy9fr+UAwEPTuqkUjD1Mph7UJzWhfutlxe37y6zhWFAkk9o0kfRvxg6LaHRIhJe UIVlAkn4hZlXJCH1iCEDTwBwj/8AJBDm+Bnr8kRuh9hfDVdPSqJUzT/8sKDjQpxp9GFX ZD1IhSGEtOFn+oivDXQKKSAB3sLUZEd75PtbRZXWtuGynPfhaS3CLsVMhWbFSkpi1JWn piZsmBhZeamFY71wHFmdCaCnd8AQcY6z6a1fbN51BRsK1T3PZmPadIMsefOgLN2sIGNR rDsw== X-Forwarded-Encrypted: i=1; AJvYcCUuwdlm3I3g00kIBS7Tjqve990m/yQJCel4ZFDLrx72CgHwRq98WfA/i/cpoMttSG6m2R5Cz6OEJvTfAaQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3bn5zZhKwH730AE9RELQRZt2+/nCD0ga16HexCeS4nTZ87bsX GJpl4RpTBFvV//ovJv767NWV/zGufem6sYGXumRFEwTadze4hoIpzTuR0ohVZj26PTc= X-Gm-Gg: AZuq6aJQ3g+SzYunKT6MfFGE2mf8Ydp1JQVbd5wKiJ02TzGbUl4sCxosPhIckTdE2fg etGDMpkEOXZBPhTJUi6vJvafTC4q97jJGA7NNO1rf+7x5vmkhWMXx3oDkbHpIQeAu20IYz8isEx G0BoK6hxm7UHlyl6EzNwbRIB/2zhd06mRU09xRSJLxwMd0Sx1NaNPlIzMUBWDYxDn3nc7NipdFE 2NQIzJp8CVmdA+7PtGYa8UkG9ZoxE8WoOXaQYI2Ga+DOf2G7bf8wdkpczYM5SzPANFGW2gEqyox 2HRVNY92/xvlIOBkE9qAqdMCGwWw4nFeRs+Wrzvk5Wiralg+tvLF7P+aAOeW7YuWU82qmpWl3ew 1Lgylpx7Uji+KQoZSMrlq+llAZDIwIce2Yezd0cXyRWCRDs+uD8rKRPepHYFHctY+MUqFtmeqqJ k2hdNc9mqOagzcQDxxo6YwB2TwGZCYFDOboRDwtJgsrXZIQA== X-Received: by 2002:a05:7022:628e:b0:119:e569:f86d with SMTP id a92af1059eb24-12740fdcd97mr1003218c88.10.1771043318277; Fri, 13 Feb 2026 20:28:38 -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.37 (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 21/21] nvme-fc: Extend FENCING state per TP4129 on CCR failure Date: Fri, 13 Feb 2026 20:25:22 -0800 Message-ID: <20260214042753.4073668-22-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/fc.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index eac3a7ccaa5c..81088a4ce298 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -167,6 +167,7 @@ struct nvme_fc_ctrl { struct blk_mq_tag_set tag_set; =20 struct work_struct fencing_work; + struct delayed_work fenced_work; struct work_struct ioerr_work; struct delayed_work connect_work; =20 @@ -1878,6 +1879,18 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *c= trl, return ret; } =20 +static void nvme_fc_fenced_work(struct work_struct *work) +{ + struct nvme_fc_ctrl *fc_ctrl =3D container_of(to_delayed_work(work), + struct nvme_fc_ctrl, fenced_work); + struct nvme_ctrl *ctrl =3D &fc_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, &fc_ctrl->ioerr_work); +} + static void nvme_fc_fencing_work(struct work_struct *work) { struct nvme_fc_ctrl *fc_ctrl =3D @@ -1886,16 +1899,33 @@ static void nvme_fc_fencing_work(struct work_struct= *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, &fc_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, &fc_ctrl->ioerr_work); } =20 +static void nvme_fc_flush_fencing_works(struct nvme_fc_ctrl *ctrl) +{ + flush_work(&ctrl->fencing_work); + flush_delayed_work(&ctrl->fenced_work); +} + static void nvme_fc_ctrl_ioerr_work(struct work_struct *work) { @@ -1917,7 +1947,7 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work) return; } =20 - flush_work(&ctrl->fencing_work); + nvme_fc_flush_fencing_works(ctrl); nvme_fc_error_recovery(ctrl); } =20 @@ -3396,7 +3426,7 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) struct nvme_fc_ctrl *ctrl =3D container_of(work, struct nvme_fc_ctrl, ctrl.reset_work); =20 - flush_work(&ctrl->fencing_work); + nvme_fc_flush_fencing_works(ctrl); nvme_stop_ctrl(&ctrl->ctrl); =20 /* will block will waiting for io to terminate */ @@ -3573,6 +3603,7 @@ nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ct= rl_options *opts, INIT_WORK(&ctrl->ctrl.reset_work, nvme_fc_reset_ctrl_work); INIT_DELAYED_WORK(&ctrl->connect_work, nvme_fc_connect_ctrl_work); INIT_WORK(&ctrl->fencing_work, nvme_fc_fencing_work); + INIT_DELAYED_WORK(&ctrl->fenced_work, nvme_fc_fenced_work); INIT_WORK(&ctrl->ioerr_work, nvme_fc_ctrl_ioerr_work); spin_lock_init(&ctrl->lock); =20 --=20 2.52.0