Fix vpp crash in DBG mode 68/868/1
authorShesha Sreenivasamurthy <shesha@cisco.com>
Mon, 25 Apr 2016 18:35:30 +0000 (14:35 -0400)
committerShesha Sreenivasamurthy <shesha@cisco.com>
Mon, 25 Apr 2016 18:38:33 +0000 (14:38 -0400)
    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>
vnet/vnet/devices/virtio/vhost-user.c

index 9747b92..f52de25 100644 (file)
@@ -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;