From nobody Thu Apr 2 15:36:29 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 473941FC0EF for ; Sat, 28 Mar 2026 00:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658775; cv=none; b=P1jSnQEJTHOSsedUcIq37csYFZ2eMmbAnBGPZSM12ATbej1y/6PFHD7D3Ec+qJWktItI8nUA1jdL/4iuVSAALnUUUvQ1is6V1yEI/H8LZbDrhpiCpjh3LpBk6Wk7tFyLXg1YLJSKQ87pSz/sDrMwDoqmPvpljlcGO4DEX37O1LA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774658775; c=relaxed/simple; bh=vZLteJ83d22AjSrcVciWB0TbOCSTORkyyhL6KfKzsMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=orGv3PRPGpasBwIsnr992GimMgMJqHJsk05YVbKeYDmRaHvPFJjKGtvV+W81d6xeA7FSl3gxztaP0080logBBmztaZb3kG1rXtcX/JaQK7oJ5TRl3ngluboG0BqEzzU6VFxFrlpdX922ZS2KSECoyQf9TaAEDjZm2UyU+g7MXCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=SQaILWIx; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="SQaILWIx" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2ad9f316d68so13294485ad.2 for ; Fri, 27 Mar 2026 17:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774658770; x=1775263570; 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=BG9grs2JIZbnZf38OXY3X2RYCpdQyaZgWV264Kd3xHo=; b=SQaILWIxj9C3weD7Fv1ddfpr207+axUPsQsZ/26tfEDZYQI2v3E6/+ox7E1/hxQX56 jXdLDEZCcj6M/aEaRR+TcR0Pn62dhffXS1puHvXbDukGKPKSXFIZ9BE4mW8nKZJPS93+ JcbHVim2PQSyuoBDupIlACRoXh1XLGLPmsDQjZ4ZWqKjrGguRvx6S7n0oKkNwNxkFVDU +by0ElFHB2vjz1YcWCwAQqL1IOMiWjzyYHgLq9HGWpTNIcsgF2VQz1n/0Ht9QKYIbTaL 3271EmJ+yI3XsT7h3CRQaj3Hjf+vBfDkU3MHg9RfhtB3OXCsqaLvQIvQ6eS/8p+YFtRt I/UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774658770; x=1775263570; 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=BG9grs2JIZbnZf38OXY3X2RYCpdQyaZgWV264Kd3xHo=; b=IDAQo22mOx5JAoTJ033KydqIqSm8+2jgI/CI5MnqVckjtugV325mhZ/3+5QAgWPOff meny1K543bp6ayAASUDErw/nkSqCmCR8/TVFJSwNVv5PlguAzBVRGDcgZW1M7wVevSqP SvJ+qCOXqKHIH0KIvrb3O3OB+tcbtC3hYoXRp8sK0pKsbiREkDbNHOi5FavtA7iyud1f 4lATE4KN9m7HDowtT+RvbklNug6osnnK2JRQSG3GzB63n24z3/ryonYBCfFJ4LZZLzKH kg5FM3+2kNGntXbALPb0VAsrPFfQ0mFfoH/NXgjaiCZx/nl4A/13J7J/U/MsyEmLoEkU C3+Q== X-Forwarded-Encrypted: i=1; AJvYcCWJwNkeMGlB+VXrEfhWLyL6xa/XKwq+fHOZz13zDHtFZf0pDZZzbM/is6RF3UaoyY+FE1Fi85j8VQGSCXY=@vger.kernel.org X-Gm-Message-State: AOJu0YwVuhf1B41M1rrwUhmzbjgn/wsmhrTOlp1/P124Ucui4UOhyX7W dGA15nZL1Cu1DsYj+/yTopD/X7SAJEE/hfZNBLKvMpGzsjlAvGXFC9k6QXNA+FL4da0= X-Gm-Gg: ATEYQzzkHdJXUs/SQOv8i+g6/zXUP4MSfbASGt23zK6JhvdJLlNPGDY4CinOv7aERhX iepN2LUalguuUVdk8IrN1n0Bdnb8aCqXzBScKFanaX0kusePgspI2fBakOoHSAjSOjOgKIxoOBr +oRF89b87q9k5J/0MK9rjIWm82Kqz6K3e1OCkjSwSXl9CaR8+1zHR7SsVcci4WeQRqF2kdsjBR2 kvLujzMJdwbGMc/VmyVannWWoDRLW5Y0hjsjKFQeC+5/LPIrJahMZGJBcaI0P/zOhtUYDeW2Hy/ jQHDHdwtj7g9rjP5M+KdfrZQfIzxBblblrALT323KfbBnKmD6oOIlFZcCWg08m7M+8dYNLtMPyi p7MEyC5aRkvNaRU8DMmXbLhZzQuNKVia1KrSZDiBTKPMUucNwfRz9BINBaqUYpuC+pTzKcuGdQK hNzFHfQ3o= X-Received: by 2002:a17:902:fccd:b0:2ae:a45b:42f7 with SMTP id d9443c01a7336-2b0cdd03fdcmr31623685ad.36.1774658770331; Fri, 27 Mar 2026 17:46:10 -0700 (PDT) Received: from ceto ([2601:640:8202:6fb0::9c63]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2b242683064sm5342705ad.33.2026.03.27.17.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 17:46:09 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , 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 v4 13/15] nvme-fc: Use CCR to recover controller that hits an error Date: Fri, 27 Mar 2026 17:43:44 -0700 Message-ID: <20260328004518.1729186-14-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260328004518.1729186-1-mkhalfella@purestorage.com> References: <20260328004518.1729186-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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 6797eb17917f..9f6b95415f25 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,22 @@ __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; + int ret; + + ret =3D nvme_fence_ctrl(ctrl); + if (ret) + dev_info(ctrl->device, "CCR failed with error %d\n", ret); + + 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 +1906,7 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work) return; } =20 + flush_work(&ctrl->fencing_work); nvme_fc_error_recovery(ctrl); } =20 @@ -1921,6 +1939,14 @@ static void nvme_fc_start_ioerr_recovery(struct nvme= _fc_ctrl *ctrl, return; } =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); @@ -3321,6 +3347,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 */ @@ -3496,6 +3523,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