From c58408c0f2db122c5185413ef35fe330551afc2d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 18 Jan 2018 14:54:04 +0100 Subject: vlib: add vlib_buffer_alloc_to_ring API Change-Id: I4e2804754b443f5f41fb25eed8334908c4a70f84 Signed-off-by: Damjan Marion --- src/vnet/devices/virtio/node.c | 13 +++---------- src/vnet/devices/virtio/virtio.c | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/vnet/devices') diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c index 5ca06366cad..9477a1cfc58 100644 --- a/src/vnet/devices/virtio/node.c +++ b/src/vnet/devices/virtio/node.c @@ -83,10 +83,9 @@ static_always_inline void virtio_refill_vring (vlib_main_t * vm, virtio_vring_t * vring) { const int hdr_sz = sizeof (struct virtio_net_hdr_v1); - u16 used, next, avail, n_slots, n_alloc; + u16 used, next, avail, n_slots; u16 sz = vring->size; u16 mask = sz - 1; - int i; used = vring->desc_in_use; @@ -96,14 +95,8 @@ virtio_refill_vring (vlib_main_t * vm, virtio_vring_t * vring) n_slots = sz - used; next = vring->desc_next; avail = vring->avail->idx; - n_alloc = vlib_buffer_alloc (vm, &vring->buffers[next], n_slots); - - if (PREDICT_FALSE (n_alloc < n_slots)) - n_slots = n_alloc; - - i = next + n_slots - sz; - if (PREDICT_FALSE (i > 0)) - clib_memcpy (vring->buffers, &vring->buffers[sz], i * sizeof (u32)); + n_slots = vlib_buffer_alloc_to_ring (vm, vring->buffers, next, vring->size, + n_slots); while (n_slots) { diff --git a/src/vnet/devices/virtio/virtio.c b/src/vnet/devices/virtio/virtio.c index 3867cf03a46..02ded3f5f52 100644 --- a/src/vnet/devices/virtio/virtio.c +++ b/src/vnet/devices/virtio/virtio.c @@ -100,7 +100,7 @@ virtio_vring_init (vlib_main_t * vm, virtio_if_t * vif, u16 idx, u16 sz) memset (vring->used, 0, i); ASSERT (vring->buffers == 0); - vec_validate_aligned (vring->buffers, sz * 2, CLIB_CACHE_LINE_BYTES); + vec_validate_aligned (vring->buffers, sz, CLIB_CACHE_LINE_BYTES); vring->size = sz; vring->call_fd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); -- cgit 1.2.3-korg