patch 'net/ice: save rule on switch filter creation' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/b3f9982494d186a61e5e635a6af675a792ebeb49

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From b3f9982494d186a61e5e635a6af675a792ebeb49 Mon Sep 17 00:00:00 2001
From: Dapeng Yu <dapengx.yu at intel.com>
Date: Thu, 4 Nov 2021 16:45:34 +0800
Subject: [PATCH] net/ice: save rule on switch filter creation

[ upstream commit 9fda31c3229ca6e036cae80392578ed6e5a51119 ]

The VSI number, lookup elements and rule information for creating switch
filter are abandoned when switch filter is created in original
implementation.

This patch saved the abandoned data in RTE flow, it is for future
use on replay when handling exception at flow redirect.

Signed-off-by: Dapeng Yu <dapengx.yu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_switch_filter.c | 78 +++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 03493ee464..24ed232e88 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -101,6 +101,27 @@ static struct ice_flow_parser ice_switch_dist_parser_comms;
 static struct ice_flow_parser ice_switch_perm_parser_os;
 static struct ice_flow_parser ice_switch_perm_parser_comms;
 
+enum ice_sw_fltr_status {
+	ICE_SW_FLTR_ADDED,
+	ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT,
+	ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT,
+};
+
+struct ice_switch_filter_conf {
+	enum ice_sw_fltr_status fltr_status;
+
+	struct ice_rule_query_data sw_query_data;
+
+	/*
+	 * The lookup elements and rule info are saved here when filter creation
+	 * succeeds.
+	 */
+	uint16_t vsi_num;
+	uint16_t lkups_num;
+	struct ice_adv_lkup_elem *lkups;
+	struct ice_adv_rule_info rule_info;
+};
+
 static struct
 ice_pattern_match_item ice_switch_pattern_dist_os[] = {
 	{pattern_ethertype,
@@ -247,7 +268,7 @@ ice_switch_create(struct ice_adapter *ad,
 	struct ice_pf *pf = &ad->pf;
 	struct ice_hw *hw = ICE_PF_TO_HW(pf);
 	struct ice_rule_query_data rule_added = {0};
-	struct ice_rule_query_data *filter_ptr;
+	struct ice_switch_filter_conf *filter_conf_ptr;
 	struct ice_adv_lkup_elem *list =
 		((struct sw_meta *)meta)->list;
 	uint16_t lkups_cnt =
@@ -269,18 +290,26 @@ ice_switch_create(struct ice_adapter *ad,
 	}
 	ret = ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_added);
 	if (!ret) {
-		filter_ptr = rte_zmalloc("ice_switch_filter",
-			sizeof(struct ice_rule_query_data), 0);
-		if (!filter_ptr) {
+		filter_conf_ptr = rte_zmalloc("ice_switch_filter",
+			sizeof(struct ice_switch_filter_conf), 0);
+		if (!filter_conf_ptr) {
 			rte_flow_error_set(error, EINVAL,
 				   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
 				   "No memory for ice_switch_filter");
 			goto error;
 		}
-		flow->rule = filter_ptr;
-		rte_memcpy(filter_ptr,
-			&rule_added,
-			sizeof(struct ice_rule_query_data));
+
+		filter_conf_ptr->sw_query_data = rule_added;
+
+		filter_conf_ptr->vsi_num =
+			ice_get_hw_vsi_num(hw, rule_info->sw_act.vsi_handle);
+		filter_conf_ptr->lkups = list;
+		filter_conf_ptr->lkups_num = lkups_cnt;
+		filter_conf_ptr->rule_info = *rule_info;
+
+		filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED;
+
+		flow->rule = filter_conf_ptr;
 	} else {
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
@@ -288,7 +317,6 @@ ice_switch_create(struct ice_adapter *ad,
 		goto error;
 	}
 
-	rte_free(list);
 	rte_free(meta);
 	return 0;
 
@@ -299,6 +327,18 @@ error:
 	return -rte_errno;
 }
 
+static inline void
+ice_switch_filter_rule_free(struct rte_flow *flow)
+{
+	struct ice_switch_filter_conf *filter_conf_ptr =
+		(struct ice_switch_filter_conf *)flow->rule;
+
+	if (filter_conf_ptr)
+		rte_free(filter_conf_ptr->lkups);
+
+	rte_free(filter_conf_ptr);
+}
+
 static int
 ice_switch_destroy(struct ice_adapter *ad,
 		struct rte_flow *flow,
@@ -306,20 +346,24 @@ ice_switch_destroy(struct ice_adapter *ad,
 {
 	struct ice_hw *hw = &ad->hw;
 	int ret;
-	struct ice_rule_query_data *filter_ptr;
+	struct ice_switch_filter_conf *filter_conf_ptr;
 
-	filter_ptr = (struct ice_rule_query_data *)
+	filter_conf_ptr = (struct ice_switch_filter_conf *)
 		flow->rule;
 
-	if (!filter_ptr) {
+	if (!filter_conf_ptr ||
+	    filter_conf_ptr->fltr_status == ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT) {
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
 			"no such flow"
 			" create by switch filter");
+
+		ice_switch_filter_rule_free(flow);
+
 		return -rte_errno;
 	}
 
-	ret = ice_rem_adv_rule_by_id(hw, filter_ptr);
+	ret = ice_rem_adv_rule_by_id(hw, &filter_conf_ptr->sw_query_data);
 	if (ret) {
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
@@ -327,16 +371,10 @@ ice_switch_destroy(struct ice_adapter *ad,
 		return -rte_errno;
 	}
 
-	rte_free(filter_ptr);
+	ice_switch_filter_rule_free(flow);
 	return ret;
 }
 
-static void
-ice_switch_filter_rule_free(struct rte_flow *flow)
-{
-	rte_free(flow->rule);
-}
-
 static uint64_t
 ice_switch_inset_get(const struct rte_flow_item pattern[],
 		struct rte_flow_error *error,
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:12.825159701 +0100
+++ 0117-net-ice-save-rule-on-switch-filter-creation.patch	2021-11-30 16:50:05.942874646 +0100
@@ -1 +1 @@
-From 9fda31c3229ca6e036cae80392578ed6e5a51119 Mon Sep 17 00:00:00 2001
+From b3f9982494d186a61e5e635a6af675a792ebeb49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9fda31c3229ca6e036cae80392578ed6e5a51119 ]
+
@@ -13,2 +14,0 @@
-Cc: stable at dpdk.org
-
@@ -22 +22 @@
-index 6b0c1bff1e..d5add64c53 100644
+index 03493ee464..24ed232e88 100644
@@ -25,3 +25,3 @@
-@@ -180,6 +180,27 @@ struct sw_meta {
- 	struct ice_adv_rule_info rule_info;
- };
+@@ -101,6 +101,27 @@ static struct ice_flow_parser ice_switch_dist_parser_comms;
+ static struct ice_flow_parser ice_switch_perm_parser_os;
+ static struct ice_flow_parser ice_switch_perm_parser_comms;
@@ -50,4 +50,4 @@
- static struct ice_flow_parser ice_switch_dist_parser;
- static struct ice_flow_parser ice_switch_perm_parser;
- 
-@@ -359,7 +380,7 @@ ice_switch_create(struct ice_adapter *ad,
+ static struct
+ ice_pattern_match_item ice_switch_pattern_dist_os[] = {
+ 	{pattern_ethertype,
+@@ -247,7 +268,7 @@ ice_switch_create(struct ice_adapter *ad,
@@ -62 +62 @@
-@@ -381,18 +402,26 @@ ice_switch_create(struct ice_adapter *ad,
+@@ -269,18 +290,26 @@ ice_switch_create(struct ice_adapter *ad,
@@ -96 +96 @@
-@@ -400,7 +429,6 @@ ice_switch_create(struct ice_adapter *ad,
+@@ -288,7 +317,6 @@ ice_switch_create(struct ice_adapter *ad,
@@ -104 +104 @@
-@@ -411,6 +439,18 @@ error:
+@@ -299,6 +327,18 @@ error:
@@ -123 +123 @@
-@@ -418,20 +458,24 @@ ice_switch_destroy(struct ice_adapter *ad,
+@@ -306,20 +346,24 @@ ice_switch_destroy(struct ice_adapter *ad,
@@ -152 +152 @@
-@@ -439,16 +483,10 @@ ice_switch_destroy(struct ice_adapter *ad,
+@@ -327,16 +371,10 @@ ice_switch_destroy(struct ice_adapter *ad,
@@ -167,2 +167,2 @@
- static bool
- ice_switch_parse_pattern(const struct rte_flow_item pattern[],
+ static uint64_t
+ ice_switch_inset_get(const struct rte_flow_item pattern[],