Add option to buffer.[ch] for 64-byte alignment

00pauln00 · Feb 23, 2024 · c8e3777 · c8e3777
1 parent 54473a4
commit c8e3777
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/buffer.c b/src/buffer.c
@@ -464,7 +464,6 @@ buffer_set_init(struct buffer_set *bs, size_t nbufs, size_t buf_size,
     CIRCLEQ_INIT(&bs->bs_free_list);
     CIRCLEQ_INIT(&bs->bs_inuse_list);
 
-
     if (opts & BUFSET_OPT_USER_CACHE)
     {
         bs->bs_allow_user_cache = 1;
@@ -491,10 +490,13 @@ buffer_set_init(struct buffer_set *bs, size_t nbufs, size_t buf_size,
         bi->bi_iov.iov_len = buf_size;
         bi->bi_register_idx = -1;
 
-        if (opts & BUFSET_OPT_MEMALIGN)
+        size_t alignment =
+            (opts & BUFSET_OPT_MEMALIGN_SECTOR) ? BUFFER_SECTOR_SIZE :
+            (opts & BUFSET_OPT_MEMALIGN_L2)     ? L2_CACHELINE_SIZE_BYTES : 0;
+
+        if (alignment)
         {
-            bi->bi_iov.iov_base =
-                niova_posix_memalign(buf_size, BUFFER_SECTOR_SIZE);
+            bi->bi_iov.iov_base = niova_posix_memalign(buf_size, alignment);
 
             FATAL_IF(bi->bi_iov.iov_base == NULL, "niova_posix_memalign()");
         }

diff --git a/src/include/buffer.h b/src/include/buffer.h
@@ -17,10 +17,12 @@
 
 enum buffer_set_opts
 {
-    BUFSET_OPT_MEMALIGN   = (1 << 0),
-    BUFSET_OPT_SERIALIZE  = (1 << 1),
-    BUFSET_OPT_USER_CACHE = (1 << 2),
-    BUFSET_OPT_LREG       = (1 << 3),
+    BUFSET_OPT_SERIALIZE       = (1 << 0),
+    BUFSET_OPT_USER_CACHE      = (1 << 1),
+    BUFSET_OPT_LREG            = (1 << 2),
+    BUFSET_OPT_MEMALIGN_L2     = (1 << 3),
+    BUFSET_OPT_MEMALIGN_SECTOR = (1 << 4),
+    BUFSET_OPT_MEMALIGN        = BUFSET_OPT_MEMALIGN_SECTOR,
 };
 
 struct buffer_set;