Skip to content

Commit af347eb

Browse files
author
Benjamin Poirier
committed
RDMA/mlx5: Create UCAP char devices for supported device capabilities
JIRA: https://issues.redhat.com/browse/RHEL-72227 JIRA: https://issues.redhat.com/browse/RHEL-73520 Upstream-status: v6.15-rc1 commit cf7174e Author: Chiara Meiohas <cmeiohas@nvidia.com> Date: Thu Mar 6 13:51:27 2025 +0200 RDMA/mlx5: Create UCAP char devices for supported device capabilities Create UCAP character devices when probing an IB device with supported firmware capabilities. If the RDMA_CTRL general object type is supported, check for specific UCTX capabilities: Create /dev/infiniband/mlx5_perm_ctrl_local for RDMA_UCAP_MLX5_CTRL_LOCAL Create /dev/infiniband/mlx5_perm_ctrl_other_vhca for RDMA_UCAP_MLX5_CTRL_OTHER_VHCA Signed-off-by: Chiara Meiohas <cmeiohas@nvidia.com> Link: https://patch.msgid.link/30ed40e7a12a694cf4ee257459ed61b145b7837d.1741261611.git.leon@kernel.org Reviewed-by: Yishai Hadas <yishaih@nvidia.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Benjamin Poirier <bpoirier@redhat.com>
1 parent 4ae45a6 commit af347eb

File tree

1 file changed

+47
-0
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+47
-0
lines changed

drivers/infiniband/hw/mlx5/main.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include <rdma/uverbs_ioctl.h>
4848
#include <rdma/mlx5_user_ioctl_verbs.h>
4949
#include <rdma/mlx5_user_ioctl_cmds.h>
50+
#include <rdma/ib_ucaps.h>
5051
#include "macsec.h"
5152
#include "data_direct.h"
5253

@@ -4201,8 +4202,47 @@ static int mlx5_ib_init_var_table(struct mlx5_ib_dev *dev)
42014202
return (var_table->bitmap) ? 0 : -ENOMEM;
42024203
}
42034204

4205+
static void mlx5_ib_cleanup_ucaps(struct mlx5_ib_dev *dev)
4206+
{
4207+
if (MLX5_CAP_GEN(dev->mdev, uctx_cap) & MLX5_UCTX_CAP_RDMA_CTRL)
4208+
ib_remove_ucap(RDMA_UCAP_MLX5_CTRL_LOCAL);
4209+
4210+
if (MLX5_CAP_GEN(dev->mdev, uctx_cap) &
4211+
MLX5_UCTX_CAP_RDMA_CTRL_OTHER_VHCA)
4212+
ib_remove_ucap(RDMA_UCAP_MLX5_CTRL_OTHER_VHCA);
4213+
}
4214+
4215+
static int mlx5_ib_init_ucaps(struct mlx5_ib_dev *dev)
4216+
{
4217+
int ret;
4218+
4219+
if (MLX5_CAP_GEN(dev->mdev, uctx_cap) & MLX5_UCTX_CAP_RDMA_CTRL) {
4220+
ret = ib_create_ucap(RDMA_UCAP_MLX5_CTRL_LOCAL);
4221+
if (ret)
4222+
return ret;
4223+
}
4224+
4225+
if (MLX5_CAP_GEN(dev->mdev, uctx_cap) &
4226+
MLX5_UCTX_CAP_RDMA_CTRL_OTHER_VHCA) {
4227+
ret = ib_create_ucap(RDMA_UCAP_MLX5_CTRL_OTHER_VHCA);
4228+
if (ret)
4229+
goto remove_local;
4230+
}
4231+
4232+
return 0;
4233+
4234+
remove_local:
4235+
if (MLX5_CAP_GEN(dev->mdev, uctx_cap) & MLX5_UCTX_CAP_RDMA_CTRL)
4236+
ib_remove_ucap(RDMA_UCAP_MLX5_CTRL_LOCAL);
4237+
return ret;
4238+
}
4239+
42044240
static void mlx5_ib_stage_caps_cleanup(struct mlx5_ib_dev *dev)
42054241
{
4242+
if (MLX5_CAP_GEN_2_64(dev->mdev, general_obj_types_127_64) &
4243+
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL)
4244+
mlx5_ib_cleanup_ucaps(dev);
4245+
42064246
bitmap_free(dev->var_table.bitmap);
42074247
}
42084248

@@ -4253,6 +4293,13 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev)
42534293
return err;
42544294
}
42554295

4296+
if (MLX5_CAP_GEN_2_64(dev->mdev, general_obj_types_127_64) &
4297+
MLX5_HCA_CAP_2_GENERAL_OBJECT_TYPES_RDMA_CTRL) {
4298+
err = mlx5_ib_init_ucaps(dev);
4299+
if (err)
4300+
return err;
4301+
}
4302+
42564303
dev->ib_dev.use_cq_dim = true;
42574304

42584305
return 0;

0 commit comments

Comments
 (0)