net/mlx4: fix ignored RSS hash types
authorAdrien Mazarguil <adrien.mazarguil@6wind.com>
Thu, 19 Apr 2018 10:07:27 +0000 (12:07 +0200)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 27 Apr 2018 14:54:56 +0000 (15:54 +0100)
When an unsupported hash type is part of a RSS configuration structure, it
is silently ignored instead of triggering an error. This may lead
applications to assume that such types are accepted, while they are in fact
not part of the resulting flow rules.

Fixes: 078b8b452e6b ("net/mlx4: add RSS flow rule action support")
Cc: stable@dpdk.org
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
drivers/net/mlx4/mlx4_flow.c

index 2b4bf70..67fd568 100644 (file)
@@ -706,6 +706,7 @@ fill:
                        const struct rte_flow_action_queue *queue;
                        const struct rte_flow_action_rss *rss;
                        const struct rte_eth_rss_conf *rss_conf;
+                       uint64_t fields;
                        unsigned int i;
 
                case RTE_FLOW_ACTION_TYPE_VOID:
@@ -780,10 +781,15 @@ fill:
                                        " of the context size";
                                goto exit_action_not_supported;
                        }
+                       rte_errno = 0;
+                       fields = mlx4_conv_rss_hf(priv, rss_conf->rss_hf);
+                       if (fields == (uint64_t)-1 && rte_errno) {
+                               msg = "unsupported RSS hash type requested";
+                               goto exit_action_not_supported;
+                       }
                        flow->rss = mlx4_rss_get
-                               (priv,
-                                mlx4_conv_rss_hf(priv, rss_conf->rss_hf),
-                                rss_conf->rss_key, rss->num, rss->queue);
+                               (priv, fields, rss_conf->rss_key, rss->num,
+                                rss->queue);
                        if (!flow->rss) {
                                msg = "either invalid parameters or not enough"
                                        " resources for additional multi-queue"