[dpdk-dev] [PATCH] net/mlx5: fix flow director drop rule deletion crash

[Shahaf Shuler <shahafs@mellanox.com>]

Drop flow rules are created on the ETH queue even though the parser layer
matches the flow rule layer (L3/L4)

Fixes: 6f2f4948b236 ("net/mlx5: fix flow director rule deletion crash")
Cc: stable@dpdk.org
Cc: adrien.mazarguil@6wind.com

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 38811bbcec..ebc6754eeb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3382,6 +3382,8 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
 	if (parser.drop) {
 		struct ibv_flow_spec_action_drop *drop;
 
+		/* Drop rules are created on the ETH queue. */
+		parser.layer = HASH_RXQ_ETH;
 		drop = (void *)((uintptr_t)parser.queue[parser.layer].ibv_attr +
 				parser.queue[parser.layer].offset);
 		*drop = (struct ibv_flow_spec_action_drop){
@@ -3401,6 +3403,9 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev,
 
 		attr = parser.queue[parser.layer].ibv_attr;
 		flow_attr = flow->frxq[parser.layer].ibv_attr;
+		/* Matching flows must have ibv context on the same queue. */
+		if (!flow_attr)
+			continue;
 		/* Compare first the attributes. */
 		if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr)))
 			continue;
-- 
2.12.0