summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-10-28 23:52:40 +0200
committerDave Barach <openvpp@barachs.net>2016-10-31 16:39:18 +0000
commitff7d642f3db5302e1fe70b6f1b9afdb4c63fa1d8 (patch)
tree706039d1ee26a2c9bd0a2be33faf81d9b44fce7c
parent860dacc3bdda67d493a5f248c28bd193f7870d23 (diff)
vhost-user: fix crash in vhost_user_intfc_tx (VPP-519)
The crash was the result of indexing off the end of the next[] array. Removing that prefetch code completelly, as it is questionable how much it helps so late in the game. Change-Id: I7bc83483a1088437edb4ac0f95a54c39afce136b Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--vnet/vnet/devices/virtio/vhost-user.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c
index fd3cd21f859..5916ced2570 100644
--- a/vnet/vnet/devices/virtio/vhost-user.c
+++ b/vnet/vnet/devices/virtio/vhost-user.c
@@ -1634,12 +1634,6 @@ vhost_user_intfc_tx (vlib_main_t * vm,
desc_len += bytes_to_copy;
}
- if (PREDICT_TRUE (n_left >= 2))
- {
- vlib_prefetch_buffer_with_index (vm, buffers[1], STORE);
- CLIB_PREFETCH (&n_left, sizeof (n_left), STORE);
- }
-
//Move from available to used ring
rxvq->used->ring[rxvq->last_used_idx & qsz_mask].id = desc_head;
rxvq->used->ring[rxvq->last_used_idx & qsz_mask].len = desc_len;