net/mlx5: fix flow operation wrapper per OS

Wrap glue call dv_create_flow_action_dest_devx_tir() with an OS API.

Fixes: b293fbf9672b ("net/mlx5: add OS specific flow actions operations")
Cc: stable@dpdk.org
Signed-off-by: Ophir Munk <ophirmu@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_flow_os.h b/drivers/net/mlx5/linux/mlx5_flow_os.h
index 7706b3be48cf9a6084f9210d45067d67294b86fa..6f3b7324ff5a9b4e9882724101b6874ccef93a15 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_flow_os.h
+++ b/drivers/net/mlx5/linux/mlx5_flow_os.h
@@ -366,6 +366,32 @@ mlx5_flow_os_create_flow_action_default_miss(void **action)
        return (*action) ? 0 : -1;
 }
 
+/**
+ * Create flow action: dest_devx_tir
+ *
+ * @param[in] tir
+ *   Pointer to DevX tir object
+ * @param[out] action
+ *   Pointer to a valid action on success, NULL otherwise.
+ *
+ * @return
+ *   0 on success, or -1 on failure and errno is set.
+ */
+static inline int
+mlx5_flow_os_create_flow_action_dest_devx_tir(struct mlx5_devx_obj *tir,
+                                             void **action)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       *action = mlx5_glue->dv_create_flow_action_dest_devx_tir(tir->obj);
+       return (*action) ? 0 : -1;
+#else
+       /* If no DV support - skip the operation and return success */
+       RTE_SET_USED(tir);
+       *action = 0;
+       return 0;
+#endif
+}
+
 /**
  * Destroy flow action.
  *

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 84a5c55ee07573c55a3eefc9f25a7121b3d3d28d..aa8ca7f4013d47d3d3b2f7214d0ca7b963f42e0f 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -23,7 +23,7 @@
 #include "mlx5_utils.h"
 #include "mlx5_devx.h"
 #include "mlx5_flow.h"
-
+#include "mlx5_flow_os.h"
 
 /**
  * Modify RQ vlan stripping offload
@@ -942,9 +942,8 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,
                goto error;
        }
 #ifdef HAVE_IBV_FLOW_DV_SUPPORT
-       hrxq->action = mlx5_glue->dv_create_flow_action_dest_devx_tir
-                                                              (hrxq->tir->obj);
-       if (!hrxq->action) {
+       if (mlx5_flow_os_create_flow_action_dest_devx_tir(hrxq->tir,
+                                                         &hrxq->action)) {
                rte_errno = errno;
                goto error;
        }