From: Florin Coras <fcoras@cisco.com>
Date: Tue, 28 Apr 2020 20:40:57 +0000 (+0000)
Subject: svm: fix fifo alignemnt in batch prealloc
X-Git-Tag: v20.09-rc0~101
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=635f5068f0802ec1fe34c998b72fb2f626259050;p=vpp.git

svm: fix fifo alignemnt in batch prealloc

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I5cdf3cff820a0679f78b212a277d1873c2cfb980
---

diff --git a/src/svm/fifo_segment.c b/src/svm/fifo_segment.c
index d9ca3a2afe3..3fd7d9d6ede 100644
--- a/src/svm/fifo_segment.c
+++ b/src/svm/fifo_segment.c
@@ -572,21 +572,27 @@ fs_try_alloc_fifo_batch (fifo_segment_header_t * fsh,
   if (fmem == 0)
     return -1;
 
-  /* Carve fifo + chunk space */
+  /* Carve fifo hdr space */
   for (i = 0; i < batch_size; i++)
     {
       f = (svm_fifo_t *) fmem;
       memset (f, 0, sizeof (*f));
       f->next = fss->free_fifos;
       fss->free_fifos = f;
-      c = (svm_fifo_chunk_t *) (fmem + sizeof (*f));
+      fmem += sizeof (*f);
+    }
+
+  /* Carve chunk space */
+  for (i = 0; i < batch_size; i++)
+    {
+      c = (svm_fifo_chunk_t *) fmem;
       c->start_byte = 0;
       c->length = rounded_data_size;
       c->enq_rb_index = RBTREE_TNIL_INDEX;
       c->deq_rb_index = RBTREE_TNIL_INDEX;
       c->next = fss->free_chunks[fl_index];
       fss->free_chunks[fl_index] = c;
-      fmem += hdrs + rounded_data_size;
+      fmem += sizeof (svm_fifo_chunk_t) + rounded_data_size;
     }
 
   fss->num_chunks[fl_index] += batch_size;