net/ixgbe: implement new Rx checksum flag

Add CKSUM_GOOD flag to distinguish a good checksum from an unknown one.

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Acked-by: Jing Chen <jing.d.chen@intel.com>

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 8b99282..2ce8234 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1344,7 +1344,9 @@ rx_desc_error_to_pkt_flags(uint32_t rx_status)
         * Bit 30: L4I, L4I integrity error
         */
        static uint64_t error_to_pkt_flags_map[4] = {
-               0,  PKT_RX_L4_CKSUM_BAD, PKT_RX_IP_CKSUM_BAD,
+               PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD,
+               PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD,
+               PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD,
                PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD
        };
        pkt_flags = error_to_pkt_flags_map[(rx_status >>

diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index a2c3e5b..ad8a9ff 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -156,6 +156,11 @@ desc_to_olflags_v(__m128i descs[4], uint8_t vlan_flags,
                        0x0000, 0x0000, 0x0000, 0x0000,
                        0x000F, 0x000F, 0x000F, 0x000F);
 
+       /* mask the lower byte of ol_flags */
+       const __m128i ol_flags_msk = _mm_set_epi16(
+                       0x0000, 0x0000, 0x0000, 0x0000,
+                       0x00FF, 0x00FF, 0x00FF, 0x00FF);
+
        /* map rss type to rss hash flag */
        const __m128i rss_flags = _mm_set_epi8(PKT_RX_FDIR, 0, 0, 0,
                        0, 0, 0, PKT_RX_RSS_HASH,
@@ -171,17 +176,25 @@ desc_to_olflags_v(__m128i descs[4], uint8_t vlan_flags,
                IXGBE_RXD_STAT_VP, IXGBE_RXD_STAT_VP,
                IXGBE_RXD_STAT_VP, IXGBE_RXD_STAT_VP);
        /* map vlan present (0x8), IPE (0x2), L4E (0x1) to ol_flags */
-       const __m128i vlan_csum_map = _mm_set_epi8(
+       const __m128i vlan_csum_map_lo = _mm_set_epi8(
                0, 0, 0, 0,
                vlan_flags | PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD,
                vlan_flags | PKT_RX_IP_CKSUM_BAD,
-               vlan_flags | PKT_RX_L4_CKSUM_BAD,
-               vlan_flags,
+               vlan_flags | PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD,
+               vlan_flags | PKT_RX_IP_CKSUM_GOOD,
                0, 0, 0, 0,
                PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD,
                PKT_RX_IP_CKSUM_BAD,
-               PKT_RX_L4_CKSUM_BAD,
-               0);
+               PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD,
+               PKT_RX_IP_CKSUM_GOOD);
+
+       const __m128i vlan_csum_map_hi = _mm_set_epi8(
+               0, 0, 0, 0,
+               0, PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+               PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t),
+               0, 0, 0, 0,
+               0, PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+               PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t));
 
        ptype0 = _mm_unpacklo_epi16(descs[0], descs[1]);
        ptype1 = _mm_unpacklo_epi16(descs[2], descs[3]);
@@ -207,7 +220,12 @@ desc_to_olflags_v(__m128i descs[4], uint8_t vlan_flags,
        vtag1 = _mm_or_si128(csum, vtag1);
 
        /* convert VP, IPE, L4E to ol_flags */
-       vtag1 = _mm_shuffle_epi8(vlan_csum_map, vtag1);
+       vtag0 = _mm_shuffle_epi8(vlan_csum_map_hi, vtag1);
+       vtag0 = _mm_slli_epi16(vtag0, sizeof(uint8_t));
+
+       vtag1 = _mm_shuffle_epi8(vlan_csum_map_lo, vtag1);
+       vtag1 = _mm_and_si128(vtag1, ol_flags_msk);
+       vtag1 = _mm_or_si128(vtag0, vtag1);
 
        vtag1 = _mm_or_si128(ptype0, vtag1);
        vol.dword = _mm_cvtsi128_si64(vtag1);