fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 02:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv/allocator: Add support for non-userptr.

Browse source 
If softpin is supported, create new BOs for the required size and add the
respective BO maps. The other main change of this commit is that
anv_block_pool_map() now returns the map for the BO that the given
offset is part of. So there's no block_pool->map access anymore (when
softpin is used.

v3:
 - set fd to -1 on softpin case (Jason)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Rafael Antognolli 2018-11-08 11:35:59 -08:00
parent 643248b66a
commit 731c4adcf9
1 changed files with 70 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/intel/vulkan/anv_allocator.c
View file

@ -443,17 +443,21 @@ anv_block_pool_init(struct anv_block_pool *pool,
anv_bo_init(pool->bo, 0, 0); anv_bo_init(pool->bo, 0, 0);
pool->fd = memfd_create("block pool", MFD_CLOEXEC); if (!(pool->bo_flags & EXEC_OBJECT_PINNED)) {
if (pool->fd == -1) pool->fd = memfd_create("block pool", MFD_CLOEXEC);
return vk_error(VK_ERROR_INITIALIZATION_FAILED); if (pool->fd == -1)
return vk_error(VK_ERROR_INITIALIZATION_FAILED);
/* Just make it 2GB up-front. The Linux kernel won't actually back it /* Just make it 2GB up-front. The Linux kernel won't actually back it
* with pages until we either map and fault on one of them or we use * with pages until we either map and fault on one of them or we use
* userptr and send a chunk of it off to the GPU. * userptr and send a chunk of it off to the GPU.
*/ */
if (ftruncate(pool->fd, BLOCK_POOL_MEMFD_SIZE) == -1) { if (ftruncate(pool->fd, BLOCK_POOL_MEMFD_SIZE) == -1) {
result = vk_error(VK_ERROR_INITIALIZATION_FAILED); result = vk_error(VK_ERROR_INITIALIZATION_FAILED);
goto fail_fd; goto fail_fd;
}
} else {
pool->fd = -1;
} }
if (!u_vector_init(&pool->mmap_cleanups, if (!u_vector_init(&pool->mmap_cleanups,
@ -477,7 +481,8 @@ anv_block_pool_init(struct anv_block_pool *pool,
fail_mmap_cleanups: fail_mmap_cleanups:
u_vector_finish(&pool->mmap_cleanups); u_vector_finish(&pool->mmap_cleanups);
fail_fd: fail_fd:
close(pool->fd); if (!(pool->bo_flags & EXEC_OBJECT_PINNED))
close(pool->fd);
return result; return result;
} }
@ -495,8 +500,8 @@ anv_block_pool_finish(struct anv_block_pool *pool)
} }
u_vector_finish(&pool->mmap_cleanups); u_vector_finish(&pool->mmap_cleanups);
if (!(pool->bo_flags & EXEC_OBJECT_PINNED))
close(pool->fd); close(pool->fd);
} }
static VkResult static VkResult
@ -506,6 +511,7 @@ anv_block_pool_expand_range(struct anv_block_pool *pool,
void *map; void *map;
uint32_t gem_handle; uint32_t gem_handle;
struct anv_mmap_cleanup *cleanup; struct anv_mmap_cleanup *cleanup;
const bool use_softpin = !!(pool->bo_flags & EXEC_OBJECT_PINNED);
/* Assert that we only ever grow the pool */ /* Assert that we only ever grow the pool */
assert(center_bo_offset >= pool->back_state.end); assert(center_bo_offset >= pool->back_state.end);
@ -513,7 +519,8 @@ anv_block_pool_expand_range(struct anv_block_pool *pool,
/* Assert that we don't go outside the bounds of the memfd */ /* Assert that we don't go outside the bounds of the memfd */
assert(center_bo_offset <= BLOCK_POOL_MEMFD_CENTER); assert(center_bo_offset <= BLOCK_POOL_MEMFD_CENTER);
assert(size - center_bo_offset <= assert(use_softpin ||
size - center_bo_offset <=
BLOCK_POOL_MEMFD_SIZE - BLOCK_POOL_MEMFD_CENTER); BLOCK_POOL_MEMFD_SIZE - BLOCK_POOL_MEMFD_CENTER);
cleanup = u_vector_add(&pool->mmap_cleanups); cleanup = u_vector_add(&pool->mmap_cleanups);
@ -522,28 +529,36 @@ anv_block_pool_expand_range(struct anv_block_pool *pool,
*cleanup = ANV_MMAP_CLEANUP_INIT; *cleanup = ANV_MMAP_CLEANUP_INIT;
/* Just leak the old map until we destroy the pool. We can't munmap it uint32_t newbo_size = size - pool->size;
* without races or imposing locking on the block allocate fast path. On if (use_softpin) {
* the whole the leaked maps adds up to less than the size of the gem_handle = anv_gem_create(pool->device, newbo_size);
* current map. MAP_POPULATE seems like the right thing to do, but we map = anv_gem_mmap(pool->device, gem_handle, 0, newbo_size, 0);
* should try to get some numbers. if (map == MAP_FAILED)
*/ return vk_errorf(pool->device->instance, pool->device,
map = mmap(NULL, size, PROT_READ | PROT_WRITE, VK_ERROR_MEMORY_MAP_FAILED, "gem mmap failed: %m");
MAP_SHARED | MAP_POPULATE, pool->fd, } else {
BLOCK_POOL_MEMFD_CENTER - center_bo_offset); /* Just leak the old map until we destroy the pool. We can't munmap it
if (map == MAP_FAILED) * without races or imposing locking on the block allocate fast path. On
return vk_errorf(pool->device->instance, pool->device, * the whole the leaked maps adds up to less than the size of the
VK_ERROR_MEMORY_MAP_FAILED, "mmap failed: %m"); * current map. MAP_POPULATE seems like the right thing to do, but we
* should try to get some numbers.
gem_handle = anv_gem_userptr(pool->device, map, size); */
if (gem_handle == 0) { map = mmap(NULL, size, PROT_READ | PROT_WRITE,
munmap(map, size); MAP_SHARED | MAP_POPULATE, pool->fd,
return vk_errorf(pool->device->instance, pool->device, BLOCK_POOL_MEMFD_CENTER - center_bo_offset);
VK_ERROR_TOO_MANY_OBJECTS, "userptr failed: %m"); if (map == MAP_FAILED)
return vk_errorf(pool->device->instance, pool->device,
VK_ERROR_MEMORY_MAP_FAILED, "mmap failed: %m");
gem_handle = anv_gem_userptr(pool->device, map, size);
if (gem_handle == 0) {
munmap(map, size);
return vk_errorf(pool->device->instance, pool->device,
VK_ERROR_TOO_MANY_OBJECTS, "userptr failed: %m");
}
} }
cleanup->map = map; cleanup->map = map;
cleanup->size = size; cleanup->size = use_softpin ? newbo_size : size;
cleanup->gem_handle = gem_handle; cleanup->gem_handle = gem_handle;
/* Regular objects are created I915_CACHING_CACHED on LLC platforms and /* Regular objects are created I915_CACHING_CACHED on LLC platforms and
@ -588,22 +603,32 @@ anv_block_pool_expand_range(struct anv_block_pool *pool,
* hard work for us. * hard work for us.
*/ */
struct anv_bo *bo; struct anv_bo *bo;
uint32_t bo_size;
uint64_t bo_offset;
assert(pool->nbos < ANV_MAX_BLOCK_POOL_BOS); assert(pool->nbos < ANV_MAX_BLOCK_POOL_BOS);
/* We just need one BO, and we already have a pointer to it. Let's simply if (use_softpin) {
* "allocate" it from our array. /* With softpin, we add a new BO to the pool, and set its offset to right
*/ * where the previous BO ends (the end of the pool).
if (pool->nbos == 0) */
pool->nbos++; bo = &pool->bos[pool->nbos++];
bo_size = newbo_size;
bo = pool->bo; bo_offset = pool->start_address + pool->size;
} else {
anv_bo_init(bo, gem_handle, size); /* Without softpin, we just need one BO, and we already have a pointer to
if (pool->bo_flags & EXEC_OBJECT_PINNED) { * it. Simply "allocate" it from our array if we didn't do it before.
bo->offset = pool->start_address + BLOCK_POOL_MEMFD_CENTER - * The offset doesn't matter since we are not pinning the BO anyway.
center_bo_offset; */
if (pool->nbos == 0)
pool->nbos++;
bo = pool->bo;
bo_size = size;
bo_offset = 0;
} }
anv_bo_init(bo, gem_handle, bo_size);
bo->offset = bo_offset;
bo->flags = pool->bo_flags; bo->flags = pool->bo_flags;
bo->map = map; bo->map = map;
pool->size = size; pool->size = size;