[PATCH mlx5-next V2 09/10] RDMA/mlx5: Pull data_direct resource creation in init phase
flat view
COOLING13d
IN NET-NEXT
From: Tariq Toukan <tariqt@nvidia.com>
Date: 2026-09-30 11:44:33
Also in:
linux-rdma, lkml
Subsystem:
infiniband subsystem, mellanox mlx5 ib driver, the rest · Maintainers:
Jason Gunthorpe, Leon Romanovsky, Linus Torvalds
Revision v2 of 2 in this series; queued in net-next as 7611034dc86c on 2026-10-01.
Revisions (2)
- v1 [diff vs current]
- v2 current
From: Dragos Tatulea <dtatulea@nvidia.com> Since data_direct resource creation happens directly after init, there's no need to separate them. This patch moves data direct resource creation in the init phase, thus simplifying the data direct API. The cleanup path gets the same treatment. This keeps the existing IB device lifetime and prepares for moving the combined initialization and cleanup to mlx5_core load and unload. The patch has no functional changes. Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> --- drivers/infiniband/hw/mlx5/data_direct.c | 16 ++++++++++++---- drivers/infiniband/hw/mlx5/data_direct.h | 3 --- drivers/infiniband/hw/mlx5/main.c | 7 ------- 3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/data_direct.c b/drivers/infiniband/hw/mlx5/data_direct.c
index f58a144d95e3..3878c4aebb2c 100644
--- a/drivers/infiniband/hw/mlx5/data_direct.c
+++ b/drivers/infiniband/hw/mlx5/data_direct.c@@ -103,7 +103,7 @@ static int mlx5_data_direct_set_dma_caps(struct pci_dev *pdev) return 0; } -int mlx5_data_direct_create_resources(struct mlx5_ib_dev *dev) +static int mlx5_data_direct_create_resources(struct mlx5_ib_dev *dev) { int inlen = MLX5_ST_SZ_BYTES(create_mkey_in); struct mlx5_core_dev *mdev = dev->mdev;
@@ -172,15 +172,13 @@ int mlx5_data_direct_create_resources(struct mlx5_ib_dev *dev) return err; } -void mlx5_data_direct_free_resources(struct mlx5_ib_dev *dev) +static void mlx5_data_direct_free_resources(struct mlx5_ib_dev *dev) { if (dev->data_direct->mkey_ro_valid) mlx5_core_destroy_mkey(dev->mdev, dev->data_direct->mkey_ro); mlx5_core_destroy_mkey(dev->mdev, dev->data_direct->mkey); mlx5_core_dealloc_pd(dev->mdev, dev->data_direct->pdn); - - memset(dev->data_direct, 0, sizeof(*dev->data_direct)); } static void mlx5_data_direct_bind(struct mlx5_data_direct_registration *reg,
@@ -222,6 +220,10 @@ int mlx5_data_direct_init(struct mlx5_ib_dev *ibdev) ibdev->data_direct = ®->dd; + err = mlx5_data_direct_create_resources(ibdev); + if (err) + goto err_resources; + mutex_lock(&mlx5_data_direct_mutex); list_for_each_entry(dev, &mlx5_data_direct_dev_list, list) { if (strcmp(dev->vuid, reg->vuid) == 0) {
@@ -236,6 +238,11 @@ int mlx5_data_direct_init(struct mlx5_ib_dev *ibdev) list_add_tail(®->list, &mlx5_data_direct_reg_list); mutex_unlock(&mlx5_data_direct_mutex); return 0; + +err_resources: + ibdev->data_direct = NULL; + kfree(reg); + return err; } void mlx5_data_direct_cleanup(struct mlx5_ib_dev *ibdev)
@@ -252,6 +259,7 @@ void mlx5_data_direct_cleanup(struct mlx5_ib_dev *ibdev) mlx5_data_direct_do_unbind(reg); mutex_unlock(&mlx5_data_direct_mutex); + mlx5_data_direct_free_resources(ibdev); ibdev->data_direct = NULL; kfree(reg); }
diff --git a/drivers/infiniband/hw/mlx5/data_direct.h b/drivers/infiniband/hw/mlx5/data_direct.h
index de2730f00852..49cdd407018a 100644
--- a/drivers/infiniband/hw/mlx5/data_direct.h
+++ b/drivers/infiniband/hw/mlx5/data_direct.h@@ -23,9 +23,6 @@ struct mlx5_data_direct_dev { struct list_head list; }; -int mlx5_data_direct_create_resources(struct mlx5_ib_dev *dev); -void mlx5_data_direct_free_resources(struct mlx5_ib_dev *dev); - int mlx5_data_direct_driver_register(void); void mlx5_data_direct_driver_unregister(void);
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index cefbcc816651..941928a782bd 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c@@ -3966,10 +3966,6 @@ static int mlx5_ib_data_direct_init(struct mlx5_ib_dev *dev) if (ret) return ret; - ret = mlx5_data_direct_create_resources(dev); - if (ret) - goto err_resources; - INIT_LIST_HEAD(&dev->data_direct_mr_list); dev->data_direct_nb.notifier_call = mlx5_ib_data_direct_event; ret = mlx5_data_direct_register(dev, &dev->data_direct_nb);
@@ -3979,8 +3975,6 @@ static int mlx5_ib_data_direct_init(struct mlx5_ib_dev *dev) return ret; err_register: - mlx5_data_direct_free_resources(dev); -err_resources: mlx5_data_direct_cleanup(dev); return ret;
@@ -3992,7 +3986,6 @@ static void mlx5_ib_data_direct_cleanup(struct mlx5_ib_dev *dev) return; mlx5_data_direct_unregister(dev, &dev->data_direct_nb); - mlx5_data_direct_free_resources(dev); mlx5_data_direct_cleanup(dev); }
--
2.44.0