* [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation
@ 2021-11-01 8:45 dapengx.yu
2021-11-01 8:45 ` [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure dapengx.yu
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-01 8:45 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@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: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure
2021-11-01 8:45 [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation dapengx.yu
@ 2021-11-01 8:45 ` dapengx.yu
2021-11-02 0:06 ` [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation Zhang, Qi Z
` (2 subsequent siblings)
3 siblings, 0 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-01 8:45 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
When the switch flow rules are redirected, if rule is removed but not
added successfully, the rule addition in the next time will not succeed
because the rule's meta cannot be found.
This patch uses the saved flow rule's meta when the flow rule is added
again to make the addition succeed.
Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
drivers/net/ice/ice_switch_filter.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index 804cf9b812..0994ea00ae 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1917,7 +1917,10 @@ ice_switch_redirect(struct ice_adapter *ad,
struct rte_flow *flow,
struct ice_flow_redirect *rd)
{
- struct ice_rule_query_data *rdata = flow->rule;
+ struct ice_rule_query_data *rdata;
+ struct ice_switch_filter_conf *filter_conf_ptr =
+ (struct ice_switch_filter_conf *)flow->rule;
+ struct ice_rule_query_data added_rdata = { 0 };
struct ice_adv_fltr_mgmt_list_entry *list_itr;
struct ice_adv_lkup_elem *lkups_dp = NULL;
struct LIST_HEAD_TYPE *list_head;
@@ -1927,6 +1930,8 @@ ice_switch_redirect(struct ice_adapter *ad,
uint16_t lkups_cnt;
int ret;
+ rdata = &filter_conf_ptr->sw_query_data;
+
if (rdata->vsi_handle != rd->vsi_handle)
return 0;
@@ -1937,6 +1942,22 @@ ice_switch_redirect(struct ice_adapter *ad,
if (rd->type != ICE_FLOW_REDIRECT_VSI)
return -ENOTSUP;
+ if (!filter_conf_ptr->added) {
+ ret = ice_add_adv_rule(hw, filter_conf_ptr->lkups,
+ filter_conf_ptr->lkups_num,
+ &filter_conf_ptr->rule_info,
+ &added_rdata);
+
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to replay the rule again");
+ return -EINVAL;
+ }
+
+ filter_conf_ptr->sw_query_data = added_rdata;
+ filter_conf_ptr->added = true;
+ return 0;
+ }
+
list_head = &sw->recp_list[rdata->rid].filt_rules;
LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry,
list_entry) {
@@ -1983,10 +2004,14 @@ ice_switch_redirect(struct ice_adapter *ad,
/* Replay the rule */
ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt,
- &rinfo, rdata);
+ &rinfo, &added_rdata);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to replay the rule");
+ filter_conf_ptr->added = false;
ret = -EINVAL;
+ } else {
+ filter_conf_ptr->sw_query_data = added_rdata;
+ filter_conf_ptr->added = true;
}
out:
--
2.27.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation
2021-11-01 8:45 [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation dapengx.yu
2021-11-01 8:45 ` [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure dapengx.yu
@ 2021-11-02 0:06 ` Zhang, Qi Z
2021-11-02 0:08 ` Zhang, Qi Z
2021-11-02 16:11 ` Ferruh Yigit
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 1/2] net/ice: save rule " dapengx.yu
3 siblings, 1 reply; 14+ messages in thread
From: Zhang, Qi Z @ 2021-11-02 0:06 UTC (permalink / raw)
To: Yu, DapengX, Yang, Qiming; +Cc: dev, Wang, Haiyue, stable
> -----Original Message-----
> From: Yu, DapengX <dapengx.yu@intel.com>
> Sent: Monday, November 1, 2021 4:45 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>; Yu, DapengX
> <dapengx.yu@intel.com>; stable@dpdk.org
> Subject: [PATCH 1/2] net/ice: save meta on switch filter creation
>
> From: Dapeng Yu <dapengx.yu@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.
Can be more specific, it is used for flow replay when handling exception at flow redirect.
Will update during merge.
>
> Fixes: 47d460d63233 ("net/ice: rework switch filter")
> Cc: stable@dpdk.org
>
> Signed-off-by: Dapeng Yu <dapengx.yu@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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation
2021-11-02 0:06 ` [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation Zhang, Qi Z
@ 2021-11-02 0:08 ` Zhang, Qi Z
0 siblings, 0 replies; 14+ messages in thread
From: Zhang, Qi Z @ 2021-11-02 0:08 UTC (permalink / raw)
To: Yu, DapengX, Yang, Qiming; +Cc: dev, Wang, Haiyue, stable
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Tuesday, November 2, 2021 8:07 AM
> To: Yu, DapengX <dapengx.yu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>;
> stable@dpdk.org
> Subject: RE: [PATCH 1/2] net/ice: save meta on switch filter creation
>
>
>
> > -----Original Message-----
> > From: Yu, DapengX <dapengx.yu@intel.com>
> > Sent: Monday, November 1, 2021 4:45 PM
> > To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>; Yu, DapengX
> > <dapengx.yu@intel.com>; stable@dpdk.org
> > Subject: [PATCH 1/2] net/ice: save meta on switch filter creation
> >
> > From: Dapeng Yu <dapengx.yu@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.
>
> Can be more specific, it is used for flow replay when handling exception at flow
> redirect.
>
> Will update during merge.
>
> >
> > Fixes: 47d460d63233 ("net/ice: rework switch filter")
This is not a fix, but can cc stable as the real fix patch depends on this.
will remove fixline during merge.
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation
2021-11-01 8:45 [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation dapengx.yu
2021-11-01 8:45 ` [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-02 0:06 ` [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation Zhang, Qi Z
@ 2021-11-02 16:11 ` Ferruh Yigit
2021-11-03 3:25 ` Yu, DapengX
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 1/2] net/ice: save rule " dapengx.yu
3 siblings, 1 reply; 14+ messages in thread
From: Ferruh Yigit @ 2021-11-02 16:11 UTC (permalink / raw)
To: dapengx.yu, Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, stable
On 11/1/2021 8:45 AM, dapengx.yu@intel.com wrote:
> From: Dapeng Yu<dapengx.yu@intel.com>
>
> The meta is abandoned when switch filter is created in original
> implementation.
>
What is 'meta', do you mean 'metadata'? Can you please clarify which
metadata you are referring to?
> This patch saved the meta in RTE flow for future use.
>
> Fixes: 47d460d63233 ("net/ice: rework switch filter")
> Cc:stable@dpdk.org
>
> Signed-off-by: Dapeng Yu<dapengx.yu@intel.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation
2021-11-02 16:11 ` Ferruh Yigit
@ 2021-11-03 3:25 ` Yu, DapengX
0 siblings, 0 replies; 14+ messages in thread
From: Yu, DapengX @ 2021-11-03 3:25 UTC (permalink / raw)
To: Yigit, Ferruh, Yang, Qiming, Zhang, Qi Z; +Cc: dev, Wang, Haiyue, stable
> -----Original Message-----
> From: Yigit, Ferruh <ferruh.yigit@intel.com>
> Sent: Wednesday, November 3, 2021 12:11 AM
> To: Yu, DapengX <dapengx.yu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>;
> stable@dpdk.org
> Subject: Re: [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter
> creation
>
> On 11/1/2021 8:45 AM, dapengx.yu@intel.com wrote:
> > From: Dapeng Yu<dapengx.yu@intel.com>
> >
> > The meta is abandoned when switch filter is created in original
> > implementation.
> >
>
> What is 'meta', do you mean 'metadata'? Can you please clarify which
> metadata you are referring to?
>
The commit log will be improved in the next version.
> > This patch saved the meta in RTE flow for future use.
> >
> > Fixes: 47d460d63233 ("net/ice: rework switch filter")
> > Cc:stable@dpdk.org
> >
> > Signed-off-by: Dapeng Yu<dapengx.yu@intel.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v2 1/2] net/ice: save rule on switch filter creation
2021-11-01 8:45 [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation dapengx.yu
` (2 preceding siblings ...)
2021-11-02 16:11 ` Ferruh Yigit
@ 2021-11-03 10:05 ` dapengx.yu
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation dapengx.yu
3 siblings, 2 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-03 10:05 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
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.
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
---
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 6b0c1bff1e..d5add64c53 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -180,6 +180,27 @@ struct sw_meta {
struct ice_adv_rule_info rule_info;
};
+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_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,
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 +402,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,
@@ -400,7 +429,6 @@ ice_switch_create(struct ice_adapter *ad,
goto error;
}
- rte_free(list);
rte_free(meta);
return 0;
@@ -411,6 +439,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 +458,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,
@@ -439,16 +483,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v2 2/2] net/ice: fix flow redirect failure
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 1/2] net/ice: save rule " dapengx.yu
@ 2021-11-03 10:05 ` dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation dapengx.yu
1 sibling, 0 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-03 10:05 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
It's possible that a switch rule can't be redirect successfully due
to kernel driver is busy to handle an ongoing VF reset, so the
redirect action need to be deferred into next redirect request which
is promised by kernel driver after VF reset done.
This patch uses the saved flow rule's meta to replay switch rule
remove/add during next flow redirect.
Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
---
drivers/net/ice/ice_switch_filter.c | 47 +++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index d5add64c53..5d7cdd7583 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1926,7 +1926,10 @@ ice_switch_redirect(struct ice_adapter *ad,
struct rte_flow *flow,
struct ice_flow_redirect *rd)
{
- struct ice_rule_query_data *rdata = flow->rule;
+ struct ice_rule_query_data *rdata;
+ struct ice_switch_filter_conf *filter_conf_ptr =
+ (struct ice_switch_filter_conf *)flow->rule;
+ struct ice_rule_query_data added_rdata = { 0 };
struct ice_adv_fltr_mgmt_list_entry *list_itr;
struct ice_adv_lkup_elem *lkups_dp = NULL;
struct LIST_HEAD_TYPE *list_head;
@@ -1936,6 +1939,8 @@ ice_switch_redirect(struct ice_adapter *ad,
uint16_t lkups_cnt;
int ret;
+ rdata = &filter_conf_ptr->sw_query_data;
+
if (rdata->vsi_handle != rd->vsi_handle)
return 0;
@@ -1946,6 +1951,33 @@ ice_switch_redirect(struct ice_adapter *ad,
if (rd->type != ICE_FLOW_REDIRECT_VSI)
return -ENOTSUP;
+ if (filter_conf_ptr->fltr_status == ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT) {
+ /* Save VSI number for failure recover */
+ filter_conf_ptr->vsi_num = rd->new_vsi_num;
+
+ /* Update VSI context */
+ hw->vsi_ctx[rd->vsi_handle]->vsi_num = rd->new_vsi_num;
+
+ ret = ice_add_adv_rule(hw, filter_conf_ptr->lkups,
+ filter_conf_ptr->lkups_num,
+ &filter_conf_ptr->rule_info,
+ &added_rdata);
+
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to replay the rule again");
+ return -EINVAL;
+ }
+
+ filter_conf_ptr->sw_query_data = added_rdata;
+ filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED;
+ return 0;
+ }
+
+ if (filter_conf_ptr->fltr_status == ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT) {
+ /* Recover VSI context */
+ hw->vsi_ctx[rd->vsi_handle]->vsi_num = filter_conf_ptr->vsi_num;
+ }
+
list_head = &sw->recp_list[rdata->rid].filt_rules;
LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry,
list_entry) {
@@ -1977,12 +2009,17 @@ ice_switch_redirect(struct ice_adapter *ad,
if (!lkups_dp)
return -EINVAL;
+ /* Save VSI number for failure recover */
+ filter_conf_ptr->vsi_num = rd->new_vsi_num;
+
/* Remove the old rule */
ret = ice_rem_adv_rule(hw, list_itr->lkups,
lkups_cnt, &rinfo);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to delete the old rule %d",
rdata->rule_id);
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT;
ret = -EINVAL;
goto out;
}
@@ -1992,10 +2029,16 @@ ice_switch_redirect(struct ice_adapter *ad,
/* Replay the rule */
ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt,
- &rinfo, rdata);
+ &rinfo, &added_rdata);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to replay the rule");
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT;
ret = -EINVAL;
+ } else {
+ filter_conf_ptr->sw_query_data = added_rdata;
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_ADDED;
}
out:
--
2.27.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 1/2] net/ice: save rule " dapengx.yu
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 2/2] net/ice: fix flow redirect failure dapengx.yu
@ 2021-11-04 8:17 ` dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation dapengx.yu
1 sibling, 2 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-04 8:17 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
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.
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
V3:
* Use switch statement to make code clear
---
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 6b0c1bff1e..d5add64c53 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -180,6 +180,27 @@ struct sw_meta {
struct ice_adv_rule_info rule_info;
};
+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_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,
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 +402,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,
@@ -400,7 +429,6 @@ ice_switch_create(struct ice_adapter *ad,
goto error;
}
- rte_free(list);
rte_free(meta);
return 0;
@@ -411,6 +439,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 +458,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,
@@ -439,16 +483,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v3 2/2] net/ice: fix flow redirect failure
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation dapengx.yu
@ 2021-11-04 8:17 ` dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation dapengx.yu
1 sibling, 0 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-04 8:17 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
It's possible that a switch rule can't be redirect successfully due
to kernel driver is busy to handle an ongoing VF reset, so the
redirect action need to be deferred into next redirect request which
is promised by kernel driver after VF reset done.
This patch uses the saved flow rule's data to replay switch rule
remove/add during next flow redirect.
Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
V3:
* Use switch statement to make code clear
---
drivers/net/ice/ice_switch_filter.c | 108 ++++++++++++++++++++--------
1 file changed, 78 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index d5add64c53..787ab3fec0 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1926,8 +1926,12 @@ ice_switch_redirect(struct ice_adapter *ad,
struct rte_flow *flow,
struct ice_flow_redirect *rd)
{
- struct ice_rule_query_data *rdata = flow->rule;
+ struct ice_rule_query_data *rdata;
+ struct ice_switch_filter_conf *filter_conf_ptr =
+ (struct ice_switch_filter_conf *)flow->rule;
+ struct ice_rule_query_data added_rdata = { 0 };
struct ice_adv_fltr_mgmt_list_entry *list_itr;
+ struct ice_adv_lkup_elem *lkups_ref = NULL;
struct ice_adv_lkup_elem *lkups_dp = NULL;
struct LIST_HEAD_TYPE *list_head;
struct ice_adv_rule_info rinfo;
@@ -1936,6 +1940,8 @@ ice_switch_redirect(struct ice_adapter *ad,
uint16_t lkups_cnt;
int ret;
+ rdata = &filter_conf_ptr->sw_query_data;
+
if (rdata->vsi_handle != rd->vsi_handle)
return 0;
@@ -1946,56 +1952,98 @@ ice_switch_redirect(struct ice_adapter *ad,
if (rd->type != ICE_FLOW_REDIRECT_VSI)
return -ENOTSUP;
- list_head = &sw->recp_list[rdata->rid].filt_rules;
- LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry,
- list_entry) {
- rinfo = list_itr->rule_info;
- if ((rinfo.fltr_rule_id == rdata->rule_id &&
- rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
- rinfo.sw_act.vsi_handle == rd->vsi_handle) ||
- (rinfo.fltr_rule_id == rdata->rule_id &&
- rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST)){
- lkups_cnt = list_itr->lkups_cnt;
- lkups_dp = (struct ice_adv_lkup_elem *)
- ice_memdup(hw, list_itr->lkups,
- sizeof(*list_itr->lkups) *
- lkups_cnt, ICE_NONDMA_TO_NONDMA);
-
- if (!lkups_dp) {
- PMD_DRV_LOG(ERR, "Failed to allocate memory.");
- return -EINVAL;
- }
+ switch (filter_conf_ptr->fltr_status) {
+ case ICE_SW_FLTR_ADDED:
+ list_head = &sw->recp_list[rdata->rid].filt_rules;
+ LIST_FOR_EACH_ENTRY(list_itr, list_head,
+ ice_adv_fltr_mgmt_list_entry,
+ list_entry) {
+ rinfo = list_itr->rule_info;
+ if ((rinfo.fltr_rule_id == rdata->rule_id &&
+ rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
+ rinfo.sw_act.vsi_handle == rd->vsi_handle) ||
+ (rinfo.fltr_rule_id == rdata->rule_id &&
+ rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST)){
+ lkups_cnt = list_itr->lkups_cnt;
+
+ lkups_dp = (struct ice_adv_lkup_elem *)
+ ice_memdup(hw, list_itr->lkups,
+ sizeof(*list_itr->lkups) *
+ lkups_cnt,
+ ICE_NONDMA_TO_NONDMA);
+ if (!lkups_dp) {
+ PMD_DRV_LOG(ERR,
+ "Failed to allocate memory.");
+ return -EINVAL;
+ }
+ lkups_ref = lkups_dp;
- if (rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST) {
- rinfo.sw_act.vsi_handle = rd->vsi_handle;
- rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ if (rinfo.sw_act.fltr_act ==
+ ICE_FWD_TO_VSI_LIST) {
+ rinfo.sw_act.vsi_handle =
+ rd->vsi_handle;
+ rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ }
+ break;
}
- break;
}
- }
- if (!lkups_dp)
+ if (!lkups_ref)
+ return -EINVAL;
+
+ goto rmv_rule;
+ case ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT:
+ /* Recover VSI context */
+ hw->vsi_ctx[rd->vsi_handle]->vsi_num = filter_conf_ptr->vsi_num;
+ rinfo = filter_conf_ptr->rule_info;
+ lkups_cnt = filter_conf_ptr->lkups_num;
+ lkups_ref = filter_conf_ptr->lkups;
+
+ if (rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST) {
+ rinfo.sw_act.vsi_handle = rd->vsi_handle;
+ rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ }
+
+ goto rmv_rule;
+ case ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT:
+ rinfo = filter_conf_ptr->rule_info;
+ lkups_cnt = filter_conf_ptr->lkups_num;
+ lkups_ref = filter_conf_ptr->lkups;
+
+ goto add_rule;
+ default:
return -EINVAL;
+ }
+ rmv_rule:
/* Remove the old rule */
- ret = ice_rem_adv_rule(hw, list_itr->lkups,
- lkups_cnt, &rinfo);
+ ret = ice_rem_adv_rule(hw, lkups_ref, lkups_cnt, &rinfo);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to delete the old rule %d",
rdata->rule_id);
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT;
ret = -EINVAL;
goto out;
}
+add_rule:
/* Update VSI context */
hw->vsi_ctx[rd->vsi_handle]->vsi_num = rd->new_vsi_num;
/* Replay the rule */
- ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt,
- &rinfo, rdata);
+ ret = ice_add_adv_rule(hw, lkups_ref, lkups_cnt,
+ &rinfo, &added_rdata);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to replay the rule");
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT;
ret = -EINVAL;
+ } else {
+ filter_conf_ptr->sw_query_data = added_rdata;
+ /* Save VSI number for failure recover */
+ filter_conf_ptr->vsi_num = rd->new_vsi_num;
+ filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED;
}
out:
--
2.27.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 2/2] net/ice: fix flow redirect failure dapengx.yu
@ 2021-11-04 8:45 ` dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 11:10 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation Zhang, Qi Z
1 sibling, 2 replies; 14+ messages in thread
From: dapengx.yu @ 2021-11-04 8:45 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
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.
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
V3:
* No change
V4:
* No change
---
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 6b0c1bff1e..d5add64c53 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -180,6 +180,27 @@ struct sw_meta {
struct ice_adv_rule_info rule_info;
};
+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_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,
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 +402,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,
@@ -400,7 +429,6 @@ ice_switch_create(struct ice_adapter *ad,
goto error;
}
- rte_free(list);
rte_free(meta);
return 0;
@@ -411,6 +439,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 +458,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,
@@ -439,16 +483,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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation dapengx.yu
@ 2021-11-04 8:45 ` dapengx.yu
2021-11-04 11:12 ` Zhang, Qi Z
2021-11-04 11:10 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation Zhang, Qi Z
1 sibling, 1 reply; 14+ messages in thread
From: dapengx.yu @ 2021-11-04 8:45 UTC (permalink / raw)
To: Qiming Yang, Qi Zhang; +Cc: dev, haiyue.wang, Dapeng Yu, stable
From: Dapeng Yu <dapengx.yu@intel.com>
It's possible that a switch rule can't be redirect successfully due
to kernel driver is busy to handle an ongoing VF reset, so the
redirect action need to be deferred into next redirect request which
is promised by kernel driver after VF reset done.
This patch uses the saved flow rule's data to replay switch rule
remove/add during next flow redirect.
Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
---
V2:
* Add more filter status and VSI number
V3:
* Use switch statement to make code clear
V4:
* Trim leading space
---
drivers/net/ice/ice_switch_filter.c | 108 ++++++++++++++++++++--------
1 file changed, 78 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index d5add64c53..ed29c00d77 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1926,8 +1926,12 @@ ice_switch_redirect(struct ice_adapter *ad,
struct rte_flow *flow,
struct ice_flow_redirect *rd)
{
- struct ice_rule_query_data *rdata = flow->rule;
+ struct ice_rule_query_data *rdata;
+ struct ice_switch_filter_conf *filter_conf_ptr =
+ (struct ice_switch_filter_conf *)flow->rule;
+ struct ice_rule_query_data added_rdata = { 0 };
struct ice_adv_fltr_mgmt_list_entry *list_itr;
+ struct ice_adv_lkup_elem *lkups_ref = NULL;
struct ice_adv_lkup_elem *lkups_dp = NULL;
struct LIST_HEAD_TYPE *list_head;
struct ice_adv_rule_info rinfo;
@@ -1936,6 +1940,8 @@ ice_switch_redirect(struct ice_adapter *ad,
uint16_t lkups_cnt;
int ret;
+ rdata = &filter_conf_ptr->sw_query_data;
+
if (rdata->vsi_handle != rd->vsi_handle)
return 0;
@@ -1946,56 +1952,98 @@ ice_switch_redirect(struct ice_adapter *ad,
if (rd->type != ICE_FLOW_REDIRECT_VSI)
return -ENOTSUP;
- list_head = &sw->recp_list[rdata->rid].filt_rules;
- LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry,
- list_entry) {
- rinfo = list_itr->rule_info;
- if ((rinfo.fltr_rule_id == rdata->rule_id &&
- rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
- rinfo.sw_act.vsi_handle == rd->vsi_handle) ||
- (rinfo.fltr_rule_id == rdata->rule_id &&
- rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST)){
- lkups_cnt = list_itr->lkups_cnt;
- lkups_dp = (struct ice_adv_lkup_elem *)
- ice_memdup(hw, list_itr->lkups,
- sizeof(*list_itr->lkups) *
- lkups_cnt, ICE_NONDMA_TO_NONDMA);
-
- if (!lkups_dp) {
- PMD_DRV_LOG(ERR, "Failed to allocate memory.");
- return -EINVAL;
- }
+ switch (filter_conf_ptr->fltr_status) {
+ case ICE_SW_FLTR_ADDED:
+ list_head = &sw->recp_list[rdata->rid].filt_rules;
+ LIST_FOR_EACH_ENTRY(list_itr, list_head,
+ ice_adv_fltr_mgmt_list_entry,
+ list_entry) {
+ rinfo = list_itr->rule_info;
+ if ((rinfo.fltr_rule_id == rdata->rule_id &&
+ rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
+ rinfo.sw_act.vsi_handle == rd->vsi_handle) ||
+ (rinfo.fltr_rule_id == rdata->rule_id &&
+ rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST)){
+ lkups_cnt = list_itr->lkups_cnt;
+
+ lkups_dp = (struct ice_adv_lkup_elem *)
+ ice_memdup(hw, list_itr->lkups,
+ sizeof(*list_itr->lkups) *
+ lkups_cnt,
+ ICE_NONDMA_TO_NONDMA);
+ if (!lkups_dp) {
+ PMD_DRV_LOG(ERR,
+ "Failed to allocate memory.");
+ return -EINVAL;
+ }
+ lkups_ref = lkups_dp;
- if (rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST) {
- rinfo.sw_act.vsi_handle = rd->vsi_handle;
- rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ if (rinfo.sw_act.fltr_act ==
+ ICE_FWD_TO_VSI_LIST) {
+ rinfo.sw_act.vsi_handle =
+ rd->vsi_handle;
+ rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ }
+ break;
}
- break;
}
- }
- if (!lkups_dp)
+ if (!lkups_ref)
+ return -EINVAL;
+
+ goto rmv_rule;
+ case ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT:
+ /* Recover VSI context */
+ hw->vsi_ctx[rd->vsi_handle]->vsi_num = filter_conf_ptr->vsi_num;
+ rinfo = filter_conf_ptr->rule_info;
+ lkups_cnt = filter_conf_ptr->lkups_num;
+ lkups_ref = filter_conf_ptr->lkups;
+
+ if (rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI_LIST) {
+ rinfo.sw_act.vsi_handle = rd->vsi_handle;
+ rinfo.sw_act.fltr_act = ICE_FWD_TO_VSI;
+ }
+
+ goto rmv_rule;
+ case ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT:
+ rinfo = filter_conf_ptr->rule_info;
+ lkups_cnt = filter_conf_ptr->lkups_num;
+ lkups_ref = filter_conf_ptr->lkups;
+
+ goto add_rule;
+ default:
return -EINVAL;
+ }
+rmv_rule:
/* Remove the old rule */
- ret = ice_rem_adv_rule(hw, list_itr->lkups,
- lkups_cnt, &rinfo);
+ ret = ice_rem_adv_rule(hw, lkups_ref, lkups_cnt, &rinfo);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to delete the old rule %d",
rdata->rule_id);
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_RMV_FAILED_ON_RIDRECT;
ret = -EINVAL;
goto out;
}
+add_rule:
/* Update VSI context */
hw->vsi_ctx[rd->vsi_handle]->vsi_num = rd->new_vsi_num;
/* Replay the rule */
- ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt,
- &rinfo, rdata);
+ ret = ice_add_adv_rule(hw, lkups_ref, lkups_cnt,
+ &rinfo, &added_rdata);
if (ret) {
PMD_DRV_LOG(ERR, "Failed to replay the rule");
+ filter_conf_ptr->fltr_status =
+ ICE_SW_FLTR_ADD_FAILED_ON_RIDRECT;
ret = -EINVAL;
+ } else {
+ filter_conf_ptr->sw_query_data = added_rdata;
+ /* Save VSI number for failure recover */
+ filter_conf_ptr->vsi_num = rd->new_vsi_num;
+ filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED;
}
out:
--
2.27.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure dapengx.yu
@ 2021-11-04 11:10 ` Zhang, Qi Z
1 sibling, 0 replies; 14+ messages in thread
From: Zhang, Qi Z @ 2021-11-04 11:10 UTC (permalink / raw)
To: Yu, DapengX, Yang, Qiming; +Cc: dev, Wang, Haiyue, stable
> -----Original Message-----
> From: Yu, DapengX <dapengx.yu@intel.com>
> Sent: Thursday, November 4, 2021 4:46 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>; Yu, DapengX
> <dapengx.yu@intel.com>; stable@dpdk.org
> Subject: [PATCH v4 1/2] net/ice: save rule on switch filter creation
>
> From: Dapeng Yu <dapengx.yu@intel.com>
>
> 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.
>
> Cc: stable@dpdk.org
>
> Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure dapengx.yu
@ 2021-11-04 11:12 ` Zhang, Qi Z
0 siblings, 0 replies; 14+ messages in thread
From: Zhang, Qi Z @ 2021-11-04 11:12 UTC (permalink / raw)
To: Yu, DapengX, Yang, Qiming; +Cc: dev, Wang, Haiyue, stable
> -----Original Message-----
> From: Yu, DapengX <dapengx.yu@intel.com>
> Sent: Thursday, November 4, 2021 4:46 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Wang, Haiyue <haiyue.wang@intel.com>; Yu, DapengX
> <dapengx.yu@intel.com>; stable@dpdk.org
> Subject: [PATCH v4 2/2] net/ice: fix flow redirect failure
>
> From: Dapeng Yu <dapengx.yu@intel.com>
>
> It's possible that a switch rule can't be redirect successfully due to kernel
> driver is busy to handle an ongoing VF reset, so the redirect action need to be
> deferred into next redirect request which is promised by kernel driver after VF
> reset done.
>
> This patch uses the saved flow rule's data to replay switch rule remove/add
> during next flow redirect.
>
> Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch")
> Cc: stable@dpdk.org
>
> Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-11-04 11:12 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-01 8:45 [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation dapengx.yu
2021-11-01 8:45 ` [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-02 0:06 ` [dpdk-stable] [PATCH 1/2] net/ice: save meta on switch filter creation Zhang, Qi Z
2021-11-02 0:08 ` Zhang, Qi Z
2021-11-02 16:11 ` Ferruh Yigit
2021-11-03 3:25 ` Yu, DapengX
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 1/2] net/ice: save rule " dapengx.yu
2021-11-03 10:05 ` [dpdk-stable] [PATCH v2 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 1/2] net/ice: save rule on switch filter creation dapengx.yu
2021-11-04 8:17 ` [dpdk-stable] [PATCH v3 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation dapengx.yu
2021-11-04 8:45 ` [dpdk-stable] [PATCH v4 2/2] net/ice: fix flow redirect failure dapengx.yu
2021-11-04 11:12 ` Zhang, Qi Z
2021-11-04 11:10 ` [dpdk-stable] [PATCH v4 1/2] net/ice: save rule on switch filter creation Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).