Support tlm memory alignment on systems with >4k pages

machineware-gmbh · Apr 14, 2024 · a6e3834 · a6e3834
1 parent a376a69
commit a6e3834
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/vcml/core/types.h b/include/vcml/core/types.h
@@ -312,6 +312,11 @@ typedef enum vcml_alignment {
 
 VCML_TYPEINFO(alignment);
 
+inline vcml_alignment host_page_alignment() {
+    static const size_t pgsz = mwr::get_page_size();
+    return pgsz ? (vcml_alignment)ctz(pgsz) : VCML_ALIGN_NONE;
+}
+
 istream& operator>>(istream& is, alignment& a);
 ostream& operator<<(ostream& os, alignment a);
 

diff --git a/src/vcml/protocols/tlm_memory_posix.cpp b/src/vcml/protocols/tlm_memory_posix.cpp
@@ -87,9 +87,9 @@ tlm_memory::~tlm_memory() {
 void tlm_memory::init(const string& shared, size_t size, alignment al) {
     VCML_ERROR_ON(m_size, "memory already initialized");
 
-    // mmap automatically aligns up to 4k, for larger alignments we
-    // reserve extra space to include an aligned start address plus size
-    u64 extra = (al > VCML_ALIGN_4K) ? (1ull << al) - 1 : 0;
+    // mmap automatically aligns up to host page size, for larger alignments
+    // we reserve extra space to include an aligned start address plus size
+    u64 extra = (al > host_page_alignment()) ? (1ull << al) - 1 : 0;
     m_size = size + extra;
 
     int fd = -1;