net/ice: fix flow type selection for FDIR
PATCH 1/1 net/ice: fix flow type selection for FDIR
The FDIR parser will select ICE_FLTR_PTYPE_NONF_IPV4_OTHER as flow type for an IPv4 UDP flow with empty l4 matching field which is not correct. Same issues happens on all the combination between IPv4/IPv6 and UDP/TCP/SCTP cases
The patch fix all the wrong flow ptype selections.
--- drivers/net/ice/ice_fdir_filter.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/net/ice/ice_fdir_filter.c +15 -12
@@ -1699,6 +1699,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tcp_spec = item->spec; tcp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_TCP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_TCP ; +if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ if (tcp_mask->hdr.sent_seq ||
@@ -1730,15 +1735,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tcp_spec->hdr.src_port; filter->input.ip.v4.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_TCP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = tcp_spec->hdr.src_port; filter->input.ip.v6.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_TCP ; } }break ;
@@ -1746,6 +1747,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, udp_spec = item->spec; udp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_UDP ; +if (udp_spec && udp_mask) {/* Check UDP mask and update input set*/ if (udp_mask->hdr.dgram_len ||
@@ -1772,15 +1778,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, udp_spec->hdr.src_port; filter->input.ip.v4.src_port = udp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_UDP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.src_port = udp_spec->hdr.dst_port; filter->input.ip.v6.dst_port = udp_spec->hdr.src_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_UDP ; } }break ;
@@ -1788,6 +1790,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, sctp_spec = item->spec; sctp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; +if (sctp_spec && sctp_mask) {/* Check SCTP mask and update input set */ if (sctp_mask->hdr.cksum) {
@@ -1813,15 +1820,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, sctp_spec->hdr.src_port; filter->input.ip.v4.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = sctp_spec->hdr.src_port; filter->input.ip.v6.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; } }break ;
Signature · 1 line
2.13.6
Quoted 128 lines
-----Original Message-----
From: Zhang, Qi Z
Sent: Tuesday, November 19, 2019 9:07 AM
To: Cao, Yahui <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>
Subject: [PATCH] net/ice: fix flow type selection for FDIRThe FDIR parser will select
ICE_FLTR_PTYPE_NONF_IPV4_OTHERas flow type for an IPv4 UDP flow with empty l4 matching field which is not correct. Same issues happens on all the combination between IPv4/IPv6 and UDP/TCP/SCTP casesThe patch fix all the wrong flow ptype selections.
Fixes f5cafa961fae ("net/ice: add flow director create and destroy")Signed-off-by Qi Zhang <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)drivers/net/ice/ice_fdir_filter.c +5
-0@@ -1699,6 +1699,11 @@ ice_fdir_parse_pattern(__rte_unused structice_adapter *ad, tcp_spec = item->spec; tcp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_TCP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_TCP ; +if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ drivers/net/ice/ice_fdir_filter.c +0
-4if (tcp_mask->hdr.sent_seq ||@@ -1730,15 +1735,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tcp_spec->hdr.src_port; filter->input.ip.v4.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_TCP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = tcp_spec->hdr.src_port; filter->input.ip.v6.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_TCP ;drivers/net/ice/ice_fdir_filter.c +5
-0} }break ;@@ -1746,6 +1747,11 @@ ice_fdir_parse_pattern(__rte_unused structice_adapter *ad, udp_spec = item->spec; udp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_UDP ; +drivers/net/ice/ice_fdir_filter.c +0
-4if (udp_spec && udp_mask) {/* Check UDP mask and update input set*/ if (udp_mask->hdr.dgram_len ||@@ -1772,15 +1778,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, udp_spec->hdr.src_port; filter->input.ip.v4.src_port = udp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_UDP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.src_port = udp_spec->hdr.dst_port; filter->input.ip.v6.dst_port = udp_spec->hdr.src_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_UDP ;drivers/net/ice/ice_fdir_filter.c +5
-0} }break ;@@ -1788,6 +1790,11 @@ ice_fdir_parse_pattern(__rte_unused structice_adapter *ad, sctp_spec = item->spec; sctp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; +drivers/net/ice/ice_fdir_filter.c +0
-4if (sctp_spec && sctp_mask) {/* Check SCTP mask and update input set */ if (sctp_mask->hdr.cksum) {@@ -1813,15 +1820,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, sctp_spec->hdr.src_port; filter->input.ip.v4.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = sctp_spec->hdr.src_port; filter->input.ip.v6.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_SCTP ;drivers/net/ice/ice_fdir_filter.c +0
-1} }break ; --
Quoted 1 line
2.13.6
Ye Xiaolong
AppliedQuoted 105 lines · Qi Zhang
The FDIR parser will select
ICE_FLTR_PTYPE_NONF_IPV4_OTHERas flow type for an IPv4 UDP flow with empty l4 matching field which is not correct. Same issues happens on all the combination between IPv4/IPv6 and UDP/TCP/SCTP casesThe patch fix all the wrong flow ptype selections.
Fixes f5cafa961fae ("net/ice: add flow director create and destroy")Signed-off-by Qi Zhang <[email protected]>---
drivers/net/ice/ice_fdir_filter.c| 27 +++++++++++++++------------1 file changed, 15 insertions(+), 12 deletions(-)drivers/net/ice/ice_fdir_filter.c +15
-12@@ -1699,6 +1699,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tcp_spec = item->spec; tcp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_TCP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_TCP ; +if (tcp_spec && tcp_mask) {/* Check TCP mask and update input set */ if (tcp_mask->hdr.sent_seq ||@@ -1730,15 +1735,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, tcp_spec->hdr.src_port; filter->input.ip.v4.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_TCP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = tcp_spec->hdr.src_port; filter->input.ip.v6.src_port = tcp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_TCP ; } }break ;@@ -1746,6 +1747,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, udp_spec = item->spec; udp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_UDP ; +if (udp_spec && udp_mask) {/* Check UDP mask and update input set*/ if (udp_mask->hdr.dgram_len ||@@ -1772,15 +1778,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, udp_spec->hdr.src_port; filter->input.ip.v4.src_port = udp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_UDP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.src_port = udp_spec->hdr.dst_port; filter->input.ip.v6.dst_port = udp_spec->hdr.src_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_UDP ; } }break ;@@ -1788,6 +1790,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, sctp_spec = item->spec; sctp_mask = item->mask; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; +else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; +if (sctp_spec && sctp_mask) {/* Check SCTP mask and update input set */ if (sctp_mask->hdr.cksum) {@@ -1813,15 +1820,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, sctp_spec->hdr.src_port; filter->input.ip.v4.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { filter->input.ip.v6.dst_port = sctp_spec->hdr.src_port; filter->input.ip.v6.src_port = sctp_spec->hdr.dst_port; - flow_type = -ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; } }break ;Signature · 1 line
2.13.6
Applied to dpdk-next-net-intel, Thanks.