net/mlx5: fix RSS consistency check of meter policy

After yellow color actions in the metering policy were supported,
the RSS could be used for both green and yellow colors and only the
queues attribute could be different.

When specifying the attributes of a RSS, some fields can be ignored
and some default values will be used in PMD. For example, there is a
default RSS key in the PMD and it will be used to create the TIR if
nothing is provided by the application.

The default value cases were missed in the current implementation
and it would cause some false positives or crashes.

The comparison function should be adjusted to take all cases into
consideration when RSS is used for both green and yellow colors.

Fixes: 4b7bf3ffb473 ("net/mlx5: support yellow in meter policy validation")
Cc: stable@dpdk.org
Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 842ada2ea96bc8354cb87506f871e7de86c707d2..75ed0156c301bb730af84d97b0cf988a362a98aa 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -17583,12 +17583,22 @@ static inline int
 flow_dv_mtr_policy_rss_compare(const struct rte_flow_action_rss *r1,
                               const struct rte_flow_action_rss *r2)
 {
-       if (!r1 || !r2)
+       if (r1 == NULL || r2 == NULL)
                return 0;
-       if (r1->func != r2->func || r1->level != r2->level ||
-           r1->types != r2->types || r1->key_len != r2->key_len ||
-           memcmp(r1->key, r2->key, r1->key_len))
+       if (!(r1->level <= 1 && r2->level <= 1) &&
+           !(r1->level > 1 && r2->level > 1))
                return 1;
+       if (r1->types != r2->types &&
+           !((r1->types == 0 || r1->types == RTE_ETH_RSS_IP) &&
+             (r2->types == 0 || r2->types == RTE_ETH_RSS_IP)))
+               return 1;
+       if (r1->key || r2->key) {
+               const void *key1 = r1->key ? r1->key : rss_hash_default_key;
+               const void *key2 = r2->key ? r2->key : rss_hash_default_key;
+
+               if (memcmp(key1, key2, MLX5_RSS_HASH_KEY_LEN))
+                       return 1;
+       }
        return 0;
 }