From: Ori Kam <orika@mellanox.com>
Date: Tue, 19 Nov 2019 12:38:33 +0000 (+0000)
Subject: net/mlx5: fix hairpin split detection
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=2e715e53deb52cf2c0fee5744702a0340fc8625e;p=dpdk.git
net/mlx5: fix hairpin split detection
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>
---
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index d677de817d..b488b679ed 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -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;