drm-shim: don't create a memfd per BO
Running shader-db on big servers with many cores, we're running out of file descriptors. Use a single 4Gb memfd instead and allocate from it using a VMA. v2: Align VMA allocation to 4096 (Eric) Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Acked-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4594>
This commit is contained in:
parent
6b34c8d35f
commit
764ef4bf1a
|
@ -42,6 +42,7 @@
|
||||||
#include "util/hash_table.h"
|
#include "util/hash_table.h"
|
||||||
#include "util/u_atomic.h"
|
#include "util/u_atomic.h"
|
||||||
|
|
||||||
|
#define SHIM_MEM_SIZE (4ull * 1024 * 1024 * 1024)
|
||||||
|
|
||||||
#ifndef HAVE_MEMFD_CREATE
|
#ifndef HAVE_MEMFD_CREATE
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
|
@ -79,6 +80,16 @@ drm_shim_device_init(void)
|
||||||
uint_key_hash,
|
uint_key_hash,
|
||||||
uint_key_compare);
|
uint_key_compare);
|
||||||
|
|
||||||
|
mtx_init(&shim_device.mem_lock, mtx_plain);
|
||||||
|
|
||||||
|
shim_device.mem_fd = memfd_create("shim mem", MFD_CLOEXEC);
|
||||||
|
assert(shim_device.mem_fd != -1);
|
||||||
|
|
||||||
|
int ret = ftruncate(shim_device.mem_fd, SHIM_MEM_SIZE);
|
||||||
|
assert(ret == 0);
|
||||||
|
|
||||||
|
util_vma_heap_init(&shim_device.mem_heap, 4096, SHIM_MEM_SIZE - 4096);
|
||||||
|
|
||||||
drm_shim_driver_init();
|
drm_shim_driver_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,17 +267,13 @@ drm_shim_ioctl(int fd, unsigned long request, void *arg)
|
||||||
void
|
void
|
||||||
drm_shim_bo_init(struct shim_bo *bo, size_t size)
|
drm_shim_bo_init(struct shim_bo *bo, size_t size)
|
||||||
{
|
{
|
||||||
bo->size = size;
|
|
||||||
bo->fd = memfd_create("shim bo", MFD_CLOEXEC);
|
|
||||||
if (bo->fd == -1) {
|
|
||||||
fprintf(stderr, "Failed to create BO: %s\n", strerror(errno));
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ftruncate(bo->fd, size) == -1) {
|
mtx_lock(&shim_device.mem_lock);
|
||||||
fprintf(stderr, "Failed to size BO: %s\n", strerror(errno));
|
bo->mem_addr = util_vma_heap_alloc(&shim_device.mem_heap, size, 4096);
|
||||||
abort();
|
mtx_unlock(&shim_device.mem_lock);
|
||||||
}
|
assert(bo->mem_addr);
|
||||||
|
|
||||||
|
bo->size = size;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct shim_bo *
|
struct shim_bo *
|
||||||
|
@ -301,7 +308,10 @@ drm_shim_bo_put(struct shim_bo *bo)
|
||||||
|
|
||||||
if (shim_device.driver_bo_free)
|
if (shim_device.driver_bo_free)
|
||||||
shim_device.driver_bo_free(bo);
|
shim_device.driver_bo_free(bo);
|
||||||
close(bo->fd);
|
|
||||||
|
mtx_lock(&shim_device.mem_lock);
|
||||||
|
util_vma_heap_free(&shim_device.mem_heap, bo->mem_addr, bo->size);
|
||||||
|
mtx_unlock(&shim_device.mem_lock);
|
||||||
free(bo);
|
free(bo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -350,5 +360,5 @@ drm_shim_mmap(struct shim_fd *shim_fd, size_t length, int prot, int flags,
|
||||||
{
|
{
|
||||||
struct shim_bo *bo = (void *)(uintptr_t)offset;
|
struct shim_bo *bo = (void *)(uintptr_t)offset;
|
||||||
|
|
||||||
return mmap(NULL, length, prot, flags, bo->fd, 0);
|
return mmap(NULL, length, prot, flags, shim_device.mem_fd, bo->mem_addr);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include "util/macros.h"
|
#include "util/macros.h"
|
||||||
#include "util/hash_table.h"
|
#include "util/hash_table.h"
|
||||||
|
#include "util/vma.h"
|
||||||
|
|
||||||
#include <xf86drm.h>
|
#include <xf86drm.h>
|
||||||
|
|
||||||
|
@ -40,6 +41,12 @@ struct shim_device {
|
||||||
/* Mapping from int fd to struct shim_fd *. */
|
/* Mapping from int fd to struct shim_fd *. */
|
||||||
struct hash_table *fd_map;
|
struct hash_table *fd_map;
|
||||||
|
|
||||||
|
mtx_t mem_lock;
|
||||||
|
/* Heap from which shim_bo are allocated */
|
||||||
|
struct util_vma_heap mem_heap;
|
||||||
|
|
||||||
|
int mem_fd;
|
||||||
|
|
||||||
int (**driver_ioctls)(int fd, unsigned long request, void *arg);
|
int (**driver_ioctls)(int fd, unsigned long request, void *arg);
|
||||||
int driver_ioctl_count;
|
int driver_ioctl_count;
|
||||||
|
|
||||||
|
@ -61,7 +68,7 @@ struct shim_fd {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct shim_bo {
|
struct shim_bo {
|
||||||
int fd;
|
uint64_t mem_addr;
|
||||||
void *map;
|
void *map;
|
||||||
int refcount;
|
int refcount;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
|
|
Loading…
Reference in New Issue