aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-10-04 08:50:38 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-10-05 07:40:51 +0000
commitbd994eda1c816d5430a9c4cdb7089e43c47d74ae (patch)
tree62499f6507012751692f7bcf422e23b8c07f129e
parentconfig: add tweak.min-stride-alignment (diff)
shm: page-align the memfd size (also needed for GPU direct import)
-rw-r--r--shm.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/shm.c b/shm.c
index 7b13db9b..31ea67ed 100644
--- a/shm.c
+++ b/shm.c
@@ -239,7 +239,6 @@ static const struct wl_buffer_listener buffer_listener = {
.release = &buffer_release,
};
-#if __SIZEOF_POINTER__ == 8
static size_t
page_size(void)
{
@@ -256,7 +255,6 @@ page_size(void)
xassert(size > 0);
return size;
}
-#endif
static bool
instantiate_offset(struct buffer_private *buf, off_t new_offset)
@@ -398,9 +396,11 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
goto err;
}
+ const size_t page_sz = page_size();
+
#if __SIZEOF_POINTER__ == 8
off_t offset = chain->scrollable && max_pool_size > 0
- ? (max_pool_size / 4) & ~(page_size() - 1)
+ ? (max_pool_size / 4) & ~(page_sz - 1)
: 0;
off_t memfd_size = chain->scrollable && max_pool_size > 0
? max_pool_size
@@ -410,7 +410,8 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
off_t memfd_size = total_size;
#endif
- xassert(chain->scrollable || (offset == 0 && memfd_size == total_size));
+ /* Page align */
+ memfd_size = (memfd_size + page_sz - 1) & ~(page_sz - 1);
LOG_DBG("memfd-size: %lu, initial offset: %lu", memfd_size, offset);
@@ -442,6 +443,9 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
memfd_size = total_size;
chain->scrollable = false;
+ /* Page align */
+ memfd_size = (memfd_size + page_sz - 1) & ~(page_sz - 1);
+
if (ftruncate(pool_fd, memfd_size) < 0) {
LOG_ERRNO("failed to set size of SHM backing memory file");
goto err;