enable more PPPoE packet type for switch
cover enable more PPPoE packet type for switch
1. add more support for switch parser of pppoe packet.
2. add redirect support for VSI list rule
3. add check for NVGRE protocol
4. support flow for specific L4 type
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
Wei Zhao (4):
net/ice: add support more PPPoE packet type for switch net/ice: add redirect support for VSI list rule net/ice: add check for NVGRE protocol net/ice: support switch flow for specific L4 type
drivers/net/ice/ice_switch_filter.c | 159 +++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 25 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/4 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- drivers/net/ice/ice_switch_filter.c | 115 ++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 15 deletions(-)
drivers/net/ice/ice_switch_filter.c +100 -15
@@ -26,6 +26,8 @@#define MAX_QGRP_NUM_TYPE 7 +#define ICE_PPP_IPV4_PROTO 0x0021 +#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -95,6 +97,18 @@ ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \ ICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION | \ ICE_INSET_PPPOE_PROTO) +#define ICE_SW_INSET_MAC_PPPOE_IPV4 ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4) +#define ICE_SW_INSET_MAC_PPPOE_IPV4_TCP ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4_TCP) +#define ICE_SW_INSET_MAC_PPPOE_IPV4_UDP ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4_UDP) +#define ICE_SW_INSET_MAC_PPPOE_IPV6 ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6) +#define ICE_SW_INSET_MAC_PPPOE_IPV6_TCP ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6_TCP) +#define ICE_SW_INSET_MAC_PPPOE_IPV6_UDP ( \ + ICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6_UDP)#define ICE_SW_INSET_MAC_IPV4_ESP ( \ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_ESP_SPI)#define ICE_SW_INSET_MAC_IPV6_ESP ( \
@@ -154,10 +168,6 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = { ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE}, - {pattern_eth_pppoed, - ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, - {pattern_eth_vlan_pppoed, - ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, {pattern_eth_pppoes, ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, {pattern_eth_vlan_pppoes,
@@ -166,6 +176,30 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = { ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, {pattern_eth_vlan_pppoes_proto, ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4, + ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4_udp, + ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6, + ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6_udp, + ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4, + ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4_udp, + ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6, + ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6_udp, + ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_esp, ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_esp,
@@ -254,10 +288,6 @@ ice_pattern_match_item ice_switch_pattern_perm[] = { ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE}, - {pattern_eth_pppoed, - ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, - {pattern_eth_vlan_pppoed, - ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, {pattern_eth_pppoes, ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, {pattern_eth_vlan_pppoes,
@@ -266,6 +296,30 @@ ice_pattern_match_item ice_switch_pattern_perm[] = { ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, {pattern_eth_vlan_pppoes_proto, ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4, + ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv4_udp, + ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6, + ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_pppoes_ipv6_udp, + ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4, + ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv4_udp, + ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6, + ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6_tcp, + ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoes_ipv6_udp, + ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE}, {pattern_eth_ipv4_esp, ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_esp,
@@ -416,13 +470,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; -uint16_t j, t =0 ; +bool pppoe_elem_valid =0 ; +bool pppoe_patt_valid =0 ; +bool pppoe_prot_valid =0 ;bool profile_rule =0 ;bool tunnel_valid =0 ; -bool pppoe_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ; +bool tcp_valiad =0 ; +uint16_t j, t =0 ;for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
@@ -752,6 +809,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_TCP : tcp_spec = item->spec; tcp_mask = item->mask; + tcp_valiad =1 ;if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ if (tcp_mask->hdr.sent_seq ||
@@ -969,6 +1027,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid pppoe item");return 0 ; } + pppoe_patt_valid =1 ;if (pppoe_spec && pppoe_mask) {/* Check pppoe mask and update input set */ if (pppoe_mask->length ||
@@ -989,7 +1048,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], input_set |=ICE_INSET_PPPOE_SESSION ; } t++; - pppoe_valid =1 ; + pppoe_elem_valid =1 ; }break ;
@@ -1010,7 +1069,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],return 0 ; }if (pppoe_proto_spec && pppoe_proto_mask) { -if (pppoe_valid) +if (pppoe_elem_valid) t--; list[t].type =ICE_PPPOE ;if (pppoe_proto_mask->proto_id) {
@@ -1019,9 +1078,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; + + pppoe_prot_valid =1 ; } +if ((pppoe_proto_mask->proto_id & + pppoe_proto_spec->proto_id) != +CPU_TO_BE16 (ICE_PPP_IPV4_PROTO ) && + (pppoe_proto_mask->proto_id & + pppoe_proto_spec->proto_id) != +CPU_TO_BE16 (ICE_PPP_IPV6_PROTO )) + *tun_type =ICE_SW_TUN_PPPOE_PAY ; +else + *tun_type =ICE_SW_TUN_PPPOE ; t++; } +break ;case RTE_FLOW_ITEM_TYPE_ESP :
@@ -1232,6 +1303,23 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], } } +if (pppoe_patt_valid && !pppoe_prot_valid) { +if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV6_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV6_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV4_UDP ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV4_TCP ; +else if (ipv6_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV6 ; +else if (ipv4_valiad) + *tun_type =ICE_SW_TUN_PPPOE_IPV4 ; +else + *tun_type =ICE_SW_TUN_PPPOE ; + } + *lkups_num = t;return input_set;
@@ -1447,9 +1535,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, tun_type =ICE_SW_TUN_VXLAN ;if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) tun_type =ICE_SW_TUN_NVGRE ; -if (item->type ==RTE_FLOW_ITEM_TYPE_PPPOED || - item->type ==RTE_FLOW_ITEM_TYPE_PPPOES ) - tun_type =ICE_SW_TUN_PPPOE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
PATCH 2/4 net/ice: add redirect support for VSI list rule
In reply to Wei ZhaoThis patch enable redirect switch rule of vsi list type.
--- drivers/net/ice/ice_switch_filter.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +11 -3
@@ -1662,6 +1662,9 @@ ice_switch_redirect(struct ice_adapter *ad,uint16_t lkups_cnt;int ret; +if (rdata->vsi_handle != rd->vsi_handle) +return 0 ; + sw = hw->switch_info;if (!sw->recp_list[rdata->rid].recp_created)return -EINVAL ;
@@ -1673,25 +1676,30 @@ ice_switch_redirect(struct ice_adapter *ad,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 && +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.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 ; } +if (rinfo.sw_act.fltr_act ==ICE_FWD_TO_VSI_LIST ) + rinfo.sw_act.vsi_handle = rd->vsi_handle;break ; } }if (!lkups_dp) -return 0 ; +return -EINVAL ;/* Remove the old rule */ ret = ice_rem_adv_rule(hw, list_itr->lkups,
Signature · 1 line
2.19.1
PATCH 3/4 net/ice: add check for NVGRE protocol
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x2F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH 4/4 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/net/ice/ice_switch_filter.c +17 -6
@@ -471,11 +471,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -960,7 +960,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =2 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ; if (nvgre_mask->tni[0] ||
@@ -1325,6 +1325,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (!pppoe_patt_valid) { +if (tunnel_valid ==1 ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==2 ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1551,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
v2 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add redirect support for VSI list rule
3. add check for NVGRE protocol
4. support flow for specific L4 type
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
Wei Zhao (4):
net/ice: add support more PPPoE packet type for switch net/ice: add redirect support for VSI list rule net/ice: add check for NVGRE protocol net/ice: support switch flow for specific L4 type
doc/guides/rel_notes/release_20_08.rst | 6 + drivers/net/ice/ice_switch_filter.c | 161 +++++++++++++++++++++---- 2 files changed, 142 insertions(+), 25 deletions(-)
Signature · 1 line
2.19.1
PATCH v2 1/4 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 6 ++ drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 106 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +6 -0
@@ -55,6 +55,12 @@ New Features This section is a comment. Do not overwrite or remove it. Also, make sure to start the actual text at the margin. ========================================================= +* **Updated the Intel ice driver.** + + Updated the Intel ice driver with new features and improvements, including: + + * Add support more PPPoE packet type for switch filter + * **Updated Mellanox mlx5 driver.**
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 2/4 net/ice: add redirect support for VSI list rule
In reply to Wei ZhaoThis patch enable redirect switch rule of vsi list type.
--- drivers/net/ice/ice_switch_filter.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +13 -3
@@ -1662,6 +1662,9 @@ ice_switch_redirect(struct ice_adapter *ad,uint16_t lkups_cnt;int ret; +if (rdata->vsi_handle != rd->vsi_handle) +return 0 ; + sw = hw->switch_info;if (!sw->recp_list[rdata->rid].recp_created)return -EINVAL ;
@@ -1673,25 +1676,32 @@ ice_switch_redirect(struct ice_adapter *ad,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 && +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.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 ; } +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 ; } }if (!lkups_dp) -return 0 ; +return -EINVAL ;/* Remove the old rule */ ret = ice_rem_adv_rule(hw, list_itr->lkups,
Signature · 1 line
2.19.1
Re: [dpdk-dev] [PATCH v2 2/4] net/ice: add redirect support for VSI list rule
Quoted 42 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, June 17, 2020 2:14 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2 2/4] net/ice: add redirect support for VSI list ruleThis patch enable redirect switch rule of vsi list type.
Fixes 397b4b3c5095 ("net/ice: enable flow redirect on switch")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)drivers/net/ice/ice_switch_filter.c +4
-1@@ -1662,6 +1662,9 @@ ice_switch_redirect(struct ice_adapter *ad,uint16_t lkups_cnt;int ret; +if (rdata->vsi_handle != rd->vsi_handle) +return 0 ; + sw = hw->switch_info;if (!sw->recp_list[rdata->rid].recp_created)return -EINVAL ;@@ -1673,25 +1676,32 @@ ice_switch_redirect(struct ice_adapter *ad,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 && + if ((rinfo.fltr_rule_id == rdata->rule_id && rinfo.sw_act.fltr_act == ICE_FWD_TO_VSI &&
drivers/net/ice/ice_switch_filter.c ice_switch_redirect(struct ice_adapter *ad, · line 1689
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +4
-1- rinfo.sw_act.vsi_handle == rd->vsi_handle) { + 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 ); +
Applied to dpdk-next-net-intel after
1, remove above redundant empty line and
2. reword on the commit log and title as below
Title: redirect switch rule with to VSI list action
Support redirect a switch rule if its action is to VSI list.
Thanks
Qi
Quoted 21 lines
drivers/net/ice/ice_switch_filter.c +5
-2if (!lkups_dp) {PMD_DRV_LOG (ERR ,"Failed to allocate memory." );return -EINVAL ; } +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 ; } }if (!lkups_dp) -return 0 ; +return -EINVAL ;/* Remove the old rule */ ret = ice_rem_adv_rule(hw, list_itr->lkups, --2.19.1
PATCH v2 3/4 net/ice: add check for NVGRE protocol
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x2F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
Re: [dpdk-dev] [PATCH v2 3/4] net/ice: add check for NVGRE protocol
Quoted 9 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, June 17, 2020 2:14 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2 3/4] net/ice: add check for NVGRE protocol
fix tunnel type for switch rule
Quoted 3 lines
This patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
The patch change default tunnel type to ICE_NON_TUN and only change to ICE_SW_TUN_AND_NON_TUN to hint switch engine if GRE proto is matched in a IPv4 header.
Quoted 15 lines
Fixes 6bc7628c5e0b ("net/ice: change default tunnel type")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/net/ice/ice_switch_filter.c +0
-0
drivers/net/ice/ice_switch_filter.c line 31
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +1
-0@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x2F
To keep consistent
#define ICE_IPV4_NVGRE_PROTO 0x002F
Quoted 26 lines
drivers/net/ice/ice_switch_filter.c +6
-1#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) @@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (;
item->type!=RTE_FLOW_ITEM_TYPE_END; item++) {
--
2.19.1
Re: [dpdk-dev] [PATCH v2 3/4] net/ice: add check for NVGRE protocol
Quoted 22 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, June 22, 2020 11:50 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]
Subject: RE: [PATCH v2 3/4] net/ice: add check for NVGRE protocolQuoted 7 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, June 17, 2020 2:14 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2 3/4] net/ice: add check for NVGRE protocolfix tunnel type for switch rule
Quoted 1 line
Quoted 7 lines
Quoted 2 lines
This patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
The patch change default tunnel type to
ICE_NON_TUNand only change toICE_SW_TUN_AND_NON_TUNto hint switch engine if GRE proto is matched in a IPv4 header.
Ok, Update in v3
Quoted 9 lines
Quoted 9 lines
Fixes 6bc7628c5e0b ("net/ice: change default tunnel type")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Quoted 13 lines
drivers/net/ice/ice_switch_filter.c line 31
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +1
-0@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x2FTo keep consistent
#defineICE_IPV4_NVGRE_PROTO0x002F
Ok, Update in v3
Quoted 28 lines
drivers/net/ice/ice_switch_filter.c line 33
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +0
-0#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) @@-632,6
drivers/net/ice/ice_switch_filter.c ice_switch_inset_get(const struct rte_flow_item pattern[],
Quoted 11 lines
drivers/net/ice/ice_switch_filter.c +5
-0+633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service; @@ -1526,7+1531,7 @@
Quoted 11 lines
ice_switch_parse_pattern_action(struct
ice_adapter*ad,drivers/net/ice/ice_switch_filter.c +1
-2const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { --2.19.1
PATCH v2 4/4 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/net/ice/ice_switch_filter.c +17 -6
@@ -471,11 +471,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -960,7 +960,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =2 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ; if (nvgre_mask->tni[0] ||
@@ -1325,6 +1325,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (!pppoe_patt_valid) { +if (tunnel_valid ==1 ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==2 ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1551,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
Re: [dpdk-dev] [PATCH v2 4/4] net/ice: support switch flow for specific L4 type
Quoted 28 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, June 17, 2020 2:14 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2 4/4] net/ice: support switch flow for specific L4 typeThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without
L4 dst/src port number as input set for the switch filter rule.Fixes 47d460d63233 ("net/ice: rework switch filter")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)drivers/net/ice/ice_switch_filter.c +0
-0
drivers/net/ice/ice_switch_filter.c ice_switch_inset_get(const struct rte_flow_item · line 475
Quoted 5 lines
drivers/net/ice/ice_switch_filter.c +1
-0@@ -471,11 +471,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;
why not vxlan_valid and nvgre_valid to keep consistent naming with other variables? Can we use a bitmap
Quoted 55 lines
drivers/net/ice/ice_switch_filter.c +0
-1bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;drivers/net/ice/ice_switch_filter.c +1
-1bool udp_valiad =0 ;@@ -960,7 +960,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =2 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;drivers/net/ice/ice_switch_filter.c +15
-0if (nvgre_mask->tni[0] ||@@ -1325,6 +1325,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (!pppoe_patt_valid) { +if (tunnel_valid ==1 ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==2 ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;drivers/net/ice/ice_switch_filter.c +0
-4return input_set;@@ -1536,10 +1551,6 @@ ice_switch_parse_pattern_action(structice_adapter *ad, for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (
item->mask)
--
2.19.1
Re: [dpdk-dev] [PATCH v2 4/4] net/ice: support switch flow for specific L4 type
Quoted 32 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, June 22, 2020 11:36 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]
Subject: RE: [PATCH v2 4/4] net/ice: support switch flow for specific L4 typeQuoted 21 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, June 17, 2020 2:14 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2 4/4] net/ice: support switch flow for specific L4 typeThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
Fixes 47d460d63233 ("net/ice: rework switch filter")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
Quoted 15 lines
drivers/net/ice/ice_switch_filter.c ice_switch_inset_get(const struct rte_flow_item · line 475
Quoted 11 lines
drivers/net/ice/ice_switch_filter.c +1
-0@@ -471,11 +471,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;why not
vxlan_validandnvgre_validto keep consistent naming with other variables?
Can we use a bitmap
Ok, Update in v3
Quoted 57 lines
Quoted 56 lines
drivers/net/ice/ice_switch_filter.c +0
-1bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;drivers/net/ice/ice_switch_filter.c +1
-1bool udp_valiad =0 ;@@ -960,7 +960,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =2 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;drivers/net/ice/ice_switch_filter.c +15
-0if (nvgre_mask->tni[0] ||@@ -1325,6 +1325,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (!pppoe_patt_valid) { +if (tunnel_valid ==1 ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==2 ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;drivers/net/ice/ice_switch_filter.c +0
-4return input_set;@@ -1536,10 +1551,6 @@ ice_switch_parse_pattern_action(structice_adapter *ad, for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (
item->mask)
--
2.19.1
v3 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
Wei Zhao (4):
net/ice: add support more PPPoE packet type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check
doc/guides/rel_notes/release_20_08.rst | 2 + drivers/net/ice/ice_switch_filter.c | 190 +++++++++++++++++++++---- 2 files changed, 167 insertions(+), 25 deletions(-)
Signature · 1 line
2.19.1
PATCH v3 1/4 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 2 + drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 102 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +2 -0
@@ -86,6 +86,8 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Added support for DCF datapath configuration. + * Added support for more PPPoE packet type for switch filter. + Removed Items -------------
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v3 2/4 net/ice: fix tunnel type for switch rule
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x002F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH v3 3/4 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/net/ice/ice_switch_filter.c +20 -7
@@ -29,6 +29,8 @@#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F +#define ICE_TUN_VXLAN_VALID 0x0001 +#define ICE_TUN_NVGRE_VALID 0x0002#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -471,11 +473,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_VXLAN_VALID ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ; if (vxlan_mask->vni[0] ||
@@ -960,7 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_NVGRE_VALID ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ; if (nvgre_mask->tni[0] ||
@@ -1325,6 +1327,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (tunnel_valid ==ICE_TUN_VXLAN_VALID ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==ICE_TUN_NVGRE_VALID ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1553,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
PATCH v3 4/4 net/ice: add input set byte number check
In reply to Wei ZhaoThis patch add the total input set byte number check, as there is a hardware requirement for the total number of 32 byte.
--- drivers/net/ice/ice_switch_filter.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +40 -3
@@ -25,7 +25,8 @@#include "ice_generic_flow.h" -#define MAX_QGRP_NUM_TYPE 7 +#define MAX_QGRP_NUM_TYPE 7 +#define MAX_INPUT_SET_BYTE 32#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F
@@ -473,6 +474,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t feild_vec_byte =0 ;uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;
@@ -540,6 +542,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->src_addr[j] = eth_mask->src.addr_bytes[j]; i =1 ; + feild_vec_byte++; }if (eth_mask->dst.addr_bytes[j]) { h->dst_addr[j] =
@@ -547,6 +550,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->dst_addr[j] = eth_mask->dst.addr_bytes[j]; i =1 ; + feild_vec_byte++; } }if (i)
@@ -557,6 +561,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], eth_spec->type; list[t].m_u.ethertype.ethtype_id = eth_mask->type; + feild_vec_byte +=2 ; t++; } }
@@ -616,24 +621,28 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.src_addr; list[t].m_u.ipv4_hdr.src_addr = ipv4_mask->hdr.src_addr; + feild_vec_byte +=2 ; }if (ipv4_mask->hdr.dst_addr) { list[t].h_u.ipv4_hdr.dst_addr = ipv4_spec->hdr.dst_addr; list[t].m_u.ipv4_hdr.dst_addr = ipv4_mask->hdr.dst_addr; + feild_vec_byte +=2 ; }if (ipv4_mask->hdr.time_to_live) { list[t].h_u.ipv4_hdr.time_to_live = ipv4_spec->hdr.time_to_live; list[t].m_u.ipv4_hdr.time_to_live = ipv4_mask->hdr.time_to_live; + feild_vec_byte++; }if (ipv4_mask->hdr.next_proto_id) { list[t].h_u.ipv4_hdr.protocol = ipv4_spec->hdr.next_proto_id; list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; + feild_vec_byte++; } if ((ipv4_spec->hdr.next_proto_id & ipv4_mask->hdr.next_proto_id) ==
@@ -644,6 +653,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.type_of_service; list[t].m_u.ipv4_hdr.tos = ipv4_mask->hdr.type_of_service; + feild_vec_byte++; } t++; }
@@ -721,12 +731,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.src_addr[j]; s->src_addr[j] = ipv6_mask->hdr.src_addr[j]; + feild_vec_byte++; }if (ipv6_mask->hdr.dst_addr[j]) { f->dst_addr[j] = ipv6_spec->hdr.dst_addr[j]; s->dst_addr[j] = ipv6_mask->hdr.dst_addr[j]; + feild_vec_byte++; } }if (ipv6_mask->hdr.proto) {
@@ -734,12 +746,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.proto; s->next_hdr = ipv6_mask->hdr.proto; + feild_vec_byte++; }if (ipv6_mask->hdr.hop_limits) { f->hop_limit = ipv6_spec->hdr.hop_limits; s->hop_limit = ipv6_mask->hdr.hop_limits; + feild_vec_byte++; }if (ipv6_mask->hdr.vtc_flow & rte_cpu_to_be_32
@@ -757,6 +771,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], RTE_IPV6_HDR_TC_MASK) >>RTE_IPV6_HDR_TC_SHIFT ; s->be_ver_tc_flow =CPU_TO_BE32 (vtf.u.val); + feild_vec_byte +=4 ; } t++; }
@@ -802,14 +817,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], udp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = udp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (udp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = udp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = udp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } - t++; + t++; }break ;
@@ -854,12 +871,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], tcp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = tcp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (tcp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = tcp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = tcp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } t++; }
@@ -899,12 +918,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], sctp_spec->hdr.src_port; list[t].m_u.sctp_hdr.src_port = sctp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (sctp_mask->hdr.dst_port) { list[t].h_u.sctp_hdr.dst_port = sctp_spec->hdr.dst_port; list[t].m_u.sctp_hdr.dst_port = sctp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } t++; }
@@ -942,6 +963,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vxlan_mask->vni[0 ]; input_set |=ICE_INSET_TUN_VXLAN_VNI ; + feild_vec_byte +=2 ; } t++; }
@@ -978,6 +1000,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], nvgre_mask->tni[0 ]; input_set |=ICE_INSET_TUN_NVGRE_TNI ; + feild_vec_byte +=2 ; } t++; }
@@ -1006,6 +1029,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.vlan = vlan_mask->tci; input_set |=ICE_INSET_VLAN_OUTER ; + feild_vec_byte +=2 ; }if (vlan_mask->inner_type) { list[t].h_u.vlan_hdr.type =
@@ -1013,6 +1037,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; input_set |=ICE_INSET_ETHERTYPE ; + feild_vec_byte +=2 ; } t++; }
@@ -1053,6 +1078,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.session_id = pppoe_mask->session_id; input_set |=ICE_INSET_PPPOE_SESSION ; + feild_vec_byte +=2 ; } t++; pppoe_elem_valid =1 ;
@@ -1085,7 +1111,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; - + feild_vec_byte +=2 ; pppoe_prot_valid =1 ; } if ((pppoe_proto_mask->proto_id &
@@ -1142,6 +1168,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.esp_hdr.spi = esp_mask->hdr.spi; input_set |=ICE_INSET_ESP_SPI ; + feild_vec_byte +=4 ; t++; }
@@ -1198,6 +1225,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ah_hdr.spi = ah_mask->spi; input_set |=ICE_INSET_AH_SPI ; + feild_vec_byte +=4 ; t++; }
@@ -1237,6 +1265,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.l2tpv3_sess_hdr.session_id = l2tp_mask->session_id; input_set |=ICE_INSET_L2TPV3OIP_SESSION_ID ; + feild_vec_byte +=4 ; t++; }
@@ -1342,6 +1371,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_IPV6_UDP ; } +if (feild_vec_byte >=MAX_INPUT_SET_BYTE ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"too much input set" ); +return -ENOTSUP ; + } + *lkups_num = t;return input_set;
Signature · 1 line
2.19.1
v3 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
Wei Zhao (4):
net/ice: add support more PPPoE packet type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check
doc/guides/rel_notes/release_20_08.rst | 2 + drivers/net/ice/ice_switch_filter.c | 190 +++++++++++++++++++++---- 2 files changed, 167 insertions(+), 25 deletions(-)
Signature · 1 line
2.19.1
PATCH v3 1/4 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 2 + drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 102 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +2 -0
@@ -86,6 +86,8 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Added support for DCF datapath configuration. + * Added support for more PPPoE packet type for switch filter. + Removed Items -------------
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v3 2/4 net/ice: fix tunnel type for switch rule
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x002F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH v3 3/4 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/net/ice/ice_switch_filter.c +20 -7
@@ -29,6 +29,8 @@#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F +#define ICE_TUN_VXLAN_VALID 0x0001 +#define ICE_TUN_NVGRE_VALID 0x0002#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -471,11 +473,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_VXLAN_VALID ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ; if (vxlan_mask->vni[0] ||
@@ -960,7 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_NVGRE_VALID ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ; if (nvgre_mask->tni[0] ||
@@ -1325,6 +1327,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (tunnel_valid ==ICE_TUN_VXLAN_VALID ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==ICE_TUN_NVGRE_VALID ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1553,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
Re: [dpdk-dev] [PATCH v3 3/4] net/ice: support switch flow for specific L4 type
Quoted 28 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Sunday, June 28, 2020 1:02 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v3 3/4] net/ice: support switch flow for specific L4 typeThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without
L4 dst/src port number as input set for the switch filter rule.Fixes 47d460d63233 ("net/ice: rework switch filter")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)drivers/net/ice/ice_switch_filter.c +0
-0
drivers/net/ice/ice_switch_filter.c line 33
Quoted 5 lines
drivers/net/ice/ice_switch_filter.c +2
-0@@ -29,6 +29,8 @@#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F +#define ICE_TUN_VXLAN_VALID 0x0001 +#define ICE_TUN_NVGRE_VALID 0x0002
Why not apply the same pattern with other valid flag? I mean use vxlan_valid and nvgre_valid.
Could be tunnel_valid = vxlan_valid | nvgre_valid.
Quoted 74 lines
drivers/net/ice/ice_switch_filter.c +0
-1#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) @@ -471,11 +473,11 @@ ice_switch_inset_get(const struct rte_flow_itempattern[],
drivers/net/ice/ice_switch_filter.c +2
-2const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], return 0; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_VXLAN_VALID ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ;drivers/net/ice/ice_switch_filter.c +1
-1if (vxlan_mask->vni[0] ||@@ -960,7 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_NVGRE_VALID ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;drivers/net/ice/ice_switch_filter.c +15
-0if (nvgre_mask->tni[0] ||@@ -1325,6 +1327,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (tunnel_valid ==ICE_TUN_VXLAN_VALID ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==ICE_TUN_NVGRE_VALID ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;drivers/net/ice/ice_switch_filter.c +0
-4return input_set;@@ -1536,10 +1553,6 @@ ice_switch_parse_pattern_action(structice_adapter *ad, for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (
item->mask)
--
2.19.1
Re: [dpdk-dev] [PATCH v3 3/4] net/ice: support switch flow for specific L4 type
Hi,
Quoted 30 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, June 29, 2020 9:56 AM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]; Lu, Nannan <[email protected]>
Subject: RE: [PATCH v3 3/4] net/ice: support switch flow for specific L4 typeQuoted 21 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Sunday, June 28, 2020 1:02 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v3 3/4] net/ice: support switch flow for specific L4 typeThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
Fixes 47d460d63233 ("net/ice: rework switch filter")Signed-off-by Wei Zhao <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
Quoted 15 lines
drivers/net/ice/ice_switch_filter.c line 33
Quoted 11 lines
drivers/net/ice/ice_switch_filter.c +2
-0@@ -29,6 +29,8 @@#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F +#define ICE_TUN_VXLAN_VALID 0x0001 +#define ICE_TUN_NVGRE_VALID 0x0002Why not apply the same pattern with other valid flag? I mean use
vxlan_validandnvgre_valid.
Could betunnel_valid=vxlan_valid|nvgre_valid.
Because we will extend to gtp-u or other kinds of packet, there will be more and more xxx_valid variable. I think we can follow rte layer to use bit define kinds of tunnel packet.
It is too complex to define too many valid flag.
Quoted 76 lines
Quoted 75 lines
drivers/net/ice/ice_switch_filter.c +0
-1#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) @@ -471,11 +473,11 @@ ice_switch_inset_get(const struct rte_flow_itempattern[],
drivers/net/ice/ice_switch_filter.c +2
-2const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], return 0; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_VXLAN_VALID ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ;drivers/net/ice/ice_switch_filter.c +1
-1if (vxlan_mask->vni[0] ||@@ -960,7 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_NVGRE_VALID ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;drivers/net/ice/ice_switch_filter.c +15
-0if (nvgre_mask->tni[0] ||@@ -1325,6 +1327,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (tunnel_valid ==ICE_TUN_VXLAN_VALID ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==ICE_TUN_NVGRE_VALID ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;drivers/net/ice/ice_switch_filter.c +0
-4return input_set;@@ -1536,10 +1553,6 @@ ice_switch_parse_pattern_action(structice_adapter *ad, for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (
item->mask)
--
2.19.1
PATCH v3 4/4 net/ice: add input set byte number check
In reply to Wei ZhaoThis patch add the total input set byte number check, as there is a hardware requirement for the total number of 32 byte.
--- drivers/net/ice/ice_switch_filter.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +40 -3
@@ -25,7 +25,8 @@#include "ice_generic_flow.h" -#define MAX_QGRP_NUM_TYPE 7 +#define MAX_QGRP_NUM_TYPE 7 +#define MAX_INPUT_SET_BYTE 32#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F
@@ -473,6 +474,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t feild_vec_byte =0 ;uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;
@@ -540,6 +542,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->src_addr[j] = eth_mask->src.addr_bytes[j]; i =1 ; + feild_vec_byte++; }if (eth_mask->dst.addr_bytes[j]) { h->dst_addr[j] =
@@ -547,6 +550,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->dst_addr[j] = eth_mask->dst.addr_bytes[j]; i =1 ; + feild_vec_byte++; } }if (i)
@@ -557,6 +561,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], eth_spec->type; list[t].m_u.ethertype.ethtype_id = eth_mask->type; + feild_vec_byte +=2 ; t++; } }
@@ -616,24 +621,28 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.src_addr; list[t].m_u.ipv4_hdr.src_addr = ipv4_mask->hdr.src_addr; + feild_vec_byte +=2 ; }if (ipv4_mask->hdr.dst_addr) { list[t].h_u.ipv4_hdr.dst_addr = ipv4_spec->hdr.dst_addr; list[t].m_u.ipv4_hdr.dst_addr = ipv4_mask->hdr.dst_addr; + feild_vec_byte +=2 ; }if (ipv4_mask->hdr.time_to_live) { list[t].h_u.ipv4_hdr.time_to_live = ipv4_spec->hdr.time_to_live; list[t].m_u.ipv4_hdr.time_to_live = ipv4_mask->hdr.time_to_live; + feild_vec_byte++; }if (ipv4_mask->hdr.next_proto_id) { list[t].h_u.ipv4_hdr.protocol = ipv4_spec->hdr.next_proto_id; list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; + feild_vec_byte++; } if ((ipv4_spec->hdr.next_proto_id & ipv4_mask->hdr.next_proto_id) ==
@@ -644,6 +653,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.type_of_service; list[t].m_u.ipv4_hdr.tos = ipv4_mask->hdr.type_of_service; + feild_vec_byte++; } t++; }
@@ -721,12 +731,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.src_addr[j]; s->src_addr[j] = ipv6_mask->hdr.src_addr[j]; + feild_vec_byte++; }if (ipv6_mask->hdr.dst_addr[j]) { f->dst_addr[j] = ipv6_spec->hdr.dst_addr[j]; s->dst_addr[j] = ipv6_mask->hdr.dst_addr[j]; + feild_vec_byte++; } }if (ipv6_mask->hdr.proto) {
@@ -734,12 +746,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.proto; s->next_hdr = ipv6_mask->hdr.proto; + feild_vec_byte++; }if (ipv6_mask->hdr.hop_limits) { f->hop_limit = ipv6_spec->hdr.hop_limits; s->hop_limit = ipv6_mask->hdr.hop_limits; + feild_vec_byte++; }if (ipv6_mask->hdr.vtc_flow & rte_cpu_to_be_32
@@ -757,6 +771,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], RTE_IPV6_HDR_TC_MASK) >>RTE_IPV6_HDR_TC_SHIFT ; s->be_ver_tc_flow =CPU_TO_BE32 (vtf.u.val); + feild_vec_byte +=4 ; } t++; }
@@ -802,14 +817,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], udp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = udp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (udp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = udp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = udp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } - t++; + t++; }break ;
@@ -854,12 +871,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], tcp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = tcp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (tcp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = tcp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = tcp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } t++; }
@@ -899,12 +918,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], sctp_spec->hdr.src_port; list[t].m_u.sctp_hdr.src_port = sctp_mask->hdr.src_port; + feild_vec_byte +=2 ; }if (sctp_mask->hdr.dst_port) { list[t].h_u.sctp_hdr.dst_port = sctp_spec->hdr.dst_port; list[t].m_u.sctp_hdr.dst_port = sctp_mask->hdr.dst_port; + feild_vec_byte +=2 ; } t++; }
@@ -942,6 +963,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vxlan_mask->vni[0 ]; input_set |=ICE_INSET_TUN_VXLAN_VNI ; + feild_vec_byte +=2 ; } t++; }
@@ -978,6 +1000,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], nvgre_mask->tni[0 ]; input_set |=ICE_INSET_TUN_NVGRE_TNI ; + feild_vec_byte +=2 ; } t++; }
@@ -1006,6 +1029,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.vlan = vlan_mask->tci; input_set |=ICE_INSET_VLAN_OUTER ; + feild_vec_byte +=2 ; }if (vlan_mask->inner_type) { list[t].h_u.vlan_hdr.type =
@@ -1013,6 +1037,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; input_set |=ICE_INSET_ETHERTYPE ; + feild_vec_byte +=2 ; } t++; }
@@ -1053,6 +1078,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.session_id = pppoe_mask->session_id; input_set |=ICE_INSET_PPPOE_SESSION ; + feild_vec_byte +=2 ; } t++; pppoe_elem_valid =1 ;
@@ -1085,7 +1111,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; - + feild_vec_byte +=2 ; pppoe_prot_valid =1 ; } if ((pppoe_proto_mask->proto_id &
@@ -1142,6 +1168,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.esp_hdr.spi = esp_mask->hdr.spi; input_set |=ICE_INSET_ESP_SPI ; + feild_vec_byte +=4 ; t++; }
@@ -1198,6 +1225,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ah_hdr.spi = ah_mask->spi; input_set |=ICE_INSET_AH_SPI ; + feild_vec_byte +=4 ; t++; }
@@ -1237,6 +1265,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.l2tpv3_sess_hdr.session_id = l2tp_mask->session_id; input_set |=ICE_INSET_L2TPV3OIP_SESSION_ID ; + feild_vec_byte +=4 ; t++; }
@@ -1342,6 +1371,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_IPV6_UDP ; } +if (feild_vec_byte >=MAX_INPUT_SET_BYTE ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"too much input set" ); +return -ENOTSUP ; + } + *lkups_num = t;return input_set;
Signature · 1 line
2.19.1
v4 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
v4:
fix typo in patch
Wei Zhao (4):
net/ice: add support more PPPoE packet type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check
doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 190 +++++++++++++++++++++---- 2 files changed, 166 insertions(+), 25 deletions(-)
Signature · 1 line
2.19.1
PATCH v4 1/4 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 101 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +1 -0
@@ -86,6 +86,7 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Added support for DCF datapath configuration. + * Added support for more PPPoE packet type for switch filter. Removed Items -------------
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v4 2/4 net/ice: fix tunnel type for switch rule
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x002F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH v4 3/4 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/net/ice/ice_switch_filter.c +20 -7
@@ -29,6 +29,8 @@#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F +#define ICE_TUN_VXLAN_VALID 0x0001 +#define ICE_TUN_NVGRE_VALID 0x0002#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -471,11 +473,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;bool profile_rule =0 ; -bool tunnel_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_VXLAN_VALID ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ; if (vxlan_mask->vni[0] ||
@@ -960,7 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } - tunnel_valid =1 ; + tunnel_valid =ICE_TUN_NVGRE_VALID ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ; if (nvgre_mask->tni[0] ||
@@ -1325,6 +1327,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (tunnel_valid ==ICE_TUN_VXLAN_VALID ) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (tunnel_valid ==ICE_TUN_NVGRE_VALID ) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1553,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
PATCH v4 4/4 net/ice: add input set byte number check
In reply to Wei ZhaoThis patch add the total input set byte number check, as there is a hardware requirement for the total number of 32 byte.
--- drivers/net/ice/ice_switch_filter.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +40 -3
@@ -25,7 +25,8 @@#include "ice_generic_flow.h" -#define MAX_QGRP_NUM_TYPE 7 +#define MAX_QGRP_NUM_TYPE 7 +#define MAX_INPUT_SET_BYTE 32#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F
@@ -473,6 +474,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t input_set_byte =0 ;uint16_t tunnel_valid =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;
@@ -540,6 +542,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->src_addr[j] = eth_mask->src.addr_bytes[j]; i =1 ; + input_set_byte++; }if (eth_mask->dst.addr_bytes[j]) { h->dst_addr[j] =
@@ -547,6 +550,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->dst_addr[j] = eth_mask->dst.addr_bytes[j]; i =1 ; + input_set_byte++; } }if (i)
@@ -557,6 +561,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], eth_spec->type; list[t].m_u.ethertype.ethtype_id = eth_mask->type; + input_set_byte +=2 ; t++; } }
@@ -616,24 +621,28 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.src_addr; list[t].m_u.ipv4_hdr.src_addr = ipv4_mask->hdr.src_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.dst_addr) { list[t].h_u.ipv4_hdr.dst_addr = ipv4_spec->hdr.dst_addr; list[t].m_u.ipv4_hdr.dst_addr = ipv4_mask->hdr.dst_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.time_to_live) { list[t].h_u.ipv4_hdr.time_to_live = ipv4_spec->hdr.time_to_live; list[t].m_u.ipv4_hdr.time_to_live = ipv4_mask->hdr.time_to_live; + input_set_byte++; }if (ipv4_mask->hdr.next_proto_id) { list[t].h_u.ipv4_hdr.protocol = ipv4_spec->hdr.next_proto_id; list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; + input_set_byte++; } if ((ipv4_spec->hdr.next_proto_id & ipv4_mask->hdr.next_proto_id) ==
@@ -644,6 +653,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.type_of_service; list[t].m_u.ipv4_hdr.tos = ipv4_mask->hdr.type_of_service; + input_set_byte++; } t++; }
@@ -721,12 +731,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.src_addr[j]; s->src_addr[j] = ipv6_mask->hdr.src_addr[j]; + input_set_byte++; }if (ipv6_mask->hdr.dst_addr[j]) { f->dst_addr[j] = ipv6_spec->hdr.dst_addr[j]; s->dst_addr[j] = ipv6_mask->hdr.dst_addr[j]; + input_set_byte++; } }if (ipv6_mask->hdr.proto) {
@@ -734,12 +746,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.proto; s->next_hdr = ipv6_mask->hdr.proto; + input_set_byte++; }if (ipv6_mask->hdr.hop_limits) { f->hop_limit = ipv6_spec->hdr.hop_limits; s->hop_limit = ipv6_mask->hdr.hop_limits; + input_set_byte++; }if (ipv6_mask->hdr.vtc_flow & rte_cpu_to_be_32
@@ -757,6 +771,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], RTE_IPV6_HDR_TC_MASK) >>RTE_IPV6_HDR_TC_SHIFT ; s->be_ver_tc_flow =CPU_TO_BE32 (vtf.u.val); + input_set_byte +=4 ; } t++; }
@@ -802,14 +817,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], udp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = udp_mask->hdr.src_port; + input_set_byte +=2 ; }if (udp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = udp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = udp_mask->hdr.dst_port; + input_set_byte +=2 ; } - t++; + t++; }break ;
@@ -854,12 +871,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], tcp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = tcp_mask->hdr.src_port; + input_set_byte +=2 ; }if (tcp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = tcp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = tcp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -899,12 +918,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], sctp_spec->hdr.src_port; list[t].m_u.sctp_hdr.src_port = sctp_mask->hdr.src_port; + input_set_byte +=2 ; }if (sctp_mask->hdr.dst_port) { list[t].h_u.sctp_hdr.dst_port = sctp_spec->hdr.dst_port; list[t].m_u.sctp_hdr.dst_port = sctp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -942,6 +963,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vxlan_mask->vni[0 ]; input_set |=ICE_INSET_TUN_VXLAN_VNI ; + input_set_byte +=2 ; } t++; }
@@ -978,6 +1000,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], nvgre_mask->tni[0 ]; input_set |=ICE_INSET_TUN_NVGRE_TNI ; + input_set_byte +=2 ; } t++; }
@@ -1006,6 +1029,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.vlan = vlan_mask->tci; input_set |=ICE_INSET_VLAN_OUTER ; + input_set_byte +=2 ; }if (vlan_mask->inner_type) { list[t].h_u.vlan_hdr.type =
@@ -1013,6 +1037,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; input_set |=ICE_INSET_ETHERTYPE ; + input_set_byte +=2 ; } t++; }
@@ -1053,6 +1078,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.session_id = pppoe_mask->session_id; input_set |=ICE_INSET_PPPOE_SESSION ; + input_set_byte +=2 ; } t++; pppoe_elem_valid =1 ;
@@ -1085,7 +1111,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; - + input_set_byte +=2 ; pppoe_prot_valid =1 ; } if ((pppoe_proto_mask->proto_id &
@@ -1142,6 +1168,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.esp_hdr.spi = esp_mask->hdr.spi; input_set |=ICE_INSET_ESP_SPI ; + input_set_byte +=4 ; t++; }
@@ -1198,6 +1225,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ah_hdr.spi = ah_mask->spi; input_set |=ICE_INSET_AH_SPI ; + input_set_byte +=4 ; t++; }
@@ -1237,6 +1265,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.l2tpv3_sess_hdr.session_id = l2tp_mask->session_id; input_set |=ICE_INSET_L2TPV3OIP_SESSION_ID ; + input_set_byte +=4 ; t++; }
@@ -1342,6 +1371,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_IPV6_UDP ; } +if (input_set_byte >MAX_INPUT_SET_BYTE ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"too much input set" ); +return -ENOTSUP ; + } + *lkups_num = t;return input_set;
Signature · 1 line
2.19.1
v5 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
5. fix typo
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
v4:
fix typo in patch
v5:
add more valid flag
Wei Zhao (5):
net/ice: add support more PPPoE packet type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check net/ice: fix typo
doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 241 ++++++++++++++++++++----- 2 files changed, 192 insertions(+), 50 deletions(-)
Signature · 1 line
2.19.1
PATCH v5 1/5 net/ice: add support more PPPoE packet type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 101 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +1 -0
@@ -86,6 +86,7 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Added support for DCF datapath configuration. + * Added support for more PPPoE packet type for switch filter. Removed Items -------------
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v5 2/5 net/ice: fix tunnel type for switch rule
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -28,6 +28,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x002F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -632,6 +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1526,7 +1531,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH v5 3/5 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/net/ice/ice_switch_filter.c +20 -6
@@ -474,8 +474,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ; -bool profile_rule =0 ;bool tunnel_valid =0 ; +bool profile_rule =0 ; +bool nvgre_valid =0 ; +bool vxlan_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -923,7 +925,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid VXLAN item");return 0 ; } - + vxlan_valid =1 ; tunnel_valid =1 ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ;
@@ -960,6 +962,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } + nvgre_valid =1 ; tunnel_valid =1 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;
@@ -1325,6 +1328,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (vxlan_valid) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (nvgre_valid) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1536,10 +1554,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
PATCH v5 4/5 net/ice: add input set byte number check
In reply to Wei ZhaoThis patch add the total input set byte number check, as there is a hardware requirement for the total number of 32 byte.
--- drivers/net/ice/ice_switch_filter.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +40 -3
@@ -25,7 +25,8 @@#include "ice_generic_flow.h" -#define MAX_QGRP_NUM_TYPE 7 +#define MAX_QGRP_NUM_TYPE 7 +#define MAX_INPUT_SET_BYTE 32#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F
@@ -471,6 +472,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t input_set_byte =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;
@@ -540,6 +542,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->src_addr[j] = eth_mask->src.addr_bytes[j]; i =1 ; + input_set_byte++; }if (eth_mask->dst.addr_bytes[j]) { h->dst_addr[j] =
@@ -547,6 +550,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->dst_addr[j] = eth_mask->dst.addr_bytes[j]; i =1 ; + input_set_byte++; } }if (i)
@@ -557,6 +561,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], eth_spec->type; list[t].m_u.ethertype.ethtype_id = eth_mask->type; + input_set_byte +=2 ; t++; } }
@@ -616,24 +621,28 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.src_addr; list[t].m_u.ipv4_hdr.src_addr = ipv4_mask->hdr.src_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.dst_addr) { list[t].h_u.ipv4_hdr.dst_addr = ipv4_spec->hdr.dst_addr; list[t].m_u.ipv4_hdr.dst_addr = ipv4_mask->hdr.dst_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.time_to_live) { list[t].h_u.ipv4_hdr.time_to_live = ipv4_spec->hdr.time_to_live; list[t].m_u.ipv4_hdr.time_to_live = ipv4_mask->hdr.time_to_live; + input_set_byte++; }if (ipv4_mask->hdr.next_proto_id) { list[t].h_u.ipv4_hdr.protocol = ipv4_spec->hdr.next_proto_id; list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; + input_set_byte++; } if ((ipv4_spec->hdr.next_proto_id & ipv4_mask->hdr.next_proto_id) ==
@@ -644,6 +653,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.type_of_service; list[t].m_u.ipv4_hdr.tos = ipv4_mask->hdr.type_of_service; + input_set_byte++; } t++; }
@@ -721,12 +731,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.src_addr[j]; s->src_addr[j] = ipv6_mask->hdr.src_addr[j]; + input_set_byte++; }if (ipv6_mask->hdr.dst_addr[j]) { f->dst_addr[j] = ipv6_spec->hdr.dst_addr[j]; s->dst_addr[j] = ipv6_mask->hdr.dst_addr[j]; + input_set_byte++; } }if (ipv6_mask->hdr.proto) {
@@ -734,12 +746,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.proto; s->next_hdr = ipv6_mask->hdr.proto; + input_set_byte++; }if (ipv6_mask->hdr.hop_limits) { f->hop_limit = ipv6_spec->hdr.hop_limits; s->hop_limit = ipv6_mask->hdr.hop_limits; + input_set_byte++; }if (ipv6_mask->hdr.vtc_flow & rte_cpu_to_be_32
@@ -757,6 +771,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], RTE_IPV6_HDR_TC_MASK) >>RTE_IPV6_HDR_TC_SHIFT ; s->be_ver_tc_flow =CPU_TO_BE32 (vtf.u.val); + input_set_byte +=4 ; } t++; }
@@ -802,14 +817,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], udp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = udp_mask->hdr.src_port; + input_set_byte +=2 ; }if (udp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = udp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = udp_mask->hdr.dst_port; + input_set_byte +=2 ; } - t++; + t++; }break ;
@@ -854,12 +871,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], tcp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = tcp_mask->hdr.src_port; + input_set_byte +=2 ; }if (tcp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = tcp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = tcp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -899,12 +918,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], sctp_spec->hdr.src_port; list[t].m_u.sctp_hdr.src_port = sctp_mask->hdr.src_port; + input_set_byte +=2 ; }if (sctp_mask->hdr.dst_port) { list[t].h_u.sctp_hdr.dst_port = sctp_spec->hdr.dst_port; list[t].m_u.sctp_hdr.dst_port = sctp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -942,6 +963,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vxlan_mask->vni[0 ]; input_set |=ICE_INSET_TUN_VXLAN_VNI ; + input_set_byte +=2 ; } t++; }
@@ -979,6 +1001,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], nvgre_mask->tni[0 ]; input_set |=ICE_INSET_TUN_NVGRE_TNI ; + input_set_byte +=2 ; } t++; }
@@ -1007,6 +1030,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.vlan = vlan_mask->tci; input_set |=ICE_INSET_VLAN_OUTER ; + input_set_byte +=2 ; }if (vlan_mask->inner_type) { list[t].h_u.vlan_hdr.type =
@@ -1014,6 +1038,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; input_set |=ICE_INSET_ETHERTYPE ; + input_set_byte +=2 ; } t++; }
@@ -1054,6 +1079,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.session_id = pppoe_mask->session_id; input_set |=ICE_INSET_PPPOE_SESSION ; + input_set_byte +=2 ; } t++; pppoe_elem_valid =1 ;
@@ -1086,7 +1112,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; - + input_set_byte +=2 ; pppoe_prot_valid =1 ; } if ((pppoe_proto_mask->proto_id &
@@ -1143,6 +1169,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.esp_hdr.spi = esp_mask->hdr.spi; input_set |=ICE_INSET_ESP_SPI ; + input_set_byte +=4 ; t++; }
@@ -1199,6 +1226,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ah_hdr.spi = ah_mask->spi; input_set |=ICE_INSET_AH_SPI ; + input_set_byte +=4 ; t++; }
@@ -1238,6 +1266,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.l2tpv3_sess_hdr.session_id = l2tp_mask->session_id; input_set |=ICE_INSET_L2TPV3OIP_SESSION_ID ; + input_set_byte +=4 ; t++; }
@@ -1343,6 +1372,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_IPV6_UDP ; } +if (input_set_byte >MAX_INPUT_SET_BYTE ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"too much input set" ); +return -ENOTSUP ; + } + *lkups_num = t;return input_set;
Signature · 1 line
2.19.1
PATCH v5 5/5 net/ice: fix typo
In reply to Wei Zhaofix typo of "valid".
--- drivers/net/ice/ice_switch_filter.c | 76 ++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/net/ice/ice_switch_filter.c +38 -38
@@ -480,10 +480,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],bool profile_rule =0 ;bool nvgre_valid =0 ;bool vxlan_valid =0 ; -bool ipv6_valiad =0 ; -bool ipv4_valiad =0 ; -bool udp_valiad =0 ; -bool tcp_valiad =0 ; +bool ipv6_valid =0 ; +bool ipv4_valid =0 ; +bool udp_valid =0 ; +bool tcp_valid =0 ;uint16_t j, t =0 ; for (item = pattern; item->type !=
@@ -570,7 +570,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_IPV4 : ipv4_spec = item->spec; ipv4_mask = item->mask; - ipv4_valiad =1 ; + ipv4_valid =1 ;if (ipv4_spec && ipv4_mask) {/* Check IPv4 mask and update input set */ if (ipv4_mask->hdr.version_ihl ||
@@ -662,7 +662,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_IPV6 : ipv6_spec = item->spec; ipv6_mask = item->mask; - ipv6_valiad =1 ; + ipv6_valid =1 ;if (ipv6_spec && ipv6_mask) {if (ipv6_mask->hdr.payload_len) { rte_flow_error_set(error, EINVAL,
@@ -780,7 +780,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_UDP : udp_spec = item->spec; udp_mask = item->mask; - udp_valiad =1 ; + udp_valid =1 ;if (udp_spec && udp_mask) {/* Check UDP mask and update input set*/ if (udp_mask->hdr.dgram_len ||
@@ -833,7 +833,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_TCP : tcp_spec = item->spec; tcp_mask = item->mask; - tcp_valiad =1 ; + tcp_valid =1 ;if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ if (tcp_mask->hdr.sent_seq ||
@@ -1151,16 +1151,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],if (!esp_spec && !esp_mask && !input_set) { profile_rule =1 ; -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_ESP ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (esp_spec && esp_mask && esp_mask->hdr.spi){ -if (udp_valiad) +if (udp_valid) list[t].type =ICE_NAT_T ;else list[t].type =ICE_ESP ;
@@ -1174,13 +1174,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_IPV6_NAT_T ; -else if (ipv4_valiad && udp_valiad) +else if (ipv4_valid && udp_valid) *tun_type =ICE_SW_TUN_IPV4_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_ESP ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_ESP ; }break ;
@@ -1211,12 +1211,12 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],if (!ah_spec && !ah_mask && !input_set) { profile_rule =1 ; -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_AH ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (ah_spec && ah_mask && ah_mask->spi){
@@ -1231,11 +1231,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (udp_valiad) +if (udp_valid)return 0 ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_AH ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_AH ; }break ;
@@ -1253,10 +1253,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!l2tp_spec && !l2tp_mask && !input_set) { -if (ipv6_valiad) +if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3 ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (l2tp_spec && l2tp_mask && l2tp_mask->session_id){
@@ -1271,10 +1271,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (ipv6_valiad) +if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_L2TPV3 ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_L2TPV3 ; }
@@ -1308,7 +1308,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (pfcp_mask->s_field && pfcp_spec->s_field ==0x01 && - ipv6_valiad) + ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION ; else if (pfcp_mask->s_field &&
@@ -1317,7 +1317,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION ; else if (pfcp_mask->s_field && !pfcp_spec->s_field && - ipv6_valiad) + ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_PFCP_NODE ; else if (pfcp_mask->s_field &&
@@ -1341,17 +1341,17 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (pppoe_patt_valid && !pppoe_prot_valid) { -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6_UDP ; -else if (ipv6_valiad && tcp_valiad) +else if (ipv6_valid && tcp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6_TCP ; -else if (ipv4_valiad && udp_valiad) +else if (ipv4_valid && udp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4_UDP ; -else if (ipv4_valiad && tcp_valiad) +else if (ipv4_valid && tcp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4_TCP ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6 ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4 ;else *tun_type =ICE_SW_TUN_PPPOE ;
@@ -1362,13 +1362,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_VXLAN ; else if (nvgre_valid) *tun_type = ICE_SW_TUN_NVGRE; - else if (ipv4_valiad && tcp_valiad) + else if (ipv4_valid && tcp_valid) *tun_type = ICE_SW_IPV4_TCP; - else if (ipv4_valiad && udp_valiad) + else if (ipv4_valid && udp_valid) *tun_type = ICE_SW_IPV4_UDP; - else if (ipv6_valiad && tcp_valiad) + else if (ipv6_valid && tcp_valid) *tun_type = ICE_SW_IPV6_TCP; - else if (ipv6_valiad && udp_valiad) + else if (ipv6_valid && udp_valid) *tun_type = ICE_SW_IPV6_UDP; }
Signature · 1 line
2.19.1
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Monday, June 29, 2020 1:10 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>
Subject: [PATCH v5 0/5] enable more PPPoE packet type for switch
1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
5. fix typo
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
v4:
fix typo in patch
v5:
add more valid flag
Wei Zhao (5):
net/ice: add support more PPPoE packet type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check net/ice: fix typo
doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 241 ++++++++++++++++++++----- 2 files changed, 192 insertions(+), 50 deletions(-)
Signature · 1 line
2.19.1
v6 cover enable more PPPoE packet type for switch
In reply to Wei Zhao1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
5. fix typo
This patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code update
Depends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.
v3:
add input set byte number check
code update as comment of code style
v4:
fix typo in patch
v5:
add more valid flag
v6:
rebase for code merge
Wei Zhao (5):
net/ice: add support more PPPoE packeat type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check net/ice: fix typo
doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 241 ++++++++++++++++++++----- 2 files changed, 192 insertions(+), 50 deletions(-)
Signature · 1 line
2.19.1
PATCH v6 1/5 net/ice: add support more PPPoE packeat type for switch
This patch add more support for switch parser of pppoe packet, it enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for pppoe payload, so we can use L4 dst/src port and L3 ip address as input set for switch filter pppoe related rule.
--- doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++---- 2 files changed, 101 insertions(+), 15 deletions(-)
doc/guides/rel_notes/release_20_08.rst +1 -0
@@ -90,6 +90,7 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Added support for DCF datapath configuration. + * Added support for more PPPoE packet type for switch filter. * **Added support for BPF_ABS/BPF_IND load instructions.**
drivers/net/ice/ice_switch_filter.c +100 -15
207 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v6 2/5 net/ice: fix tunnel type for switch rule
In reply to Wei ZhaoThis patch add check for protocol type of IPv4 packet, it need to update tunnel type when NVGRE is in payload.
--- drivers/net/ice/ice_switch_filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ice/ice_switch_filter.c +6 -1
@@ -29,6 +29,7 @@#define MAX_QGRP_NUM_TYPE 7#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057 +#define ICE_IPV4_PROTO_NVGRE 0x002F#define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
@@ -633,6 +634,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; } +if ((ipv4_spec->hdr.next_proto_id & + ipv4_mask->hdr.next_proto_id) == +ICE_IPV4_PROTO_NVGRE ) + *tun_type =ICE_SW_TUN_AND_NON_TUN ;if (ipv4_mask->hdr.type_of_service) { list[t].h_u.ipv4_hdr.tos = ipv4_spec->hdr.type_of_service;
@@ -1532,7 +1537,7 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,const struct rte_flow_item *item = pattern;uint16_t item_num =0 ;enum ice_sw_tunnel_type tun_type = -ICE_SW_TUN_AND_NON_TUN ; +ICE_NON_TUN ;struct ice_pattern_match_item *pattern_match_item =NULL ;for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {
Signature · 1 line
2.19.1
PATCH v6 3/5 net/ice: support switch flow for specific L4 type
In reply to Wei ZhaoThis patch add more specific tunnel type for ipv4/ipv6 packet, it enable tcp/udp layer of ipv4/ipv6 as L4 payload but without L4 dst/src port number as input set for the switch filter rule.
--- drivers/net/ice/ice_switch_filter.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/net/ice/ice_switch_filter.c +20 -6
@@ -475,8 +475,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ; -bool profile_rule =0 ;bool tunnel_valid =0 ; +bool profile_rule =0 ; +bool nvgre_valid =0 ; +bool vxlan_valid =0 ;bool ipv6_valiad =0 ;bool ipv4_valiad =0 ;bool udp_valiad =0 ;
@@ -924,7 +926,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid VXLAN item");return 0 ; } - + vxlan_valid =1 ; tunnel_valid =1 ;if (vxlan_spec && vxlan_mask) { list[t].type =ICE_VXLAN ;
@@ -961,6 +963,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], "Invalid NVGRE item");return 0 ; } + nvgre_valid =1 ; tunnel_valid =1 ;if (nvgre_spec && nvgre_mask) { list[t].type =ICE_NVGRE ;
@@ -1326,6 +1329,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_PPPOE ; } +if (*tun_type ==ICE_NON_TUN ) { +if (vxlan_valid) + *tun_type =ICE_SW_TUN_VXLAN ; +else if (nvgre_valid) + *tun_type =ICE_SW_TUN_NVGRE ; +else if (ipv4_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV4_TCP ; +else if (ipv4_valiad && udp_valiad) + *tun_type =ICE_SW_IPV4_UDP ; +else if (ipv6_valiad && tcp_valiad) + *tun_type =ICE_SW_IPV6_TCP ; +else if (ipv6_valiad && udp_valiad) + *tun_type =ICE_SW_IPV6_UDP ; + } + *lkups_num = t;return input_set;
@@ -1542,10 +1560,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ;if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) {const struct rte_flow_item_eth *eth_mask;if (item->mask)
Signature · 1 line
2.19.1
PATCH v6 4/5 net/ice: add input set byte number check
In reply to Wei ZhaoThis patch add the total input set byte number check, as there is a hardware requirement for the total number of 32 byte.
--- drivers/net/ice/ice_switch_filter.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/ice/ice_switch_filter.c +40 -3
@@ -26,7 +26,8 @@#include "ice_dcf_ethdev.h" -#define MAX_QGRP_NUM_TYPE 7 +#define MAX_QGRP_NUM_TYPE 7 +#define MAX_INPUT_SET_BYTE 32#define ICE_PPP_IPV4_PROTO 0x0021#define ICE_PPP_IPV6_PROTO 0x0057#define ICE_IPV4_PROTO_NVGRE 0x002F
@@ -472,6 +473,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],const struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;uint64_t input_set =ICE_INSET_NONE ; +uint16_t input_set_byte =0 ;bool pppoe_elem_valid =0 ;bool pppoe_patt_valid =0 ;bool pppoe_prot_valid =0 ;
@@ -541,6 +543,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->src_addr[j] = eth_mask->src.addr_bytes[j]; i =1 ; + input_set_byte++; }if (eth_mask->dst.addr_bytes[j]) { h->dst_addr[j] =
@@ -548,6 +551,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], m->dst_addr[j] = eth_mask->dst.addr_bytes[j]; i =1 ; + input_set_byte++; } }if (i)
@@ -558,6 +562,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], eth_spec->type; list[t].m_u.ethertype.ethtype_id = eth_mask->type; + input_set_byte +=2 ; t++; } }
@@ -617,24 +622,28 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.src_addr; list[t].m_u.ipv4_hdr.src_addr = ipv4_mask->hdr.src_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.dst_addr) { list[t].h_u.ipv4_hdr.dst_addr = ipv4_spec->hdr.dst_addr; list[t].m_u.ipv4_hdr.dst_addr = ipv4_mask->hdr.dst_addr; + input_set_byte +=2 ; }if (ipv4_mask->hdr.time_to_live) { list[t].h_u.ipv4_hdr.time_to_live = ipv4_spec->hdr.time_to_live; list[t].m_u.ipv4_hdr.time_to_live = ipv4_mask->hdr.time_to_live; + input_set_byte++; }if (ipv4_mask->hdr.next_proto_id) { list[t].h_u.ipv4_hdr.protocol = ipv4_spec->hdr.next_proto_id; list[t].m_u.ipv4_hdr.protocol = ipv4_mask->hdr.next_proto_id; + input_set_byte++; } if ((ipv4_spec->hdr.next_proto_id & ipv4_mask->hdr.next_proto_id) ==
@@ -645,6 +654,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv4_spec->hdr.type_of_service; list[t].m_u.ipv4_hdr.tos = ipv4_mask->hdr.type_of_service; + input_set_byte++; } t++; }
@@ -722,12 +732,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.src_addr[j]; s->src_addr[j] = ipv6_mask->hdr.src_addr[j]; + input_set_byte++; }if (ipv6_mask->hdr.dst_addr[j]) { f->dst_addr[j] = ipv6_spec->hdr.dst_addr[j]; s->dst_addr[j] = ipv6_mask->hdr.dst_addr[j]; + input_set_byte++; } }if (ipv6_mask->hdr.proto) {
@@ -735,12 +747,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], ipv6_spec->hdr.proto; s->next_hdr = ipv6_mask->hdr.proto; + input_set_byte++; }if (ipv6_mask->hdr.hop_limits) { f->hop_limit = ipv6_spec->hdr.hop_limits; s->hop_limit = ipv6_mask->hdr.hop_limits; + input_set_byte++; }if (ipv6_mask->hdr.vtc_flow & rte_cpu_to_be_32
@@ -758,6 +772,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], RTE_IPV6_HDR_TC_MASK) >>RTE_IPV6_HDR_TC_SHIFT ; s->be_ver_tc_flow =CPU_TO_BE32 (vtf.u.val); + input_set_byte +=4 ; } t++; }
@@ -803,14 +818,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], udp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = udp_mask->hdr.src_port; + input_set_byte +=2 ; }if (udp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = udp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = udp_mask->hdr.dst_port; + input_set_byte +=2 ; } - t++; + t++; }break ;
@@ -855,12 +872,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], tcp_spec->hdr.src_port; list[t].m_u.l4_hdr.src_port = tcp_mask->hdr.src_port; + input_set_byte +=2 ; }if (tcp_mask->hdr.dst_port) { list[t].h_u.l4_hdr.dst_port = tcp_spec->hdr.dst_port; list[t].m_u.l4_hdr.dst_port = tcp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -900,12 +919,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], sctp_spec->hdr.src_port; list[t].m_u.sctp_hdr.src_port = sctp_mask->hdr.src_port; + input_set_byte +=2 ; }if (sctp_mask->hdr.dst_port) { list[t].h_u.sctp_hdr.dst_port = sctp_spec->hdr.dst_port; list[t].m_u.sctp_hdr.dst_port = sctp_mask->hdr.dst_port; + input_set_byte +=2 ; } t++; }
@@ -943,6 +964,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vxlan_mask->vni[0 ]; input_set |=ICE_INSET_TUN_VXLAN_VNI ; + input_set_byte +=2 ; } t++; }
@@ -980,6 +1002,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], nvgre_mask->tni[0 ]; input_set |=ICE_INSET_TUN_NVGRE_TNI ; + input_set_byte +=2 ; } t++; }
@@ -1008,6 +1031,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.vlan = vlan_mask->tci; input_set |=ICE_INSET_VLAN_OUTER ; + input_set_byte +=2 ; }if (vlan_mask->inner_type) { list[t].h_u.vlan_hdr.type =
@@ -1015,6 +1039,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; input_set |=ICE_INSET_ETHERTYPE ; + input_set_byte +=2 ; } t++; }
@@ -1055,6 +1080,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.session_id = pppoe_mask->session_id; input_set |=ICE_INSET_PPPOE_SESSION ; + input_set_byte +=2 ; } t++; pppoe_elem_valid =1 ;
@@ -1087,7 +1113,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.pppoe_hdr.ppp_prot_id = pppoe_proto_mask->proto_id; input_set |=ICE_INSET_PPPOE_PROTO ; - + input_set_byte +=2 ; pppoe_prot_valid =1 ; } if ((pppoe_proto_mask->proto_id &
@@ -1144,6 +1170,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.esp_hdr.spi = esp_mask->hdr.spi; input_set |=ICE_INSET_ESP_SPI ; + input_set_byte +=4 ; t++; }
@@ -1200,6 +1227,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.ah_hdr.spi = ah_mask->spi; input_set |=ICE_INSET_AH_SPI ; + input_set_byte +=4 ; t++; }
@@ -1239,6 +1267,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], list[t].m_u.l2tpv3_sess_hdr.session_id = l2tp_mask->session_id; input_set |=ICE_INSET_L2TPV3OIP_SESSION_ID ; + input_set_byte +=4 ; t++; }
@@ -1344,6 +1373,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_IPV6_UDP ; } +if (input_set_byte >MAX_INPUT_SET_BYTE ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"too much input set" ); +return -ENOTSUP ; + } + *lkups_num = t;return input_set;
Signature · 1 line
2.19.1
PATCH v6 5/5 net/ice: fix typo
In reply to Wei Zhaofix typo of "valid".
--- drivers/net/ice/ice_switch_filter.c | 76 ++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/net/ice/ice_switch_filter.c +38 -38
@@ -481,10 +481,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],bool profile_rule =0 ;bool nvgre_valid =0 ;bool vxlan_valid =0 ; -bool ipv6_valiad =0 ; -bool ipv4_valiad =0 ; -bool udp_valiad =0 ; -bool tcp_valiad =0 ; +bool ipv6_valid =0 ; +bool ipv4_valid =0 ; +bool udp_valid =0 ; +bool tcp_valid =0 ;uint16_t j, t =0 ; for (item = pattern; item->type !=
@@ -571,7 +571,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_IPV4 : ipv4_spec = item->spec; ipv4_mask = item->mask; - ipv4_valiad =1 ; + ipv4_valid =1 ;if (ipv4_spec && ipv4_mask) {/* Check IPv4 mask and update input set */ if (ipv4_mask->hdr.version_ihl ||
@@ -663,7 +663,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_IPV6 : ipv6_spec = item->spec; ipv6_mask = item->mask; - ipv6_valiad =1 ; + ipv6_valid =1 ;if (ipv6_spec && ipv6_mask) {if (ipv6_mask->hdr.payload_len) { rte_flow_error_set(error, EINVAL,
@@ -781,7 +781,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_UDP : udp_spec = item->spec; udp_mask = item->mask; - udp_valiad =1 ; + udp_valid =1 ;if (udp_spec && udp_mask) {/* Check UDP mask and update input set*/ if (udp_mask->hdr.dgram_len ||
@@ -834,7 +834,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],case RTE_FLOW_ITEM_TYPE_TCP : tcp_spec = item->spec; tcp_mask = item->mask; - tcp_valiad =1 ; + tcp_valid =1 ;if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ if (tcp_mask->hdr.sent_seq ||
@@ -1152,16 +1152,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],if (!esp_spec && !esp_mask && !input_set) { profile_rule =1 ; -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_ESP ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (esp_spec && esp_mask && esp_mask->hdr.spi){ -if (udp_valiad) +if (udp_valid) list[t].type =ICE_NAT_T ;else list[t].type =ICE_ESP ;
@@ -1175,13 +1175,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_IPV6_NAT_T ; -else if (ipv4_valiad && udp_valiad) +else if (ipv4_valid && udp_valid) *tun_type =ICE_SW_TUN_IPV4_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_ESP ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_ESP ; }break ;
@@ -1212,12 +1212,12 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],if (!ah_spec && !ah_mask && !input_set) { profile_rule =1 ; -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_NAT_T ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_AH ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (ah_spec && ah_mask && ah_mask->spi){
@@ -1232,11 +1232,11 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (udp_valiad) +if (udp_valid)return 0 ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_AH ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_AH ; }break ;
@@ -1254,10 +1254,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!l2tp_spec && !l2tp_mask && !input_set) { -if (ipv6_valiad) +if (ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3 ; -else if (ipv4_valiad) +else if (ipv4_valid)return 0 ; }else if (l2tp_spec && l2tp_mask && l2tp_mask->session_id){
@@ -1272,10 +1272,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (!profile_rule) { -if (ipv6_valiad) +if (ipv6_valid) *tun_type =ICE_SW_TUN_IPV6_L2TPV3 ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_IPV4_L2TPV3 ; }
@@ -1309,7 +1309,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (pfcp_mask->s_field && pfcp_spec->s_field ==0x01 && - ipv6_valiad) + ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_PFCP_SESSION ; else if (pfcp_mask->s_field &&
@@ -1318,7 +1318,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],ICE_SW_TUN_PROFID_IPV4_PFCP_SESSION ; else if (pfcp_mask->s_field && !pfcp_spec->s_field && - ipv6_valiad) + ipv6_valid) *tun_type =ICE_SW_TUN_PROFID_IPV6_PFCP_NODE ; else if (pfcp_mask->s_field &&
@@ -1342,17 +1342,17 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], }if (pppoe_patt_valid && !pppoe_prot_valid) { -if (ipv6_valiad && udp_valiad) +if (ipv6_valid && udp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6_UDP ; -else if (ipv6_valiad && tcp_valiad) +else if (ipv6_valid && tcp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6_TCP ; -else if (ipv4_valiad && udp_valiad) +else if (ipv4_valid && udp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4_UDP ; -else if (ipv4_valiad && tcp_valiad) +else if (ipv4_valid && tcp_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4_TCP ; -else if (ipv6_valiad) +else if (ipv6_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV6 ; -else if (ipv4_valiad) +else if (ipv4_valid) *tun_type =ICE_SW_TUN_PPPOE_IPV4 ;else *tun_type =ICE_SW_TUN_PPPOE ;
@@ -1363,13 +1363,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], *tun_type =ICE_SW_TUN_VXLAN ; else if (nvgre_valid) *tun_type = ICE_SW_TUN_NVGRE; - else if (ipv4_valiad && tcp_valiad) + else if (ipv4_valid && tcp_valid) *tun_type = ICE_SW_IPV4_TCP; - else if (ipv4_valiad && udp_valiad) + else if (ipv4_valid && udp_valid) *tun_type = ICE_SW_IPV4_UDP; - else if (ipv6_valiad && tcp_valiad) + else if (ipv6_valid && tcp_valid) *tun_type = ICE_SW_IPV6_TCP; - else if (ipv6_valiad && udp_valiad) + else if (ipv6_valid && udp_valid) *tun_type = ICE_SW_IPV6_UDP; }
Signature · 1 line
2.19.1
Quoted 45 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Friday, July 3, 2020 2:20 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>
Subject: [PATCH v6 0/5] enable more PPPoE packet type for switch1. add more support for switch parser of pppoe packet.
2. add check for NVGRE protocol
3. support flow for specific L4 type
4. add input set byte number check
5. fix typoThis patchset is based on:
[1] https://patches.dpdk.org/cover/70762/ : net/ice: base code updateDepends-on: series-10300
v2:
fix bug in patch add redirect support for VSI list rule. add information in release note.v3:
add input set byte number check
code update as comment of code stylev4:
fix typo in patchv5:
add more valid flagv6:
rebase for code mergeWei Zhao (5):
net/ice: add support more PPPoE packeat type for switch net/ice: fix tunnel type for switch rule net/ice: support switch flow for specific L4 type net/ice: add input set byte number check net/ice: fix typo
Quoted 5 lines
doc/guides/rel_notes/release_20_08.rst | 1 + drivers/net/ice/ice_switch_filter.c | 241 ++++++++++++++++++++----- 2 files changed, 192 insertions(+), 50 deletions(-)Tested-by Nannan Lu <[email protected]>
Applied to dpdk-next-net-intel
Thanks
Qi