net/ice: enable QinQ filter for switch
PATCH 1/1 net/ice: enable QinQ filter for switch
Enable the double VLAN support for switch QinQ filtering.
--- drivers/net/ice/ice_generic_flow.c | 15 ++++ drivers/net/ice/ice_generic_flow.h | 1 + drivers/net/ice/ice_switch_filter.c | 104 +++++++++++++++++++++++++--- 3 files changed, 109 insertions(+), 11 deletions(-)
drivers/net/ice/ice_generic_flow.c +15 -0
@@ -1455,6 +1455,14 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes[] = {RTE_FLOW_ITEM_TYPE_PPPOES , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_PPPOES,
@@ -2100,29 +2108,36 @@ static struct ice_ptype_match ice_ptype_map[] = { {pattern_eth_ipv6_pfcp, ICE_MAC_IPV6_PFCP_SESSION}, {pattern_ethertype, ICE_PTYPE_MAC_PAY}, {pattern_ethertype_vlan, ICE_PTYPE_MAC_PAY}, + {pattern_ethertype_qinq, ICE_PTYPE_MAC_PAY}, {pattern_eth_arp, ICE_PTYPE_MAC_PAY}, {pattern_eth_vlan_ipv4, ICE_PTYPE_IPV4_PAY}, + {pattern_eth_qinq_ipv4, ICE_PTYPE_IPV4_PAY}, {pattern_eth_vlan_ipv4_udp, ICE_PTYPE_IPV4_UDP_PAY}, {pattern_eth_vlan_ipv4_tcp, ICE_PTYPE_IPV4_TCP_PAY}, {pattern_eth_vlan_ipv4_sctp, ICE_PTYPE_IPV4_SCTP_PAY}, {pattern_eth_vlan_ipv6, ICE_PTYPE_IPV6_PAY}, + {pattern_eth_qinq_ipv6, ICE_PTYPE_IPV6_PAY}, {pattern_eth_vlan_ipv6_udp, ICE_PTYPE_IPV6_UDP_PAY}, {pattern_eth_vlan_ipv6_tcp, ICE_PTYPE_IPV6_TCP_PAY}, {pattern_eth_vlan_ipv6_sctp, ICE_PTYPE_IPV6_SCTP_PAY}, {pattern_eth_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes_proto, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, + {pattern_eth_qinq_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_vlan_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, + {pattern_eth_qinq_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_vlan_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_ipv4_udp_vxlan_ipv4, ICE_MAC_IPV4_TUN_IPV4_PAY},
drivers/net/ice/ice_generic_flow.h +1 -0
@@ -426,6 +426,7 @@ extern enum rte_flow_item_type pattern_eth_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes[]; +extern enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[];
drivers/net/ice/ice_switch_filter.c +93 -11
189 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 1/1 net/ice: enable QinQ filter for switch
Enable the double VLAN support for switch QinQ filtering.
--- doc/guides/rel_notes/release_21_02.rst | 4 + drivers/net/ice/ice_generic_flow.c | 15 ++++ drivers/net/ice/ice_generic_flow.h | 1 + drivers/net/ice/ice_switch_filter.c | 104 ++++++++++++++++++++++--- 4 files changed, 113 insertions(+), 11 deletions(-)
doc/guides/rel_notes/release_21_02.rst +4 -0
@@ -69,6 +69,10 @@ New Features * Added GTP PDU session container matching and raw encap/decap. +* **Updated Intel ice driver.** + + * Added Double VLAN support for DCF switch QinQ filtering. + Removed Items -------------
drivers/net/ice/ice_generic_flow.c +15 -0
@@ -1455,6 +1455,14 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes[] = {RTE_FLOW_ITEM_TYPE_PPPOES , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_PPPOES,
@@ -2100,29 +2108,36 @@ static struct ice_ptype_match ice_ptype_map[] = { {pattern_eth_ipv6_pfcp, ICE_MAC_IPV6_PFCP_SESSION}, {pattern_ethertype, ICE_PTYPE_MAC_PAY}, {pattern_ethertype_vlan, ICE_PTYPE_MAC_PAY}, + {pattern_ethertype_qinq, ICE_PTYPE_MAC_PAY}, {pattern_eth_arp, ICE_PTYPE_MAC_PAY}, {pattern_eth_vlan_ipv4, ICE_PTYPE_IPV4_PAY}, + {pattern_eth_qinq_ipv4, ICE_PTYPE_IPV4_PAY}, {pattern_eth_vlan_ipv4_udp, ICE_PTYPE_IPV4_UDP_PAY}, {pattern_eth_vlan_ipv4_tcp, ICE_PTYPE_IPV4_TCP_PAY}, {pattern_eth_vlan_ipv4_sctp, ICE_PTYPE_IPV4_SCTP_PAY}, {pattern_eth_vlan_ipv6, ICE_PTYPE_IPV6_PAY}, + {pattern_eth_qinq_ipv6, ICE_PTYPE_IPV6_PAY}, {pattern_eth_vlan_ipv6_udp, ICE_PTYPE_IPV6_UDP_PAY}, {pattern_eth_vlan_ipv6_tcp, ICE_PTYPE_IPV6_TCP_PAY}, {pattern_eth_vlan_ipv6_sctp, ICE_PTYPE_IPV6_SCTP_PAY}, {pattern_eth_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes_proto, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, + {pattern_eth_qinq_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_vlan_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, + {pattern_eth_qinq_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_vlan_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_ipv4_udp_vxlan_ipv4, ICE_MAC_IPV4_TUN_IPV4_PAY},
drivers/net/ice/ice_generic_flow.h +1 -0
@@ -426,6 +426,7 @@ extern enum rte_flow_item_type pattern_eth_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes[]; +extern enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[];
drivers/net/ice/ice_switch_filter.c +93 -11
189 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 1/1 net/ice: enable QinQ filter for switch
Enable the double VLAN support for switch QinQ filtering.
--- doc/guides/rel_notes/release_21_02.rst | 4 + drivers/net/ice/ice_generic_flow.c | 15 ++++ drivers/net/ice/ice_generic_flow.h | 1 + drivers/net/ice/ice_switch_filter.c | 104 ++++++++++++++++++++++--- 4 files changed, 113 insertions(+), 11 deletions(-)
doc/guides/rel_notes/release_21_02.rst +4 -0
@@ -72,6 +72,10 @@ New Features * Added inner UDP/IPv4 support for VXLAN IPv4 GSO. +* **Updated Intel ice driver.** + + * Added Double VLAN support for DCF switch QinQ filtering. + Removed Items -------------
drivers/net/ice/ice_generic_flow.c +15 -0
@@ -1455,6 +1455,14 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes[] = {RTE_FLOW_ITEM_TYPE_PPPOES , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_PPPOES,
@@ -2100,29 +2108,36 @@ static struct ice_ptype_match ice_ptype_map[] = { {pattern_eth_ipv6_pfcp, ICE_MAC_IPV6_PFCP_SESSION}, {pattern_ethertype, ICE_PTYPE_MAC_PAY}, {pattern_ethertype_vlan, ICE_PTYPE_MAC_PAY}, + {pattern_ethertype_qinq, ICE_PTYPE_MAC_PAY}, {pattern_eth_arp, ICE_PTYPE_MAC_PAY}, {pattern_eth_vlan_ipv4, ICE_PTYPE_IPV4_PAY}, + {pattern_eth_qinq_ipv4, ICE_PTYPE_IPV4_PAY}, {pattern_eth_vlan_ipv4_udp, ICE_PTYPE_IPV4_UDP_PAY}, {pattern_eth_vlan_ipv4_tcp, ICE_PTYPE_IPV4_TCP_PAY}, {pattern_eth_vlan_ipv4_sctp, ICE_PTYPE_IPV4_SCTP_PAY}, {pattern_eth_vlan_ipv6, ICE_PTYPE_IPV6_PAY}, + {pattern_eth_qinq_ipv6, ICE_PTYPE_IPV6_PAY}, {pattern_eth_vlan_ipv6_udp, ICE_PTYPE_IPV6_UDP_PAY}, {pattern_eth_vlan_ipv6_tcp, ICE_PTYPE_IPV6_TCP_PAY}, {pattern_eth_vlan_ipv6_sctp, ICE_PTYPE_IPV6_SCTP_PAY}, {pattern_eth_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_vlan_pppoes_proto, ICE_MAC_PPPOE_PAY}, + {pattern_eth_qinq_pppoes_proto, ICE_MAC_PPPOE_PAY}, {pattern_eth_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, + {pattern_eth_qinq_pppoes_ipv4, ICE_MAC_PPPOE_IPV4_PAY}, {pattern_eth_vlan_pppoes_ipv4_tcp, ICE_MAC_PPPOE_IPV4_TCP}, {pattern_eth_vlan_pppoes_ipv4_udp, ICE_MAC_PPPOE_IPV4_UDP_PAY}, {pattern_eth_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, + {pattern_eth_qinq_pppoes_ipv6, ICE_MAC_PPPOE_IPV6_PAY}, {pattern_eth_vlan_pppoes_ipv6_tcp, ICE_MAC_PPPOE_IPV6_TCP}, {pattern_eth_vlan_pppoes_ipv6_udp, ICE_MAC_PPPOE_IPV6_UDP_PAY}, {pattern_eth_ipv4_udp_vxlan_ipv4, ICE_MAC_IPV4_TUN_IPV4_PAY},
drivers/net/ice/ice_generic_flow.h +1 -0
@@ -426,6 +426,7 @@ extern enum rte_flow_item_type pattern_eth_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes[]; +extern enum rte_flow_item_type pattern_eth_qinq_pppoes_proto[];extern enum rte_flow_item_type pattern_eth_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[];
drivers/net/ice/ice_switch_filter.c +93 -11
189 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 12 lines
-----Original Message-----
From: Guo, Junfeng <[email protected]>
Sent: Monday, January 18, 2021 10:08 PM
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Zhang, Yuying <[email protected]>; Guo, Junfeng <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v3] net/ice: enable QinQ filter for switch
Quoted 5 lines
Enable the double VLAN support for switch QinQ filtering.
Signed-off-by Wei Zhao <[email protected]>Signed-off-by Haiyue Wang <[email protected]>Signed-off-by Junfeng Guo <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi