From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4AA6E7719F for ; Mon, 13 Jan 2025 12:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=gUsC2VhDxyFzzWal8KmLNhRlJylRZmKMxyZX05FpXTA=; b=nLwLY3w/DAvxwlylGysbWRcxl8 R30k67FDbnyDAfmSAGJn1OSkJs+oLgCNVDBK/jH1Xg9CEL9NaOK0iBqM7ZvyvHKxiYdYu1SnssacX ml9kpYhqW0VaL7p165bWkqX4HSfVPUkTx2Zeyx4dOAQ/zuN8ekQ0wEXBkb391M7G8d+09k7K1nI0w ubpYjWVH1yA5VY79UcWHvHPfqZoPMyrObnr9BdxxdjKHM9zaLxldGbjHNAoEg7smyTFO3WenQdVZG ynhEkX2T0eBvduQ6WuhNPbfN0PuMri16IE9lilUxkshSEkD8/7g3bzk0/TtF/dOKVqE21MhQyI9+y dgKY0EMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tXJqH-000000059D7-1twO; Mon, 13 Jan 2025 12:46:53 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tXJoU-000000058uY-49EL for linux-nvme@lists.infradead.org; Mon, 13 Jan 2025 12:45:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736772301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUsC2VhDxyFzzWal8KmLNhRlJylRZmKMxyZX05FpXTA=; b=O+SMRqWVobc4HTYaZs6QHxsCqF3TjiA4STK5g1BCu64K2+X+TR4Bv1wfsldkY3E1LPwCgs c/L2Wy/GKHGHxEVjVqxH9Ig6ngGTcj5DkMLP8Ac4Qv24qAa8urj4cxIscHGDSOKAhGv9Gh ERKFCOlDzUvJNINk5ACHwzxXEsyHUHg= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-l0mn_0blOjiYYpv38AhPvA-1; Mon, 13 Jan 2025 07:44:58 -0500 X-MC-Unique: l0mn_0blOjiYYpv38AhPvA-1 X-Mimecast-MFC-AGG-ID: l0mn_0blOjiYYpv38AhPvA Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5CADC19560A3; Mon, 13 Jan 2025 12:44:57 +0000 (UTC) Received: from localhost (unknown [10.72.116.4]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E5355195E3D9; Mon, 13 Jan 2025 12:44:55 +0000 (UTC) From: Ming Lei To: Christoph Hellwig , Keith Busch , linux-nvme@lists.infradead.org Cc: Ming Lei , Marco Patalano , Ewan Milne , James Smart , Sagi Grimberg Subject: [RFC PATCH] nvme-fc: move tagset removal to nvme_fc_delete_ctrl() Date: Mon, 13 Jan 2025 20:44:46 +0800 Message-ID: <20250113124446.830697-1-ming.lei@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xItHXGE6EKLXbhyERQeboKUxXW--Galsft4bCAj1-hw_1736772297 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250113_044503_092918_C22440D9 X-CRM114-Status: GOOD ( 14.16 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Now target is removed from nvme_fc_ctrl_free() which is the ctrl->ref release handler. And even admin queue is unquiesced there, this way is definitely wrong because the ctr->ref is grabbed when submitting command. And Marco observed that nvme_fc_ctrl_free() can be called from request completion code path, and trigger kernel warning since request completes from softirq context. Fix the issue by moveing target removal into nvme_fc_delete_ctrl(), which is also aligned with nvme-tcp and nvme-rdma. Cc: Marco Patalano Cc: Ewan Milne Cc: James Smart Cc: Sagi Grimberg Signed-off-by: Ming Lei --- drivers/nvme/host/fc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index b81af7919e94..b94b4e50a3df 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2389,17 +2389,11 @@ nvme_fc_ctrl_free(struct kref *ref) container_of(ref, struct nvme_fc_ctrl, ref); unsigned long flags; - if (ctrl->ctrl.tagset) - nvme_remove_io_tag_set(&ctrl->ctrl); - /* remove from rport list */ spin_lock_irqsave(&ctrl->rport->lock, flags); list_del(&ctrl->ctrl_list); spin_unlock_irqrestore(&ctrl->rport->lock, flags); - nvme_unquiesce_admin_queue(&ctrl->ctrl); - nvme_remove_admin_tag_set(&ctrl->ctrl); - kfree(ctrl->queues); put_device(ctrl->dev); @@ -3288,6 +3282,13 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl) cancel_work_sync(&ctrl->ioerr_work); cancel_delayed_work_sync(&ctrl->connect_work); + + if (ctrl->ctrl.tagset) + nvme_remove_io_tag_set(&ctrl->ctrl); + + nvme_unquiesce_admin_queue(&ctrl->ctrl); + nvme_remove_admin_tag_set(&ctrl->ctrl); + /* * kill the association on the link side. this will block * waiting for io to terminate -- 2.47.0