[dpdk-stable] patch 'net/ice: fix flow director passthru' 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/19/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 6a3de06023c9301132cb3fce90ed3725f3c0b4aa Mon Sep 17 00:00:00 2001
From: Yahui Cao <yahui.cao at intel.com>
Date: Tue, 21 Jan 2020 10:25:59 +0800
Subject: [PATCH] net/ice: fix flow director passthru

[ upstream commit 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 ]

The original PASSTHRU implementation is forwarding to queue 0. The
corrected implementation is forwarding to the next stage filter.

Fixes: f5cafa961fae ("net/ice: add flow director create and destroy")

Signed-off-by: Yahui Cao <yahui.cao at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/base/ice_fdir.c   | 9 ++++++++-
 drivers/net/ice/ice_fdir_filter.c | 3 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 551c7a6bc6..8e5aef8a38 100644
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -430,6 +430,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DROP_PKT) {
 		fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_YES;
 		fdir_fltr_ctx.qindex = 0;
+	} else if (input->dest_ctl ==
+			ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER) {
+		fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_NO;
+		fdir_fltr_ctx.qindex = 0;
 	} else {
 		if (input->dest_ctl ==
 		    ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QGROUP)
@@ -441,7 +445,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
 	fdir_fltr_ctx.cnt_index = input->cnt_index;
 	fdir_fltr_ctx.fd_vsi = ice_get_hw_vsi_num(hw, input->dest_vsi);
 	fdir_fltr_ctx.evict_ena = ICE_FXD_FLTR_QW0_EVICT_ENA_FALSE;
-	fdir_fltr_ctx.toq_prio = 3;
+	if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER)
+		fdir_fltr_ctx.toq_prio = 0;
+	else
+		fdir_fltr_ctx.toq_prio = 3;
 	fdir_fltr_ctx.pcmd = (add) ? ICE_FXD_FLTR_QW1_PCMD_ADD :
 		ICE_FXD_FLTR_QW1_PCMD_REMOVE;
 	fdir_fltr_ctx.swap = ICE_FXD_FLTR_QW1_SWAP_NOT_SET;
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 442295e59d..5a791610f8 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -1499,8 +1499,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 			dest_num++;
 
 			filter->input.dest_ctl =
-				ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QINDEX;
-			filter->input.q_index = 0;
+				ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER;
 			break;
 		case RTE_FLOW_ACTION_TYPE_RSS:
 			dest_num++;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:15.938317194 +0000
+++ 0022-net-ice-fix-flow-director-passthru.patch	2020-02-17 17:00:15.311950512 +0000
@@ -1,13 +1,14 @@
-From 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 Mon Sep 17 00:00:00 2001
+From 6a3de06023c9301132cb3fce90ed3725f3c0b4aa Mon Sep 17 00:00:00 2001
 From: Yahui Cao <yahui.cao at intel.com>
 Date: Tue, 21 Jan 2020 10:25:59 +0800
 Subject: [PATCH] net/ice: fix flow director passthru
 
+[ upstream commit 0d14c49b282196f48d63da0e34d1a20cdfc6e3a8 ]
+
 The original PASSTHRU implementation is forwarding to queue 0. The
 corrected implementation is forwarding to the next stage filter.
 
 Fixes: f5cafa961fae ("net/ice: add flow director create and destroy")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yahui Cao <yahui.cao at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -17,10 +18,10 @@
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
-index 56c1c1c845..ba002586b6 100644
+index 551c7a6bc6..8e5aef8a38 100644
 --- a/drivers/net/ice/base/ice_fdir.c
 +++ b/drivers/net/ice/base/ice_fdir.c
-@@ -401,6 +401,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
+@@ -430,6 +430,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
  	if (input->dest_ctl == ICE_FLTR_PRGM_DESC_DEST_DROP_PKT) {
  		fdir_fltr_ctx.drop = ICE_FXD_FLTR_QW0_DROP_YES;
  		fdir_fltr_ctx.qindex = 0;
@@ -31,7 +32,7 @@
  	} else {
  		if (input->dest_ctl ==
  		    ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_QGROUP)
-@@ -412,7 +416,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
+@@ -441,7 +445,10 @@ ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,
  	fdir_fltr_ctx.cnt_index = input->cnt_index;
  	fdir_fltr_ctx.fd_vsi = ice_get_hw_vsi_num(hw, input->dest_vsi);
  	fdir_fltr_ctx.evict_ena = ICE_FXD_FLTR_QW0_EVICT_ENA_FALSE;