Skip to contentSkip to conversation

net/ice/base: add profile validation on switch filter

PATCH Applied Yuying Zhang 3 participants 5 messages Jan 26, 2022 – Feb 10, 2022 1 message not in the archive Network drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): http://patchwork.dpdk.org/project/dpdk/patch/[email protected]/

#1 lore raw

PATCH v3 1/2 net/ice/base: add profile validation on switch filter

Profile type was determined without validation when getting switch field vector bitmap. It caused error when associating profile id with given recipe if no lookup elements were given. Add profile validation to check if the profile is existing before getting bitmap.

---
 drivers/net/ice/base/ice_flex_pipe.c     | 11 +++++------
 drivers/net/ice/base/ice_flex_type.h     |  1 +
 drivers/net/ice/base/ice_protocol_type.h |  1 +
 drivers/net/ice/base/ice_switch.c        |  1 +
 4 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/ice/base/ice_flex_pipe.c +5 -6
index 395787806b..f6a29f87c5 100644
@@ -1785,8 +1785,12 @@ static enum ice_prof_type
 ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
 {
 	u16 i;
+	bool valid_prof = false;
 
 	for (i = 0; i < hw->blk[ICE_BLK_SW].es.fvw; i++) {
+		if (fv->ew[i].off != ICE_NAN_OFFSET)
+			valid_prof = true;
+
 		/* UDP tunnel will have UDP_OF protocol ID and VNI offset */
 		if (fv->ew[i].prot_id == (u8)ICE_PROT_UDP_OF &&
 		    fv->ew[i].off == ICE_VNI_OFFSET)
@@ -1801,7 +1805,7 @@ ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
 			return ICE_PROF_TUN_PPPOE;
 	}
 
-	return ICE_PROF_NON_TUN;
+	return valid_prof ? ICE_PROF_NON_TUN : ICE_PROF_INVALID;
 }
 
 /**
@@ -1818,11 +1822,6 @@ ice_get_sw_fv_bitmap(struct ice_hw *hw, enum ice_prof_type req_profs,
 	struct ice_seg *ice_seg;
 	struct ice_fv *fv;
 
-	if (req_profs == ICE_PROF_ALL) {
-		ice_bitmap_set(bm, 0, ICE_MAX_NUM_PROFILES);
-		return;
-	}
-
 	ice_memset(&state, 0, sizeof(state), ICE_NONDMA_MEM);
 	ice_zero_bitmap(bm, ICE_MAX_NUM_PROFILES);
 	ice_seg = hw->seg;
drivers/net/ice/base/ice_flex_type.h +1 -0
index 59eeca0a30..09a02fe9ac 100644
@@ -1003,6 +1003,7 @@ struct ice_chs_chg {
 #define ICE_FLOW_PTYPE_MAX		ICE_XLT1_CNT
 
 enum ice_prof_type {
+	ICE_PROF_INVALID = 0x0,
 	ICE_PROF_NON_TUN = 0x1,
 	ICE_PROF_TUN_UDP = 0x2,
 	ICE_PROF_TUN_GRE = 0x4,
drivers/net/ice/base/ice_protocol_type.h +1 -0
index cef8354f77..0e6e5990be 100644
@@ -191,6 +191,7 @@ enum ice_prot_id {
 
 #define ICE_VNI_OFFSET		12 /* offset of VNI from ICE_PROT_UDP_OF */
 
+#define ICE_NAN_OFFSET		511
 #define ICE_MAC_OFOS_HW		1
 #define ICE_MAC_IL_HW		4
 #define ICE_ETYPE_OL_HW		9
drivers/net/ice/base/ice_switch.c +1 -0
index 1fee790c25..d4cc664ad7 100644
@@ -7779,6 +7779,7 @@ ice_get_compat_fv_bitmap(struct ice_hw *hw, struct ice_adv_rule_info *rinfo,
 bool ice_is_prof_rule(enum ice_sw_tunnel_type type)
 {
 	switch (type) {
+	case ICE_SW_TUN_AND_NON_TUN:
 	case ICE_SW_TUN_PROFID_IPV6_ESP:
 	case ICE_SW_TUN_PROFID_IPV6_AH:
 	case ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3:
Signature · 1 line
2.25.1
#2 lore raw

PATCH v3 2/2 net/ice: support drop any and steer all to queue

This patch supports drop any and steer all to queue in switch filter. Support new rte_flow pattern any to handle all packets. The usage is listed below.

1. drop any:
flow create 0 ingress pattern any / end actions drop / end All packets received in port 0 will be dropped.

2. steer all to queue:
flow create 0 ingress pattern any / end actions queue index 3 / end All packets received in port 0 will be steered to queue 3.

---
 drivers/net/ice/ice_generic_flow.c  | 6 ++++++
 drivers/net/ice/ice_generic_flow.h  | 3 +++
 drivers/net/ice/ice_switch_filter.c | 6 ++++++
 3 files changed, 15 insertions(+)
drivers/net/ice/ice_generic_flow.c +6 -0
index 406a0a953f..53b1c0b69a 100644
@@ -65,6 +65,11 @@ enum rte_flow_item_type pattern_empty[] = {
 	RTE_FLOW_ITEM_TYPE_END,
 };
 
+enum rte_flow_item_type pattern_any[] = {
+	RTE_FLOW_ITEM_TYPE_ANY,
+	RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* raw */
 enum rte_flow_item_type pattern_raw[] = {
 	RTE_FLOW_ITEM_TYPE_RAW,
@@ -2111,6 +2116,7 @@ struct ice_ptype_match {
 
 static struct ice_ptype_match ice_ptype_map[] = {
 	{pattern_raw,					ICE_PTYPE_IPV4_PAY},
+	{pattern_any,					ICE_PTYPE_IPV4_PAY},
 	{pattern_eth_ipv4,				ICE_PTYPE_IPV4_PAY},
 	{pattern_eth_ipv4_udp,				ICE_PTYPE_IPV4_UDP_PAY},
 	{pattern_eth_ipv4_tcp,				ICE_PTYPE_IPV4_TCP_PAY},
drivers/net/ice/ice_generic_flow.h +3 -0
index 1b030c0466..11f51a5c15 100644
@@ -124,6 +124,9 @@
 /* empty pattern */
 extern enum rte_flow_item_type pattern_empty[];
 
+/* any pattern */
+extern enum rte_flow_item_type pattern_any[];
+
 /* raw pattern */
 extern enum rte_flow_item_type pattern_raw[];
 
drivers/net/ice/ice_switch_filter.c +6 -0
index bd805d9606..36c9bffb73 100644
@@ -206,6 +206,7 @@ static struct ice_flow_parser ice_switch_perm_parser;
 
 static struct
 ice_pattern_match_item ice_switch_pattern_dist_list[] = {
+	{pattern_any,					ICE_INSET_NONE,				ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype,				ICE_SW_INSET_ETHER,			ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype_vlan,			ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype_qinq,			ICE_SW_INSET_MAC_QINQ,			ICE_INSET_NONE,				ICE_INSET_NONE},
@@ -289,6 +290,7 @@ ice_pattern_match_item ice_switch_pattern_dist_list[] = {
 
 static struct
 ice_pattern_match_item ice_switch_pattern_perm_list[] = {
+	{pattern_any,					ICE_INSET_NONE,				ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype,				ICE_SW_INSET_ETHER,			ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype_vlan,			ICE_SW_INSET_MAC_VLAN,			ICE_INSET_NONE,				ICE_INSET_NONE},
 	{pattern_ethertype_qinq,			ICE_SW_INSET_MAC_QINQ,			ICE_INSET_NONE,				ICE_INSET_NONE},
@@ -582,6 +584,10 @@ ice_switch_parse_pattern(const struct rte_flow_item pattern[],
 		item_type = item->type;
 
 		switch (item_type) {
+		case RTE_FLOW_ITEM_TYPE_ANY:
+			*tun_type = ICE_SW_TUN_AND_NON_TUN;
+			break;
+
 		case RTE_FLOW_ITEM_TYPE_ETH:
 			eth_spec = item->spec;
 			eth_mask = item->mask;
Signature · 1 line
2.25.1
Acked-by on v3 2/2 Applied
#3 lore raw

RE: [PATCH v3 2/2] net/ice: support drop any and steer all to queue

Quoted 17 lines

-----Original Message-----
From: Zhang, Yuying <[email protected]>
Sent: Wednesday, January 26, 2022 11:57 PM
To: [email protected]; Zhang, Qi Z <[email protected]>
Cc: Zhang, Yuying <[email protected]>
Subject: [PATCH v3 2/2] net/ice: support drop any and steer all to queue

This patch supports drop any and steer all to queue in switch filter. Support new rte_flow pattern any to handle all packets.
The usage is listed below.

1. drop any:
flow create 0 ingress pattern any / end actions drop / end All packets received in port 0 will be dropped.

Quoted 5 lines

2. steer all to queue:
flow create 0 ingress pattern any / end actions queue index 3 / end All packets received in port 0 will be steered to queue 3.

Applied to dpdk-next-net-intel.

Thanks
Qi

#4 lore raw

Re: [PATCH v3 2/2] net/ice: support drop any and steer all to queue

In reply to Yuying Zhang
Quoted 12 lines · Yuying Zhang

This patch supports drop any and steer all to queue in switch filter. Support new rte_flow pattern any to handle all packets. The usage is listed below.

1. drop any:
flow create 0 ingress pattern any / end actions drop / end All packets received in port 0 will be dropped.

2. steer all to queue:
flow create 0 ingress pattern any / end actions queue index 3 / end All packets received in port 0 will be steered to queue 3.

Quoted 6 lines
---
  drivers/net/ice/ice_generic_flow.c  | 6 ++++++
  drivers/net/ice/ice_generic_flow.h  | 3 +++
  drivers/net/ice/ice_switch_filter.c | 6 ++++++
  3 files changed, 15 insertions(+)

Documentation is missing, 'check-doc-vs-code.sh' gives following error.

$ ./devtools/check-doc-vs-code.sh
rte_flow doc out of sync for ice
        item any

I will fix it in next-net while merging

Acked-by on v3 1/2 Applied
#5 lore raw
In reply to Yuying Zhang
Quoted 9 lines

-----Original Message-----
From: Zhang, Yuying <[email protected]>
Sent: Wednesday, January 26, 2022 11:57 PM
To: [email protected]; Zhang, Qi Z <[email protected]>
Cc: Zhang, Yuying <[email protected]>
Subject: [PATCH v3 1/2] net/ice/base: add profile validation on switch filter

Quoted 4 lines

Profile type was determined without validation when getting switch field vector bitmap. It caused error when associating profile id with given recipe if no lookup elements were given.
Add profile validation to check if the profile is existing before getting bitmap.

Added fixline :

Fixes 55744222e6e2 ("net/ice/base: associate recipes by profile type")
Quoted 2 lines

Applied to dpdk-next-net-intel.

Thanks
Qi