From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794814284; b=bRD75X8UfBQ5FEK7Nzl/tDtB9jeN/fBTqcFLZeR4ZFx5eklslx9oVXR1ZrETc6+8C6EJ gnLezq+1ghMA2bkB6BYM3ZnGEQrXjdflxNvb5t/w3XzRGa3CKUH0pX69wEXBYwVH1l0Br OUnHQ8dz4ddNVXpBPTyvWFECXrt0tHgNmpgyvNAgClD4cxODRaRsI3wa4Uahi5P57zpX6 9xzK1a0RLTBuQNjN7Y68jgsrACoQokYzkue+AsWNpgangv3YiWbi8uBFSz07Tes85j33S eLNKGGqp1DolBZ143TPF0qfkEnhwl/2EY0/w1dZOkNkTf1i6sKiIy38fiJU6GWtIYPQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794814284; h=DMARC-Filter:Received:DKIM-Signature:DKIM-Signature:DKIM-Signature: DKIM-Signature:Received:Received:Message-ID:Date:MIME-Version: User-Agent:Subject:To:Cc:References:Content-Language:From:In-Reply-To: Content-Type:Content-Transfer-Encoding:X-Spamd-Result:X-Spam-Score: X-Spam-Level:X-Spam-Flag; bh=u1ukYDs6G6VuUfmsZP+zRpytgH58T0ALVC3YGhPO8j0=; b=OJ8f+0BOOjWoXvV/S8a+b0gqtan+8R289LU17G4RvpwBQD3kFxzHLR8Z0pLH/gaiGI9C yn3cWt35WOMRMvDLn155RKwYMx5eSUvyy9vAQX9WHCInzyq4DXpxuKmtHWO/qzUqegMXr gpieOY2e33HWDYuc9LTWBP6qVICJpl2K9qYXAY2mDWPWMs/j5JFvuoZU3y+pKglASPidi VTlrPr0Umg9jiKpMjTwz1uKsp5s/Fx05SN5awUSaAG4u8t8dW2mkD1P3FVt/KsoIxYDwX ACG9CpM0XAviBObfukFptKZGjgXva+NuRv9figoL1AT0MMBwgFlLPtkzfjPkH47ksfA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=OowYAJ57; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hbiOBLB8; dkim=pass header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=OowYAJ57; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hbiOBLB8; arc=none smtp.remote-ip=195.135.223.131 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBF13606A31C for ; Mon, 16 Nov 2026 07:31:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EBF13606A31C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=OowYAJ57; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hbiOBLB8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=OowYAJ57; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hbiOBLB8 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0FD6E1FCF5; Mon, 16 Nov 2026 07:31:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1794814282; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u1ukYDs6G6VuUfmsZP+zRpytgH58T0ALVC3YGhPO8j0=; b=OowYAJ57UmpKF4i8ukUIrqSiCRSh8RVaqfi84391mO+S2pWtHqhHe3OwA7/o2kaU1IwsAO xr75z211sfQImJUXCHKbL8ZccMmwWITPgYJpPoFG6rGfyQiEqMm0sNclU1Y7s/dkxh0CQT W8g42UoACNub4PIFfBLlIiijUX58zqs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1794814282; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u1ukYDs6G6VuUfmsZP+zRpytgH58T0ALVC3YGhPO8j0=; b=hbiOBLB8HdD9eCx28C8bTakCpfwnwNI5MvoFR0YEzBb53z0r+2ThpTGQ31JpnstFg3+bVL T9Oty+1zj8s7mYAg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1794814282; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u1ukYDs6G6VuUfmsZP+zRpytgH58T0ALVC3YGhPO8j0=; b=OowYAJ57UmpKF4i8ukUIrqSiCRSh8RVaqfi84391mO+S2pWtHqhHe3OwA7/o2kaU1IwsAO xr75z211sfQImJUXCHKbL8ZccMmwWITPgYJpPoFG6rGfyQiEqMm0sNclU1Y7s/dkxh0CQT W8g42UoACNub4PIFfBLlIiijUX58zqs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1794814282; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u1ukYDs6G6VuUfmsZP+zRpytgH58T0ALVC3YGhPO8j0=; b=hbiOBLB8HdD9eCx28C8bTakCpfwnwNI5MvoFR0YEzBb53z0r+2ThpTGQ31JpnstFg3+bVL T9Oty+1zj8s7mYAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 68DA413408; Mon, 16 Nov 2026 07:31:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id J98sD0mx+mrDKwAAD6G6ig (envelope-from ); Mon, 16 Nov 2026 07:31:21 +0000 Message-ID: Date: Mon, 16 Nov 2026 08:31:20 +0100 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 12/17] nvme-fc: start error recovery instead of aborting timed out IOs To: Mohamed Khalfella , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Justin Tee , Naresh Gottumukkala , Paul Ely , Hannes Reinecke , Chaitanya Kulkarni , James Smart , Randy Jennings , Daniel Wagner , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org References: <20261114030454.2836543-1-mkhalfella@purestorage.com> <20261114030454.2836543-13-mkhalfella@purestorage.com> Content-Language: en-US From: Hannes Reinecke In-Reply-To: <20261114030454.2836543-13-mkhalfella@purestorage.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-13.29 / 50.00]; SUSE_INTERNAL_BYPASS(-9.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[15]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[broadcom.com,gmail.com,kernel.org,nvidia.com,purestorage.com,suse.de,lists.infradead.org,vger.kernel.org]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,purestorage.com:email] X-Spam-Score: -13.29 X-Spam-Level: X-Spam-Flag: NO On 11/14/26 4:04 AM, Mohamed Khalfella wrote: > Aborts issued from the timeout handler run outside the FCCTRL_TERMIO > window, so they are not counted in ctrl->iocnt and > nvme_fc_delete_association() does not wait for them. The association > can be torn down while the LLDD is still working on the abort. > > Instead of aborting the timed out command, reset the controller like > the other fabrics transports do. The association teardown aborts the > outstanding IOs, counts the aborts and waits for them to complete. > > Count every abort in ctrl->iocnt, not only the ones issued while > FCCTRL_TERMIO is set, and do not reset the count when the teardown > starts. An abort issued before the teardown is then waited for as well. > > Only a LIVE controller starts error recovery. In every other state the > association is being set up, being torn down or already gone, so abort > the timed out command from the timeout handler instead and return > BLK_EH_DONE. The command completes through nvme_fc_fcpio_done() once > the LLDD has finished the abort, and the abort is counted so a teardown > that follows waits for it. This matters for a controller being deleted. > The delete path drains the IOs itself and tears the association down in > nvme_fc_delete_ctrl() once the drain is done, and DELETING cannot move > to RESETTING, so without the abort a timed out IO would hang the drain > against a dead target. > > The new nvme_fc_start_ioerr_recovery() is the common entry point for IO > timeouts, transport errors reported by nvme_fc_fcpio_done(), Disconnect > LS and connectivity loss. It moves the controller to RESETTING and > queues ioerr_work only if that succeeds, so nothing is ever queued on a > controller that is CONNECTING or being deleted. A Disconnect LS or a > transport error received while CONNECTING is resolved when the inflight > request fails, or times out and is aborted. > > ioerr_work still calls nvme_fc_error_recovery(), which returns without > doing anything for a controller that is not LIVE. With the controller > already in RESETTING when the work runs, no recovery takes place yet > and the controller stays in RESETTING. The next patch moves the > recovery into ioerr_work itself and completes the change. > > Link: https://lore.kernel.org/all/20250529214928.2112990-1-mkhalfella@purestorage.com/ > Signed-off-by: Mohamed Khalfella > --- > drivers/nvme/host/fc.c | 66 ++++++++++++++++++++++++++++++------------ > 1 file changed, 47 insertions(+), 19 deletions(-) > > diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c > index 0b9ff50d26ff..c4603be38144 100644 > --- a/drivers/nvme/host/fc.c > +++ b/drivers/nvme/host/fc.c > @@ -227,6 +227,8 @@ static DEFINE_IDA(nvme_fc_ctrl_cnt); > static struct device *fc_udev_device; > > static void nvme_fc_complete_rq(struct request *rq); > +static void nvme_fc_start_ioerr_recovery(struct nvme_fc_ctrl *ctrl, > + char *errmsg); > > /* *********************** FC-NVME Port Management ************************ */ > > @@ -788,7 +790,7 @@ nvme_fc_ctrl_connectivity_loss(struct nvme_fc_ctrl *ctrl) > "Reconnect", ctrl->cnum); > > set_bit(ASSOC_FAILED, &ctrl->flags); > - nvme_reset_ctrl(&ctrl->ctrl); > + nvme_fc_start_ioerr_recovery(ctrl, "Connectivity Loss"); > } > > /** > @@ -1569,7 +1571,8 @@ nvme_fc_ls_disconnect_assoc(struct nvmefc_ls_rcv_op *lsop) > */ > > /* fail the association */ > - nvme_fc_error_recovery(ctrl, "Disconnect Association LS received"); > + nvme_fc_start_ioerr_recovery(ctrl, > + "Disconnect Association LS received"); > > /* release the reference taken by nvme_fc_match_disconn_ls() */ > nvme_fc_ctrl_put(ctrl); > @@ -1813,11 +1816,18 @@ __nvme_fc_abort_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_fcp_op *op) > unsigned long flags; > int opstate; > > + /* > + * Every abort is counted, not only those issued by the association > + * teardown: the teardown waits for iocnt to drop to zero before it > + * deletes the hw queues, and an abort issued earlier, by > + * nvme_fc_timeout() while deleting or by the CONNECTING recovery > + * path, must not still be in progress in the LLDD then. > + */ > spin_lock_irqsave(&ctrl->lock, flags); > opstate = atomic_xchg(&op->state, FCPOP_STATE_ABORTED); > - if (opstate != FCPOP_STATE_ACTIVE) > + if (opstate != FCPOP_STATE_ACTIVE) { > atomic_set(&op->state, opstate); > - else if (test_bit(FCCTRL_TERMIO, &ctrl->flags)) { > + } else { > op->flags |= FCOP_FLAGS_TERMIO; > ctrl->iocnt++; > } > @@ -1856,8 +1866,7 @@ __nvme_fc_fcpop_chk_teardowns(struct nvme_fc_ctrl *ctrl, > > if (opstate == FCPOP_STATE_ABORTED) { > spin_lock_irqsave(&ctrl->lock, flags); > - if (test_bit(FCCTRL_TERMIO, &ctrl->flags) && > - op->flags & FCOP_FLAGS_TERMIO) { > + if (op->flags & FCOP_FLAGS_TERMIO) { > if (!--ctrl->iocnt) > wake_up(&ctrl->ioabort_wait); > } > @@ -1892,6 +1901,19 @@ char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req) > } > EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid); > > +/* > + * Start recovery only if this caller can claim it with a state change. > + */ > +static void > +nvme_fc_start_ioerr_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg) > +{ > + 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); > + queue_work(nvme_reset_wq, &ctrl->ioerr_work); > + } > +} > + > static void > nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) > { > @@ -2049,9 +2071,8 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) > nvme_fc_complete_rq(rq); > > check_error: > - if (terminate_assoc && > - nvme_ctrl_state(&ctrl->ctrl) != NVME_CTRL_RESETTING) > - queue_work(nvme_reset_wq, &ctrl->ioerr_work); > + if (terminate_assoc) > + nvme_fc_start_ioerr_recovery(ctrl, "io error"); > } > > static int > @@ -2548,24 +2569,32 @@ static enum blk_eh_timer_return nvme_fc_timeout(struct request *rq) > struct nvme_fc_cmd_iu *cmdiu = &op->cmd_iu; > struct nvme_command *sqe = &cmdiu->sqe; > > - /* > - * Attempt to abort the offending command. Command completion > - * will detect the aborted io and will fail the connection. > - */ > dev_info(ctrl->ctrl.device, > "NVME-FC{%d.%d}: io timeout: opcode %d fctype %d (%s) w10/11: " > "x%08x/x%08x\n", > ctrl->cnum, qnum, sqe->common.opcode, sqe->fabrics.fctype, > nvme_fabrics_opcode_str(qnum, sqe), > sqe->common.cdw10, sqe->common.cdw11); > - if (__nvme_fc_abort_op(ctrl, op)) > - nvme_fc_error_recovery(ctrl, "io timeout abort failed"); > + > + if (nvme_ctrl_state(&ctrl->ctrl) != NVME_CTRL_LIVE) { > + /* > + * The association is being set up, being torn down or is > + * already gone, so recovery cannot be started from here. > + * Abort the command so the connect or teardown it would > + * block can make progress. It completes through > + * nvme_fc_fcpio_done() once the LLDD has finished the > + * abort, and the abort is counted so a teardown that > + * follows waits for it. > + */ > + __nvme_fc_abort_op(ctrl, op); > + return BLK_EH_DONE; > + } Nit: With this change __nvme_fc_abort_op() can be made a void function as every caller is ignoring the return value. > > /* > - * the io abort has been initiated. Have the reset timer > - * restarted and the abort completion will complete the io > - * shortly. Avoids a synchronous wait while the abort finishes. > + * A LIVE controller starts error recovery, which tears the > + * association down and completes this request. > */ > + nvme_fc_start_ioerr_recovery(ctrl, "io timeout"); > return BLK_EH_RESET_TIMER; > } > > @@ -3217,7 +3246,6 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) > > spin_lock_irqsave(&ctrl->lock, flags); > set_bit(FCCTRL_TERMIO, &ctrl->flags); > - ctrl->iocnt = 0; > spin_unlock_irqrestore(&ctrl->lock, flags); > > __nvme_fc_abort_outstanding_ios(ctrl, false); Otherwise looks good. Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich