mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-23 05:33:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

shm: page-align the memfd size (also needed for GPU direct import)

Browse source
This commit is contained in:
Daniel Eklöf 2025-10-04 10:50:38 +02:00
parent fac3994154
commit bd994eda1c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shm.c
View file

@ -239,7 +239,6 @@ static const struct wl_buffer_listener buffer_listener = {
.release = &buffer_release, .release = &buffer_release,
}; };
#if __SIZEOF_POINTER__ == 8
static size_t static size_t
page_size(void) page_size(void)
{ {
@ -256,7 +255,6 @@ page_size(void)
xassert(size > 0); xassert(size > 0);
return size; return size;
} }
#endif
static bool static bool
instantiate_offset(struct buffer_private *buf, off_t new_offset) 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; goto err;
} }
const size_t page_sz = page_size();
#if __SIZEOF_POINTER__ == 8 #if __SIZEOF_POINTER__ == 8
off_t offset = chain->scrollable && max_pool_size > 0 off_t offset = chain->scrollable && max_pool_size > 0
? (max_pool_size / 4) & ~(page_size() - 1) ? (max_pool_size / 4) & ~(page_sz - 1)
: 0; : 0;
off_t memfd_size = chain->scrollable && max_pool_size > 0 off_t memfd_size = chain->scrollable && max_pool_size > 0
? max_pool_size ? max_pool_size
@ -410,7 +410,8 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
off_t memfd_size = total_size; off_t memfd_size = total_size;
#endif #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); 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; memfd_size = total_size;
chain->scrollable = false; chain->scrollable = false;
/* Page align */
memfd_size = (memfd_size + page_sz - 1) & ~(page_sz - 1);
if (ftruncate(pool_fd, memfd_size) < 0) { if (ftruncate(pool_fd, memfd_size) < 0) {
LOG_ERRNO("failed to set size of SHM backing memory file"); LOG_ERRNO("failed to set size of SHM backing memory file");
goto err; goto err;