net/mlx5: fix Direct Rules build

Message ID 20190420000243.39143-1-yskoh@mellanox.com
State Accepted, archived
Delegated to: Shahaf Shuler
Headers show
Series
  • net/mlx5: fix Direct Rules build
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Yongseok Koh April 20, 2019, 12:02 a.m.
All the library calls must be called via the glue layer.

Fixes: b2177648b8de ("net/mlx5: add Direct Rules flow data alloc/free routines")
Fixes: 79e35d0d5979 ("net/mlx5: share Direct Rules/Verbs flow related structures")
Cc: viacheslavo@mellanox.com

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Shahaf Shuler April 22, 2019, 5:46 p.m. | #1
Saturday, April 20, 2019 3:03 AM, Yongseok Koh:
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix Direct Rules build
> 
> All the library calls must be called via the glue layer.
> 
> Fixes: b2177648b8de ("net/mlx5: add Direct Rules flow data alloc/free
> routines")
> Fixes: 79e35d0d5979 ("net/mlx5: share Direct Rules/Verbs flow related
> structures")
> Cc: viacheslavo@mellanox.com
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>

Applied to next-net-mlx, thanks.

Patch

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 65c69afe5a..08ed678d0d 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -332,14 +332,16 @@  mlx5_alloc_shared_dr(struct mlx5_priv *priv)
 		return 0;
 	}
 	/* Reference counter is zero, we should initialize structures. */
-	ns = mlx5dv_dr_create_ns(sh->ctx, MLX5DV_DR_NS_DOMAIN_INGRESS_BYPASS);
+	ns = mlx5_glue->dr_create_ns(sh->ctx,
+				     MLX5DV_DR_NS_DOMAIN_INGRESS_BYPASS);
 	if (!ns) {
 		DRV_LOG(ERR, "ingress mlx5dv_dr_create_ns failed");
 		err = errno;
 		goto error;
 	}
 	sh->rx_ns = ns;
-	ns = mlx5dv_dr_create_ns(sh->ctx, MLX5DV_DR_NS_DOMAIN_EGRESS_BYPASS);
+	ns = mlx5_glue->dr_create_ns(sh->ctx,
+				     MLX5DV_DR_NS_DOMAIN_EGRESS_BYPASS);
 	if (!ns) {
 		DRV_LOG(ERR, "egress mlx5dv_dr_create_ns failed");
 		err = errno;
@@ -367,11 +369,11 @@  mlx5_alloc_shared_dr(struct mlx5_priv *priv)
 error:
        /* Rollback the created objects. */
 	if (sh->rx_ns) {
-		mlx5dv_dr_destroy_ns(sh->rx_ns);
+		mlx5_glue->dr_destroy_ns(sh->rx_ns);
 		sh->rx_ns = NULL;
 	}
 	if (sh->tx_ns) {
-		mlx5dv_dr_destroy_ns(sh->tx_ns);
+		mlx5_glue->dr_destroy_ns(sh->tx_ns);
 		sh->tx_ns = NULL;
 	}
 	if (sh->fdb_ns) {
@@ -410,11 +412,11 @@  mlx5_free_shared_dr(struct mlx5_priv *priv)
 	if (sh->dv_refcnt && --sh->dv_refcnt)
 		return;
 	if (sh->rx_ns) {
-		mlx5dv_dr_destroy_ns(sh->rx_ns);
+		mlx5_glue->dr_destroy_ns(sh->rx_ns);
 		sh->rx_ns = NULL;
 	}
 	if (sh->tx_ns) {
-		mlx5dv_dr_destroy_ns(sh->tx_ns);
+		mlx5_glue->dr_destroy_ns(sh->tx_ns);
 		sh->tx_ns = NULL;
 	}
 #ifdef HAVE_MLX5DV_DR_ESWITCH