From nobody Sat Feb 7 18:28:57 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 0B68930E831; Sun, 4 Jan 2026 13:51:53 +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=1767534714; cv=none; b=kC0q0w1pY2D4+cW118iVfDtIpdxB8AGLSFmWtmEOxbOWcvKErA45HP3L4zmvcNULNT7DnaDiNPqxZnkIKPpItKcPQ3NDzB6RTBgCeQ+1KpwwqZT7HeraW5/vZH3dx2TIpbpagAo3VQ/PcGrqT565OFWsQ5X2DK4ZQDHWLB8gQJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534714; c=relaxed/simple; bh=EeZQUbk7mszSUq49dnmxH/p0FndUizzKMzIynzr0iz4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qRN9a4Ul5U/m9u5PSqA/hx0eV6pcRkOv65l48SM2LDblUpT6ekvys8GqXuX1EEQG53Do9mXvvjBisLtnPCiziyfoOkDBprLYrS+hNNOzr7MPO4hYQXbk4arxjAW2Ef6c7ctKxGdhSpV2+lhLk6MxETysY9VKsjHmlBcdF73BUNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GyQdDSyu; 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="GyQdDSyu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3D8AC19422; Sun, 4 Jan 2026 13:51:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534713; bh=EeZQUbk7mszSUq49dnmxH/p0FndUizzKMzIynzr0iz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GyQdDSyuC1YAO481SXcqr5pC/JPW/Cw1nrI/C3LjcRoHz03+y7DIXPhkBhB5c2VIz 74an+Et9bXf3miz1DiCL/YiTgLWXG++tAZV7C9stH/qdOLXeFdpPFTy0zGZJ8zKSgJ HJwqNliVR/P1ltwrHhQ7UADD4/xVN04IaW07eL4DCrTQ/bGQzrUieS+wsp2TQWPvjL UzzH/j2BLxd+YNlRvn+4KmrVdhlLhoaI82f1C53YzJCzRcPbpNuYzxQP4OtxpnwDcA 2xHxjWivrcyVmEqFhmSsfd1l2KVqi4cO/b3AE4gyeR/jNRis4KhXrjOpf/V++bB48W D29zNnHeeHpUA== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next 1/6] RDMA/umem: Remove redundant DMABUF ops check Date: Sun, 4 Jan 2026 15:51:33 +0200 Message-ID: <20260104-ib-core-misc-v1-1-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky ib_umem_dmabuf_get_with_dma_device() is an in-kernel function and does not require a defensive check for the .move_notify callback. All current callers guarantee that this callback is always present. Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP --- drivers/infiniband/core/umem_dmabuf.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/infiniband/core/umem_dmabuf.c b/drivers/infiniband/cor= e/umem_dmabuf.c index 0ec2e4120cc9..939da49b0dcc 100644 --- a/drivers/infiniband/core/umem_dmabuf.c +++ b/drivers/infiniband/core/umem_dmabuf.c @@ -129,9 +129,6 @@ ib_umem_dmabuf_get_with_dma_device(struct ib_device *de= vice, if (check_add_overflow(offset, (unsigned long)size, &end)) return ret; =20 - if (unlikely(!ops || !ops->move_notify)) - return ret; - dmabuf =3D dma_buf_get(fd); if (IS_ERR(dmabuf)) return ERR_CAST(dmabuf); --=20 2.52.0 From nobody Sat Feb 7 18:28:57 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 D2C07238159; Sun, 4 Jan 2026 13:52:05 +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=1767534728; cv=none; b=TZbT3q11LUTZxUMd6Rg9fRIux5Gn741UkYEc1wLM81P8+fiUgiNRw/j5VLIFfWWbITOLsCjG3ILtUkNTgylzoj+09h4T6Zm0Tf6oUGcQ4mf3OcAk6xZS9BB38tZrWAcSvFmMBgW5RBF5P9AEE1+KFXmN7sc2FXSkTz5B0lihu10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534728; c=relaxed/simple; bh=Sqsm7E4FnC30GhaI3axA8ZSOLdQDpG9lmUCjOyWWT5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hg28kL+zNbTBcfRVikPKHD1RJFgC5hV9klm/TVlyVbNtZua8kZehTzDE0aW8exCPwTVRnoRcIg8TohesDkXoDpQwKJRhpaIuEUAZjffRYuIiLLLYWP/PxWjDIIvuu5cdp10lBhx38Nc+fO0Mz4iGvJg/idBi4PgqVnktkGqiMMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J6BDGzwS; 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="J6BDGzwS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFB89C19422; Sun, 4 Jan 2026 13:52:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534725; bh=Sqsm7E4FnC30GhaI3axA8ZSOLdQDpG9lmUCjOyWWT5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J6BDGzwSXiyN63U+jblrpW7KqdC4QKxBCmYJGo0tMn/FR9F91qDY0i7m2itqhNeP3 bNRMxQNG7+bAzaxDLnCQRaw78sQRSsdD2OOE8SU72XuZKuQhY5sEXEsD5jndiOvUvx v8qqjpHCN1hCAbBTb5vt9pWkLU6t87RKbXwi47bAk9gXPhqm9iHckc9RjOEmyXo/Iv TfU4vERYrb1yVlqsw+Wvq3JnXAf5Vmh/wGzrPGmohjsHmONiik0OPqrciMDXNj9bAk JvyLHkvaH4DbPN/cai9/DJk7bnOHpKMW7/tOoYln1G2AYkMdCum7+MfmcEXeSuFVDe rc5eaJr+XJvhQ== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Parav Pandit Subject: [PATCH rdma-next 2/6] RDMA/core: Avoid exporting module local functions and remove not-used ones Date: Sun, 4 Jan 2026 15:51:34 +0200 Message-ID: <20260104-ib-core-misc-v1-2-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Parav Pandit Some of the functions are local to the module and some are not used starting from commit 36783dec8d79 ("RDMA/rxe: Delete deprecated module parameters interface"). Delete and avoid exporting them. Signed-off-by: Parav Pandit Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP Reviewed-by: Zhu Yanjun --- drivers/infiniband/core/device.c | 30 ------------------------------ include/rdma/ib_verbs.h | 2 -- 2 files changed, 32 deletions(-) diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/dev= ice.c index 13e8a1714bbd..0b0efa9d93aa 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -361,34 +361,6 @@ static struct ib_device *__ib_device_get_by_name(const= char *name) return NULL; } =20 -/** - * ib_device_get_by_name - Find an IB device by name - * @name: The name to look for - * @driver_id: The driver ID that must match (RDMA_DRIVER_UNKNOWN matches = all) - * - * Find and hold an ib_device by its name. The caller must call - * ib_device_put() on the returned pointer. - */ -struct ib_device *ib_device_get_by_name(const char *name, - enum rdma_driver_id driver_id) -{ - struct ib_device *device; - - down_read(&devices_rwsem); - device =3D __ib_device_get_by_name(name); - if (device && driver_id !=3D RDMA_DRIVER_UNKNOWN && - device->ops.driver_id !=3D driver_id) - device =3D NULL; - - if (device) { - if (!ib_device_try_get(device)) - device =3D NULL; - } - up_read(&devices_rwsem); - return device; -} -EXPORT_SYMBOL(ib_device_get_by_name); - static int rename_compat_devs(struct ib_device *device) { struct ib_core_device *cdev; @@ -2875,7 +2847,6 @@ int ib_add_sub_device(struct ib_device *parent, =20 return ret; } -EXPORT_SYMBOL(ib_add_sub_device); =20 int ib_del_sub_device_and_put(struct ib_device *sub) { @@ -2894,7 +2865,6 @@ int ib_del_sub_device_and_put(struct ib_device *sub) =20 return 0; } -EXPORT_SYMBOL(ib_del_sub_device_and_put); =20 #ifdef CONFIG_INFINIBAND_VIRT_DMA int ib_dma_virt_map_sg(struct ib_device *dev, struct scatterlist *sg, int = nents) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 6aad66bc5dd7..e92bf2e44fd8 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -4545,8 +4545,6 @@ static inline bool ib_device_try_get(struct ib_device= *dev) void ib_device_put(struct ib_device *device); struct ib_device *ib_device_get_by_netdev(struct net_device *ndev, enum rdma_driver_id driver_id); -struct ib_device *ib_device_get_by_name(const char *name, - enum rdma_driver_id driver_id); struct net_device *ib_get_net_dev_by_params(struct ib_device *dev, u32 por= t, u16 pkey, const union ib_gid *gid, const struct sockaddr *addr); --=20 2.52.0 From nobody Sat Feb 7 18:28:57 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 2987C30DED4; Sun, 4 Jan 2026 13:51:57 +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=1767534718; cv=none; b=Py3PMwZfatgsg4nedEJQUhyn3c1a62hisxDINoZbHKAVjW2M+yo2l+IPQrNf8Toe4y4ZJqRriWj07UP44bqxurZmtRrTB+XaDe7q17K9UvlsH4o44KYlFonDnnp7CZZuzFEBVcH72pwB/WFBoJGDfEgdo5kz9Z/uU42Q2JX95aA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534718; c=relaxed/simple; bh=zyQCc/ionfSra2OR43YGpjX2gNO3Y7Zq64wRAGZWgRw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QPwKBH5e65JE6gfCGRIEt9XO41AAcnwxy2hcpLlsqpmFqYDfkj1lJetlHZZW4Z2yXsJh1Blo8lv9vg098RO6h5VgThHd1J/O8DI3lJfMAKWjOEZaYeZiIlMWmA3hFCwREsys33Tc851lgTbKRRYZA94KRbKN72EyRIs+Z+yghsU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rDF5qgBm; 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="rDF5qgBm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0814DC19422; Sun, 4 Jan 2026 13:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534717; bh=zyQCc/ionfSra2OR43YGpjX2gNO3Y7Zq64wRAGZWgRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rDF5qgBmTeXCzRuADBQ1XtpPOJSlaiQZ1KlfLCDZ7Be5qnj3leJ6aQF8OMWaYbXc3 2uPJS5M6nVGkHANOwcDY17v6AzNv6Ee3ZSCejTRAXX+u09u71PF5CRrc+7CyaA6mP3 LxdGwLFEEOO/Zbiv1pWAd6v0RwrV3tjCLHXhAqqE/yuWBz7iVB/4ghzSGAa1iWHPhM M2vz2z1o3yr0v7b47sgdj0PbhzsSBbyk7yyrK42cZdkYaifaDJ6/D1vqMIeeFREv3N PGA1fk6fVPMQvlxSOrVouiGKq6hezto/Lw7VYgtJJnN7jW6sXV8PJk2M2oNvrrVGWP 5GhDOxZC2glLg== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Maher Sanalla Subject: [PATCH rdma-next 3/6] RDMA/mlx5: Fix ucaps init error flow Date: Sun, 4 Jan 2026 15:51:35 +0200 Message-ID: <20260104-ib-core-misc-v1-3-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Maher Sanalla In mlx5_ib_stage_caps_init(), if mlx5_ib_init_ucaps() fails after mlx5_ib_init_var_table() succeeds, the VAR bitmap is leaked since the function returns without cleanup. Thus, cleanup the var table bitmap in case of error of initializing ucaps before exiting, preventing the leak above. Fixes: cf7174e8982f ("RDMA/mlx5: Create UCAP char devices for supported dev= ice capabilities") Signed-off-by: Maher Sanalla Reviewed-by: Yishai Hadas Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP --- drivers/infiniband/hw/mlx5/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5= /main.c index 40284bbb45d6..8d515d266125 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -4466,12 +4466,16 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_d= ev *dev) MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL) { err =3D mlx5_ib_init_ucaps(dev); if (err) - return err; + goto err_ucaps; } =20 dev->ib_dev.use_cq_dim =3D true; =20 return 0; + +err_ucaps: + bitmap_free(dev->var_table.bitmap); + return err; } =20 static const struct ib_device_ops mlx5_ib_dev_port_ops =3D { --=20 2.52.0 From nobody Sat Feb 7 18:28:57 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 EA7D4274B42; Sun, 4 Jan 2026 13:52: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=1767534722; cv=none; b=ck6N4a5ngPakEItb1PqKL1+qHmlcO7hcHvp5JGB3IfvYeIyiWkN+9rM6SEv3kOixKDxB6C2I+do9ib6TG2EuYF0pnhxZAtNQMOLfSNOlp9J5KLsP4YQaCYqcfZlyL1BIJe5IBtq+dMlDEz6D1CSCTcRB3wz9/jLAgNxEi5HmRLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534722; c=relaxed/simple; bh=08SYnLgqHKSF/4Y/EkzfgqxzPfpsQUrQNyDNPrDhd9k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dT2U6BWqP5LDBmPp4Uci4w1n6xN/MrqWvBCPLrMdv8IWVTeKOCXCYjupYMwvCU7mJHA4j4OrfWaX8RcHgL9jCcTPVG4nlg5lyO+vJQ+2XXiijetqoiI26ENShSlEuw2MnQaEt+JTbT5JwFGtnL5LetilOHoDdmXk4/HK1sjnvKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZWX5g01G; 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="ZWX5g01G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3E25C19423; Sun, 4 Jan 2026 13:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534721; bh=08SYnLgqHKSF/4Y/EkzfgqxzPfpsQUrQNyDNPrDhd9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZWX5g01GzZsZeTb4mzKUQknxgOFFfsmbOsnkfXfhiJCuG+uPsGrRvTSbcEt87TGnz 0Q4KESys5m8DQvWCPZXDY9gKTweR5+oY+8eUVEN7hAL1byODTTO/Vdb3DjC+ac92B8 9f2UAVW4aFnvYQDKH1oy6CXxfq9VglpEPwWmQYeoQydVzuGMvTFXgSPc5L75JvFooG z2VKEJgcXHU3WE6jy0T9LYXza4Cr8FuOG1ctxUmAM046Xw7wiZvKfTI2i6YYnKeQTn Hofxt9ObHeXWf7mH542LmEVIUhzSjFOayrB0HeS/F0ewZaOfHoyGsp7IHOJFmpCO8s NvcdjjLdLp1hw== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next 4/6] RDMA/mlx5: Avoid direct access to DMA device pointer Date: Sun, 4 Jan 2026 15:51:36 +0200 Message-ID: <20260104-ib-core-misc-v1-4-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky The dma_device field is marked as internal and must not be accessed by drivers or ULPs. Remove all direct mlx5 references to this field. Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP --- drivers/infiniband/hw/mlx5/mr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/m= r.c index 325fa04cbe8a..a7b37e3df072 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1646,10 +1646,13 @@ reg_user_mr_dmabuf(struct ib_pd *pd, struct device = *dma_device, offset, length, fd, access_flags, &mlx5_ib_dmabuf_attach_ops); - else + else if (dma_device) umem_dmabuf =3D ib_umem_dmabuf_get_pinned_with_dma_device(&dev->ib_dev, dma_device, offset, length, fd, access_flags); + else + umem_dmabuf =3D ib_umem_dmabuf_get_pinned( + &dev->ib_dev, offset, length, fd, access_flags); =20 if (IS_ERR(umem_dmabuf)) { mlx5_ib_dbg(dev, "umem_dmabuf get failed (%pe)\n", umem_dmabuf); @@ -1782,10 +1785,8 @@ struct ib_mr *mlx5_ib_reg_user_mr_dmabuf(struct ib_p= d *pd, u64 offset, return reg_user_mr_dmabuf_by_data_direct(pd, offset, length, virt_addr, fd, access_flags); =20 - return reg_user_mr_dmabuf(pd, pd->device->dma_device, - offset, length, virt_addr, - fd, access_flags, MLX5_MKC_ACCESS_MODE_MTT, - dmah); + return reg_user_mr_dmabuf(pd, NULL, offset, length, virt_addr, fd, + access_flags, MLX5_MKC_ACCESS_MODE_MTT, dmah); } =20 /* --=20 2.52.0 From nobody Sat Feb 7 18:28:57 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 3DAB330DD25; Sun, 4 Jan 2026 13:52:14 +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=1767534736; cv=none; b=FswRiCoEOATTTHPkDG33SiyY8LsDTZk8clPbdYVR/oz++JEaLKGCYZqHr4PI8sg7z2VI4unP9cs1p1sjo1515pq5V0EQjcGKiqqjsnC2CGM81X5CohWoeE5zkxnmdhBMsv1PTBYIcQ4hyixf2oR4kQz/cH9hL4lERL2eIyeDUlc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534736; c=relaxed/simple; bh=clihBJLIvyZKpn1Xh11ErRq8CsnV0HHf40gSe8OjgzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jDPUEgENiZR676SwpSOznfFQFJs5W5Duentvpyuj9JXF2NFiSWWQ8LDFcLsMzjg/4DGeKOjHCoNjlSr+ffEqPPlzD9v9DcQ5a6pB+i8KAhafwh4HlUrZJM30MjmjTTBy5G6Kdvn4r3pkKnZ8vUINi457pFWvmZzsjAosxBhMGFI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kfS7AG/J; 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="kfS7AG/J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0CE6C4CEF7; Sun, 4 Jan 2026 13:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534734; bh=clihBJLIvyZKpn1Xh11ErRq8CsnV0HHf40gSe8OjgzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kfS7AG/JaAUBkXLtXtm7stDt1Of+1OCfLxi13Naaa24qRnlkqOM7oLS4H5OOkACPI zJ4f13yI6aLUUKew0HOhsQeQnM4w8D8w5AO9ki+w/OtzoY/2KXp1XQNGwI9PSLOkdW /VIzfF0+4cJaK3lh6KhJTPWQcagTFky2tBtA5k12pMEWv3kAwatOPhqDsOS7BywFKo v3t/W2XY9vpgUoAarA1hLoOyJDcfCYY6QrisZ+byXZmx0IijwKBGMduBXru3ydHfkn A3dDFfxk2MOkJtvuyphVARCmivZhsC+g9s9W+KRAzvMDfqrrG3jMe161GedU21TBkt Cxx8Mg441e45g== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next 5/6] RDMA/qedr: Remove unused defines Date: Sun, 4 Jan 2026 15:51:37 +0200 Message-ID: <20260104-ib-core-misc-v1-5-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky Perform basic cleanup by removing unused defines from qedr.h. Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP --- drivers/infiniband/hw/qedr/qedr.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr= /qedr.h index db9ef3e1eb97..a6c9a4d9ab93 100644 --- a/drivers/infiniband/hw/qedr/qedr.h +++ b/drivers/infiniband/hw/qedr/qedr.h @@ -53,11 +53,8 @@ DP_NAME(dev) ? DP_NAME(dev) : "", ## __VA_ARGS__) =20 #define QEDR_MSG_INIT "INIT" -#define QEDR_MSG_MISC "MISC" #define QEDR_MSG_CQ " CQ" #define QEDR_MSG_MR " MR" -#define QEDR_MSG_RQ " RQ" -#define QEDR_MSG_SQ " SQ" #define QEDR_MSG_QP " QP" #define QEDR_MSG_SRQ " SRQ" #define QEDR_MSG_GSI " GSI" @@ -65,7 +62,6 @@ =20 #define QEDR_CQ_MAGIC_NUMBER (0x11223344) =20 -#define FW_PAGE_SIZE (RDMA_RING_PAGE_SIZE) #define FW_PAGE_SHIFT (12) =20 struct qedr_dev; @@ -178,24 +174,18 @@ struct qedr_dev { u8 user_dpm_enabled; }; =20 -#define QEDR_MAX_SQ_PBL (0x8000) #define QEDR_MAX_SQ_PBL_ENTRIES (0x10000 / sizeof(void *)) #define QEDR_SQE_ELEMENT_SIZE (sizeof(struct rdma_sq_sge)) #define QEDR_MAX_SQE_ELEMENTS_PER_SQE (ROCE_REQ_MAX_SINGLE_SQ_WQE_SIZE / \ QEDR_SQE_ELEMENT_SIZE) -#define QEDR_MAX_SQE_ELEMENTS_PER_PAGE ((RDMA_RING_PAGE_SIZE) / \ - QEDR_SQE_ELEMENT_SIZE) #define QEDR_MAX_SQE ((QEDR_MAX_SQ_PBL_ENTRIES) *\ (RDMA_RING_PAGE_SIZE) / \ (QEDR_SQE_ELEMENT_SIZE) /\ (QEDR_MAX_SQE_ELEMENTS_PER_SQE)) /* RQ */ -#define QEDR_MAX_RQ_PBL (0x2000) #define QEDR_MAX_RQ_PBL_ENTRIES (0x10000 / sizeof(void *)) #define QEDR_RQE_ELEMENT_SIZE (sizeof(struct rdma_rq_sge)) #define QEDR_MAX_RQE_ELEMENTS_PER_RQE (RDMA_MAX_SGE_PER_RQ_WQE) -#define QEDR_MAX_RQE_ELEMENTS_PER_PAGE ((RDMA_RING_PAGE_SIZE) / \ - QEDR_RQE_ELEMENT_SIZE) #define QEDR_MAX_RQE ((QEDR_MAX_RQ_PBL_ENTRIES) *\ (RDMA_RING_PAGE_SIZE) / \ (QEDR_RQE_ELEMENT_SIZE) /\ @@ -210,12 +200,8 @@ struct qedr_dev { =20 #define QEDR_ROCE_MAX_CNQ_SIZE (0x4000) =20 -#define QEDR_MAX_PORT (1) #define QEDR_PORT (1) =20 -#define QEDR_UVERBS(CMD_NAME) (1ull << IB_USER_VERBS_CMD_##CMD_NAME) - -#define QEDR_ROCE_PKEY_MAX 1 #define QEDR_ROCE_PKEY_TABLE_LEN 1 #define QEDR_ROCE_PKEY_DEFAULT 0xffff =20 @@ -336,12 +322,6 @@ struct qedr_qp_hwq_info { union db_prod32 iwarp_db2_data; }; =20 -#define QEDR_INC_SW_IDX(p_info, index) \ - do { \ - p_info->index =3D (p_info->index + 1) & \ - qed_chain_get_capacity(p_info->pbl) \ - } while (0) - struct qedr_srq_hwq_info { u32 max_sges; u32 max_wr; --=20 2.52.0 From nobody Sat Feb 7 18:28:57 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 AEF93221721; Sun, 4 Jan 2026 13:52:09 +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=1767534729; cv=none; b=MuvV/J7/iQiiom49FUUOtCFRGWUZeN26ehHGsKy1zOnia7VMDtU2AucsdOKBSEGL3phm1u1BymmMg5oR1C0PhnnMiy8sRv7TkjiK33AF+SWq7ce95sdCv/fB+BBUlmWAnYPv83RO2VhYa/70cLq54d7oQoCcDoTWybOQElTlZVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767534729; c=relaxed/simple; bh=jENC5axotUMMRBSPnZ2/0la2N0qC/blZRxffKg8xvjg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dJPrTDEZco8m65M4umeZ5hHvwHs/Gv57bkEqOM+5WFr8n+/EIOuZgVGOH+JTOJQudPM/qTcvzJvELdFP2FM5F/wu0ZpfKTpFhIJs0uk3qt35pMJXYyhti4NVq/JleGx4y/yaC9ZaUQKWB/f8I+nhYlwDfNGYgd3Vnnaeh4MNQqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uE2ElZiA; 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="uE2ElZiA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB9FEC4CEF7; Sun, 4 Jan 2026 13:52:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767534729; bh=jENC5axotUMMRBSPnZ2/0la2N0qC/blZRxffKg8xvjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uE2ElZiAmoYT9Jv13jCgvJgZI7PvkTr4iVVtKja5NZpGIlsNc8B74q9SKRokBy87n JxVQUmz9rbUZPJlwawg/C831ZKIRFqz4Rv+PkalUSJWVIjPSIYv1je8WCZqEOPhaEW BusJLnLYEa5pAzZQGRAQhOWxdilo5fnzDjUXub7cwzSiu6RJs5Sa2aWBic+sYGyTTU fPTYom8fZLI76sihAnpjAUOvHJ4n1KQD+o0gVjHB9CtJtKS8RCJgfRm3tgMzulEIWE ICyUNblHpPJuiS1s6UerHUL1MAQ14SOMsJc64rvLXE9T+g8FKS63slVuKsFCD+IVzq hss21UI8yLBdg== From: Leon Romanovsky To: Jason Gunthorpe , Leon Romanovsky , Yishai Hadas , Chiara Meiohas , Michal Kalderon , Selvin Xavier Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next 6/6] RDMA/ocrdma: Remove unused OCRDMA_UVERBS definition Date: Sun, 4 Jan 2026 15:51:38 +0200 Message-ID: <20260104-ib-core-misc-v1-6-00367f77f3a8@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260104-ib-core-misc-v1-0-00367f77f3a8@nvidia.com> References: <20260104-ib-core-misc-v1-0-00367f77f3a8@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-a6db3 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky The OCRDMA_UVERBS() macro is unused, so remove it to clean up the code. Signed-off-by: Leon Romanovsky Reviewed-by: Kalesh AP --- drivers/infiniband/hw/ocrdma/ocrdma.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/= ocrdma/ocrdma.h index 5eb61c110090..5584b781e2e8 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h @@ -67,8 +67,6 @@ #define OC_SKH_DEVICE_VF 0x728 #define OCRDMA_MAX_AH 512 =20 -#define OCRDMA_UVERBS(CMD_NAME) (1ull << IB_USER_VERBS_CMD_##CMD_NAME) - #define convert_to_64bit(lo, hi) ((u64)hi << 32 | (u64)lo) #define EQ_INTR_PER_SEC_THRSH_HI 150000 #define EQ_INTR_PER_SEC_THRSH_LOW 100000 --=20 2.52.0