net/mlx5: fix tunnel offload validation

Tunnel offload API allows the application to restore packet to
its original form if the chain of flows is missed after DECAP action.

MLX5 PMD provides tunnel offload support only if DV API was enabled.

The patch verifies DV availability before processing with
tunnel offload tasks.

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
Cc: stable@dpdk.org
Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 4062568..29134b4 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -9489,33 +9489,37 @@ err:
        return err;
 }
 
-static inline bool
+static inline int
 mlx5_flow_tunnel_validate(struct rte_eth_dev *dev,
                          struct rte_flow_tunnel *tunnel,
-                         const char *err_msg)
+                         struct rte_flow_error *error)
 {
-       err_msg = NULL;
-       if (!is_tunnel_offload_active(dev)) {
-               err_msg = "tunnel offload was not activated";
-               goto out;
-       } else if (!tunnel) {
-               err_msg = "no application tunnel";
-               goto out;
-       }
+       struct mlx5_priv *priv = dev->data->dev_private;
 
+       if (!priv->config.dv_flow_en)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "flow DV interface is off");
+       if (!is_tunnel_offload_active(dev))
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "tunnel offload was not activated");
+       if (!tunnel)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "no application tunnel");
        switch (tunnel->type) {
        default:
-               err_msg = "unsupported tunnel type";
-               goto out;
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "unsupported tunnel type");
        case RTE_FLOW_ITEM_TYPE_VXLAN:
        case RTE_FLOW_ITEM_TYPE_GRE:
        case RTE_FLOW_ITEM_TYPE_NVGRE:
        case RTE_FLOW_ITEM_TYPE_GENEVE:
                break;
        }
-
-out:
-       return !err_msg;
+       return 0;
 }
 
 static int
@@ -9525,15 +9529,11 @@ mlx5_flow_tunnel_decap_set(struct rte_eth_dev *dev,
                    uint32_t *num_of_actions,
                    struct rte_flow_error *error)
 {
-       int ret;
        struct mlx5_flow_tunnel *tunnel;
-       const char *err_msg = NULL;
-       bool verdict = mlx5_flow_tunnel_validate(dev, app_tunnel, err_msg);
+       int ret = mlx5_flow_tunnel_validate(dev, app_tunnel, error);
 
-       if (!verdict)
-               return rte_flow_error_set(error, EINVAL,
-                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
-                                         err_msg);
+       if (ret)
+               return ret;
        ret = mlx5_get_flow_tunnel(dev, app_tunnel, &tunnel);
        if (ret < 0) {
                return rte_flow_error_set(error, ret,
@@ -9552,15 +9552,11 @@ mlx5_flow_tunnel_match(struct rte_eth_dev *dev,
                       uint32_t *num_of_items,
                       struct rte_flow_error *error)
 {
-       int ret;
        struct mlx5_flow_tunnel *tunnel;
-       const char *err_msg = NULL;
-       bool verdict = mlx5_flow_tunnel_validate(dev, app_tunnel, err_msg);
+       int ret = mlx5_flow_tunnel_validate(dev, app_tunnel, error);
 
-       if (!verdict)
-               return rte_flow_error_set(error, EINVAL,
-                                         RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-                                         err_msg);
+       if (ret)
+               return ret;
        ret = mlx5_get_flow_tunnel(dev, app_tunnel, &tunnel);
        if (ret < 0) {
                return rte_flow_error_set(error, ret,

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index fa017c5..8fa7829 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6871,6 +6871,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
        tunnel = is_tunnel_offload_active(dev) ?
                 mlx5_get_tof(items, actions, &tof_rule_type) : NULL;
        if (tunnel) {
+               if (!priv->config.dv_flow_en)
+                       return rte_flow_error_set
+                               (error, ENOTSUP,
+                                RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                NULL, "tunnel offload requires DV flow interface");
                if (priv->representor)
                        return rte_flow_error_set
                                (error, ENOTSUP,