]> git.droids-corp.org - dpdk.git/commitdiff
net/mlx5: fix hairpin split detection
authorOri Kam <orika@mellanox.com>
Tue, 19 Nov 2019 12:38:33 +0000 (12:38 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 20 Nov 2019 16:36:06 +0000 (17:36 +0100)
When creating a flow, the flow is checked if it should be split into
2 flows based on the queue/rss acton.

If the RSS action with given without any queues, it will result in crash
due to the fact that the function checks the queue type.

This commit fixes this issue by checking if the rss action is not empty,
and at least one queue.

Fixes: d85c7b5ea59f ("net/mlx5: split hairpin flows")
Signed-off-by: Ori Kam <orika@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
drivers/net/mlx5/mlx5_flow.c

index d677de817ded348a9a11b41165406329dd6fa522..b488b679edb47b06a03e558e37f5f00c51fb00ce 100644 (file)
@@ -2814,6 +2814,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
                switch (actions->type) {
                case RTE_FLOW_ACTION_TYPE_QUEUE:
                        queue = actions->conf;
+                       if (queue == NULL)
+                               return 0;
                        if (mlx5_rxq_get_type(dev, queue->index) !=
                            MLX5_RXQ_TYPE_HAIRPIN)
                                return 0;
@@ -2822,6 +2824,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
                        break;
                case RTE_FLOW_ACTION_TYPE_RSS:
                        rss = actions->conf;
+                       if (rss == NULL || rss->queue_num == 0)
+                               return 0;
                        if (mlx5_rxq_get_type(dev, rss->queue[0]) !=
                            MLX5_RXQ_TYPE_HAIRPIN)
                                return 0;