[dpdk-stable] patch 'net/bnxt: fix non matching flow hitting filter rule' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 8a0dcafe970bf57a19da6d3aafef313deedfc0b8 Mon Sep 17 00:00:00 2001
From: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
Date: Fri, 20 Dec 2019 18:29:40 -0800
Subject: [PATCH] net/bnxt: fix non matching flow hitting filter rule

[ upstream commit 5c63167168138cb5f119372814e62472bbdcd38e ]

As part of ntuple filter, we were creating L2 filter with the ntuple
redirect queue resulting in any L2 matching flow getting steered to
this queue. For ntuple filters, we need to create the L2 filter with
default queue. The user specified redirect queue will be set while
creating the ntuple filter in hardware.

Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")

Signed-off-by: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
---
 drivers/net/bnxt/bnxt_flow.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index dd40b2d72e..98b1f27bbd 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1126,7 +1126,16 @@ use_vnic:
 		PMD_DRV_LOG(DEBUG,
 			    "Setting vnic ff_idx %d\n", vnic->ff_pool_idx);
 		filter->dst_id = vnic->fw_vnic_id;
-		filter1 = bnxt_get_l2_filter(bp, filter, vnic);
+
+		/* For ntuple filter, create the L2 filter with default VNIC.
+		 * The user specified redirect queue will be set while creating
+		 * the ntuple filter in hardware.
+		 */
+		vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
+		if (use_ntuple)
+			filter1 = bnxt_get_l2_filter(bp, filter, vnic0);
+		else
+			filter1 = bnxt_get_l2_filter(bp, filter, vnic);
 		if (filter1 == NULL) {
 			rte_flow_error_set(error,
 					   ENOSPC,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.982474881 +0000
+++ 0055-net-bnxt-fix-non-matching-flow-hitting-filter-rule.patch	2020-02-11 11:17:38.428001871 +0000
@@ -1,8 +1,10 @@
-From 5c63167168138cb5f119372814e62472bbdcd38e Mon Sep 17 00:00:00 2001
+From 8a0dcafe970bf57a19da6d3aafef313deedfc0b8 Mon Sep 17 00:00:00 2001
 From: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
 Date: Fri, 20 Dec 2019 18:29:40 -0800
 Subject: [PATCH] net/bnxt: fix non matching flow hitting filter rule
 
+[ upstream commit 5c63167168138cb5f119372814e62472bbdcd38e ]
+
 As part of ntuple filter, we were creating L2 filter with the ntuple
 redirect queue resulting in any L2 matching flow getting steered to
 this queue. For ntuple filters, we need to create the L2 filter with
@@ -10,7 +12,6 @@
 creating the ntuple filter in hardware.
 
 Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")
-Cc: stable at dpdk.org
 
 Signed-off-by: Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
 Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
@@ -19,7 +20,7 @@
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index 7343b7e7b4..855994a6b0 100644
+index dd40b2d72e..98b1f27bbd 100644
 --- a/drivers/net/bnxt/bnxt_flow.c
 +++ b/drivers/net/bnxt/bnxt_flow.c
 @@ -1126,7 +1126,16 @@ use_vnic: