From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD22C2E1C7C; Tue, 31 Mar 2026 17:02:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976574; cv=none; b=IpImuJKjZcDeonk8OLvavkVIvU3KbVk0WoiDv8ONY63GMlP+WiguUpLjMWB8fl/2nVMJTcuGRPUAlmeXRtozG8X4LQjUfXQfebqPPde8hjCe6EQfSQ4uWShkG7m/e0R9smbbb0ZlwRbi/YugrTqdx+opKlOHk5eI1g4uk5FAb0I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976574; c=relaxed/simple; bh=8Of7Vd0qWjpfJTXOkaeYLbccWI78DLHwKLVGjavMaY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G8AbUH871QW99E5aZj9VBU+pxs5C1d0dosZi8AH9MggqOSO+a2o9mqP2P/LE1tuIEsEWfdwOkApa6uS8Ydw+18npYRM+JKxiHekeKcWY9oEMLrGyvpt6nodIHUcgd7WCzql8IMvjxkV9gpd2qoDJCW055nJ1Gz0z0y7im1bKcfU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nnpFknze; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nnpFknze" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63F8BC19423; Tue, 31 Mar 2026 17:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774976574; bh=8Of7Vd0qWjpfJTXOkaeYLbccWI78DLHwKLVGjavMaY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nnpFknzeP94+kf71CJ/L9ZOUUGF69ZjNhRYycat3m0QRDoTc1J60s6fnE389CdYsW jgQ+O/TbJOsI7GvDqnY1kisjVTDgE+UuRRv8FcHeqUlc0ZvOgUxtTrGTKJMqOrItnC HZsGYH2KRkMbNSJOKcrqVfns5rMkpe39webAXAH0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Anil Samal , Tatyana Nikolova , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.18 146/309] RDMA/irdma: Fix deadlock during netdev reset with active connections Date: Tue, 31 Mar 2026 18:20:49 +0200 Message-ID: <20260331161758.845991244@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161753.468533260@linuxfoundation.org> References: <20260331161753.468533260@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anil Samal [ Upstream commit 6f52370970ac07d352a7af4089e55e0e6425f827 ] Resolve deadlock that occurs when user executes netdev reset while RDMA applications (e.g., rping) are active. The netdev reset causes ice driver to remove irdma auxiliary driver, triggering device_delete and subsequent client removal. During client removal, uverbs_client waits for QP reference count to reach zero while cma_client holds the final reference, creating circular dependency and indefinite wait in iWARP mode. Skip QP reference count wait during device reset to prevent deadlock. Fixes: c8f304d75f6c ("RDMA/irdma: Prevent QP use after free") Signed-off-by: Anil Samal Signed-off-by: Tatyana Nikolova Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/irdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c index ed2f985a35408..c77d6d0eafdec 100644 --- a/drivers/infiniband/hw/irdma/verbs.c +++ b/drivers/infiniband/hw/irdma/verbs.c @@ -558,7 +558,8 @@ static int irdma_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) } irdma_qp_rem_ref(&iwqp->ibqp); - wait_for_completion(&iwqp->free_qp); + if (!iwdev->rf->reset) + wait_for_completion(&iwqp->free_qp); irdma_free_lsmm_rsrc(iwqp); irdma_cqp_qp_destroy_cmd(&iwdev->rf->sc_dev, &iwqp->sc_qp); -- 2.53.0