net/ice: clean GTPU flow type for flow director

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

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d162cf0..1a74d5a 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1653,7 +1653,7 @@ mlx5_flow_field_id_to_modify_info
                break;
        case RTE_FLOW_FIELD_TCP_FLAGS:
                info[idx] = (struct field_modify_info){1, 0,
-                                       MLX5_MODI_IN_TCP_FLAGS};
+                                       MLX5_MODI_OUT_TCP_FLAGS};
                if (mask) {
                        mask[idx] = 0x0000003f;
                        if (width < 6)
@@ -1960,13 +1960,20 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused,
                                          "isn't supported");
                if (reg != REG_A)
                        nic_mask.data = priv->sh->dv_meta_mask;
-       } else if (attr->transfer) {
-               return rte_flow_error_set(error, ENOTSUP,
+       } else {
+               if (attr->transfer)
+                       return rte_flow_error_set(error, ENOTSUP,
                                        RTE_FLOW_ERROR_TYPE_ITEM, item,
                                        "extended metadata feature "
                                        "should be enabled when "
                                        "meta item is requested "
                                        "with e-switch mode ");
+               if (attr->ingress)
+                       return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ITEM, item,
+                                       "match on metadata for ingress "
+                                       "is not supported in legacy "
+                                       "metadata mode");
        }
        if (!mask)
                mask = &rte_flow_item_meta_mask;
@@ -13000,6 +13007,10 @@ __flow_dv_action_rss_update(struct rte_eth_dev *dev, uint32_t idx,
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "invalid shared action to update");
+       if (priv->obj_ops.ind_table_modify == NULL)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+                                         "cannot modify indirection table");
        queue = mlx5_malloc(MLX5_MEM_ZERO,
                            RTE_ALIGN_CEIL(queue_size, sizeof(void *)),
                            0, SOCKET_ID_ANY);
@@ -13882,6 +13893,20 @@ flow_dv_action_validate(struct rte_eth_dev *dev,
        RTE_SET_USED(conf);
        switch (action->type) {
        case RTE_FLOW_ACTION_TYPE_RSS:
+               /*
+                * priv->obj_ops is set according to driver capabilities.
+                * When DevX capabilities are
+                * sufficient, it is set to devx_obj_ops.
+                * Otherwise, it is set to ibv_obj_ops.
+                * ibv_obj_ops doesn't support ind_table_modify operation.
+                * In this case the shared RSS action can't be used.
+                */
+               if (priv->obj_ops.ind_table_modify == NULL)
+                       return rte_flow_error_set
+                                       (err, ENOTSUP,
+                                        RTE_FLOW_ERROR_TYPE_ACTION,
+                                        NULL,
+                                        "shared RSS action not supported");
                return mlx5_validate_action_rss(dev, action, err);
        case RTE_FLOW_ACTION_TYPE_AGE:
                if (!priv->sh->aso_age_mng)