[PATCH v3 2/4] net/mlx5: fix connection tracking action validation

[Dariusz Sosnowski]

In mlx5 PMD, handles to indirect connection tracking flow actions
are encoded as 32-bit unsigned integers, where port ID is stored
in bits 28-25. Because of this, connection tracking flow actions
cannot be created on ports with IDs higher than 15.
This patch adds missing validation.

Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS")
Cc: sta...@dpdk.org

Signed-off-by: Dariusz Sosnowski <dsosnow...@nvidia.com>
Acked-by: Ori Kam <or...@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 9 +++++++++
 drivers/net/mlx5/mlx5_flow_hw.c | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 75a8a223ab..ddf19e9a51 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -13889,6 +13889,13 @@ flow_dv_translate_create_conntrack(struct rte_eth_dev 
*dev,
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ACTION, NULL,
                                          "Connection is not supported");
+       if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) {
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "CT supports port indexes up to "
+                                  RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT));
+               return 0;
+       }
        idx = flow_dv_aso_ct_alloc(dev, error);
        if (!idx)
                return rte_flow_error_set(error, rte_errno,
@@ -16586,6 +16593,8 @@ flow_dv_action_create(struct rte_eth_dev *dev,
        case RTE_FLOW_ACTION_TYPE_CONNTRACK:
                ret = flow_dv_translate_create_conntrack(dev, action->conf,
                                                         err);
+               if (!ret)
+                       break;
                idx = MLX5_INDIRECT_ACT_CT_GEN_IDX(PORT_ID(priv), ret);
                break;
        default:
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 2a1281732a..a8e2c9cc9e 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -10344,6 +10344,13 @@ flow_hw_conntrack_create(struct rte_eth_dev *dev, 
uint32_t queue,
                                   "CT is not enabled");
                return 0;
        }
+       if (dev->data->port_id >= MLX5_INDIRECT_ACT_CT_MAX_PORT) {
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "CT supports port indexes up to "
+                                  RTE_STR(MLX5_ACTION_CTX_CT_MAX_PORT));
+               return 0;
+       }
        ct = mlx5_ipool_zmalloc(pool->cts, &ct_idx);
        if (!ct) {
                rte_flow_error_set(error, rte_errno,
-- 
2.25.1