net/iavf: fix mask not allowed issue
PATCH 1/1 net/iavf: fix mask not allowed issue
Only zero-mask and full-mask for IPv4/UDP/TCP/SCTP addr/port are supported in current code. Otherwise will return failure when parse pattern.
--- drivers/net/iavf/iavf_fdir.c | 150 +++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 61 deletions(-)
drivers/net/iavf/iavf_fdir.c +89 -61
@@ -802,6 +802,14 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,return -rte_errno; } +/* Mask for IPv4 src/dst addrs not supported */ +if (ipv4_mask->hdr.src_addr && + ipv4_mask->hdr.src_addr !=UINT32_MAX ) +return -rte_errno; +if (ipv4_mask->hdr.dst_addr && + ipv4_mask->hdr.dst_addr !=UINT32_MAX ) +return -rte_errno; + if (ipv4_last && (ipv4_last->hdr.version_ihl || ipv4_last->hdr.type_of_service ||
@@ -998,37 +1006,47 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,VIRTCHNL_SET_PROTO_HDR_TYPE (hdr,UDP ); -if (udp_spec && udp_mask) { -if (udp_mask->hdr.dgram_len || - udp_mask->hdr.dgram_cksum) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid UDP mask" ); -return -rte_errno; - } +if (udp_spec && udp_mask) +break ; -if (udp_mask->hdr.src_port ==UINT16_MAX ) { - input_set |=IAVF_INSET_UDP_SRC_PORT ; -VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,UDP ,SRC_PORT ); - } -if (udp_mask->hdr.dst_port ==UINT16_MAX ) { - input_set |=IAVF_INSET_UDP_DST_PORT ; -VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,UDP ,DST_PORT ); - } +if (udp_mask->hdr.dgram_len || + udp_mask->hdr.dgram_cksum) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , item, +"Invalid UDP mask" ); +return -rte_errno; + } -if (tun_inner) { - input_set &= ~IAVF_PROT_UDP_OUTER ; - input_set |=IAVF_PROT_UDP_INNER ; - } +/* Mask for UDP src/dst ports not supported */ +if (udp_mask->hdr.src_port && + udp_mask->hdr.src_port !=UINT16_MAX ) +return -rte_errno; +if (udp_mask->hdr.dst_port && + udp_mask->hdr.dst_port !=UINT16_MAX ) +return -rte_errno; -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) -rte_memcpy (hdr->buffer, - &udp_spec->hdr, -sizeof (udp_spec->hdr)); -else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) -rte_memcpy (hdr->buffer, - &udp_spec->hdr, -sizeof (udp_spec->hdr)); +if (udp_mask->hdr.src_port ==UINT16_MAX ) { + input_set |=IAVF_INSET_UDP_SRC_PORT ; +VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,UDP ,SRC_PORT ); + } +if (udp_mask->hdr.dst_port ==UINT16_MAX ) { + input_set |=IAVF_INSET_UDP_DST_PORT ; +VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,UDP ,DST_PORT ); + } + +if (tun_inner) { + input_set &= ~IAVF_PROT_UDP_OUTER ; + input_set |=IAVF_PROT_UDP_INNER ; + } + +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { +rte_memcpy (hdr->buffer, + &udp_spec->hdr, +sizeof (udp_spec->hdr)); + }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { +rte_memcpy (hdr->buffer, + &udp_spec->hdr, +sizeof (udp_spec->hdr)); } hdrs->count = ++layer;
@@ -1042,42 +1060,52 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,VIRTCHNL_SET_PROTO_HDR_TYPE (hdr,TCP ); -if (tcp_spec && tcp_mask) { -if (tcp_mask->hdr.sent_seq || - tcp_mask->hdr.recv_ack || - tcp_mask->hdr.data_off || - tcp_mask->hdr.tcp_flags || - tcp_mask->hdr.rx_win || - tcp_mask->hdr.cksum || - tcp_mask->hdr.tcp_urp) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , item, -"Invalid TCP mask" ); -return -rte_errno; - } +if (tcp_spec && tcp_mask) +break ; -if (tcp_mask->hdr.src_port ==UINT16_MAX ) { - input_set |=IAVF_INSET_TCP_SRC_PORT ; -VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,TCP ,SRC_PORT ); - } -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { - input_set |=IAVF_INSET_TCP_DST_PORT ; -VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,TCP ,DST_PORT ); - } +if (tcp_mask->hdr.sent_seq || + tcp_mask->hdr.recv_ack || + tcp_mask->hdr.data_off || + tcp_mask->hdr.tcp_flags || + tcp_mask->hdr.rx_win || + tcp_mask->hdr.cksum || + tcp_mask->hdr.tcp_urp) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , item, +"Invalid TCP mask" ); +return -rte_errno; + } -if (tun_inner) { - input_set &= ~IAVF_PROT_TCP_OUTER ; - input_set |=IAVF_PROT_TCP_INNER ; - } +/* Mask for TCP src/dst ports not supported */ +if (tcp_mask->hdr.src_port && + tcp_mask->hdr.src_port !=UINT16_MAX ) +return -rte_errno; +if (tcp_mask->hdr.dst_port && + tcp_mask->hdr.dst_port !=UINT16_MAX ) +return -rte_errno; -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) -rte_memcpy (hdr->buffer, - &tcp_spec->hdr, -sizeof (tcp_spec->hdr)); -else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) -rte_memcpy (hdr->buffer, - &tcp_spec->hdr, -sizeof (tcp_spec->hdr)); +if (tcp_mask->hdr.src_port ==UINT16_MAX ) { + input_set |=IAVF_INSET_TCP_SRC_PORT ; +VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,TCP ,SRC_PORT ); + } +if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { + input_set |=IAVF_INSET_TCP_DST_PORT ; +VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT (hdr,TCP ,DST_PORT ); + } + +if (tun_inner) { + input_set &= ~IAVF_PROT_TCP_OUTER ; + input_set |=IAVF_PROT_TCP_INNER ; + } + +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { +rte_memcpy (hdr->buffer, + &tcp_spec->hdr, +sizeof (tcp_spec->hdr)); + }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { +rte_memcpy (hdr->buffer, + &tcp_spec->hdr, +sizeof (tcp_spec->hdr)); } hdrs->count = ++layer;
Signature · 1 line
2.25.1
Quoted 9 lines
-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Monday, May 16, 2022 10:03 AM
To: [email protected]; Zhang, Qi Z <[email protected]>
Cc: Yang, Qiming <[email protected]>; [email protected]
Subject: [PATCH] net/iavf: fix mask not allowed issue
How about "fix invalid flow mask handling"
Quoted 17 lines
Only zero-mask and full-mask for IPv4/UDP/TCP/SCTP addr/port are supported in current code. Otherwise will return failure when parse pattern.
Fixes d5eb3e600d9e ("net/iavf: support flow director basic rule")Signed-off-by Qiming Yang <[email protected]>--- drivers/net/iavf/iavf_fdir.c | 150 +++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 61 deletions(-)drivers/net/iavf/iavf_fdir.c index renamed from drivers/net/iavf/iavf_fdir.c +0
-0
b63aaca91d..356bca8d41100644drivers/net/iavf/iavf_fdir.c +0
-0@@ -802,6 +802,14 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
drivers/net/iavf/iavf_fdir.c iavf_fdir_parse_pattern(__rte_unused struct · line 812
Quoted 10 lines
drivers/net/iavf/iavf_fdir.c +7
-0return -rte_errno; } +/* Mask for IPv4 src/dst addrs not supported */ +if (ipv4_mask->hdr.src_addr && + ipv4_mask->hdr.src_addr !=UINT32_MAX ) +return -rte_errno; +if (ipv4_mask->hdr.dst_addr && + ipv4_mask->hdr.dst_addr !=UINT32_MAX ) +return -rte_errno;
Do we need to call rte_flow_error_set before return -rte_errno?