debian/patches/nicvf-0001-net-thunderx-check-data-offset-alignment-requirement.patch

   1 From 34c2e7026fb30f6756d2c84d07d99c94106bb2ab Mon Sep 17 00:00:00 2001
   2 From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
   3 Date: Mon, 13 Mar 2017 13:32:11 +0530
   4 Subject: [PATCH] net/thunderx: check data offset alignment requirement
   5
   6 nicvf HW expects the DMA address of the packet data to be
   7 aligned with cache line size.
   8
   9 Packet data offset is a function of struct mbuf size,
  10 mbuf private size and headroom. mbuf private size can
  11 be changed from the application in pool creation, this
  12 check detects HW alignment requirement constraint in pmd
  13 start function.
  14
  15 Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
  16 Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
  17 ---
  18  drivers/net/thunderx/nicvf_ethdev.c | 14 +++++++++++---
  19  1 file changed, 11 insertions(+), 3 deletions(-)
  20
  21 Origin: http://dpdk.org/browse/dpdk/commit/?id=34c2e7026fb30f6756d2c84d07d99c94106bb2ab
  22 Original-Author: Jerin Jacob <jerin.jacob@caviumnetworks.com>
  23 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1691659
  24 Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
  25 Last-Update: 2017-05-18
  26
  27 --- a/drivers/net/thunderx/nicvf_ethdev.c
  28 +++ b/drivers/net/thunderx/nicvf_ethdev.c
  29 @@ -1407,7 +1407,7 @@
  30  nicvf_vf_start(struct rte_eth_dev *dev, struct nicvf *nic, uint32_t rbdrsz)
  31  {
  32         int ret;
  33 -       uint16_t qidx;
  34 +       uint16_t qidx, data_off;
  35         uint32_t total_rxq_desc, nb_rbdr_desc, exp_buffs;
  36         uint64_t mbuf_phys_off = 0;
  37         struct nicvf_rxq *rxq;
  38 @@ -1448,10 +1448,18 @@
  39                                      nic->vf_id, qidx, rxq->pool->name);
  40                         return -ENOMEM;
  41                 }
  42 -               rxq->mbuf_phys_off -= nicvf_mbuff_meta_length(mbuf);
  43 -               rxq->mbuf_phys_off -= RTE_PKTMBUF_HEADROOM;
  44 +               data_off = nicvf_mbuff_meta_length(mbuf);
  45 +               data_off += RTE_PKTMBUF_HEADROOM;
  46                 rte_pktmbuf_free(mbuf);
  47
  48 +               if (data_off % RTE_CACHE_LINE_SIZE) {
  49 +                       PMD_INIT_LOG(ERR, "%s: unaligned data_off=%d delta=%d",
  50 +                               rxq->pool->name, data_off,
  51 +                               data_off % RTE_CACHE_LINE_SIZE);
  52 +                       return -EINVAL;
  53 +               }
  54 +               rxq->mbuf_phys_off -= data_off;
  55 +
  56                 if (mbuf_phys_off == 0)
  57                         mbuf_phys_off = rxq->mbuf_phys_off;
  58                 if (mbuf_phys_off != rxq->mbuf_phys_off) {