patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [DPDK 09/11] net/ice: fix input set of VLAN item
       [not found] <1583808404-21284-1-git-send-email-wei.zhao1@intel.com>
@ 2020-03-10  2:46 ` wei zhao
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 10/11] net/ice: change default tunnle type wei zhao
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 11/11] net/ice: add action number check for swicth wei zhao
  2 siblings, 0 replies; 4+ messages in thread
From: wei zhao @ 2020-03-10  2:46 UTC (permalink / raw)
  To: qabuild; +Cc: wei zhao, stable

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 f0fe361..888fa28 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -858,7 +858,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.7.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [DPDK 10/11] net/ice: change default tunnle type
       [not found] <1583808404-21284-1-git-send-email-wei.zhao1@intel.com>
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 09/11] net/ice: fix input set of VLAN item wei zhao
@ 2020-03-10  2:46 ` wei zhao
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 11/11] net/ice: add action number check for swicth wei zhao
  2 siblings, 0 replies; 4+ messages in thread
From: wei zhao @ 2020-03-10  2:46 UTC (permalink / raw)
  To: qabuild; +Cc: wei zhao, stable

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 888fa28..03b664c 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1088,7 +1088,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.7.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [DPDK 11/11] net/ice: add action number check for swicth
       [not found] <1583808404-21284-1-git-send-email-wei.zhao1@intel.com>
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 09/11] net/ice: fix input set of VLAN item wei zhao
  2020-03-10  2:46 ` [dpdk-stable] [DPDK 10/11] net/ice: change default tunnle type wei zhao
@ 2020-03-10  2:46 ` wei zhao
  2 siblings, 0 replies; 4+ messages in thread
From: wei zhao @ 2020-03-10  2:46 UTC (permalink / raw)
  To: qabuild; +Cc: wei zhao, stable

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 03b664c..ca85fd7 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -1071,6 +1071,46 @@ ice_switch_parse_action(struct ice_pf *pf,
 }
 
 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,
 		uint32_t array_len,
@@ -1155,6 +1195,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.7.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [DPDK 09/11] net/ice: fix input set of VLAN item
       [not found] <1583808845-21411-1-git-send-email-wei.zhao1@intel.com>
@ 2020-03-10  2:54 ` wei zhao
  0 siblings, 0 replies; 4+ messages in thread
From: wei zhao @ 2020-03-10  2:54 UTC (permalink / raw)
  To: qabuild; +Cc: wei zhao, stable

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 f0fe361..888fa28 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -858,7 +858,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.7.5


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-03-10  3:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1583808404-21284-1-git-send-email-wei.zhao1@intel.com>
2020-03-10  2:46 ` [dpdk-stable] [DPDK 09/11] net/ice: fix input set of VLAN item wei zhao
2020-03-10  2:46 ` [dpdk-stable] [DPDK 10/11] net/ice: change default tunnle type wei zhao
2020-03-10  2:46 ` [dpdk-stable] [DPDK 11/11] net/ice: add action number check for swicth wei zhao
     [not found] <1583808845-21411-1-git-send-email-wei.zhao1@intel.com>
2020-03-10  2:54 ` [dpdk-stable] [DPDK 09/11] 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).