add support for L2TP AH ESP and NAT-T on switch
cover add support for L2TP AH ESP and NAT-T on switch
This patch set add switch filter support for AH ESP NAT-T and L2TP protocol, and use spi or session idas input set for switch rule.
Wei Zhao (3):
net/ice/base: add support for AH ESP and NAT-T on switch net/ice/base: add support for L2TP on switch net/ice: add flow support for AH ESP and L2TP
drivers/net/ice/base/ice_protocol_type.h | 14 + drivers/net/ice/base/ice_switch.c | 311 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 2 + drivers/net/ice/ice_generic_flow.c | 25 ++ drivers/net/ice/ice_generic_flow.h | 23 ++ drivers/net/ice/ice_switch_filter.c | 198 ++++++++++++--- 6 files changed, 543 insertions(+), 30 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/3 net/ice/base: add support for AH ESP and NAT-T on switch
Add dummy packet and tunnel type to support
AH ESP and NAT-T on switch, now we can use spi as
input set for swicth rule.
--- drivers/net/ice/base/ice_protocol_type.h | 12 ++ drivers/net/ice/base/ice_switch.c | 235 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 1 + 3 files changed, 248 insertions(+)
drivers/net/ice/base/ice_protocol_type.h +12 -0
@@ -50,6 +50,7 @@ enum ice_protocol_type {ICE_L2TPV3 ,ICE_ESP ,ICE_AH , +ICE_NAT_T , ICE_PROTOCOL_LAST };
@@ -65,6 +66,12 @@ enum ice_sw_tunnel_type {*/ ICE_SW_TUN_GTP ,ICE_SW_TUN_PPPOE , +ICE_SW_TUN_IPV4_ESP , +ICE_SW_TUN_IPV6_ESP , +ICE_SW_TUN_IPV4_AH , +ICE_SW_TUN_IPV6_AH , +ICE_SW_TUN_IPV4_NAT_T , +ICE_SW_TUN_IPV6_NAT_T ,ICE_SW_TUN_PROFID_IPV6_ESP ,ICE_SW_TUN_PROFID_IPV6_AH , ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3,
@@ -287,6 +294,10 @@ struct ice_ah_hdr {__be32 seq; }; +struct ice_nat_t_hdr { +struct ice_esp_hdr esp; +}; +struct ice_nvgre {__be16 flags;__be16 protocol;
@@ -309,6 +320,7 @@ union ice_prot_hdr {struct ice_l2tpv3_sess_hdr l2tpv3_sess_hdr;struct ice_esp_hdr esp_hdr;struct ice_ah_hdr ah_hdr; +struct ice_nat_t_hdr nat_t_hdr; };/* This is mapping table entry that maps every word within a given protocol
drivers/net/ice/base/ice_switch.c +235 -0
277 lines not on this page · raw message
drivers/net/ice/base/ice_switch.h +1 -0
@@ -18,6 +18,7 @@/* Switch Profile IDs for Profile related switch rules */ #define ICE_PROFID_IPV6_ESP 72#define ICE_PROFID_IPV6_AH 74 +#define ICE_PROFID_IPV4_NAT_T 75#define ICE_PROFID_IPV6_NAT_T 76#define ICE_PROFID_MAC_IPV6_L2TPV3 78#define ICE_PROFID_IPV4_PFCP_NODE 79
Signature · 1 line
2.19.1
PATCH 2/3 net/ice/base: add support for L2TP on switch
In reply to Wei ZhaoAdd dummy packet and tunnel type to support
L2TP on switch, now we can use session id as
input set for swicth rule.
--- drivers/net/ice/base/ice_protocol_type.h | 2 + drivers/net/ice/base/ice_switch.c | 76 ++++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 1 + 3 files changed, 79 insertions(+)
drivers/net/ice/base/ice_protocol_type.h +2 -0
@@ -72,6 +72,8 @@ enum ice_sw_tunnel_type {ICE_SW_TUN_IPV6_AH ,ICE_SW_TUN_IPV4_NAT_T ,ICE_SW_TUN_IPV6_NAT_T , +ICE_SW_TUN_IPV4_L2TPV3 , +ICE_SW_TUN_IPV6_L2TPV3 ,ICE_SW_TUN_PROFID_IPV6_ESP ,ICE_SW_TUN_PROFID_IPV6_AH , ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3,
drivers/net/ice/base/ice_switch.c +76 -0
106 lines not on this page · raw message
drivers/net/ice/base/ice_switch.h +1 -0
@@ -20,6 +20,7 @@#define ICE_PROFID_IPV6_AH 74#define ICE_PROFID_IPV4_NAT_T 75#define ICE_PROFID_IPV6_NAT_T 76 +#define ICE_PROFID_MAC_IPV4_L2TPV3 77#define ICE_PROFID_MAC_IPV6_L2TPV3 78#define ICE_PROFID_IPV4_PFCP_NODE 79#define ICE_PROFID_IPV4_PFCP_SESSION 80
Signature · 1 line
2.19.1
PATCH 3/3 net/ice: add flow support for AH ESP and L2TP
In reply to Wei ZhaoAdd switch filter support for AH ESP and L2TP protocol, and use spi or session idas input set for switch rule.
--- drivers/net/ice/ice_generic_flow.c | 25 ++++ drivers/net/ice/ice_generic_flow.h | 23 ++++ drivers/net/ice/ice_switch_filter.c | 198 +++++++++++++++++++++++----- 3 files changed, 216 insertions(+), 30 deletions(-)
drivers/net/ice/ice_generic_flow.c +25 -0
@@ -1382,18 +1382,37 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = {RTE_FLOW_ITEM_TYPE_ICMP6 , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_esp[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV6 ,RTE_FLOW_ITEM_TYPE_ESP ,RTE_FLOW_ITEM_TYPE_END , }; +enum rte_flow_item_type pattern_eth_ipv4_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_ah[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV6 ,RTE_FLOW_ITEM_TYPE_AH ,RTE_FLOW_ITEM_TYPE_END , }; +enum rte_flow_item_type pattern_eth_ipv4_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_udp_esp[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV6,
@@ -1408,6 +1427,12 @@ enum rte_flow_item_type pattern_eth_ipv6_udp_ah[] = {RTE_FLOW_ITEM_TYPE_AH , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_l2tp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_l2tp[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV6,
drivers/net/ice/ice_generic_flow.h +23 -0
@@ -31,6 +31,10 @@#define ICE_PROT_NVGRE (1ULL << 20)#define ICE_PROT_GTPU (1ULL << 21)#define ICE_PROT_PPPOE_S (1ULL << 22) +#define ICE_PROT_ESP (1ULL << 23) +#define ICE_PROT_AH (1ULL << 24) +#define ICE_PROT_L2TPV3OIP (1ULL << 25) +#define ICE_PROT_PFCP (1ULL << 26)/* field */
@@ -52,6 +56,11 @@#define ICE_GTPU_QFI (1ULL << 48)#define ICE_PPPOE_SESSION (1ULL << 47)#define ICE_PPPOE_PROTO (1ULL << 46) +#define ICE_ESP_SPI (1ULL << 45) +#define ICE_AH_SPI (1ULL << 44) +#define ICE_L2TPV3OIP_SESSION_ID (1ULL << 43) +#define ICE_PFCP_SEID (1ULL << 42) +#define ICE_PFCP_S_FIELD (1ULL << 41)/* input set */
@@ -184,6 +193,16 @@ (ICE_PROT_PPPOE_S | ICE_PPPOE_SESSION)#define ICE_INSET_PPPOE_PROTO \ (ICE_PROT_PPPOE_S | ICE_PPPOE_PROTO) +#define ICE_INSET_ESP_SPI \ + (ICE_PROT_ESP | ICE_ESP_SPI) +#define ICE_INSET_AH_SPI \ + (ICE_PROT_AH | ICE_AH_SPI) +#define ICE_INSET_L2TPV3OIP_SESSION_ID \ + (ICE_PROT_L2TPV3OIP | ICE_L2TPV3OIP_SESSION_ID) +#define ICE_INSET_PFCP_S_FIELD \ + (ICE_PROT_PFCP | ICE_PFCP_S_FIELD) +#define ICE_INSET_PFCP_SEID \ + (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[];
@@ -392,14 +411,18 @@ extern enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[];/* ESP */ +extern enum rte_flow_item_type pattern_eth_ipv4_esp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_udp_esp[];extern enum rte_flow_item_type pattern_eth_ipv6_esp[];extern enum rte_flow_item_type pattern_eth_ipv6_udp_esp[];/* AH */ +extern enum rte_flow_item_type pattern_eth_ipv4_ah[];extern enum rte_flow_item_type pattern_eth_ipv6_ah[];extern enum rte_flow_item_type pattern_eth_ipv6_udp_ah[];/* L2TP */ +extern enum rte_flow_item_type pattern_eth_ipv4_l2tp[];extern enum rte_flow_item_type pattern_eth_ipv6_l2tp[];/* PFCP */
drivers/net/ice/ice_switch_filter.c +168 -30
278 lines not on this page · raw message
Signature · 1 line
2.19.1
Re: [dpdk-dev] [PATCH 3/3] net/ice: add flow support for AH ESP and L2TP
Quoted 15 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Friday, April 17, 2020 4:26 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Fu, Qi <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH 3/3] net/ice: add flow support for AH ESP and L2TPAdd switch filter support for AH ESP and L2TP protocol, and use spi or session idas input set for switch rule.
Signed-off-by Wei Zhao <[email protected]>---
.....
drivers/net/ice/ice_switch_filter.c ice_pattern_match_item · line 173
Quoted 11 lines
struct
sw_meta{drivers/net/ice/ice_switch_filter.c +4
-0struct ice_adv_lkup_elem *list;@@ -148,16 +166,24 @@ 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_ipv4_esp, + ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_esp, + ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
Why IPv6 input be used by IPv4 flow? Just typo?
drivers/net/ice/ice_switch_filter.c ice_pattern_match_item ice_switch_pattern_dist_comms[] = { · line 174
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +1
-1{pattern_eth_ipv6_esp, - ICE_INSET_NONE, ICE_INSET_NONE}, + ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
Same issue.
Re: [dpdk-dev] [PATCH 3/3] net/ice: add flow support for AH ESP and L2TP
Ok, fix in v2
Quoted 45 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Monday, April 20, 2020 1:17 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: Fu, Qi <[email protected]>
Subject: RE: [PATCH 3/3] net/ice: add flow support for AH ESP and L2TPQuoted 13 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Friday, April 17, 2020 4:26 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Fu, Qi <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH 3/3] net/ice: add flow support for AH ESP and L2TPAdd switch filter support for AH ESP and L2TP protocol, and use spi or session idas input set for switch rule.
Signed-off-by Wei Zhao <[email protected]>---
.....
drivers/net/ice/ice_switch_filter.c ice_pattern_match_item · line 173
Quoted 11 lines
struct
sw_meta{drivers/net/ice/ice_switch_filter.c +4
-0struct ice_adv_lkup_elem *list;@@ -148,16 +166,24 @@ 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_ipv4_esp, + ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE}, + {pattern_eth_ipv4_udp_esp, + ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},Why IPv6 input be used by IPv4 flow? Just typo?
drivers/net/ice/ice_switch_filter.c ice_pattern_match_item ice_switch_pattern_dist_comms[] = { · line 174
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +1
-1{pattern_eth_ipv6_esp, - ICE_INSET_NONE, ICE_INSET_NONE}, + ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},Same issue.
v2 cover add support for L2TP AH ESP and NAT-T on switch
In reply to Wei ZhaoThis patch set add switch filter support for AH ESP NAT-T and L2TP protocol, and use spi or session idas input set for switch rule.
v2:
-fix bug for input set error.
Wei Zhao (3):
net/ice/base: add support for AH ESP and NAT-T on switch net/ice/base: add support for L2TP on switch net/ice: add flow support for AH ESP and L2TP
drivers/net/ice/base/ice_protocol_type.h | 14 + drivers/net/ice/base/ice_switch.c | 311 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 2 + drivers/net/ice/ice_generic_flow.c | 25 ++ drivers/net/ice/ice_generic_flow.h | 23 ++ drivers/net/ice/ice_switch_filter.c | 198 ++++++++++++--- 6 files changed, 543 insertions(+), 30 deletions(-)
Signature · 1 line
2.19.1
PATCH v2 1/3 net/ice/base: add support for AH ESP and NAT-T on switch
Add dummy packet and tunnel type to support
AH ESP and NAT-T on switch, now we can use spi as
input set for swicth rule.
--- drivers/net/ice/base/ice_protocol_type.h | 12 ++ drivers/net/ice/base/ice_switch.c | 235 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 1 + 3 files changed, 248 insertions(+)
drivers/net/ice/base/ice_protocol_type.h +12 -0
@@ -50,6 +50,7 @@ enum ice_protocol_type {ICE_L2TPV3 ,ICE_ESP ,ICE_AH , +ICE_NAT_T , ICE_PROTOCOL_LAST };
@@ -65,6 +66,12 @@ enum ice_sw_tunnel_type {*/ ICE_SW_TUN_GTP ,ICE_SW_TUN_PPPOE , +ICE_SW_TUN_IPV4_ESP , +ICE_SW_TUN_IPV6_ESP , +ICE_SW_TUN_IPV4_AH , +ICE_SW_TUN_IPV6_AH , +ICE_SW_TUN_IPV4_NAT_T , +ICE_SW_TUN_IPV6_NAT_T ,ICE_SW_TUN_PROFID_IPV6_ESP ,ICE_SW_TUN_PROFID_IPV6_AH , ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3,
@@ -287,6 +294,10 @@ struct ice_ah_hdr {__be32 seq; }; +struct ice_nat_t_hdr { +struct ice_esp_hdr esp; +}; +struct ice_nvgre {__be16 flags;__be16 protocol;
@@ -309,6 +320,7 @@ union ice_prot_hdr {struct ice_l2tpv3_sess_hdr l2tpv3_sess_hdr;struct ice_esp_hdr esp_hdr;struct ice_ah_hdr ah_hdr; +struct ice_nat_t_hdr nat_t_hdr; };/* This is mapping table entry that maps every word within a given protocol
drivers/net/ice/base/ice_switch.c +235 -0
277 lines not on this page · raw message
drivers/net/ice/base/ice_switch.h +1 -0
@@ -18,6 +18,7 @@/* Switch Profile IDs for Profile related switch rules */ #define ICE_PROFID_IPV6_ESP 72#define ICE_PROFID_IPV6_AH 74 +#define ICE_PROFID_IPV4_NAT_T 75#define ICE_PROFID_IPV6_NAT_T 76#define ICE_PROFID_MAC_IPV6_L2TPV3 78#define ICE_PROFID_IPV4_PFCP_NODE 79
Signature · 1 line
2.19.1
PATCH v2 2/3 net/ice/base: add support for L2TP on switch
In reply to Wei ZhaoAdd dummy packet and tunnel type to support
L2TP on switch, now we can use session id as
input set for swicth rule.
--- drivers/net/ice/base/ice_protocol_type.h | 2 + drivers/net/ice/base/ice_switch.c | 76 ++++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 1 + 3 files changed, 79 insertions(+)
drivers/net/ice/base/ice_protocol_type.h +2 -0
@@ -72,6 +72,8 @@ enum ice_sw_tunnel_type {ICE_SW_TUN_IPV6_AH ,ICE_SW_TUN_IPV4_NAT_T ,ICE_SW_TUN_IPV6_NAT_T , +ICE_SW_TUN_IPV4_L2TPV3 , +ICE_SW_TUN_IPV6_L2TPV3 ,ICE_SW_TUN_PROFID_IPV6_ESP ,ICE_SW_TUN_PROFID_IPV6_AH , ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3,
drivers/net/ice/base/ice_switch.c +76 -0
106 lines not on this page · raw message
drivers/net/ice/base/ice_switch.h +1 -0
@@ -20,6 +20,7 @@#define ICE_PROFID_IPV6_AH 74#define ICE_PROFID_IPV4_NAT_T 75#define ICE_PROFID_IPV6_NAT_T 76 +#define ICE_PROFID_MAC_IPV4_L2TPV3 77#define ICE_PROFID_MAC_IPV6_L2TPV3 78#define ICE_PROFID_IPV4_PFCP_NODE 79#define ICE_PROFID_IPV4_PFCP_SESSION 80
Signature · 1 line
2.19.1
PATCH v2 3/3 net/ice: add flow support for AH ESP and L2TP
In reply to Wei ZhaoAdd switch filter support for AH ESP and L2TP protocol, and use spi or session idas input set for switch rule.
--- drivers/net/ice/ice_generic_flow.c | 25 ++++ drivers/net/ice/ice_generic_flow.h | 23 ++++ drivers/net/ice/ice_switch_filter.c | 198 +++++++++++++++++++++++----- 3 files changed, 216 insertions(+), 30 deletions(-)
drivers/net/ice/ice_generic_flow.c +25 -0
@@ -1382,18 +1382,37 @@ enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = {RTE_FLOW_ITEM_TYPE_ICMP6 , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_esp[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV6 ,RTE_FLOW_ITEM_TYPE_ESP ,RTE_FLOW_ITEM_TYPE_END , }; +enum rte_flow_item_type pattern_eth_ipv4_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_ah[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV6 ,RTE_FLOW_ITEM_TYPE_AH ,RTE_FLOW_ITEM_TYPE_END , }; +enum rte_flow_item_type pattern_eth_ipv4_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_udp_esp[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV6,
@@ -1408,6 +1427,12 @@ enum rte_flow_item_type pattern_eth_ipv6_udp_ah[] = {RTE_FLOW_ITEM_TYPE_AH , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_l2tp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv6_l2tp[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV6,
drivers/net/ice/ice_generic_flow.h +23 -0
@@ -31,6 +31,10 @@#define ICE_PROT_NVGRE (1ULL << 20)#define ICE_PROT_GTPU (1ULL << 21)#define ICE_PROT_PPPOE_S (1ULL << 22) +#define ICE_PROT_ESP (1ULL << 23) +#define ICE_PROT_AH (1ULL << 24) +#define ICE_PROT_L2TPV3OIP (1ULL << 25) +#define ICE_PROT_PFCP (1ULL << 26)/* field */
@@ -52,6 +56,11 @@#define ICE_GTPU_QFI (1ULL << 48)#define ICE_PPPOE_SESSION (1ULL << 47)#define ICE_PPPOE_PROTO (1ULL << 46) +#define ICE_ESP_SPI (1ULL << 45) +#define ICE_AH_SPI (1ULL << 44) +#define ICE_L2TPV3OIP_SESSION_ID (1ULL << 43) +#define ICE_PFCP_SEID (1ULL << 42) +#define ICE_PFCP_S_FIELD (1ULL << 41)/* input set */
@@ -184,6 +193,16 @@ (ICE_PROT_PPPOE_S | ICE_PPPOE_SESSION)#define ICE_INSET_PPPOE_PROTO \ (ICE_PROT_PPPOE_S | ICE_PPPOE_PROTO) +#define ICE_INSET_ESP_SPI \ + (ICE_PROT_ESP | ICE_ESP_SPI) +#define ICE_INSET_AH_SPI \ + (ICE_PROT_AH | ICE_AH_SPI) +#define ICE_INSET_L2TPV3OIP_SESSION_ID \ + (ICE_PROT_L2TPV3OIP | ICE_L2TPV3OIP_SESSION_ID) +#define ICE_INSET_PFCP_S_FIELD \ + (ICE_PROT_PFCP | ICE_PFCP_S_FIELD) +#define ICE_INSET_PFCP_SEID \ + (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[];
@@ -392,14 +411,18 @@ extern enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[];extern enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[];/* ESP */ +extern enum rte_flow_item_type pattern_eth_ipv4_esp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_udp_esp[];extern enum rte_flow_item_type pattern_eth_ipv6_esp[];extern enum rte_flow_item_type pattern_eth_ipv6_udp_esp[];/* AH */ +extern enum rte_flow_item_type pattern_eth_ipv4_ah[];extern enum rte_flow_item_type pattern_eth_ipv6_ah[];extern enum rte_flow_item_type pattern_eth_ipv6_udp_ah[];/* L2TP */ +extern enum rte_flow_item_type pattern_eth_ipv4_l2tp[];extern enum rte_flow_item_type pattern_eth_ipv6_l2tp[];/* PFCP */
drivers/net/ice/ice_switch_filter.c +168 -30
278 lines not on this page · raw message
Signature · 1 line
2.19.1
Quoted 29 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Monday, April 20, 2020 1:19 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Fu, Qi <[email protected]>
Subject: [PATCH v2 0/3] add support for L2TP AH ESP and NAT-T on switchThis patch set add switch filter support for AH ESP NAT-T and L2TP protocol, and use spi or session idas input set for switch rule.
v2:
-fix bug for input set error.Wei Zhao (3):
net/ice/base: add support for AH ESP and NAT-T on switchnet/ice/base: add support for L2TP on switch net/ice: add flow support for AH ESP and L2TPdrivers/net/ice/base/ice_protocol_type.h | 14 + drivers/net/ice/base/ice_switch.c | 311 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 2 + drivers/net/ice/ice_generic_flow.c | 25 ++ drivers/net/ice/ice_generic_flow.h | 23 ++ drivers/net/ice/ice_switch_filter.c | 198 ++++++++++++--- 6 files changed, 543 insertions(+), 30 deletions(-)
Quoted 2 lines
--
2.19.1
Ye Xiaolong
AppliedQuoted 29 lines · Qi Z
Quoted 29 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Monday, April 20, 2020 1:19 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Fu, Qi <[email protected]>
Subject: [PATCH v2 0/3] add support for L2TP AH ESP and NAT-T on switchThis patch set add switch filter support for AH ESP NAT-T and L2TP protocol, and use spi or session idas input set for switch rule.
v2:
-fix bug for input set error.Wei Zhao (3):
net/ice/base: add support for AH ESP and NAT-T on switchnet/ice/base: add support for L2TP on switch net/ice: add flow support for AH ESP and L2TPdrivers/net/ice/base/ice_protocol_type.h | 14 + drivers/net/ice/base/ice_switch.c | 311 +++++++++++++++++++++++ drivers/net/ice/base/ice_switch.h | 2 + drivers/net/ice/ice_generic_flow.c | 25 ++ drivers/net/ice/ice_generic_flow.h | 23 ++ drivers/net/ice/ice_switch_filter.c | 198 ++++++++++++--- 6 files changed, 543 insertions(+), 30 deletions(-)
Quoted 5 lines
Quoted 2 lines
--
2.19.1Acked-by Qi Zhang <[email protected]>
Applied to dpdk-next-net-intel, Thanks.