From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 A428418622 for ; Tue, 19 Dec 2023 11:43:49 +0000 (UTC) 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 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 E48B51FD54; Tue, 19 Dec 2023 11:43:47 +0000 (UTC) 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 963EA1375D; Tue, 19 Dec 2023 11:43:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id Otm0IfOBgWURNwAAD6G6ig (envelope-from ); Tue, 19 Dec 2023 11:43:47 +0000 Message-ID: <662c46d9-d342-47c3-9048-9d73d8e745a5@suse.de> Date: Tue, 19 Dec 2023 12:43:46 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 15/16] nvmet-fc: avoid deadlock on delete association path Content-Language: en-US To: Daniel Wagner , linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Christoph Hellwig , Sagi Grimberg , Keith Busch , James Smart References: <20231218153105.12717-1-dwagner@suse.de> <20231218153105.12717-16-dwagner@suse.de> From: Hannes Reinecke In-Reply-To: <20231218153105.12717-16-dwagner@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spam-Level: Authentication-Results: smtp-out2.suse.de; none X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[] X-Spam-Score: -4.00 X-Rspamd-Queue-Id: E48B51FD54 X-Spam-Flag: NO On 12/18/23 16:31, Daniel Wagner wrote: > When deleting an association the shutdown path is deadlocking because we > try to flush the nvmet_wq nested. Avoid this by deadlock by deferring > the put work into its own work item. > Maybe deleting the first 'by' ? > Signed-off-by: Daniel Wagner > --- > drivers/nvme/target/fc.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c > index 23d8779dc221..30ba4ede333f 100644 > --- a/drivers/nvme/target/fc.c > +++ b/drivers/nvme/target/fc.c > @@ -111,6 +111,8 @@ struct nvmet_fc_tgtport { > struct nvmet_fc_port_entry *pe; > struct kref ref; > u32 max_sg_cnt; > + > + struct work_struct put_work; > }; > > struct nvmet_fc_port_entry { > @@ -243,6 +245,13 @@ static LIST_HEAD(nvmet_fc_portentry_list); > > static void nvmet_fc_handle_ls_rqst_work(struct work_struct *work); > static void nvmet_fc_fcp_rqst_op_defer_work(struct work_struct *work); > +static void nvmet_fc_put_tgtport_work(struct work_struct *work) > +{ > + struct nvmet_fc_tgtport *tgtport = > + container_of(work, struct nvmet_fc_tgtport, put_work); > + > + nvmet_fc_tgtport_put(tgtport); > +} > static void nvmet_fc_tgt_a_put(struct nvmet_fc_tgt_assoc *assoc); > static int nvmet_fc_tgt_a_get(struct nvmet_fc_tgt_assoc *assoc); > static void nvmet_fc_tgt_q_put(struct nvmet_fc_tgt_queue *queue); > @@ -359,7 +368,7 @@ __nvmet_fc_finish_ls_req(struct nvmet_fc_ls_req_op *lsop) > > if (!lsop->req_queued) { > spin_unlock_irqrestore(&tgtport->lock, flags); > - nvmet_fc_tgtport_put(tgtport); > + queue_work(nvmet_wq, &tgtport->put_work); > return; > } > > @@ -373,7 +382,7 @@ __nvmet_fc_finish_ls_req(struct nvmet_fc_ls_req_op *lsop) > (lsreq->rqstlen + lsreq->rsplen), > DMA_BIDIRECTIONAL); > > - nvmet_fc_tgtport_put(tgtport); > + queue_work(nvmet_wq, &tgtport->put_work); > } > > static int > @@ -1402,6 +1411,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo, > kref_init(&newrec->ref); > ida_init(&newrec->assoc_cnt); > newrec->max_sg_cnt = template->max_sgl_segments; > + INIT_WORK(&newrec->put_work, nvmet_fc_put_tgtport_work); > > ret = nvmet_fc_alloc_ls_iodlist(newrec); > if (ret) { Otherwise: Reviewed-by: Hannes Reinecke Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Ivo Totev, Andrew McDonald, Werner Knoblich