summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f078ceb)
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 fixes all the wrong flow ptype selections.
Fixes:
f5cafa961fae ("net/ice: add flow director create and destroy")
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
tcp_spec = item->spec;
tcp_mask = item->mask;
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 ||
if (tcp_spec && tcp_mask) {
/* Check TCP mask and update input set */
if (tcp_mask->hdr.sent_seq ||
tcp_spec->hdr.src_port;
filter->input.ip.v4.src_port =
tcp_spec->hdr.dst_port;
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;
} 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;
udp_spec = item->spec;
udp_mask = item->mask;
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 ||
if (udp_spec && udp_mask) {
/* Check UDP mask and update input set*/
if (udp_mask->hdr.dgram_len ||
udp_spec->hdr.src_port;
filter->input.ip.v4.src_port =
udp_spec->hdr.dst_port;
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;
} 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;
sctp_spec = item->spec;
sctp_mask = item->mask;
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) {
if (sctp_spec && sctp_mask) {
/* Check SCTP mask and update input set */
if (sctp_mask->hdr.cksum) {
sctp_spec->hdr.src_port;
filter->input.ip.v4.src_port =
sctp_spec->hdr.dst_port;
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;
} 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;