From: Dapeng Yu <dapengx...@intel.com>
The meta is abandoned when switch filter is created in original
implementation.
This patch saved the meta in RTE flow for future use.
Fixes: 47d460d63233 ("net/ice: rework switch filter")
Cc: sta...@dpdk.org
Signed-off-by: Dapeng Yu <dapengx...@intel.com>
---
drivers/net/ice/ice_switch_filter.c | 69 ++++++++++++++++++++---------
1 file changed, 49 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c
b/drivers/net/ice/ice_switch_filter.c
index 6b0c1bff1e..804cf9b812 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -180,6 +180,21 @@ struct sw_meta {
struct ice_adv_rule_info rule_info;
};
+struct ice_switch_filter_conf {
+ bool added;
+
+ /* Only when added flag is true, the query data is valid */
+ struct ice_rule_query_data sw_query_data;
+
+ /*
+ * The lookup elements and rule info are saved here when filter creation
+ * succeeds.
+ */
+ uint16_t lkups_num;
+ struct ice_adv_lkup_elem *lkups;
+ struct ice_adv_rule_info rule_info;
+};
+
static struct ice_flow_parser ice_switch_dist_parser;
static struct ice_flow_parser ice_switch_perm_parser;
@@ -359,7 +374,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 =
@@ -381,18 +396,24 @@ 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->lkups = list;
+ filter_conf_ptr->lkups_num = lkups_cnt;
+ filter_conf_ptr->rule_info = *rule_info;
+
+ filter_conf_ptr->added = true;
+
+ flow->rule = filter_conf_ptr;
} else {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
@@ -400,7 +421,6 @@ ice_switch_create(struct ice_adapter *ad,
goto error;
}
- rte_free(list);
rte_free(meta);
return 0;
@@ -411,6 +431,18 @@ ice_switch_create(struct ice_adapter *ad,
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,
@@ -418,20 +450,23 @@ 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->added) {
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,
@@ -439,16 +474,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 bool
ice_switch_parse_pattern(const struct rte_flow_item pattern[],
struct rte_flow_error *error,
--
2.27.0
