net/ice: fix SPI for ESP and NATT not work issue
PATCH 1/1 net/ice: fix SPI for ESP and NATT not work issue
This patch fixes this issue by adding the correspongding input set for ESP and NATT when parsing input set. Also, it adds input set bit for NAT_T_ESP to distinguish ESP over IP and ESP over UDP.
--- drivers/net/ice/ice_fdir_filter.c | 14 ++++++++++---- drivers/net/ice/ice_generic_flow.h | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/net/ice/ice_fdir_filter.c +10 -4
@@ -100,11 +100,11 @@#define ICE_FDIR_INSET_IPV4_NATT_ESP (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)#define ICE_FDIR_INSET_IPV6_NATT_ESP (\ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)static struct ice_pattern_match_item ice_fdir_pattern_list[] = { {pattern_ethertype,ICE_FDIR_INSET_ETH ,ICE_INSET_NONE ,ICE_INSET_NONE },
@@ -951,6 +951,8 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID}, {ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI}, {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, + {ICE_INSET_ESP_SPI, ICE_FLOW_FIELD_IDX_ESP_SPI}, + {ICE_INSET_NAT_T_ESP_SPI, ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI}, };for (i =0 , j =0 ; i <RTE_DIM (ice_inset_map); i++) {
@@ -2128,8 +2130,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,if (!(esp_spec && esp_mask))break ; -if (esp_mask->hdr.spi ==UINT32_MAX ) - *input_set |=ICE_INSET_ESP_SPI ; +if (esp_mask->hdr.spi ==UINT32_MAX ) { +if (l4 ==RTE_FLOW_ITEM_TYPE_UDP ) + *input_set |=ICE_INSET_NAT_T_ESP_SPI ; +else + *input_set |=ICE_INSET_ESP_SPI ; + }if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) filter->input.ip.v4.sec_parm_idx =
drivers/net/ice/ice_generic_flow.h +3 -0
@@ -26,6 +26,7 @@#define ICE_PROT_AH BIT_ULL(15)#define ICE_PROT_L2TPV3OIP BIT_ULL(16)#define ICE_PROT_PFCP BIT_ULL(17) +#define ICE_PROT_NAT_T_ESP BIT_ULL(18)/* field */
@@ -117,6 +118,8 @@ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD)#define ICE_INSET_PFCP_SEID \ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID) +#define ICE_INSET_NAT_T_ESP_SPI \ + (ICE_PROT_NAT_T_ESP | ICE_ESP_SPI)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[];
Signature · 1 line
2.9.5
Quoted 9 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Monday, July 12, 2021 5:39 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Cao, Yahui <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH] net/ice: fix SPI for ESP and NATT not work issue
What is "ESP and NATT"
Do you mean
fix FDIR when SPI as inputset for an ESP over UDP Flow ?
Quoted 2 lines
This patch fixes this issue by adding the correspongding input set for ESP and
s/ correspongding/corresponding
Quoted 81 lines
NATT when parsing input set. Also, it adds input set bit for
NAT_T_ESPto distinguish ESP over IP and ESP over UDP.Fixes 70feafc1a3f2 ("net/ice: support ESP/NATT flow director to match outerIP")
Signed-off-by Simei Su <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 14 ++++++++++---- drivers/net/ice/ice_generic_flow.h | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-)drivers/net/ice/ice_fdir_filter.c +2
-2@@ -100,11 +100,11 @@#define ICE_FDIR_INSET_IPV4_NATT_ESP (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)#define ICE_FDIR_INSET_IPV6_NATT_ESP (\ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)static struct ice_pattern_match_item ice_fdir_pattern_list[] = { {pattern_ethertype,ICE_FDIR_INSET_ETH ,ICE_INSET_NONE, ICE_INSET_NONE},drivers/net/ice/ice_fdir_filter.c +2
-0@@ -951,6 +951,8 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID}, {ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI}, {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, + {ICE_INSET_ESP_SPI, ICE_FLOW_FIELD_IDX_ESP_SPI}, + {ICE_INSET_NAT_T_ESP_SPI, ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI}, };for (i = 0, j = 0; i <
RTE_DIM(ice_inset_map); i++) { @@ -2128,8 +2130,12
@@ ice_fdir_parse_pattern(__rte_unused structice_adapter*ad,drivers/net/ice/ice_fdir_filter.c +6
-2if (!(esp_spec && esp_mask))break ; -if (esp_mask->hdr.spi ==UINT32_MAX ) - *input_set |=ICE_INSET_ESP_SPI ; +if (esp_mask->hdr.spi ==UINT32_MAX ) { +if (l4 ==RTE_FLOW_ITEM_TYPE_UDP ) + *input_set |=ICE_INSET_NAT_T_ESP_SPI ; +else + *input_set |=ICE_INSET_ESP_SPI ; + }if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) filter->input.ip.v4.sec_parm_idx =drivers/net/ice/ice_generic_flow.h +3
-1@@ -26,6 +26,7 @@#define ICE_PROT_AH BIT_ULL(15)#define ICE_PROT_L2TPV3OIP BIT_ULL(16)#define ICE_PROT_PFCP BIT_ULL(17) +#define ICE_PROT_NAT_T_ESP BIT_ULL(18)/* field */ @@ -117,6 +118,8 @@ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD)#define ICE_INSET_PFCP_SEID \ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID) +#define ICE_INSET_NAT_T_ESP_SPI \ + (ICE_PROT_NAT_T_ESP | ICE_ESP_SPI)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[]; --2.9.5
Hi, Qi
Quoted 17 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Tuesday, July 13, 2021 9:07 AM
To: Su, Simei <[email protected]>
Cc: [email protected]; Cao, Yahui <[email protected]>
Subject: RE: [PATCH] net/ice: fix SPI for ESP and NATT not work issueQuoted 7 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Monday, July 12, 2021 5:39 PM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Cao, Yahui <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH] net/ice: fix SPI for ESP and NATT not work issue
Quoted 4 lines
What is "ESP and NATT"
Do you mean
fix FDIR when SPI as inputset for an ESP over UDP Flow ?
Yes, I mean when SPI as inputset for both ESP over IP and ESP over UDP. I will refine the title to let it be more accurate.
Quoted 5 lines
Quoted 3 lines
This patch fixes this issue by adding the correspongding input set for ESP and
s/ correspongding/corresponding
OK. Thanks for correcting it.
Quoted 81 lines
Quoted 80 lines
NATT when parsing input set. Also, it adds input set bit for
NAT_T_ESPto distinguish ESP over IP and ESP over UDP.Fixes 70feafc1a3f2 ("net/ice: support ESP/NATT flow director to matchouter
IP")Signed-off-by Simei Su <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 14 ++++++++++---- drivers/net/ice/ice_generic_flow.h | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-)drivers/net/ice/ice_fdir_filter.c +2
-2@@ -100,11 +100,11 @@#define ICE_FDIR_INSET_IPV4_NATT_ESP (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ -ICE_INSET_ESP_SPI) +ICE_INSET_NAT_T_ESP_SPI)#define ICE_FDIR_INSET_IPV6_NATT_ESP (\ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \ -ICE_INSET_ESP_SPI) +ICE_INSET_NAT_T_ESP_SPI)static struct ice_pattern_match_item ice_fdir_pattern_list[] = { {pattern_ethertype,ICE_FDIR_INSET_ETH ,ICE_INSET_NONE,ICE_INSET_NONE},
drivers/net/ice/ice_fdir_filter.c +2
-0@@ -951,6 +951,8 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID}, {ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI}, {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, +{ICE_INSET_ESP_SPI, ICE_FLOW_FIELD_IDX_ESP_SPI}, +{ICE_INSET_NAT_T_ESP_SPI, ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI}, };for (i = 0, j = 0; i <
RTE_DIM(ice_inset_map); i++) { @@ -2128,8
+2130,12 @@ ice_fdir_parse_pattern(__rte_unused structice_adapter*ad, if (!(esp_spec &&esp_mask)) break;drivers/net/ice/ice_fdir_filter.c +3
-2-if (esp_mask->hdr.spi ==UINT32_MAX ) -*input_set |=ICE_INSET_ESP_SPI ; +if (esp_mask->hdr.spi ==UINT32_MAX ) {if (l4 == +RTE_FLOW_ITEM_TYPE_UDP ) *input_set |=ICE_INSET_NAT_T_ESP_SPI ;else +*input_set |=ICE_INSET_ESP_SPI ; }if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) filter->input.ip.v4.sec_parm_idx =drivers/net/ice/ice_generic_flow.h +3
-1@@ -26,6 +26,7 @@ #define ICE_PROT_AHBIT_ULL(15) #define ICE_PROT_L2TPV3OIPBIT_ULL(16) #define ICE_PROT_PFCPBIT_ULL(17) +#define ICE_PROT_NAT_T_ESPBIT_ULL(18)/* field */ @@ -117,6 +118,8 @@ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD)#define ICE_INSET_PFCP_SEID \ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID) +#define ICE_INSET_NAT_T_ESP_SPI \ +(ICE_PROT_NAT_T_ESP | ICE_ESP_SPI)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[]; --2.9.5
PATCH v2 1/1 net/ice: fix FDIR when SPI as input set for ESP flow
In reply to Simei SuFDIR can't work when SPI as inputset for both ESP over IP and ESP over UDP flow. This patch fixes this issue by adding the corresponding input set for ESP over IP and ESP over UDP when parsing input set. Also, it adds input set bit for NAT_T_ESP to distinguish ESP over IP and ESP over UDP.
v2:
* Refine title and commit log to be more accurate.
* Correct spelling mistakes in commit log.
--- drivers/net/ice/ice_fdir_filter.c | 14 ++++++++++---- drivers/net/ice/ice_generic_flow.h | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/net/ice/ice_fdir_filter.c +10 -4
@@ -100,11 +100,11 @@#define ICE_FDIR_INSET_IPV4_NATT_ESP (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)#define ICE_FDIR_INSET_IPV6_NATT_ESP (\ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | \ - ICE_INSET_ESP_SPI) + ICE_INSET_NAT_T_ESP_SPI)static struct ice_pattern_match_item ice_fdir_pattern_list[] = { {pattern_ethertype,ICE_FDIR_INSET_ETH ,ICE_INSET_NONE ,ICE_INSET_NONE },
@@ -951,6 +951,8 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID}, {ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI}, {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, + {ICE_INSET_ESP_SPI, ICE_FLOW_FIELD_IDX_ESP_SPI}, + {ICE_INSET_NAT_T_ESP_SPI, ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI}, };for (i =0 , j =0 ; i <RTE_DIM (ice_inset_map); i++) {
@@ -2128,8 +2130,12 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,if (!(esp_spec && esp_mask))break ; -if (esp_mask->hdr.spi ==UINT32_MAX ) - *input_set |=ICE_INSET_ESP_SPI ; +if (esp_mask->hdr.spi ==UINT32_MAX ) { +if (l4 ==RTE_FLOW_ITEM_TYPE_UDP ) + *input_set |=ICE_INSET_NAT_T_ESP_SPI ; +else + *input_set |=ICE_INSET_ESP_SPI ; + }if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) filter->input.ip.v4.sec_parm_idx =
drivers/net/ice/ice_generic_flow.h +3 -0
@@ -26,6 +26,7 @@#define ICE_PROT_AH BIT_ULL(15)#define ICE_PROT_L2TPV3OIP BIT_ULL(16)#define ICE_PROT_PFCP BIT_ULL(17) +#define ICE_PROT_NAT_T_ESP BIT_ULL(18)/* field */
@@ -117,6 +118,8 @@ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD)#define ICE_INSET_PFCP_SEID \ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID) +#define ICE_INSET_NAT_T_ESP_SPI \ + (ICE_PROT_NAT_T_ESP | ICE_ESP_SPI)/* empty pattern */ extern enum rte_flow_item_type pattern_empty[];
Signature · 1 line
2.9.5
Re: [dpdk-dev] [PATCH v2] net/ice: fix FDIR when SPI as input set for ESP flow
Quoted 15 lines
-----Original Message-----
From: Su, Simei <[email protected]>
Sent: Tuesday, July 13, 2021 10:10 AM
To: Zhang, Qi Z <[email protected]>
Cc: [email protected]; Cao, Yahui <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH v2] net/ice: fix FDIR when SPI as input set for ESP flowFDIR can't work when SPI as inputset for both ESP over IP and ESP over UDP flow. This patch fixes this issue by adding the corresponding input set for ESP over IP and ESP over UDP when parsing input set. Also, it adds input set bit for
NAT_T_ESPto distinguish ESP over IP and ESP over UDP.
Quoted 8 lines
Fixes 70feafc1a3f2 ("net/ice: support ESP/NATT flow director to match outerIP")
Signed-off-by Simei Su <[email protected]>v2:
* Refine title and commit log to be more accurate.
* Correct spelling mistakes in commit log.
Change log is not part of the commit log, should below "---"
Applied to dpdk-next-net-intel.
Thanks
Qi