From nobody Thu Apr 2 22:08:38 2026 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 6921E3596E4; Fri, 13 Feb 2026 11:02:01 +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=1770980521; cv=none; b=X2IWbTQWBeeER8Nq5rETZN3TG+skYoM+zP4etYcp+9hawUmPkiVw3grGmPS6XTbSYwLIaqq9cED1eLivnbUeTzq7zMQr4agU7j0QLBdmqtW8aoj6sDeWEq2r6teeAKeohC/KrZMRIYtrz9DqijAJ5k5dTu/MmUG4Dd4fZMwUG+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770980521; c=relaxed/simple; bh=46FOhXy82s7WTWz6+l85BPMRthsUy90zX4MlVpe3m6w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Cne7TwDsO/PcFPcTirSsxcYwZ8y+90dc4kBD5h5VLeS6FL6CAXb808B+HarxY3sh5neJvkLbsU3CYpbf4pisdwqROn/oiZsjHYLytvaX0mJYJIz7tzxf5t/Rgkt8VMeB32XUMOCSaDp1osc6X/K/JQ7tssapJiXiQLi+BEq6k+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mFbKbfqu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mFbKbfqu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FA60C116C6; Fri, 13 Feb 2026 11:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770980521; bh=46FOhXy82s7WTWz6+l85BPMRthsUy90zX4MlVpe3m6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFbKbfqudf4zer/t7PIEGz2aaHZV/Rfc7eXOFwMRdcf5T243TjgDF6GAKPJNx2DQx mbdU8jSd+n2nLYbqzOt1vi/+NuWS6MY2PI0vG0rm5fhM3mq7Q3uTvoRFX29OeFqI2e Dq7uOZRHqAwrC+7oaeCIqDF6wcbr8sMhfiwBzQF+rW5L/b4vNQY78iPvw2yFRHrBbw kVtuKgwFot52fCK8DF+k3q3iAbRz8bL0//Ucp6sCKVq06Ba/nX1lI6CNM8ChReYcNi LAxNRUOLuXadHun8HBVM0M2S3i+Ph3DTCs2ApGBKWZweeT1gdp4HqwXdPAP9RV99tB tjAiuscfqHbLA== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Selvin Xavier , Kalesh AP , Potnuri Bharat Teja , Michael Margolin , Gal Pressman , Yossi Leybovich , Cheng Xu , Kai Shen , Chengchang Tang , Junxian Huang , Abhijit Gangurde , Allen Hubbe , Krzysztof Czurylo , Tatyana Nikolova , Long Li , Konstantin Taranov , Yishai Hadas , Michal Kalderon , Bryan Tan , Vishnu Dasa , Broadcom internal kernel review list , Christian Benvenuti , Nelson Escobar , Dennis Dalessandro , Bernard Metzler , Zhu Yanjun Cc: linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: [PATCH rdma-next 50/50] RDMA/mthca: Use generic resize-CQ lock Date: Fri, 13 Feb 2026 12:58:26 +0200 Message-ID: <20260213-refactor-umem-v1-50-f3be85847922@nvidia.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213-refactor-umem-v1-0-f3be85847922@nvidia.com> References: <20260213-refactor-umem-v1-0-f3be85847922@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev-47773 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky Replace the open=E2=80=91coded resize=E2=80=91CQ lock with the standard core implementation for better consistency and maintainability. Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mthca/mthca_cq.c | 1 - drivers/infiniband/hw/mthca/mthca_provider.c | 20 ++++++-------------- drivers/infiniband/hw/mthca/mthca_provider.h | 1 - 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw= /mthca/mthca_cq.c index 26c3408dcaca..9c15e9b886d1 100644 --- a/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/drivers/infiniband/hw/mthca/mthca_cq.c @@ -819,7 +819,6 @@ int mthca_init_cq(struct mthca_dev *dev, int nent, spin_lock_init(&cq->lock); cq->refcount =3D 1; init_waitqueue_head(&cq->wait); - mutex_init(&cq->mutex); =20 memset(cq_context, 0, sizeof *cq_context); cq_context->flags =3D cpu_to_be32(MTHCA_CQ_STATUS_OK | diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infinib= and/hw/mthca/mthca_provider.c index 85de004547ab..cb94d73e89d6 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c @@ -680,28 +680,20 @@ static int mthca_resize_cq(struct ib_cq *ibcq, unsign= ed int entries, if (entries > dev->limits.max_cqes) return -EINVAL; =20 - mutex_lock(&cq->mutex); - entries =3D roundup_pow_of_two(entries + 1); - if (entries =3D=3D ibcq->cqe + 1) { - ret =3D 0; - goto out; - } + if (entries =3D=3D ibcq->cqe + 1) + return 0; =20 - if (ib_copy_from_udata(&ucmd, udata, sizeof ucmd)) { - ret =3D -EFAULT; - goto out; - } + if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) + return -EFAULT; lkey =3D ucmd.lkey; =20 ret =3D mthca_RESIZE_CQ(dev, cq->cqn, lkey, ilog2(entries)); if (ret) - goto out; + return ret; =20 ibcq->cqe =3D entries - 1; -out: - mutex_unlock(&cq->mutex); - return ret; + return 0; } =20 static int mthca_destroy_cq(struct ib_cq *cq, struct ib_udata *udata) diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infinib= and/hw/mthca/mthca_provider.h index 8a77483bb33c..7797d76fb93d 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.h +++ b/drivers/infiniband/hw/mthca/mthca_provider.h @@ -198,7 +198,6 @@ struct mthca_cq { int arm_sn; =20 wait_queue_head_t wait; - struct mutex mutex; }; =20 struct mthca_srq { --=20 2.52.0