dpdk/dpdk-16.04_patches/0013-Revert-ixgbe-fix-packet-type-from-vector-Rx.patch

   1 From 33f94cb41621f2816db702b6b104f4642eefa857 Mon Sep 17 00:00:00 2001
   2 From: Damjan Marion <damarion@cisco.com>
   3 Date: Fri, 29 Apr 2016 19:51:35 +0200
   4 Subject: [PATCH 13/17] Revert "ixgbe: fix packet type from vector Rx"
   5
   6 This reverts commit d9a2009a81089093645fea2e04b51dd37edf3e6f.
   7 ---
   8  drivers/net/ixgbe/ixgbe_ethdev.c   |  4 +++-
   9  drivers/net/ixgbe/ixgbe_rxtx_vec.c | 34 +++++++++++++++++++++++-----------
  10  2 files changed, 26 insertions(+), 12 deletions(-)
  11
  12 diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
  13 index 3f1ebc1..c48cb52 100644
  14 --- a/drivers/net/ixgbe/ixgbe_ethdev.c
  15 +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
  16 @@ -3000,7 +3000,9 @@ ixgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev)
  17         if (dev->rx_pkt_burst == ixgbe_recv_pkts ||
  18             dev->rx_pkt_burst == ixgbe_recv_pkts_lro_single_alloc ||
  19             dev->rx_pkt_burst == ixgbe_recv_pkts_lro_bulk_alloc ||
  20 -           dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc)
  21 +           dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc ||
  22 +           dev->rx_pkt_burst == ixgbe_recv_pkts_vec ||
  23 +           dev->rx_pkt_burst == ixgbe_recv_scattered_pkts_vec)
  24                 return ptypes;
  25         return NULL;
  26  }
  27 diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec.c b/drivers/net/ixgbe/ixgbe_rxtx_vec.c
  28 index 5040704..ccd93c7 100644
  29 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec.c
  30 +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec.c
  31 @@ -220,6 +220,8 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  32                                 0, 0            /* ignore pkt_type field */
  33                         );
  34         __m128i dd_check, eop_check;
  35 +       __m128i desc_mask = _mm_set_epi32(0xFFFFFFFF, 0xFFFFFFFF,
  36 +                                         0xFFFFFFFF, 0xFFFF07F0);
  37
  38         /* nb_pkts shall be less equal than RTE_IXGBE_MAX_RX_BURST */
  39         nb_pkts = RTE_MIN(nb_pkts, RTE_IXGBE_MAX_RX_BURST);
  40 @@ -257,8 +259,9 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  41                 13, 12,      /* octet 12~13, 16 bits data_len */
  42                 0xFF, 0xFF,  /* skip high 16 bits pkt_len, zero out */
  43                 13, 12,      /* octet 12~13, low 16 bits pkt_len */
  44 -               0xFF, 0xFF,  /* skip 32 bit pkt_type */
  45 -               0xFF, 0xFF
  46 +               0xFF, 0xFF,  /* skip high 16 bits pkt_type */
  47 +               1,           /* octet 1, 8 bits pkt_type field */
  48 +               0            /* octet 0, 4 bits offset 4 pkt_type field */
  49                 );
  50
  51         /* Cache is empty -> need to scan the buffer rings, but first move
  52 @@ -275,6 +278,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  53         for (pos = 0, nb_pkts_recd = 0; pos < nb_pkts;
  54                         pos += RTE_IXGBE_DESCS_PER_LOOP,
  55                         rxdp += RTE_IXGBE_DESCS_PER_LOOP) {
  56 +               __m128i descs0[RTE_IXGBE_DESCS_PER_LOOP];
  57                 __m128i descs[RTE_IXGBE_DESCS_PER_LOOP];
  58                 __m128i pkt_mb1, pkt_mb2, pkt_mb3, pkt_mb4;
  59                 __m128i zero, staterr, sterr_tmp1, sterr_tmp2;
  60 @@ -285,7 +289,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  61
  62                 /* Read desc statuses backwards to avoid race condition */
  63                 /* A.1 load 4 pkts desc */
  64 -               descs[3] = _mm_loadu_si128((__m128i *)(rxdp + 3));
  65 +               descs0[3] = _mm_loadu_si128((__m128i *)(rxdp + 3));
  66
  67                 /* B.2 copy 2 mbuf point into rx_pkts  */
  68                 _mm_storeu_si128((__m128i *)&rx_pkts[pos], mbp1);
  69 @@ -293,10 +297,10 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  70                 /* B.1 load 1 mbuf point */
  71                 mbp2 = _mm_loadu_si128((__m128i *)&sw_ring[pos+2]);
  72
  73 -               descs[2] = _mm_loadu_si128((__m128i *)(rxdp + 2));
  74 +               descs0[2] = _mm_loadu_si128((__m128i *)(rxdp + 2));
  75                 /* B.1 load 2 mbuf point */
  76 -               descs[1] = _mm_loadu_si128((__m128i *)(rxdp + 1));
  77 -               descs[0] = _mm_loadu_si128((__m128i *)(rxdp));
  78 +               descs0[1] = _mm_loadu_si128((__m128i *)(rxdp + 1));
  79 +               descs0[0] = _mm_loadu_si128((__m128i *)(rxdp));
  80
  81                 /* B.2 copy 2 mbuf point into rx_pkts  */
  82                 _mm_storeu_si128((__m128i *)&rx_pkts[pos+2], mbp2);
  83 @@ -308,6 +312,14 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  84                         rte_prefetch0(&rx_pkts[pos + 3]->cacheline1);
  85                 }
  86
  87 +               /* A* mask out 0~3 bits RSS type */
  88 +               descs[3] = _mm_and_si128(descs0[3], desc_mask);
  89 +               descs[2] = _mm_and_si128(descs0[2], desc_mask);
  90 +
  91 +               /* A* mask out 0~3 bits RSS type */
  92 +               descs[1] = _mm_and_si128(descs0[1], desc_mask);
  93 +               descs[0] = _mm_and_si128(descs0[0], desc_mask);
  94 +
  95                 /* avoid compiler reorder optimization */
  96                 rte_compiler_barrier();
  97
  98 @@ -315,22 +327,22 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  99                 pkt_mb4 = _mm_shuffle_epi8(descs[3], shuf_msk);
 100                 pkt_mb3 = _mm_shuffle_epi8(descs[2], shuf_msk);
 101
 102 -               /* D.1 pkt 1,2 convert format from desc to pktmbuf */
 103 -               pkt_mb2 = _mm_shuffle_epi8(descs[1], shuf_msk);
 104 -               pkt_mb1 = _mm_shuffle_epi8(descs[0], shuf_msk);
 105 -
 106                 /* C.1 4=>2 filter staterr info only */
 107                 sterr_tmp2 = _mm_unpackhi_epi32(descs[3], descs[2]);
 108                 /* C.1 4=>2 filter staterr info only */
 109                 sterr_tmp1 = _mm_unpackhi_epi32(descs[1], descs[0]);
 110
 111                 /* set ol_flags with vlan packet type */
 112 -               desc_to_olflags_v(descs, &rx_pkts[pos]);
 113 +               desc_to_olflags_v(descs0, &rx_pkts[pos]);
 114
 115                 /* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
 116                 pkt_mb4 = _mm_add_epi16(pkt_mb4, crc_adjust);
 117                 pkt_mb3 = _mm_add_epi16(pkt_mb3, crc_adjust);
 118
 119 +               /* D.1 pkt 1,2 convert format from desc to pktmbuf */
 120 +               pkt_mb2 = _mm_shuffle_epi8(descs[1], shuf_msk);
 121 +               pkt_mb1 = _mm_shuffle_epi8(descs[0], shuf_msk);
 122 +
 123                 /* C.2 get 4 pkts staterr value  */
 124                 zero = _mm_xor_si128(dd_check, dd_check);
 125                 staterr = _mm_unpacklo_epi32(sterr_tmp1, sterr_tmp2);
 126 --
 127 2.7.4
 128