net/mlx5: fix crash on GRE flow rule parsing

[dpdk.git] / drivers / net / mlx5 / mlx5_flow.c

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 14a89e2..5c78ea7 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -364,7 +364,15 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
        case MLX5_METADATA_TX:
                return REG_A;
        case MLX5_METADATA_FDB:
-               return REG_C_0;
+               switch (config->dv_xmeta_en) {
+               case MLX5_XMETA_MODE_LEGACY:
+                       return REG_NONE;
+               case MLX5_XMETA_MODE_META16:
+                       return REG_C_0;
+               case MLX5_XMETA_MODE_META32:
+                       return REG_C_1;
+               }
+               break;
        case MLX5_FLOW_MARK:
                switch (config->dv_xmeta_en) {
                case MLX5_XMETA_MODE_LEGACY:
@@ -1990,8 +1998,8 @@ mlx5_flow_validate_item_gre_key(const struct rte_flow_item *item,
        const rte_be32_t *mask = item->mask;
        int ret = 0;
        rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);
-       const struct rte_flow_item_gre *gre_spec = gre_item->spec;
-       const struct rte_flow_item_gre *gre_mask = gre_item->mask;
+       const struct rte_flow_item_gre *gre_spec;
+       const struct rte_flow_item_gre *gre_mask;
 
        if (item_flags & MLX5_FLOW_LAYER_GRE_KEY)
                return rte_flow_error_set(error, ENOTSUP,
@@ -2005,8 +2013,10 @@ mlx5_flow_validate_item_gre_key(const struct rte_flow_item *item,
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ITEM, item,
                                          "GRE key following a wrong item");
+       gre_mask = gre_item->mask;
        if (!gre_mask)
                gre_mask = &rte_flow_item_gre_mask;
+       gre_spec = gre_item->spec;
        if (gre_spec && (gre_mask->c_rsvd0_ver & RTE_BE16(0x2000)) &&
                         !(gre_spec->c_rsvd0_ver & RTE_BE16(0x2000)))
                return rte_flow_error_set(error, EINVAL,
@@ -2814,6 +2824,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
                switch (actions->type) {
                case RTE_FLOW_ACTION_TYPE_QUEUE:
                        queue = actions->conf;
+                       if (queue == NULL)
+                               return 0;
                        if (mlx5_rxq_get_type(dev, queue->index) !=
                            MLX5_RXQ_TYPE_HAIRPIN)
                                return 0;
@@ -2822,6 +2834,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
                        break;
                case RTE_FLOW_ACTION_TYPE_RSS:
                        rss = actions->conf;
+                       if (rss == NULL || rss->queue_num == 0)
+                               return 0;
                        if (mlx5_rxq_get_type(dev, rss->queue[0]) !=
                            MLX5_RXQ_TYPE_HAIRPIN)
                                return 0;
@@ -3862,16 +3876,18 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
                        },
                };
                uint64_t hash_fields = dev_flow->hash_fields;
-               dev_flow = NULL;
+
                /*
-                * Configure the tag action only if we are not the meter sub
-                * flow. Since tag is already marked in the meter suffix sub
-                * flow.
+                * Configure the tag item only if there is no meter subflow.
+                * Since tag is already marked in the meter suffix subflow
+                * we can just use the meter suffix items as is.
                 */
                if (qrss_id) {
+                       /* Not meter subflow. */
+                       assert(!mtr_sfx);
                        /*
                         * Put unique id in prefix flow due to it is destroyed
-                        * after prefix flow and id will be freed after there
+                        * after suffix flow and id will be freed after there
                         * is no actual flows with this id and identifier
                         * reallocation becomes possible (for example, for
                         * other flows in other threads).
@@ -3884,6 +3900,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
                                goto exit;
                        q_tag_spec.id = ret;
                }
+               dev_flow = NULL;
                /* Add suffix subflow to execute Q/RSS. */
                ret = flow_create_split_inner(dev, flow, &dev_flow,
                                              &q_attr, mtr_sfx ? items :