From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f42.google.com (mail-dl1-f42.google.com [74.125.82.42]) (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 087AC3B2BA for ; Wed, 25 Mar 2026 19:07:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774465645; cv=none; b=HI31SEbvDmfAHH/gurDX3GyC559+fEt9maHTaKp+n68MO56HlbW4h9zUrfgwYQNW5EmsRrKzi/SKP2B/Ip5B0H6H9ttNVnxDMUqCz27zuvjyMMfG7FXPwZbwGfW9vbjQ5G9EeHDSpZLwWBqkz6LJ2IYjtkpyRzbroA/LYGuwB2U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774465645; c=relaxed/simple; bh=zkj+BLZt+WOaGz98rpYRdjEOiAa6twa1YrIE4mavIkQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=BzPwJ7c3JNxNPbi2HV7emcs6uihinGDMvoaN2KHBOKKRaKREWj05Rxh+xvUcSpdpSwnOA87LQMp4im30LU5qSyG50jdTEsno2RpFjA4LUk45Judo3mF7sDknIZUpCHzsO0k1g4kq4lzywhRrDdVZSe4ZnrSt4EcUdfVBJFtTqRU= 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=cJFv/dyX; arc=none smtp.client-ip=74.125.82.42 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="cJFv/dyX" Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-1271257ae53so216340c88.1 for ; Wed, 25 Mar 2026 12:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1774465643; x=1775070443; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=3CFNV3fXhTyYK2FfmGVgZlda+hYMW+xdTutgAp9N5H0=; b=cJFv/dyX2ScdlfoWZs9qKeM6BrSF1u8DapU3v/byrABixHvoF8P8XfHqel2w863+DP xspxwHT2fV5SpoVb6W5BYFKW60czBL9Hu/P1QLkiwwzNtI9lKQIGC/u2DWJYgfV+R/9a Raop+YKTa2cK0edxszp08eYmvAbTK9Wa2k7vxe80WjC0oYv1c50XHhe2UJKXStPz3hWU PfmLIz4LVzPruH3thWCGJF8LpIFf548dKgIzTuTshni8Sn7Wa1HWaTnDGIss4NI+DAoZ d2XLVFQSv7Nhp2aj7Wqa40C+NtItf/gRtmzd8Ybyh6zH5vd9q8hsy4q/3eq0DH+LApn5 5TTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774465643; x=1775070443; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3CFNV3fXhTyYK2FfmGVgZlda+hYMW+xdTutgAp9N5H0=; b=mGuAgRM0C0+nBuVWLaV/dv4tyBel2N8FDoBj5c05h/jFzn0h9we61AVW4SbHAdaT3a TFiQsMUmmoWazE4vUNN68VFMVgI4O0vMhKckdLrstkQO1qxRXXrNLP1/WvDpgEWQBUQG 0RYM72acQZ6sv3RLet9xFi7WP+C4AsguOn9WeklVQNsy0kmiUtRdx7BPK0htcU0J5hL5 A/LfWWHFugFc7GHUwUR6AIeJoG4nHQPN4gMohURGSQmKhj7ZTsrcTCaSlWyqyiIr7/SY qqoZLmOqgr0yFO2c+qGZF9Q5pNvpMBg9Iy8SOjkvRd5crxBxnpWQWZTzNxo6HjCc8s9g 111Q== X-Forwarded-Encrypted: i=1; AJvYcCUy5VINGFN2tVY1twRuNejS3k/f3vz7qrde8qGK8co0mErX4mvfefMcKDqEiPFBHxQ2E4guHSKK/m51bxY=@vger.kernel.org X-Gm-Message-State: AOJu0YwuR2LyNzuIea52d6gJl4F5dydWdMK2qSpuX3AZPAGkL1cWBlkj QKi9Xd3bvodfZjn/3J9b9bHD96wlB64Ccmi0M/+80T3sznwsl2k/44kzFvAxseaupdA= X-Gm-Gg: ATEYQzyt+/ziHFk2WpIEk2gKqLkcZfzc9I4WmYMWOK0g8vRilnUAaDbxbdzJmvdpiGb X23A9SgIsAgv8e3jmpp9PwQc47nO3GyY4y5AuhKSgkg/TBtH/bfeRyUKf+uMaO9EyBNEI8uDdLh W4Y30S6H44Jo+7P9d9qWp+trtaBEyyrnGBgN47dcEtctwO1Pypjgvwk21dHbh65oGq0mrJb2bET 0ViyoCQGW8gj9TH2P3Fa/0KoAnzWd7vmCkr+krCqnuSmydd4BVcILnNBwXLUud0Nt74RzgIisnp B8O3vQhENwPbrJBi+YSEVA/2QpGitb/1RygS8Q/MqMvFy3InOO2IZ137tENEtrvBNZIz79MCaaB hYrv82+7B5lEfeujc9e1iLATNs49a4fbtHrYLvQv9duPrmsMDekt3giChTmM77NNI3DeEpEDL9+ r+gE873TMQTNHThxtPVnU5N5CRyiPF X-Received: by 2002:a05:7022:4a7:b0:11a:23fb:16e2 with SMTP id a92af1059eb24-12a96e4901bmr2240147c88.9.1774465642819; Wed, 25 Mar 2026 12:07:22 -0700 (PDT) Received: from medusa.lab.kspace.sh ([2601:640:8202:6fb0::9c63]) by smtp.googlemail.com with UTF8SMTPSA id a92af1059eb24-12aa6e5b38csm873408c88.2.2026.03.25.12.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 12:07:22 -0700 (PDT) Date: Wed, 25 Mar 2026 12:07:21 -0700 From: Mohamed Khalfella To: James Smart Cc: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , Hannes Reinecke , Aaron Dailey , Randy Jennings , Dhaval Giani , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 21/21] nvme-fc: Extend FENCING state per TP4129 on CCR failure Message-ID: <20260325190721.GD145093-mkhalfella@purestorage.com> References: <20260214042753.4073668-1-mkhalfella@purestorage.com> <20260214042753.4073668-22-mkhalfella@purestorage.com> <74b4496a-5ce9-496f-8032-a220c2f69cfd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <74b4496a-5ce9-496f-8032-a220c2f69cfd@gmail.com> On Fri 2026-02-27 17:20:45 -0800, James Smart wrote: > On 2/13/2026 8:25 PM, Mohamed Khalfella wrote: > > 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; > > > > struct work_struct fencing_work; > > + struct delayed_work fenced_work; > > struct work_struct ioerr_work; > > struct delayed_work connect_work; > > > > @@ -1878,6 +1879,18 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *ctrl, > > return ret; > > } > > > > +static void nvme_fc_fenced_work(struct work_struct *work) > > +{ > > + struct nvme_fc_ctrl *fc_ctrl = container_of(to_delayed_work(work), > > + struct nvme_fc_ctrl, fenced_work); > > + struct nvme_ctrl *ctrl = &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); > > sync with comments on patch 12 I will do that. It has been suggested to move CQT changes into a separate patchset and focus on CCR changes for now. I will drop patches [16 - 21] from this patchset to be re-introduced later. > > > +} > > + > > static void nvme_fc_fencing_work(struct work_struct *work) > > { > > struct nvme_fc_ctrl *fc_ctrl = > > @@ -1886,16 +1899,33 @@ static void nvme_fc_fencing_work(struct work_struct *work) > > unsigned long rem; > > > > rem = 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; > > } > > > > + dev_info(ctrl->device, > > + "CCR failed, switch to time-based recovery, timeout = %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); > > } > > > > +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; > > } > > > > - flush_work(&ctrl->fencing_work); > > + nvme_fc_flush_fencing_works(ctrl); > > nvme_fc_error_recovery(ctrl); > > } > > > > @@ -3396,7 +3426,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_fc_flush_fencing_works(ctrl); > > nvme_stop_ctrl(&ctrl->ctrl); > > > > /* will block will waiting for io to terminate */ > > @@ -3573,6 +3603,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_DELAYED_WORK(&ctrl->fenced_work, nvme_fc_fenced_work); > > INIT_WORK(&ctrl->ioerr_work, nvme_fc_ctrl_ioerr_work); > > spin_lock_init(&ctrl->lock); > > > > looks ok. > > Signed-off-by: James Smart > > -- james >