IB/mlx5: Expose DEVX tree

Expose DEVX tree to be used by upper layers.

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index dbf2d61591d31dbca6d0053c476d325f431746ff..f535e7da2dc51ed09be2fb49eea10fa5f9ecd10f 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -1100,3 +1100,8 @@ static DECLARE_UVERBS_OBJECT_TREE(devx_objects,
        &UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX),
        &UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX_OBJ),
        &UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX_UMEM));
+
+const struct uverbs_object_tree_def *mlx5_ib_get_devx_tree(void)
+{
+       return &devx_objects;
+}

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 058a82a55ffe172122bd23a1cfd529c12e0b2ec1..c29c7c8389807b32898c1cf159548f9d36a18e32 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -5264,7 +5264,7 @@ ADD_UVERBS_ATTRIBUTES_SIMPLE(mlx5_ib_flow_action, UVERBS_OBJECT_FLOW_ACTION,
                                                 UVERBS_ATTR_TYPE(u64),
                                                 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));
 
-#define NUM_TREES      2
+#define NUM_TREES      3
 static int populate_specs_root(struct mlx5_ib_dev *dev)
 {
        const struct uverbs_object_tree_def *default_root[NUM_TREES + 1] = {
@@ -5279,6 +5279,11 @@ static int populate_specs_root(struct mlx5_ib_dev *dev)
            !WARN_ON(num_trees >= ARRAY_SIZE(default_root)))
                default_root[num_trees++] = &mlx5_ib_dm;
 
+       if (MLX5_CAP_GEN_64(dev->mdev, general_obj_types) &
+                           MLX5_GENERAL_OBJ_TYPES_CAP_UCTX &&
+           !WARN_ON(num_trees >= ARRAY_SIZE(default_root)))
+               default_root[num_trees++] = mlx5_ib_get_devx_tree();
+
        dev->ib_dev.specs_root =
                uverbs_alloc_spec_tree(num_trees, default_root);
 

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index e45f364622eb1cbb30896f25ba81bbdc2f074716..a72c73c3ed334385a5036fd88faa71eaf8d5ab7e 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1221,12 +1221,15 @@ int mlx5_ib_devx_create(struct mlx5_ib_dev *dev,
                        struct mlx5_ib_ucontext *context);
 void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev,
                          struct mlx5_ib_ucontext *context);
+const struct uverbs_object_tree_def *mlx5_ib_get_devx_tree(void);
 #else
 static inline int
 mlx5_ib_devx_create(struct mlx5_ib_dev *dev,
                    struct mlx5_ib_ucontext *context) { return -EOPNOTSUPP; };
 static inline void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev,
                                        struct mlx5_ib_ucontext *context) {}
+static inline const struct uverbs_object_tree_def *
+mlx5_ib_get_devx_tree(void) { return NULL; }
 #endif
 static inline void init_query_mad(struct ib_smp *mad)
 {