dpdk/dpdk-16.04_patches/0029-i40e-Enable-bad-checksum-flags-in-i40e-vPMD.patch

   1 From ff4d874754e5e420671cc78d82829cd7317542ad Mon Sep 17 00:00:00 2001
   2 From: Damjan Marion <damarion@cisco.com>
   3 Date: Thu, 14 Jul 2016 09:59:02 -0700
   4 Subject: [PATCH 29/29] i40e: Enable bad checksum flags in i40e vPMD
   5
   6 Decode the checksum flags from the rx descriptor, setting
   7 the appropriate bit in the mbuf ol_flags field when the flag
   8 indicates a bad checksum.
   9
  10 Signed-off-by: Damjan Marion <damarion@cisco.com>
  11 Signed-off-by: Jeff Shaw <jeffrey.b.shaw@intel.com>
  12 ---
  13  drivers/net/i40e/i40e_rxtx_vec.c | 55 +++++++++++++++++++++++-----------------
  14  1 file changed, 32 insertions(+), 23 deletions(-)
  15
  16 diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
  17 index defa581..09ec6e6 100644
  18 --- a/drivers/net/i40e/i40e_rxtx_vec.c
  19 +++ b/drivers/net/i40e/i40e_rxtx_vec.c
  20 @@ -138,18 +138,14 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq)
  21  static inline void
  22  desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
  23  {
  24 -       __m128i vlan0, vlan1, rss;
  25 -       union {
  26 -               uint16_t e[4];
  27 -               uint64_t dword;
  28 -       } vol;
  29 +       __m128i vlan0, vlan1, rss, l3_l4e;
  30
  31 -       /* mask everything except rss and vlan flags
  32 -       *bit2 is for vlan tag, bits 13:12 for rss
  33 -       */
  34 -       const __m128i rss_vlan_msk = _mm_set_epi16(
  35 -                       0x0000, 0x0000, 0x0000, 0x0000,
  36 -                       0x3004, 0x3004, 0x3004, 0x3004);
  37 +       /* mask everything except RSS, flow director and VLAN flags
  38 +        * bit2 is for VLAN tag, bit11 for flow director indication
  39 +        * bit13:12 for RSS indication.
  40 +        */
  41 +       const __m128i rss_vlan_msk = _mm_set_epi32(
  42 +                       0x1c03004, 0x1c03004, 0x1c03004, 0x1c03004);
  43
  44         /* map rss and vlan type to rss hash and vlan flag */
  45         const __m128i vlan_flags = _mm_set_epi8(0, 0, 0, 0,
  46 @@ -162,23 +158,36 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
  47                         0, 0, 0, 0,
  48                         PKT_RX_FDIR, 0, PKT_RX_RSS_HASH, 0);
  49
  50 -       vlan0 = _mm_unpackhi_epi16(descs[0], descs[1]);
  51 -       vlan1 = _mm_unpackhi_epi16(descs[2], descs[3]);
  52 -       vlan0 = _mm_unpacklo_epi32(vlan0, vlan1);
  53 +       const __m128i l3_l4e_flags = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
  54 +                       PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD,
  55 +                       PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD,
  56 +                       PKT_RX_EIP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD,
  57 +                       PKT_RX_EIP_CKSUM_BAD,
  58 +                       PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD,
  59 +                       PKT_RX_L4_CKSUM_BAD,
  60 +                       PKT_RX_IP_CKSUM_BAD,
  61 +                       0);
  62 +
  63 +       vlan0 = _mm_unpackhi_epi32(descs[0], descs[1]);
  64 +       vlan1 = _mm_unpackhi_epi32(descs[2], descs[3]);
  65 +       vlan0 = _mm_unpacklo_epi64(vlan0, vlan1);
  66
  67         vlan1 = _mm_and_si128(vlan0, rss_vlan_msk);
  68         vlan0 = _mm_shuffle_epi8(vlan_flags, vlan1);
  69
  70 -       rss = _mm_srli_epi16(vlan1, 12);
  71 +       rss = _mm_srli_epi32(vlan1, 12);
  72         rss = _mm_shuffle_epi8(rss_flags, rss);
  73
  74 +       l3_l4e = _mm_srli_epi32(vlan1, 22);
  75 +       l3_l4e = _mm_shuffle_epi8(l3_l4e_flags, l3_l4e);
  76 +
  77         vlan0 = _mm_or_si128(vlan0, rss);
  78 -       vol.dword = _mm_cvtsi128_si64(vlan0);
  79 +       vlan0 = _mm_or_si128(vlan0, l3_l4e);
  80
  81 -       rx_pkts[0]->ol_flags = vol.e[0];
  82 -       rx_pkts[1]->ol_flags = vol.e[1];
  83 -       rx_pkts[2]->ol_flags = vol.e[2];
  84 -       rx_pkts[3]->ol_flags = vol.e[3];
  85 +       rx_pkts[0]->ol_flags = _mm_extract_epi16(vlan0, 0);
  86 +       rx_pkts[1]->ol_flags = _mm_extract_epi16(vlan0, 2);
  87 +       rx_pkts[2]->ol_flags = _mm_extract_epi16(vlan0, 4);
  88 +       rx_pkts[3]->ol_flags = _mm_extract_epi16(vlan0, 6);
  89  }
  90  #else
  91  #define desc_to_olflags_v(desc, rx_pkts) do {} while (0)
  92 @@ -770,7 +779,8 @@ i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev *dev)
  93  #ifndef RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE
  94         /* whithout rx ol_flags, no VP flag report */
  95         if (rxmode->hw_vlan_strip != 0 ||
  96 -           rxmode->hw_vlan_extend != 0)
  97 +           rxmode->hw_vlan_extend != 0 ||
  98 +           rxmode->hw_ip_checksum != 0)
  99                 return -1;
 100  #endif
 101
 102 @@ -781,8 +791,7 @@ i40e_rx_vec_dev_conf_condition_check(struct rte_eth_dev *dev)
 103          /* - no csum error report support
 104          * - no header split support
 105          */
 106 -       if (rxmode->hw_ip_checksum == 1 ||
 107 -           rxmode->header_split == 1)
 108 +       if (rxmode->header_split == 1)
 109                 return -1;
 110
 111         return 0;
 112 --
 113 2.7.4
 114