From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 31523395D98 for ; Sat, 20 Jun 2026 15:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781970794; cv=none; b=okPz/A7ZbldginPVaux/DrxIkardqhf5xW4vnudxegAFZ+yOGri5IwfvYFBVE0GFJPAv4rGaupC+kjEywYXAEto9KKcMit/Lh+HKSHL4kLzThj/mt1WkMYtqDA5JY0mkGA/Wu46FDB3JSEG1vpcNR58N6A8tjo2xosrctu15Id4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781970794; c=relaxed/simple; bh=nUEOUJPcMM6F3ojO7jNZx+tzFDczA+xoIvOWV0cS0sU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=t8JQrLjYhlQy6JO8H+UdLknIJ+vQz+pVoSQ88b/Gh7C3//vdAhyyo7VOL/epA1BVBHDxrR6AY26U19b8G5YORvrSTho+VyzH6+Z6VKGhs/0oL2qSPWPRQIdkCYtFgxoLfY24vsmAM6KGuXzDgS2j/STeXeXw7cqXbiL50I+Nu2E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gbSrojJT; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gbSrojJT" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-84236f9b638so1361687b3a.2 for ; Sat, 20 Jun 2026 08:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781970792; x=1782575592; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MreWZ5YlOFE+/jjPmoYRzaFL7VfpWqK9ApPBCskwOcE=; b=gbSrojJTO7ENL7G33ZVziN72C/F0u+Jy74tyRcEUeJmxtk8gzZTLEWdnK9FKaskjkw eIBrws5lTP+S6T87nkLkh1rPGpJa6MVHEyr0JhnFBGtinUZwwdTKzKtW7QYzRStQEO80 xfvaoPsGb2Q8mQ2tnOWW0zZoohjjswRx5WaT3dWgv9yBFt72cb+scfZCyexhIUop7v2q VcOK3wW/xD9zUZNlzLW7wJXc8iINq+iwnQEqiStgtxtYuZjQRm/00xF3Viatu4IANRTM jz3yF9QJTc/VEWkTR5csBY67CfcJHH1ib4yoROIAwLBLd0bg9T98i1XFOmpIXdZD7hKH woXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781970792; x=1782575592; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MreWZ5YlOFE+/jjPmoYRzaFL7VfpWqK9ApPBCskwOcE=; b=g5Wab7ordShJxFpRecqPp82OTxnI7rnsxw/JBbtRdpEZoMtSkwIxS8RcdMpB9a0MWZ 7Qxp0zelP7OMH7cJi3HL1zxgctKOFcg50/qnOxHgkqMWSBEc3uUaYcUec2si1YdlIJtF DEbjZHOhutjnh3FznaqwjlTjDy2o6ym5EP9CVun6UcgwDB/UG2kD1JwCNbraq4ee6ELb CcB0VSGohYAOHmxP7c3c/8ZpLpJGHswLSxkAZd206QTmu4A40E+0HWZzURMjTp7KKeJz 8uiPHrnBdi5QRruDiufUUiDfhpD42eJ+weK5wTUtskUnErED0QLTn4K+wy7CQ5gmLwiq 0nMA== X-Forwarded-Encrypted: i=1; AFNElJ8AFOqZ5s5hU1hAA1k/09Yt/ZEAzzo5TTtlQus14+/w48nkEbfp7GPh54AMCSwFNFcxF6GGw2TE6bxJI7s=@vger.kernel.org X-Gm-Message-State: AOJu0YwqPljevSAqIGV1kquK5AwlY0qwQk0BTDZsuQNO3bMvXG8QFRe7 BSTZuatyBA8rbEjwK0abtKI7KaMsJ/c8GzTPncibGB2CBLalUrv9d6Ewj762sKRwjyQ= X-Gm-Gg: AfdE7ckx/wur4fY2mak4RUZGZclw5kv5zKweM3EL9S3tgDH5WnVSd2EGDcKcqP3k/O1 /fKSlKo125mTELftDQw8+jR+6+yGwXw+TUQqxP9yX7JjBCCUCU1djVrvRzidT9gzkqSQDcHV0un d/BPtAZP5RcBidCuE/KyAmtTAEW6Q4ITZzChs1fR3xeA1hr4XPQXj7Pl3ncGrbEkssP6b0EXWLj 9B5XL3IiHgwH5tuLrXyX3LmQDDk+1slyTAVHwscXZO3Y/jTkFKFlYIn5c3JRHSDbpcrDf/P82OU Fhx0oFiL0VR/eiC+ccHqyj5ShnXzAgFnVwAh9wAAfQIg7ZEmmfYqUxtLQTlH+btMykdwZG1ML73 q1tP9l7rXmyjfckMXSjvBZYwoVneQrotlJFiFVrHIQEWWypWOXd38FrmQwRvaj1Wje7XqO/BV3I tJ+VB4wa8/OGeEm04EUqz4Ew4eFxh9M8HA X-Received: by 2002:a05:6a00:94f6:b0:842:5a8d:3036 with SMTP id d2e1a72fcca58-845508aeb2dmr8960456b3a.35.1781970792330; Sat, 20 Jun 2026 08:53:12 -0700 (PDT) Received: from haichao.tail057a43.ts.net ([2001:da8:e000:1206:8e0e:956e:b09c:23cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84564d8cd9csm2489413b3a.21.2026.06.20.08.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jun 2026 08:53:12 -0700 (PDT) From: Ruoyu Wang To: Bernard Metzler , Jason Gunthorpe , Leon Romanovsky Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Ruoyu Wang Subject: [PATCH] RDMA/siw: publish QP after initialization Date: Sat, 20 Jun 2026 23:53:06 +0800 Message-ID: <20260620155306.78919-1-ruoyuw560@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit siw_create_qp() allocates a QP number before the queues, CQ pointers, state, completion, and device list entry are ready. A QPN lookup can therefore reach a QP that is still being constructed if the object is published at allocation time. Reserve the QPN with an empty XArray entry first. Publish the QP object only after the kernel-visible QP state is initialized and just before siw_create_qp() returns it to the caller. Fixes: f29dd55b0236 ("rdma/siw: queue pair methods") Signed-off-by: Ruoyu Wang --- drivers/infiniband/sw/siw/siw.h | 1 + drivers/infiniband/sw/siw/siw_qp.c | 26 ++++++++++++++++++-------- drivers/infiniband/sw/siw/siw_verbs.c | 12 +++++++++++- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/siw.h index f5fd71717b80..ade7c96135c2 100644 --- a/drivers/infiniband/sw/siw/siw.h +++ b/drivers/infiniband/sw/siw/siw.h @@ -511,6 +511,7 @@ void siw_send_terminate(struct siw_qp *qp); void siw_qp_get_ref(struct ib_qp *qp); void siw_qp_put_ref(struct ib_qp *qp); int siw_qp_add(struct siw_device *sdev, struct siw_qp *qp); +int siw_qp_publish(struct siw_qp *qp); void siw_free_qp(struct kref *ref); void siw_init_terminate(struct siw_qp *qp, enum term_elayer layer, diff --git a/drivers/infiniband/sw/siw/siw_qp.c b/drivers/infiniband/sw/siw/siw_qp.c index bb780e3904a2..1a9135d9a2a7 100644 --- a/drivers/infiniband/sw/siw/siw_qp.c +++ b/drivers/infiniband/sw/siw/siw_qp.c @@ -1281,15 +1281,25 @@ void siw_rq_flush(struct siw_qp *qp) int siw_qp_add(struct siw_device *sdev, struct siw_qp *qp) { - int rv = xa_alloc(&sdev->qp_xa, &qp->base_qp.qp_num, qp, xa_limit_32b, - GFP_KERNEL); + qp->sdev = sdev; - if (!rv) { - kref_init(&qp->ref); - qp->sdev = sdev; - siw_dbg_qp(qp, "new QP\n"); - } - return rv; + return xa_alloc(&sdev->qp_xa, &qp->base_qp.qp_num, NULL, + xa_limit_32b, GFP_KERNEL); +} + +int siw_qp_publish(struct siw_qp *qp) +{ + void *old; + + kref_init(&qp->ref); + + old = xa_store(&qp->sdev->qp_xa, qp_id(qp), qp, GFP_KERNEL); + if (xa_is_err(old)) + return xa_err(old); + + siw_dbg_qp(qp, "new QP\n"); + + return 0; } void siw_free_qp(struct kref *ref) diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c index 1e1d262a4ae2..71bc0cc59e3d 100644 --- a/drivers/infiniband/sw/siw/siw_verbs.c +++ b/drivers/infiniband/sw/siw/siw_verbs.c @@ -482,14 +482,24 @@ int siw_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attrs, goto err_out_xa; } INIT_LIST_HEAD(&qp->devq); + init_completion(&qp->qp_free); + spin_lock_irqsave(&sdev->lock, flags); list_add_tail(&qp->devq, &sdev->qp_list); spin_unlock_irqrestore(&sdev->lock, flags); - init_completion(&qp->qp_free); + rv = siw_qp_publish(qp); + if (rv) + goto err_out_list; return 0; +err_out_list: + spin_lock_irqsave(&sdev->lock, flags); + list_del(&qp->devq); + spin_unlock_irqrestore(&sdev->lock, flags); + + siw_put_tx_cpu(qp->tx_cpu); err_out_xa: xa_erase(&sdev->qp_xa, qp_id(qp)); if (uctx) {