* [dpdk-stable] [PATCH 5/7] net/ice: change default tunnle type [not found] <20200313020806.21654-1-wei.zhao1@intel.com> @ 2020-03-13 2:08 ` Wei Zhao 2020-03-13 2:08 ` [dpdk-stable] [PATCH 6/7] net/ice: add action number check for swicth Wei Zhao ` (2 subsequent siblings) 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-03-13 2:08 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, xiaolong.ye, stable, Wei Zhao The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 20d0577b5..7ca922602 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1097,7 +1097,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH 6/7] net/ice: add action number check for swicth [not found] <20200313020806.21654-1-wei.zhao1@intel.com> 2020-03-13 2:08 ` [dpdk-stable] [PATCH 5/7] net/ice: change default tunnle type Wei Zhao @ 2020-03-13 2:08 ` Wei Zhao 2020-03-13 2:08 ` [dpdk-stable] [PATCH 7/7] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-03-13 2:08 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, xiaolong.ye, stable, Wei Zhao The action number can only be one for DCF or PF switch filter, not support large action. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 7ca922602..48d689deb 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1079,6 +1079,46 @@ ice_switch_parse_action(struct ice_pf *pf, return -rte_errno; } +static int +ice_switch_check_action(const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + const struct rte_flow_action *action; + enum rte_flow_action_type action_type; + uint16_t actions_num = 0; + + for (action = actions; action->type != + RTE_FLOW_ACTION_TYPE_END; action++) { + action_type = action->type; + switch (action_type) { + case RTE_FLOW_ACTION_TYPE_VF: + case RTE_FLOW_ACTION_TYPE_RSS: + case RTE_FLOW_ACTION_TYPE_QUEUE: + case RTE_FLOW_ACTION_TYPE_DROP: + actions_num++; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + continue; + default: + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action type"); + return -rte_errno; + } + } + + if (actions_num > 1) { + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action number"); + return -rte_errno; + } + + return 0; +} + static int ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1164,6 +1204,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, goto error; } + ret = ice_switch_check_action(actions, error); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Invalid input action number"); + goto error; + } + if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH 7/7] net/ice: fix input set of VLAN item [not found] <20200313020806.21654-1-wei.zhao1@intel.com> 2020-03-13 2:08 ` [dpdk-stable] [PATCH 5/7] net/ice: change default tunnle type Wei Zhao 2020-03-13 2:08 ` [dpdk-stable] [PATCH 6/7] net/ice: add action number check for swicth Wei Zhao @ 2020-03-13 2:08 ` Wei Zhao [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-03-13 2:08 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, xiaolong.ye, stable, Wei Zhao The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 48d689deb..ecd7c75aa 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -867,7 +867,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <20200402064620.47668-1-wei.zhao1@intel.com>]
* [dpdk-stable] [PATCH v2 05/13] net/ice: change default tunnle type [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> @ 2020-04-02 6:46 ` Wei Zhao 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth Wei Zhao ` (2 subsequent siblings) 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-02 6:46 UTC (permalink / raw) To: dev Cc: qi.z.zhang, yuan.peng, nannan.lu, qi.fu, haiyue.wang, stable, Wei Zhao The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index ed02d9805..d9bdf9637 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 05/13] net/ice: change default tunnle type Wei Zhao @ 2020-04-02 6:46 ` Wei Zhao 2020-04-02 8:29 ` Zhang, Qi Z 2020-04-03 1:49 ` Lu, Nannan 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 11/13] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> 3 siblings, 2 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-02 6:46 UTC (permalink / raw) To: dev Cc: qi.z.zhang, yuan.peng, nannan.lu, qi.fu, haiyue.wang, stable, Wei Zhao The action number can only be one for DCF or PF switch filter, not support large action. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index d9bdf9637..cc48f22dd 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, return -rte_errno; } +static int +ice_switch_check_action(const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + const struct rte_flow_action *action; + enum rte_flow_action_type action_type; + uint16_t actions_num = 0; + + for (action = actions; action->type != + RTE_FLOW_ACTION_TYPE_END; action++) { + action_type = action->type; + switch (action_type) { + case RTE_FLOW_ACTION_TYPE_VF: + case RTE_FLOW_ACTION_TYPE_RSS: + case RTE_FLOW_ACTION_TYPE_QUEUE: + case RTE_FLOW_ACTION_TYPE_DROP: + actions_num++; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + continue; + default: + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action type"); + return -rte_errno; + } + } + + if (actions_num > 1) { + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action number"); + return -rte_errno; + } + + return 0; +} + static int ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, goto error; } + ret = ice_switch_check_action(actions, error); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Invalid input action number"); + goto error; + } + if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-02 8:29 ` Zhang, Qi Z 2020-04-02 8:31 ` Zhao1, Wei 2020-04-03 1:49 ` Lu, Nannan 1 sibling, 1 reply; 16+ messages in thread From: Zhang, Qi Z @ 2020-04-02 8:29 UTC (permalink / raw) To: Zhao1, Wei, dev; +Cc: Peng, Yuan, Lu, Nannan, Fu, Qi, Wang, Haiyue, stable > -----Original Message----- > From: Zhao1, Wei <wei.zhao1@intel.com> > Sent: Thursday, April 2, 2020 2:46 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Peng, Yuan <yuan.peng@intel.com>; > Lu, Nannan <nannan.lu@intel.com>; Fu, Qi <qi.fu@intel.com>; Wang, Haiyue > <haiyue.wang@intel.com>; stable@dpdk.org; Zhao1, Wei > <wei.zhao1@intel.com> > Subject: [PATCH v2 06/13] net/ice: add action number check for swicth > > The action number can only be one for DCF or PF switch filter, not support > large action. There is no "large action" in rte_flow, maybe just "not support multiple actions"? > > Cc: stable@dpdk.org > Fixes: 47d460d63233 ("net/ice: rework switch filter") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > --- > drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/net/ice/ice_switch_filter.c > b/drivers/net/ice/ice_switch_filter.c > index d9bdf9637..cc48f22dd 100644 > --- a/drivers/net/ice/ice_switch_filter.c > +++ b/drivers/net/ice/ice_switch_filter.c > @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, > return -rte_errno; > } > > +static int > +ice_switch_check_action(const struct rte_flow_action *actions, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action *action; > + enum rte_flow_action_type action_type; > + uint16_t actions_num = 0; > + > + for (action = actions; action->type != > + RTE_FLOW_ACTION_TYPE_END; action++) { > + action_type = action->type; > + switch (action_type) { > + case RTE_FLOW_ACTION_TYPE_VF: > + case RTE_FLOW_ACTION_TYPE_RSS: > + case RTE_FLOW_ACTION_TYPE_QUEUE: > + case RTE_FLOW_ACTION_TYPE_DROP: > + actions_num++; > + break; > + case RTE_FLOW_ACTION_TYPE_VOID: > + continue; > + default: > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action type"); > + return -rte_errno; > + } > + } > + > + if (actions_num > 1) { > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action number"); > + return -rte_errno; > + } > + > + return 0; > +} > + > static int > ice_switch_parse_pattern_action(struct ice_adapter *ad, > struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ > ice_switch_parse_pattern_action(struct ice_adapter *ad, > goto error; > } > > + ret = ice_switch_check_action(actions, error); > + if (ret) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > + "Invalid input action number"); > + goto error; > + } > + > if (ad->hw.dcf_enabled) > ret = ice_switch_parse_dcf_action(actions, error, &rule_info); > else > -- > 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth 2020-04-02 8:29 ` Zhang, Qi Z @ 2020-04-02 8:31 ` Zhao1, Wei 0 siblings, 0 replies; 16+ messages in thread From: Zhao1, Wei @ 2020-04-02 8:31 UTC (permalink / raw) To: Zhang, Qi Z, dev; +Cc: Peng, Yuan, Lu, Nannan, Fu, Qi, Wang, Haiyue, stable Ok > -----Original Message----- > From: Zhang, Qi Z <qi.z.zhang@intel.com> > Sent: Thursday, April 2, 2020 4:30 PM > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org > Cc: Peng, Yuan <yuan.peng@intel.com>; Lu, Nannan <nannan.lu@intel.com>; > Fu, Qi <qi.fu@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>; > stable@dpdk.org > Subject: RE: [PATCH v2 06/13] net/ice: add action number check for swicth > > > > > -----Original Message----- > > From: Zhao1, Wei <wei.zhao1@intel.com> > > Sent: Thursday, April 2, 2020 2:46 PM > > To: dev@dpdk.org > > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Peng, Yuan > > <yuan.peng@intel.com>; Lu, Nannan <nannan.lu@intel.com>; Fu, Qi > > <qi.fu@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>; > > stable@dpdk.org; Zhao1, Wei <wei.zhao1@intel.com> > > Subject: [PATCH v2 06/13] net/ice: add action number check for swicth > > > > The action number can only be one for DCF or PF switch filter, not > > support large action. > > There is no "large action" in rte_flow, maybe just "not support multiple > actions"? > > > > > Cc: stable@dpdk.org > > Fixes: 47d460d63233 ("net/ice: rework switch filter") > > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > > --- > > drivers/net/ice/ice_switch_filter.c | 48 > > +++++++++++++++++++++++++++++ > > 1 file changed, 48 insertions(+) > > > > diff --git a/drivers/net/ice/ice_switch_filter.c > > b/drivers/net/ice/ice_switch_filter.c > > index d9bdf9637..cc48f22dd 100644 > > --- a/drivers/net/ice/ice_switch_filter.c > > +++ b/drivers/net/ice/ice_switch_filter.c > > @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, > > return -rte_errno; > > } > > > > +static int > > +ice_switch_check_action(const struct rte_flow_action *actions, > > + struct rte_flow_error *error) > > +{ > > + const struct rte_flow_action *action; > > + enum rte_flow_action_type action_type; > > + uint16_t actions_num = 0; > > + > > + for (action = actions; action->type != > > + RTE_FLOW_ACTION_TYPE_END; action++) { > > + action_type = action->type; > > + switch (action_type) { > > + case RTE_FLOW_ACTION_TYPE_VF: > > + case RTE_FLOW_ACTION_TYPE_RSS: > > + case RTE_FLOW_ACTION_TYPE_QUEUE: > > + case RTE_FLOW_ACTION_TYPE_DROP: > > + actions_num++; > > + break; > > + case RTE_FLOW_ACTION_TYPE_VOID: > > + continue; > > + default: > > + rte_flow_error_set(error, > > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > > + actions, > > + "Invalid action type"); > > + return -rte_errno; > > + } > > + } > > + > > + if (actions_num > 1) { > > + rte_flow_error_set(error, > > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > > + actions, > > + "Invalid action number"); > > + return -rte_errno; > > + } > > + > > + return 0; > > +} > > + > > static int > > ice_switch_parse_pattern_action(struct ice_adapter *ad, > > struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ > > ice_switch_parse_pattern_action(struct ice_adapter *ad, > > goto error; > > } > > > > + ret = ice_switch_check_action(actions, error); > > + if (ret) { > > + rte_flow_error_set(error, EINVAL, > > + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > > + "Invalid input action number"); > > + goto error; > > + } > > + > > if (ad->hw.dcf_enabled) > > ret = ice_switch_parse_dcf_action(actions, error, &rule_info); > > else > > -- > > 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-02 8:29 ` Zhang, Qi Z @ 2020-04-03 1:49 ` Lu, Nannan 1 sibling, 0 replies; 16+ messages in thread From: Lu, Nannan @ 2020-04-03 1:49 UTC (permalink / raw) To: Zhao1, Wei, dev; +Cc: Zhang, Qi Z, Peng, Yuan, Fu, Qi, Wang, Haiyue, stable Tested-by: Lu, Nannan <nannan.lu@intel.com> -----Original Message----- From: Zhao1, Wei Sent: Thursday, April 2, 2020 2:46 PM To: dev@dpdk.org Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Peng, Yuan <yuan.peng@intel.com>; Lu, Nannan <nannan.lu@intel.com>; Fu, Qi <qi.fu@intel.com>; Wang, Haiyue <haiyue.wang@intel.com>; stable@dpdk.org; Zhao1, Wei <wei.zhao1@intel.com> Subject: [PATCH v2 06/13] net/ice: add action number check for swicth The action number can only be one for DCF or PF switch filter, not support large action. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index d9bdf9637..cc48f22dd 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, return -rte_errno; } +static int +ice_switch_check_action(const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + const struct rte_flow_action *action; + enum rte_flow_action_type action_type; + uint16_t actions_num = 0; + + for (action = actions; action->type != + RTE_FLOW_ACTION_TYPE_END; action++) { + action_type = action->type; + switch (action_type) { + case RTE_FLOW_ACTION_TYPE_VF: + case RTE_FLOW_ACTION_TYPE_RSS: + case RTE_FLOW_ACTION_TYPE_QUEUE: + case RTE_FLOW_ACTION_TYPE_DROP: + actions_num++; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + continue; + default: + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action type"); + return -rte_errno; + } + } + + if (actions_num > 1) { + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action number"); + return -rte_errno; + } + + return 0; +} + static int ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, goto error; } + ret = ice_switch_check_action(actions, error); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Invalid input action number"); + goto error; + } + if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v2 11/13] net/ice: fix input set of VLAN item [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-02 6:46 ` Wei Zhao [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-02 6:46 UTC (permalink / raw) To: dev Cc: qi.z.zhang, yuan.peng, nannan.lu, qi.fu, haiyue.wang, stable, Wei Zhao The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 81d069e99..686f9c3e3 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <20200403024353.24681-1-wei.zhao1@intel.com>]
* [dpdk-stable] [PATCH v3 05/13] net/ice: change default tunnle type [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> @ 2020-04-03 2:43 ` Wei Zhao 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth Wei Zhao ` (2 subsequent siblings) 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-03 2:43 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index ed02d9805..d9bdf9637 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 05/13] net/ice: change default tunnle type Wei Zhao @ 2020-04-03 2:43 ` Wei Zhao 2020-04-03 3:15 ` Zhang, Qi Z 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 11/13] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> 3 siblings, 1 reply; 16+ messages in thread From: Wei Zhao @ 2020-04-03 2:43 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The action number can only be one for DCF or PF switch filter, not support not support multiple actions. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index d9bdf9637..cc48f22dd 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, return -rte_errno; } +static int +ice_switch_check_action(const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + const struct rte_flow_action *action; + enum rte_flow_action_type action_type; + uint16_t actions_num = 0; + + for (action = actions; action->type != + RTE_FLOW_ACTION_TYPE_END; action++) { + action_type = action->type; + switch (action_type) { + case RTE_FLOW_ACTION_TYPE_VF: + case RTE_FLOW_ACTION_TYPE_RSS: + case RTE_FLOW_ACTION_TYPE_QUEUE: + case RTE_FLOW_ACTION_TYPE_DROP: + actions_num++; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + continue; + default: + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action type"); + return -rte_errno; + } + } + + if (actions_num > 1) { + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action number"); + return -rte_errno; + } + + return 0; +} + static int ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, goto error; } + ret = ice_switch_check_action(actions, error); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Invalid input action number"); + goto error; + } + if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-03 3:15 ` Zhang, Qi Z 0 siblings, 0 replies; 16+ messages in thread From: Zhang, Qi Z @ 2020-04-03 3:15 UTC (permalink / raw) To: Zhao1, Wei, dev; +Cc: Lu, Nannan, Fu, Qi, Peng, Yuan, stable > -----Original Message----- > From: Zhao1, Wei <wei.zhao1@intel.com> > Sent: Friday, April 3, 2020 10:44 AM > To: dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Lu, Nannan <nannan.lu@intel.com>; > Fu, Qi <qi.fu@intel.com>; Peng, Yuan <yuan.peng@intel.com>; > stable@dpdk.org; Zhao1, Wei <wei.zhao1@intel.com> > Subject: [PATCH v3 06/13] net/ice: add action number check for swicth > > The action number can only be one for DCF or PF switch filter, not support > not support multiple actions. Not support multiple actions > > Cc: stable@dpdk.org > Fixes: 47d460d63233 ("net/ice: rework switch filter") > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com> > --- > drivers/net/ice/ice_switch_filter.c | 48 > +++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/drivers/net/ice/ice_switch_filter.c > b/drivers/net/ice/ice_switch_filter.c > index d9bdf9637..cc48f22dd 100644 > --- a/drivers/net/ice/ice_switch_filter.c > +++ b/drivers/net/ice/ice_switch_filter.c > @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, > return -rte_errno; > } > > +static int > +ice_switch_check_action(const struct rte_flow_action *actions, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action *action; > + enum rte_flow_action_type action_type; > + uint16_t actions_num = 0; > + > + for (action = actions; action->type != > + RTE_FLOW_ACTION_TYPE_END; action++) { > + action_type = action->type; > + switch (action_type) { > + case RTE_FLOW_ACTION_TYPE_VF: > + case RTE_FLOW_ACTION_TYPE_RSS: > + case RTE_FLOW_ACTION_TYPE_QUEUE: > + case RTE_FLOW_ACTION_TYPE_DROP: > + actions_num++; > + break; > + case RTE_FLOW_ACTION_TYPE_VOID: > + continue; > + default: > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action type"); > + return -rte_errno; > + } > + } > + > + if (actions_num > 1) { > + rte_flow_error_set(error, > + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "Invalid action number"); > + return -rte_errno; > + } > + > + return 0; > +} > + > static int > ice_switch_parse_pattern_action(struct ice_adapter *ad, > struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ > ice_switch_parse_pattern_action(struct ice_adapter *ad, > goto error; > } > > + ret = ice_switch_check_action(actions, error); > + if (ret) { > + rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > + "Invalid input action number"); > + goto error; > + } > + > if (ad->hw.dcf_enabled) > ret = ice_switch_parse_dcf_action(actions, error, &rule_info); > else > -- > 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v3 11/13] net/ice: fix input set of VLAN item [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-03 2:43 ` Wei Zhao [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> 3 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-03 2:43 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 81d069e99..686f9c3e3 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <20200403044609.27512-1-wei.zhao1@intel.com>]
* [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> @ 2020-04-03 4:46 ` Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao 2 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-03 4:46 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index ed02d9805..d9bdf9637 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao @ 2020-04-03 4:46 ` Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao 2 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-03 4:46 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The action number can only be one for DCF or PF switch filter, not support multiple actions. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index d9bdf9637..cc48f22dd 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, return -rte_errno; } +static int +ice_switch_check_action(const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + const struct rte_flow_action *action; + enum rte_flow_action_type action_type; + uint16_t actions_num = 0; + + for (action = actions; action->type != + RTE_FLOW_ACTION_TYPE_END; action++) { + action_type = action->type; + switch (action_type) { + case RTE_FLOW_ACTION_TYPE_VF: + case RTE_FLOW_ACTION_TYPE_RSS: + case RTE_FLOW_ACTION_TYPE_QUEUE: + case RTE_FLOW_ACTION_TYPE_DROP: + actions_num++; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + continue; + default: + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action type"); + return -rte_errno; + } + } + + if (actions_num > 1) { + rte_flow_error_set(error, + EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "Invalid action number"); + return -rte_errno; + } + + return 0; +} + static int ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, goto error; } + ret = ice_switch_check_action(actions, error); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Invalid input action number"); + goto error; + } + if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-03 4:46 ` Wei Zhao 2 siblings, 0 replies; 16+ messages in thread From: Wei Zhao @ 2020-04-03 4:46 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 81d069e99..686f9c3e3 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } -- 2.19.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-04-03 5:07 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20200313020806.21654-1-wei.zhao1@intel.com> 2020-03-13 2:08 ` [dpdk-stable] [PATCH 5/7] net/ice: change default tunnle type Wei Zhao 2020-03-13 2:08 ` [dpdk-stable] [PATCH 6/7] net/ice: add action number check for swicth Wei Zhao 2020-03-13 2:08 ` [dpdk-stable] [PATCH 7/7] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200402064620.47668-1-wei.zhao1@intel.com> 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-02 8:29 ` Zhang, Qi Z 2020-04-02 8:31 ` Zhao1, Wei 2020-04-03 1:49 ` Lu, Nannan 2020-04-02 6:46 ` [dpdk-stable] [PATCH v2 11/13] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200403024353.24681-1-wei.zhao1@intel.com> 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-03 3:15 ` Zhang, Qi Z 2020-04-03 2:43 ` [dpdk-stable] [PATCH v3 11/13] net/ice: fix input set of VLAN item Wei Zhao [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao
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).