git: f7280623cdfe - stable/15 - mlx5_ib: register DEVX objects in the uverbs ioctl parse tree

The branch stable/15 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=f7280623cdfe24bf7cc28fe7d5c5f03fa10f9650

commit f7280623cdfe24bf7cc28fe7d5c5f03fa10f9650
Author:     Ariel Ehrenberg <aehrenberg@nvidia.com>
AuthorDate: 2026-06-09 11:20:23 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-07-20 20:26:05 +0000

    mlx5_ib: register DEVX objects in the uverbs ioctl parse tree
    
    (cherry picked from commit 705d6cf4bf25f7b87f017322e04c6a1a37f1fac0)
---
 sys/dev/mlx5/mlx5_ib/mlx5_ib.h      |  1 +
 sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
index c2c4bc5d2791..7e370ba004e7 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
@@ -1082,6 +1082,7 @@ void mlx5_ib_devx_init_event_table(struct mlx5_ib_dev *dev);
 void mlx5_ib_devx_cleanup_event_table(struct mlx5_ib_dev *dev);
 bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type);
 bool mlx5_ib_devx_is_flow_counter(void *obj, u32 offset, u32 *counter_id);
+extern const struct uapi_definition mlx5_ib_devx_defs[];
 #else
 static inline int
 mlx5_ib_devx_create(struct mlx5_ib_dev *dev,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
index cf1e5f4324d8..b79072e2eaa7 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -3328,6 +3328,11 @@ free:
 	return ARRAY_SIZE(names);
 }
 
+static const struct uapi_definition mlx5_ib_defs[] = {
+	UAPI_DEF_CHAIN(mlx5_ib_devx_defs),
+	{}
+};
+
 static int mlx5_ib_stage_bfreg_init(struct mlx5_ib_dev *dev)
 {
 	int err;
@@ -3402,6 +3407,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
 	dev->ib_dev.num_comp_vectors    =
 		dev->mdev->priv.eq_table.num_comp_vectors;
 	dev->ib_dev.dma_device	= &mdev->pdev->dev;
+	dev->ib_dev.driver_def	= mlx5_ib_defs;
 
 	dev->ib_dev.uverbs_abi_ver	= MLX5_IB_UVERBS_ABI_VERSION;
 	dev->ib_dev.uverbs_cmd_mask	=
@@ -3567,9 +3573,18 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
 	if (err)
 		goto err_q_cnt;
 
+	/*
+	 * Initialize the DEVX event table before ib_register_device().
+	 * Registration merges ib_dev.driver_def into the uverbs uapi, which
+	 * makes the DEVX object tree live immediately; initializing the event
+	 * table afterwards would leave a window where a DEVX ioctl could touch
+	 * an uninitialized dev->devx_event_table.
+	 */
+	mlx5_ib_devx_init_event_table(dev);
+
 	err = ib_register_device(&dev->ib_dev, NULL);
 	if (err)
-		goto err_bfreg;
+		goto err_devx;
 
 	err = create_umr_res(dev);
 	if (err)
@@ -3596,7 +3611,9 @@ err_umrc:
 err_dev:
 	ib_unregister_device(&dev->ib_dev);
 
-err_bfreg:
+err_devx:
+	mlx5_ib_devx_cleanup_event_table(dev);
+
 	mlx5_ib_stage_bfreg_cleanup(dev);
 
 err_q_cnt:
@@ -3628,6 +3645,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)
 	struct mlx5_ib_dev *dev = context;
 	enum rdma_link_layer ll = mlx5_ib_port_link_layer(&dev->ib_dev, 1);
 
+	mlx5_ib_devx_cleanup_event_table(dev);
 	mlx5_ib_cleanup_congestion(dev);
 	mlx5_remove_roce_notifier(dev);
 	ib_unregister_device(&dev->ib_dev);