From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 A02AD368D7F for ; Sun, 12 Jul 2026 02:25:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823142; cv=none; b=n/+f77qeYTczfweSMaCZTzYL9V+u8lhsdYogcZZXUdaIjJBt1PQ3a4M0stIQObfDkEZDfmNhljCyeA44eTcVsxkR60ovb4KlExWuMAaWF+k69zK48qoOOKM/VfKuhudY6JHsKUxgkJR+7kkRO+bbpqWGjy2c3NlC+NrOfeObIhg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783823142; c=relaxed/simple; bh=KD2rtVzAuhf8z4ZUcpIAEQ+TGp2leVjSVv26TPUyCiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IgN1FBT6tgBl8laPrlAUx9iuK5kDwDngqu/+5deGaXhHz7eTZ56PE4XXjRuFYZXjRR+SuKsrpIrCaAbB/dto12XpMQKoRCYIwrdEDKyiNiiKW1ZrfsUtGmcXala7R2Vnf4xIYWd/3skpe7zhxyRLc+/ve+W/zSv5b0MX9IRJ/1Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=fw0RjYVD; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass 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="fw0RjYVD" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ce7d2adef4so27961605ad.3 for ; Sat, 11 Jul 2026 19:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1783823140; x=1784427940; 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:content-type; bh=cHeryY6vgxsV95CWKD2Kjdif2w+1k42bjuOLEzQoEGM=; b=fw0RjYVDYA+od2fHGGv7kq704IxMniOPe4F6GKHWisGoK7mCA5rfRkED9GW3jTowhx YYpz1BLuvLP7t5qYtiRfWxX5oK+yN6A0ugbZSeZ8/3uEdr9k+XpBsgRfvGzYdpT0CWCL sKtE+ApsgEpRyBHZ3b19eIdvEwzACRnL+1LIWV/n7AoT3QIF6wrE4i1ihHZjnjBQ21wu vK7d7/jNiiQJ4hOqbhmkGnZEQKzXA9aOeHQBH8kbmM6poKwdsB+jTH+vxmbPUjYfNAjD BzasXZ7NrMV3I1kTgHyngM1GjbZztqIItFA/lENRKvp294HcD5QeraQLY5spfl/f0SAc /mCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783823140; x=1784427940; 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:content-type; bh=cHeryY6vgxsV95CWKD2Kjdif2w+1k42bjuOLEzQoEGM=; b=k5lZJE01mNgqWAk41an0oPjvVCILA6WJiUeg0xRcRnX+1ptt7UzbA4F6uM+MdvZKnB 7kKBmUFvpFPV1xnYAJtv/Ab8sGAluqLAAEZ50KqI5RFqTOtA2OT07gQL8WZOUzS7nPLu rnHxt0XF5JUuWpk2NMXdFBsfZClqFyZjwA8/gufg7fOjIJ64caDqPcZTpMAZRx+QL+dX aZOweJvl3r855Dxo0wGd/IMfzg4h3rOqm9DZnrY5+eEDVVjeMonuQAZj8VphirGcUB9d 2HJU7TH21ZepfpwRNmOeNGd+jNjVTyUB3z3yACXJEcxw+AAgM0X7dl8SaE8dh10nubrZ c94Q== X-Forwarded-Encrypted: i=1; AHgh+RrJofKfmITV1e/wIebQYoLKccb35r/ZyRmMMJcuvu+V0xts/ZBFtzVAdVnpxTbUpoX1Pc0l36fx5cYtngQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyM9IgJIgXDh0yc5TGmRHsCDoyQSNxQ2gaX7K+PVwvHOeTWnm1T l/NISMM1Re+xWZtpZ4PZigpWk2xbjA+QoGMMtG+Ke9HAjrnxY5y4cj6dfgrJe0nmm10= X-Gm-Gg: AfdE7cnQfbhsuXLr2SnVjLE3xeNEameCtBAFUJvudS+xDduwYKTFb9k9t7aSKH+gofB Giy2H71WoCS4Zf3R2kD2q21un7nEdozpGFShDzYPEBo5JEdKE9+bshEe7JVZqc2HgIp/ctqSIfb UqMDUaY8Pt83ipzJ0jnov8NFJSSqejE/hK1tiGcYWBLe1xcWItwKN7Sf8rXYlizZdKvooUniMAH rOcjKf/PUNVJ7RFjBSGKrH3loSR+beNQqvHecILQb+1vJcAA/wXUd199SpoqP8dyUXfGd5X3D7x NCnqok65vUSnEMJx9ygsueBj4MFmwJDJYcHV1hQRhbr6zpSgAE0+JyvLdvL4o/ODNVFZamENzGW /kYrerz26KVcHm1pVfeS1Fl8lQ9uZmHZUEJOvBOpiv7q8nxlwlZ8wyPO5v28jjQSL+5umotMKXW oZs3CuD1QXcyvW/Z0= X-Received: by 2002:a17:90a:da85:b0:387:e0db:3fa9 with SMTP id 98e67ed59e1d1-38dc777018cmr4731701a91.34.1783823139833; Sat, 11 Jul 2026 19:25:39 -0700 (PDT) Received: from ceto.lan ([2607:fb90:9c20:2264::1c31]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm60704693eec.0.2026.07.11.19.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 19:25:39 -0700 (PDT) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke , Randy Jennings , Dhaval Giani Cc: Aaron Dailey , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v5 13/16] nvme-fc: Use CCR to recover controller that hits an error Date: Sat, 11 Jul 2026 19:23:34 -0700 Message-ID: <20260712022437.3743117-14-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260712022437.3743117-1-mkhalfella@purestorage.com> References: <20260712022437.3743117-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: 8bit 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 54a09db9716d..03b6c3649210 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; + struct work_struct fencing_work; struct work_struct ioerr_work; struct delayed_work connect_work; @@ -1868,6 +1869,22 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *ctrl, } } +static void nvme_fc_fencing_work(struct work_struct *work) +{ + struct nvme_fc_ctrl *fc_ctrl = + container_of(work, struct nvme_fc_ctrl, fencing_work); + struct nvme_ctrl *ctrl = &fc_ctrl->ctrl; + unsigned long rem; + + rem = nvme_fence_ctrl(ctrl); + if (rem) + dev_info(ctrl->device, "CCR failed, starting error 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 +1906,7 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work) return; } + flush_work(&ctrl->fencing_work); nvme_fc_error_recovery(ctrl); } @@ -1921,6 +1939,14 @@ static void nvme_fc_start_ioerr_recovery(struct nvme_fc_ctrl *ctrl, return; } + 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); @@ -3328,6 +3354,7 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) struct nvme_fc_ctrl *ctrl = container_of(work, struct nvme_fc_ctrl, ctrl.reset_work); + flush_work(&ctrl->fencing_work); nvme_stop_ctrl(&ctrl->ctrl); /* will block will waiting for io to terminate */ @@ -3504,6 +3531,7 @@ nvme_fc_alloc_ctrl(struct device *dev, struct nvmf_ctrl_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_WORK(&ctrl->ioerr_work, nvme_fc_ctrl_ioerr_work); spin_lock_init(&ctrl->lock); -- 2.54.0