From nobody Thu Apr 2 23:54:47 2026 Received: from mail-dl1-f44.google.com (mail-dl1-f44.google.com [74.125.82.44]) (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 39BE929D28F for ; Sat, 14 Feb 2026 04:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043319; cv=none; b=RZhXQNuR+UEUI+71z9Fe8zWy2WpGupMFYSJa6wRekpX9EaSKt06RGVSVxc4t8SjR0cLgn2Y+AzSaMxvTKSrkcuD5FK5bLytgsxY6XHiYruK9WS04CixDF0B+OCanZ90xn8tH9ilH89klAI5HImitGBbnKoJbtORed8LkcNbjpNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043319; c=relaxed/simple; bh=/B74rC7en6yjYP0MzdpgJ++YVbG7lR6S5MtCVCFWekk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W1GY/oremLQe6tHPOxy1POlWOOTKdIrklgokSfTc68kc/5iDjCNPeNwHv20vx8vEZGltA1ijOLpPjVjU6aRgixHxihqwIfd2TPOpD9zowV1bTF5FX1uPbNEY+XcWu9+tK0wrgUVe/GOF7N9QDnX/P8IMx3QnzW4HD1qqjpiQQys= 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=YLzBP9e7; arc=none smtp.client-ip=74.125.82.44 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="YLzBP9e7" Received: by mail-dl1-f44.google.com with SMTP id a92af1059eb24-12732e6a123so2654805c88.1 for ; Fri, 13 Feb 2026 20:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043312; x=1771648112; 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=XwNieIMOOEiX5lV5XWEf+KtzHT/dG6SPDzSjOWp5JHE=; b=YLzBP9e7OWVkX6OBxlQrnQLkZTIAp+5BOt+4DEwAgkpJvCVqc6DtRn3obMB9dirS+m v0EpSVc+qr2Y9zLOj8wibPLlnXkBpwbdcQ5LvcBUOeL/Hdpxo6oH+CwPQV3U4hn6BEIX VWEUzyIv00ZINFox4BXhaIARi85j8D9aRJL8zbYjiaQPL79reYOd+INwpbgvenrnhrUk 9T2zjoB8CnBpA9EBaHSFuckKiCbesNn5b/+PVjmyTiSSkvi0033R43bMUJ+gdY10kUNH SnNlYPoDmyCpxFxm05vcaISRtkVaihpkkfdncNSd+iEE4F4PRKPhqZhkURu68K9iGOr0 qtjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043312; x=1771648112; 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=XwNieIMOOEiX5lV5XWEf+KtzHT/dG6SPDzSjOWp5JHE=; b=HHEVd7tLUNWEAQywOy6uYsvXc6zOYvrBT9DXCfh3U64z9BO0RW9GuagWF2Hoplek+p OCao9p5q9r3qbVv3b88OFd+3gaEPLeRaC34sveTicMaR9DMUoEBG7VkASEiadWDn/6FN iReCT+w2KN0KqbM27uX6v54DdSFFrihX/HZOv+G8FVUUzMij5bLh9eeHC0t6plad2PYy d18/NsYumH5OoLz4KOs6whNFTw9Zck7GSsKorNETMzWNQHLE7Whkia3MK8Py6/SQMOQY GmtrfePq8Pzjjhbb5Nuk5aE+jTEYkHKeVxPO/M17touCZSNF4zOWnTDoEv8fUfiZhfB0 xkQg== X-Forwarded-Encrypted: i=1; AJvYcCV2bVcbpslP0V0YrfvsZMnh8EkHp8/vpg0fGCe1EXfbVGonUjoaN+mUinfPGR5zQVJ6Tbg+MwBNacRCbQY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx88KKAocxXD0hW/cMu61zBLxIYCLvL1ScVAmrzJ2l2aIgJDrv5 Z9jFYlcTACwFRRZbuC8rIbVgV2AFAn3Sy4PgzANJP949PW7h1ZOafickl+VF7hG8MwQ= X-Gm-Gg: AZuq6aL365KwLFsKPJglsfZeV89sLVO8BJbLVYC3FHRTlGcNnckXqWhK52juSrBN+7f y7YMb2DLXQq2YpVznAJDPbUvdQAU6x8KFeA/m2tRrKJEhlIodijOaetQH48YUWu7bpA2+mRiLWo Vf8WbO7fWwJEHU4X97s81sR21yiqPY5riFJXrmZb83aw5CSrMnNWoHYQ8sTWvOryKpDIHG5+B1K y2g3ED1O7Nzl1TcMEOKDOOvW6ECled/SfHLbz5apqADIOjo1Bc5XUvf9W5ePZp/l0CVn3FPWiAd 0Bgq0X7d4Zaog9FHMzQav4IzzCF1+87nEDAV4LK74D2uMriyeNY2rpix0reacV50yET1S5zZBG4 oTxodnzdzrOkV/qrZbDjOfnyF8hBnya0nFb9loUqy8s+j+vXIBtmegkLR6ShdGqo5mOVcXA8Lzm vCGIMjEfO491EeNtsyIlTvQuebpiHkB++1PV/oLmXHplqtjw== X-Received: by 2002:a05:7022:6706:b0:119:e569:fb9a with SMTP id a92af1059eb24-1273adba5d6mr1562540c88.9.1771043311738; Fri, 13 Feb 2026 20:28:31 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:31 -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 13/21] nvme-fc: Use CCR to recover controller that hits an error Date: Fri, 13 Feb 2026 20:25:14 -0800 Message-ID: <20260214042753.4073668-14-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" 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/fc.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index e6ffaa19aba4..6ebabfb7e76d 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -166,6 +166,7 @@ struct nvme_fc_ctrl { struct blk_mq_tag_set admin_tag_set; struct blk_mq_tag_set tag_set; =20 + struct work_struct fencing_work; struct work_struct ioerr_work; struct delayed_work connect_work; =20 @@ -1868,6 +1869,24 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *c= trl, } } =20 +static void nvme_fc_fencing_work(struct work_struct *work) +{ + struct nvme_fc_ctrl *fc_ctrl =3D + container_of(work, struct nvme_fc_ctrl, fencing_work); + struct nvme_ctrl *ctrl =3D &fc_ctrl->ctrl; + unsigned long rem; + + rem =3D nvme_fence_ctrl(ctrl); + if (rem) { + dev_info(ctrl->device, + "CCR failed, skipping time-based recovery\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_ctrl_ioerr_work(struct work_struct *work) { @@ -1889,6 +1908,7 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work) return; } =20 + flush_work(&ctrl->fencing_work); nvme_fc_error_recovery(ctrl); } =20 @@ -1915,6 +1935,14 @@ static void nvme_fc_start_ioerr_recovery(struct nvme= _fc_ctrl *ctrl, { enum nvme_ctrl_state state; =20 + if (nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_FENCING)) { + dev_warn(ctrl->ctrl.device, + "NVME-FC{%d}: starting controller fencing %s\n", + ctrl->cnum, errmsg); + queue_work(nvme_wq, &ctrl->fencing_work); + return; + } + if (nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING)) { dev_warn(ctrl->ctrl.device, "NVME-FC{%d}: starting error recovery %s\n", ctrl->cnum, errmsg); @@ -3322,6 +3350,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_stop_ctrl(&ctrl->ctrl); =20 /* will block will waiting for io to terminate */ @@ -3497,6 +3526,7 @@ nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ct= rl_options *opts, =20 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_WORK(&ctrl->ioerr_work, nvme_fc_ctrl_ioerr_work); spin_lock_init(&ctrl->lock); =20 --=20 2.52.0