net/ena: fix setting Rx checksum flags in mbuf
authorMichal Krawczyk <mk@semihalf.com>
Fri, 30 Oct 2020 11:31:17 +0000 (12:31 +0100)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 3 Nov 2020 22:35:06 +0000 (23:35 +0100)
The driver was never setting PKT_RX_*_CKSUM_GOOD flags, so the only way
of checking if the checksum was checked was by testing for the
PKT_RX_*_CKSUM_BAD. In that situation, the application couldn't detect
if the checksum was valid or unknown, as unknown flag is equal to 0.

Moreover, the l3_csum_err value is only valid if the l3_proto is
indicating IPv4, so it shouldn't be checked for other protocols.

Fixes: 1173fca25af9 ("ena: add polling-mode driver")
Cc: stable@dpdk.org
Signed-off-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Igor Chauskin <igorch@amazon.com>
Reviewed-by: Guy Tzalik <gtzalik@amazon.com>
drivers/net/ena/ena_ethdev.c

index 7ab9b93..ad593c8 100644 (file)
@@ -296,21 +296,23 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf,
        else if (ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_UDP)
                packet_type |= RTE_PTYPE_L4_UDP;
 
-       if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4)
+       if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) {
                packet_type |= RTE_PTYPE_L3_IPV4;
-       else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6)
+               if (unlikely(ena_rx_ctx->l3_csum_err))
+                       ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               else
+                       ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       } else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6) {
                packet_type |= RTE_PTYPE_L3_IPV6;
+       }
 
-       if (!ena_rx_ctx->l4_csum_checked)
+       if (!ena_rx_ctx->l4_csum_checked || ena_rx_ctx->frag)
                ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
        else
-               if (unlikely(ena_rx_ctx->l4_csum_err) && !ena_rx_ctx->frag)
+               if (unlikely(ena_rx_ctx->l4_csum_err))
                        ol_flags |= PKT_RX_L4_CKSUM_BAD;
                else
-                       ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
-
-       if (unlikely(ena_rx_ctx->l3_csum_err))
-               ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       ol_flags |= PKT_RX_L4_CKSUM_GOOD;
 
        mbuf->ol_flags = ol_flags;
        mbuf->packet_type = packet_type;