From: Shesha Sreenivasamurthy <shesha@cisco.com>
Date: Mon, 25 Apr 2016 18:35:30 +0000 (-0400)
Subject: Fix vpp crash in DBG mode
X-Git-Tag: v16.06-rc1~117
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F868%2F1;p=vpp.git

Fix vpp crash in DBG mode

    virtio-vhost driver was specifying wrong prefetch
    size. This caused VPP to assert in DBG mode.

Change-Id: Icbe3d5574bd2463b98dfc618a001b16198ab82be
Signed-off-by: Shesha Sreenivasamurthy <shesha@cisco.com>
---

diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index 9747b9200fe..f52de25416f 100644
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -1216,7 +1216,8 @@ vhost_user_intfc_tx (vlib_main_t * vm,
         error = VHOST_USER_TX_FUNC_ERROR_MMAP_FAIL;
         goto done;
       }
-      CLIB_PREFETCH(buffer_addr, clib_min(rxvq->desc[desc_current].len, 500), STORE);
+      CLIB_PREFETCH(buffer_addr, clib_min(rxvq->desc[desc_current].len,
+	4*CLIB_CACHE_LINE_BYTES), STORE);
 
       virtio_net_hdr_mrg_rxbuf_t * hdr = (virtio_net_hdr_mrg_rxbuf_t *) buffer_addr;
       hdr->hdr.flags = 0;