[dpdk-stable] patch 'net/ice: support mark only action for flow director' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 2e1e12f6a83b7e94ab50ccfa0df05629482a331e Mon Sep 17 00:00:00 2001
From: Simei Su <simei.su at intel.com>
Date: Tue, 14 Apr 2020 23:11:13 +0800
Subject: [PATCH] net/ice: support mark only action for flow director

[ upstream commit 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 ]

This patch fixes issue that doesn't support mark only case.
Mark only action is equal to mark + passthru action.

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

Signed-off-by: Simei Su <simei.su at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_fdir_filter.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index 6342b560c9..91fef712c1 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -1533,7 +1533,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 		}
 	}
 
-	if (dest_num == 0 || dest_num >= 2) {
+	if (dest_num >= 2) {
 		rte_flow_error_set(error, EINVAL,
 			   RTE_FLOW_ERROR_TYPE_ACTION, actions,
 			   "Unsupported action combination");
@@ -1554,6 +1554,18 @@ ice_fdir_parse_action(struct ice_adapter *ad,
 		return -rte_errno;
 	}
 
+	if (dest_num + mark_num + counter_num == 0) {
+		rte_flow_error_set(error, EINVAL,
+			   RTE_FLOW_ERROR_TYPE_ACTION, actions,
+			   "Empty action");
+		return -rte_errno;
+	}
+
+	/* set default action to PASSTHRU mode, in "mark/count only" case. */
+	if (dest_num == 0)
+		filter->input.dest_ctl =
+			ICE_FLTR_PRGM_DESC_DEST_DIRECT_PKT_OTHER;
+
 	return 0;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:52.315888095 +0100
+++ 0190-net-ice-support-mark-only-action-for-flow-director.patch	2020-05-19 14:04:44.544654318 +0100
@@ -1,13 +1,14 @@
-From 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 Mon Sep 17 00:00:00 2001
+From 2e1e12f6a83b7e94ab50ccfa0df05629482a331e Mon Sep 17 00:00:00 2001
 From: Simei Su <simei.su at intel.com>
 Date: Tue, 14 Apr 2020 23:11:13 +0800
 Subject: [PATCH] net/ice: support mark only action for flow director
 
+[ upstream commit 0f664f7d57268f9ab9bdef95f0d48b3ce5004a61 ]
+
 This patch fixes issue that doesn't support mark only case.
 Mark only action is equal to mark + passthru action.
 
 Fixes: f5cafa961fae ("net/ice: add flow director create and destroy")
-Cc: stable at dpdk.org
 
 Signed-off-by: Simei Su <simei.su at intel.com>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
-index 1a85d6cc16..69c714c59c 100644
+index 6342b560c9..91fef712c1 100644
 --- a/drivers/net/ice/ice_fdir_filter.c
 +++ b/drivers/net/ice/ice_fdir_filter.c
-@@ -1539,7 +1539,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
+@@ -1533,7 +1533,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
  		}
  	}
  
@@ -28,7 +29,7 @@
  		rte_flow_error_set(error, EINVAL,
  			   RTE_FLOW_ERROR_TYPE_ACTION, actions,
  			   "Unsupported action combination");
-@@ -1560,6 +1560,18 @@ ice_fdir_parse_action(struct ice_adapter *ad,
+@@ -1554,6 +1554,18 @@ ice_fdir_parse_action(struct ice_adapter *ad,
  		return -rte_errno;
  	}