On Tue, Feb 6, 2018 at 9:07 AM, Olivier Matz <olivier.m...@6wind.com> wrote:
> The hw flags are not read correctly: the defines
> RX_PKT_CMPL_FLAGS_ITYPE_* are not bits but values, so the should not be
> tested with if (value & X) but with if ((value & MASK) == X).
> This was resulting in a wrong packet type.
>
> For instance, an IPv4/ICMP packet was returning a value of 7 for
> the layer 4, which is undefined.
>
> This patch rework the way packet types are processed, to ensure
> that only valid packet types will be advertised.
>
> Fixes: 3d2a6644eb05 ("net/bnxt: support getting ptypes")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Olivier Matz <olivier.m...@6wind.com>
>
Acked-by: Ajit Khaparde <ajit.khapa...@broadcom.com>
> ---
> drivers/net/bnxt/bnxt_rxr.c | 75 ++++++++++++++++++++++++++++--
> ---------------
> 1 file changed, 47 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
> index 9b88a64bf..2b4044a83 100644
> --- a/drivers/net/bnxt/bnxt_rxr.c
> +++ b/drivers/net/bnxt/bnxt_rxr.c
> @@ -338,41 +338,60 @@ static inline struct rte_mbuf *bnxt_tpa_end(
> static uint32_t
> bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi
> *rxcmp1)
> {
> - uint32_t pkt_type = 0;
> - uint32_t t_ipcs = 0, ip = 0, ip6 = 0;
> - uint32_t tcp = 0, udp = 0, icmp = 0;
> - uint32_t vlan = 0;
> + uint32_t l3, pkt_type = 0;
> + uint32_t t_ipcs = 0, ip6 = 0, vlan = 0;
> + uint32_t flags_type;
>
> vlan = !!(rxcmp1->flags2 &
> rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN));
> + pkt_type |= vlan ? RTE_PTYPE_L2_ETHER_VLAN : RTE_PTYPE_L2_ETHER;
> +
> t_ipcs = !!(rxcmp1->flags2 &
> rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC));
> ip6 = !!(rxcmp1->flags2 &
> rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_TYPE));
> - icmp = !!(rxcmp->flags_type &
> - rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_ICMP));
> - tcp = !!(rxcmp->flags_type &
> - rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_TCP));
> - udp = !!(rxcmp->flags_type &
> - rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_UDP));
> - ip = !!(rxcmp->flags_type &
> - rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_ITYPE_IP));
> -
> - pkt_type |= ((ip || tcp || udp || icmp) && !t_ipcs && !ip6) ?
> - RTE_PTYPE_L3_IPV4_EXT_UNKNOWN : 0;
> - pkt_type |= ((ip || tcp || udp || icmp) && !t_ipcs && ip6) ?
> - RTE_PTYPE_L3_IPV6_EXT_UNKNOWN : 0;
> - pkt_type |= (!t_ipcs && icmp) ? RTE_PTYPE_L4_ICMP : 0;
> - pkt_type |= (!t_ipcs && udp) ? RTE_PTYPE_L4_UDP : 0;
> - pkt_type |= (!t_ipcs && tcp) ? RTE_PTYPE_L4_TCP : 0;
> - pkt_type |= ((ip || tcp || udp || icmp) && t_ipcs && !ip6) ?
> - RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN : 0;
> - pkt_type |= ((ip || tcp || udp || icmp) && t_ipcs && ip6) ?
> - RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN : 0;
> - pkt_type |= (t_ipcs && icmp) ? RTE_PTYPE_INNER_L4_ICMP : 0;
> - pkt_type |= (t_ipcs && udp) ? RTE_PTYPE_INNER_L4_UDP : 0;
> - pkt_type |= (t_ipcs && tcp) ? RTE_PTYPE_INNER_L4_TCP : 0;
> - pkt_type |= vlan ? RTE_PTYPE_L2_ETHER_VLAN : 0;
> +
> + flags_type = rxcmp->flags_type &
> + rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS_ITYPE_MASK);
> +
> + if (!t_ipcs && !ip6)
> + l3 = RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
> + else if (!t_ipcs && ip6)
> + l3 = RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
> + else if (t_ipcs && !ip6)
> + l3 = RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN;
> + else
> + l3 = RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN;
> +
> + switch (flags_type) {
> + case RTE_LE32(RX_PKT_CMPL_FLAGS_ITYPE_ICMP):
> + if (!t_ipcs)
> + pkt_type |= l3 | RTE_PTYPE_L4_ICMP;
> + else
> + pkt_type |= l3 | RTE_PTYPE_INNER_L4_ICMP;
> + break;
> +
> + case RTE_LE32(RX_PKT_CMPL_FLAGS_ITYPE_TCP):
> + if (!t_ipcs)
> + pkt_type |= l3 | RTE_PTYPE_L4_TCP;
> + else
> + pkt_type |= l3 | RTE_PTYPE_INNER_L4_TCP;
> + break;
> +
> + case RTE_LE32(RX_PKT_CMPL_FLAGS_ITYPE_UDP):
> + if (!t_ipcs)
> + pkt_type |= l3 | RTE_PTYPE_L4_UDP;
> + else
> + pkt_type |= l3 | RTE_PTYPE_INNER_L4_UDP;
> + break;
> +
> + case RTE_LE32(RX_PKT_CMPL_FLAGS_ITYPE_IP):
> + if (!t_ipcs)
> + pkt_type |= l3 | RTE_PTYPE_L4_ICMP;
> + else
> + pkt_type |= l3 | RTE_PTYPE_INNER_L4_ICMP;
> + break;
> + }
>
> return pkt_type;
> }
> --
> 2.11.0
>
>
