net/mlx5: add flow action functions to glue

This patch adds glue functions for operations:
- Create packet reformat (encap/decap) flow action.
- Destroy flow action.

The new operations depend on HAVE_IBV_FLOW_DV_SUPPORT.

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index ba433d3..2a8fcc9 100644 (file)
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -145,7 +145,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
        $Q sh -- '$<' '$@' \
                HAVE_IBV_FLOW_DV_SUPPORT \
                infiniband/mlx5dv.h \
-               enum MLX5DV_FLOW_ACTION_TAG \
+               func mlx5dv_create_flow_action_packet_reformat \
                $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_ETHTOOL_LINK_MODE_25G \

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index f8e0c1b..2c8fd19 100644 (file)
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -99,7 +99,7 @@ if build
                [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
                'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
                [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-               'MLX5DV_FLOW_ACTION_TAG' ],
+               'mlx5dv_create_flow_action_packet_reformat' ],
                [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
                'IBV_FLOW_SPEC_MPLS' ],
                [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',

diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index 1afb114..dd10ad6 100644 (file)
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -174,6 +174,17 @@ mlx5_glue_destroy_flow(struct ibv_flow *flow_id)
        return ibv_destroy_flow(flow_id);
 }
 
+static int
+mlx5_glue_destroy_flow_action(struct ibv_flow_action *action)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       return ibv_destroy_flow_action(action);
+#else
+       (void)action;
+       return ENOTSUP;
+#endif
+}
+
 static struct ibv_qp *
 mlx5_glue_create_qp(struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)
 {
@@ -444,6 +455,30 @@ mlx5_glue_dv_destroy_flow_matcher(struct mlx5dv_flow_matcher *matcher)
 #endif
 }
 
+static struct ibv_flow_action *
+mlx5_glue_dv_create_flow_action_packet_reformat
+               (struct ibv_context *ctx,
+                size_t data_sz,
+                void *data,
+                enum mlx5dv_flow_action_packet_reformat_type reformat_type,
+                enum mlx5dv_flow_table_type ft_type)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+       return mlx5dv_create_flow_action_packet_reformat(ctx,
+                                                        data_sz,
+                                                        data,
+                                                        reformat_type,
+                                                        ft_type);
+#else
+       (void)ctx;
+       (void)data_sz;
+       (void)data;
+       (void)reformat_type;
+       (void)ft_type;
+       return NULL;
+#endif
+}
+
 alignas(RTE_CACHE_LINE_SIZE)
 const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .version = MLX5_GLUE_VERSION,
@@ -470,6 +505,7 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .modify_wq = mlx5_glue_modify_wq,
        .create_flow = mlx5_glue_create_flow,
        .destroy_flow = mlx5_glue_destroy_flow,
+       .destroy_flow_action = mlx5_glue_destroy_flow_action,
        .create_qp = mlx5_glue_create_qp,
        .create_qp_ex = mlx5_glue_create_qp_ex,
        .destroy_qp = mlx5_glue_destroy_qp,
@@ -497,4 +533,6 @@ const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
        .dv_create_flow_matcher = mlx5_glue_dv_create_flow_matcher,
        .dv_destroy_flow_matcher = mlx5_glue_dv_destroy_flow_matcher,
        .dv_create_flow = mlx5_glue_dv_create_flow,
+       .dv_create_flow_action_packet_reformat =
+                       mlx5_glue_dv_create_flow_action_packet_reformat,
 };

diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index 44bfefe..2d92ba8 100644 (file)
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -50,6 +50,9 @@ struct mlx5dv_flow_matcher;
 struct mlx5dv_flow_matcher_attr;
 struct mlx5dv_flow_action_attr;
 struct mlx5dv_flow_match_parameters;
+struct ibv_flow_action;
+enum mlx5dv_flow_action_packet_reformat_type { packet_reformat_type = 0, };
+enum mlx5dv_flow_table_type { flow_table_type = 0, };
 #endif
 
 /* LIB_GLUE_VERSION must be updated every time this structure is modified. */
@@ -91,6 +94,7 @@ struct mlx5_glue {
        struct ibv_flow *(*create_flow)(struct ibv_qp *qp,
                                        struct ibv_flow_attr *flow);
        int (*destroy_flow)(struct ibv_flow *flow_id);
+       int (*destroy_flow_action)(struct ibv_flow_action *action);
        struct ibv_qp *(*create_qp)(struct ibv_pd *pd,
                                    struct ibv_qp_init_attr *qp_init_attr);
        struct ibv_qp *(*create_qp_ex)
@@ -154,6 +158,12 @@ struct mlx5_glue {
                          struct mlx5dv_flow_match_parameters *match_value,
                          size_t num_actions,
                          struct mlx5dv_flow_action_attr *actions_attr);
+       struct ibv_flow_action *(*dv_create_flow_action_packet_reformat)
+               (struct ibv_context *ctx,
+                size_t data_sz,
+                void *data,
+                enum mlx5dv_flow_action_packet_reformat_type reformat_type,
+                enum mlx5dv_flow_table_type ft_type);
 };
 
 const struct mlx5_glue *mlx5_glue;