| Message ID | 20230809165330.2451699-11-boris.brezillon@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Add a driver for FW-based Mali GPUs | expand |
On 09/08/2023 17:53, Boris Brezillon wrote: > Tiler heap growing requires some kernel driver involvement: when the > tiler runs out of heap memory, it will raise an exception which is > either directly handled by the firmware if some free heap chunks are > available in the heap context, or passed back to the kernel otherwise. > The heap helpers will be used by the scheduler logic to allocate more > heap chunks to a heap context, when such a situation happens. > > Heap context creation is explicitly requested by userspace (using > the TILER_HEAP_CREATE ioctl), and the returned context is attached to a > queue through some command stream instruction. > > All the kernel does is keep the list of heap chunks allocated to a > context, so they can be freed when TILER_HEAP_DESTROY is called, or > extended when the FW requests a new chunk. > > v2: > - Rename the driver (pancsf -> panthor) > - Split the driver addition commit > - Document the code > - Fix various bugs > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Mostly looks good, but I think we might have issues with struct panthor_heap_gpu_ctx potentially being smaller than a (GPU) cache line (see below). > --- > drivers/gpu/drm/panthor/panthor_heap.c | 550 +++++++++++++++++++++++++ > drivers/gpu/drm/panthor/panthor_heap.h | 36 ++ > 2 files changed, 586 insertions(+) > create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c > create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h > > diff --git a/drivers/gpu/drm/panthor/panthor_heap.c b/drivers/gpu/drm/panthor/panthor_heap.c > new file mode 100644 > index 000000000000..39244efc2eaa > --- /dev/null > +++ b/drivers/gpu/drm/panthor/panthor_heap.c > @@ -0,0 +1,550 @@ > +// SPDX-License-Identifier: GPL-2.0 or MIT > +/* Copyright 2023 Collabora ltd. */ > + > +#include <linux/iosys-map.h> > +#include <linux/rwsem.h> > + > +#include <drm/panthor_drm.h> > + > +#include "panthor_device.h" > +#include "panthor_gem.h" > +#include "panthor_heap.h" > +#include "panthor_mmu.h" > + > +/** > + * struct panthor_heap_gpu_ctx - Heap context used by the GPU/FW. > + */ > +struct panthor_heap_gpu_ctx { > + /** > + * @first_heap_chunk: GPU VA of the first free heap chunk. > + * > + * This forms a single-link list, where each chunk points to the > + * next free chunk, and the last element points to NULL. > + * > + * Heap chunks get freed and returned to the heap context when fragment > + * jobs picking data from those heap chunks complete. When this happens > + * this field is updated to insert the heap chunks that were freed. > + * > + * When the tiler runs out of memory, it will first check if there > + * are free heap chunks in the heap context, and pick those if there are. > + * > + * When there is no free heap chunks left, the FW will raise a TILER_OOM > + * interrupt, letting the kernel driver allocate more heap chunks. > + * > + * If the heap context reached its heap chunk limit, the FW will wait > + * for fragment jobs to consume some data and return chunks to the > + * context. > + * > + * As a last resort, if there is no in-flight fragment jobs, the FW > + * will try to execute the exception handler set on the command stream. > + * This exception handler is expected to issue fragment job to store > + * the partial rendering results, free up some heap chunks. > + */ > + u64 first_heap_chunk; > + > + /** @unused1: MBZ. */ > + u32 unused1[2]; > + > + /** > + * @vt_started_count: Number of vertex/tiling operations started. > + * > + * This is marking the beginning of a render pass, and is explicity s/explicity/explicitly/ > + * flagged with a HEAP_OPERATION.vt_start instruction. If the render pass > + * contains multiple vertex/tiler/IDVS jobs, this HEAP_OPERATION.vt_start > + * is only called once. > + */ > + u32 vt_started_count; > + > + /** > + * @vt_completed_count: Number of completed vertex/tiler jobs. > + * > + * This is marking the end of the geometry processing part of a render > + * pass, and is explicity flagged by the user command stream with s/explicity/explicitly/ > + * a HEAP_OPERATION.vt_completed instruction. If the render pass contains > + * multiple vertex/tiler/IDVS jobs, this HEAP_OPERATION.vt_end > + * instruction is only issued once. > + */ > + u32 vt_completed_count; > + > + /** @unused2: MBZ. */ > + u32 unused2; > + > + /** > + * @frag_completed_count: Number of completed fragment jobs. > + * > + * @vt_started_count - @frag_completed_count is the number of in-flight > + * render targets that's used by the driver to determine if it's worth > + * allocating new chunk or if we should instead wait for fragment jobs > + * to complete. > + * > + * Fragment completion is explicitly flagged by the user command stream > + * with a HEAP_OPERATION.frag_end or FINISH_FRAGMENT.frag_end instruction. > + */ > + u32 frag_completed_count; > +}; I'm not sure whether we should really be describing this structure in the kernel. Beyond the size the kernel has no reason to be looking at the internals and the spec does have a warning that the layout may change. Interestingly kbase also rounds this size up to ensure that it is at least a cache line. Which I guess might be required if the CPU and GPU are not coherent as we zero the context (from the CPU) before use. > + > +/** > + * struct panthor_heap_chunk_header - Heap chunk header > + */ > +struct panthor_heap_chunk_header { > + /** > + * @next: Next heap chunk in the list. > + * > + * This is a GPU VA. > + */ > + u64 next; > + > + /** @unknown: MBZ. */ > + u32 unknown[14]; > +}; > + > +/** > + * struct panthor_heap_chunk - Structure used to keep track of allocated heap chunks. > + */ > +struct panthor_heap_chunk { > + /** @node: Used to insert the heap chunk in panthor_heap::chunks. */ > + struct list_head node; > + > + /** @bo: Buffer object backing the heap chunk. */ > + struct panthor_gem_object *bo; > + > + /** @gpu_va: GPU address of this heap chunk. */ > + u64 gpu_va; > +}; > + > +/** > + * struct panthor_heap - Structure used to manage tiler heap contexts. > + */ > +struct panthor_heap { > + /** @chunks: List containing all heap chunks allocated so far. */ > + struct list_head chunks; > + > + /** @chunk_size: Size of each chunk. */ > + u32 chunk_size; > + > + /** @max_chunks: Maximum number of chunks. */ > + u32 max_chunks; > + > + /** > + * @target_in_flight: Number of in-flight render passes after which > + * we'd let the FW wait for fragment job to finish instead of allocating new chunks. > + */ > + u32 target_in_flight; > + > + /** @chunk_count: Number of heap chunks currently allocated. */ > + u32 chunk_count; > +}; > + > +#define MAX_HEAPS_PER_POOL 128 > + > +/** > + * struct panthor_heap_pool - Pool of heap contexts > + * > + * The pool is attached to a panthor_file and can't be shared across processes. > + */ > +struct panthor_heap_pool { > + /** @refcount: Reference count. */ > + struct kref refcount; > + > + /** @ptdev: Device. */ > + struct panthor_device *ptdev; > + > + /** @vm: VM this pool is bound to. */ > + struct panthor_vm *vm; > + > + /** @lock: Lock protecting access to @xa. */ > + struct rw_semaphore lock; > + > + /** @xa: Array storing panthor_heap objects. */ > + struct xarray xa; > + > + /** @bo: Buffer object containing the GPU heap contexts. */ > + struct panthor_gem_object *bo; > + > + /** @gpu_contexts: Array of GPU heap contexts. */ > + struct panthor_heap_gpu_ctx *gpu_contexts; > + > + /** @gpu_va: GPU address of the heap contexts. */ > + u64 gpu_va; > +}; > + > +static void panthor_free_heap_chunk(struct panthor_vm *vm, > + struct panthor_heap_chunk *chunk) > +{ > + if (!chunk) > + return; > + > + list_del(&chunk->node); > + panthor_gem_unmap_and_put(vm, chunk->bo, chunk->gpu_va, NULL); > + kfree(chunk); > +} > + > +static int panthor_alloc_heap_chunk(struct panthor_device *ptdev, > + struct panthor_vm *vm, > + struct panthor_heap *heap, > + bool initial_chunk) > +{ > + struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL); > + struct panthor_heap_chunk *chunk; > + struct panthor_heap_chunk_header *hdr; > + int ret; > + > + chunk = kmalloc(sizeof(*chunk), GFP_KERNEL); > + if (!chunk) > + return -ENOMEM; > + > + chunk->gpu_va = PANTHOR_GEM_ALLOC_VA; > + chunk->bo = panthor_gem_create_and_map(ptdev, vm, heap->chunk_size, > + DRM_PANTHOR_BO_NO_MMAP, > + DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC, > + &chunk->gpu_va, > + (void **)&hdr); > + if (IS_ERR(chunk->bo)) { > + ret = PTR_ERR(chunk->bo); > + goto err_free_chunk; > + } > + > + memset(hdr, 0, sizeof(*hdr)); > + > + if (initial_chunk && !list_empty(&heap->chunks)) { > + struct panthor_heap_chunk *prev_chunk; > + > + prev_chunk = list_first_entry(&heap->chunks, > + struct panthor_heap_chunk, > + node); > + > + hdr->next = (prev_chunk->gpu_va & GENMASK_ULL(63, 12)) | > + (heap->chunk_size >> 12); > + } > + > + map.vaddr = hdr; > + drm_gem_vunmap_unlocked(&chunk->bo->base.base, &map); > + > + if (initial_chunk) > + list_add(&chunk->node, &heap->chunks); > + else > + list_add_tail(&chunk->node, &heap->chunks); I'm not sure I see the reason to do list_add_tail() here, changing it to always list_add() and updating the list_last_entry() to list_first_entry() in panthor_heap_grow() would seem to work (unless I've missed something). > + heap->chunk_count++; > + > + return 0; > + > +err_free_chunk: > + kfree(chunk); > + > + return ret; > +} > + > +static void panthor_free_heap_chunks(struct panthor_vm *vm, > + struct panthor_heap *heap) > +{ > + struct panthor_heap_chunk *chunk, *tmp; > + > + list_for_each_entry_safe(chunk, tmp, &heap->chunks, node) { > + panthor_free_heap_chunk(vm, chunk); > + } > + > + heap->chunk_count = 0; > +} > + > +static int panthor_alloc_heap_chunks(struct panthor_device *ptdev, > + struct panthor_vm *vm, > + struct panthor_heap *heap, > + u32 chunk_count) > +{ > + int ret; > + u32 i; > + > + for (i = 0; i < chunk_count; i++) { > + ret = panthor_alloc_heap_chunk(ptdev, vm, heap, true); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > +static int > +panthor_heap_destroy_locked(struct panthor_heap_pool *pool, u32 handle) > +{ > + struct panthor_heap *heap = NULL; No need to initialize heap to NULL. Steve > + > + heap = xa_erase(&pool->xa, handle); > + if (!heap) > + return -EINVAL; > + > + panthor_free_heap_chunks(pool->vm, heap); > + kfree(heap); > + return 0; > +} > + > +/** > + * panthor_heap_destroy() - Destroy a heap context > + * @pool: Pool this context belongs to. > + * @handle: Handle returned by panthor_heap_create(). > + */ > +int panthor_heap_destroy(struct panthor_heap_pool *pool, u32 handle) > +{ > + int ret; > + > + down_write(&pool->lock); > + ret = panthor_heap_destroy_locked(pool, handle); > + up_write(&pool->lock); > + > + return ret; > +} > + > +/** > + * panthor_heap_create() - Create a heap context > + * @pool: Pool to instantiate the heap context from. > + * @initial_chunk_count: Number of chunk allocated at initialization time. > + * Must be at least 1. > + * @chunk_size: The size of each chunk. Must be a power of two between 256k > + * and 2M. > + * @max_chunks: Maximum number of chunks that can be allocated. > + * @target_in_flight: Maximum number of in-flight render passes. > + * @heap_ctx_gpu_va: Pointer holding the GPU address of the allocated heap > + * context. > + * @first_chunk_gpu_va: Pointer holding the GPU address of the first chunk > + * assigned to the heap context. > + * > + * Return: a positive handle on success, a negative error otherwise. > + */ > +int panthor_heap_create(struct panthor_heap_pool *pool, > + u32 initial_chunk_count, > + u32 chunk_size, > + u32 max_chunks, > + u32 target_in_flight, > + u64 *heap_ctx_gpu_va, > + u64 *first_chunk_gpu_va) > +{ > + struct panthor_heap *heap; > + struct panthor_heap_gpu_ctx *gpu_ctx; > + struct panthor_heap_chunk *first_chunk; > + int ret = 0; > + u32 id; > + > + if (initial_chunk_count == 0) > + return -EINVAL; > + > + if (hweight32(chunk_size) != 1 || > + chunk_size < SZ_256K || chunk_size > SZ_2M) > + return -EINVAL; > + > + heap = kzalloc(sizeof(*heap), GFP_KERNEL); > + if (!heap) > + return -ENOMEM; > + > + INIT_LIST_HEAD(&heap->chunks); > + heap->chunk_size = chunk_size; > + heap->max_chunks = max_chunks; > + heap->target_in_flight = target_in_flight; > + > + down_write(&pool->lock); > + > + /* The pool has been destroyed, we can't create a new heap. */ > + if (!pool->vm) { > + ret = -EINVAL; > + goto out_unlock; > + } > + > + ret = xa_alloc(&pool->xa, &id, heap, XA_LIMIT(1, MAX_HEAPS_PER_POOL), GFP_KERNEL); > + if (ret) { > + kfree(heap); > + goto out_unlock; > + } > + > + gpu_ctx = &pool->gpu_contexts[id]; > + memset(gpu_ctx, 0, sizeof(*gpu_ctx)); > + > + ret = panthor_alloc_heap_chunks(pool->ptdev, pool->vm, heap, > + initial_chunk_count); > + if (ret) { > + panthor_heap_destroy_locked(pool, id); > + goto out_unlock; > + } > + > + *heap_ctx_gpu_va = pool->gpu_va + (sizeof(*pool->gpu_contexts) * id); > + > + first_chunk = list_first_entry(&heap->chunks, > + struct panthor_heap_chunk, > + node); > + *first_chunk_gpu_va = first_chunk->gpu_va; > + ret = id; > + > +out_unlock: > + up_write(&pool->lock); > + return ret; > +} > + > +/** > + * panthor_heap_grow() - Make a heap context grow. > + * @pool: The pool this heap belongs to. > + * @heap_gpu_va: The GPU address of the heap context. > + * @renderpasses_in_flight: Number of render passes currently in-flight. > + * @pending_frag_count: Number of fragment jobs waiting for execution/completion. > + */ > +int panthor_heap_grow(struct panthor_heap_pool *pool, > + u64 heap_gpu_va, > + u32 renderpasses_in_flight, > + u32 pending_frag_count, > + u64 *new_chunk_gpu_va) > +{ > + u64 heap_id = (heap_gpu_va - pool->gpu_va) / > + sizeof(struct panthor_heap_gpu_ctx); > + struct panthor_heap_chunk *chunk; > + struct panthor_heap *heap; > + int ret; > + > + down_read(&pool->lock); > + heap = xa_load(&pool->xa, heap_id); > + if (!heap) { > + ret = -EINVAL; > + goto out_unlock; > + } > + > + /* If we reached the target in-flight render passes, or if we > + * reached the maximum number of chunks, let the FW figure another way to > + * find some memory (wait for render passes to finish, or call the exception > + * handler provided by the userspace driver, if any). > + */ > + if (renderpasses_in_flight > heap->target_in_flight || > + (pending_frag_count > 0 && heap->chunk_count >= heap->max_chunks)) { > + ret = -EBUSY; > + goto out_unlock; > + } else if (heap->chunk_count >= heap->max_chunks) { > + ret = -ENOMEM; > + goto out_unlock; > + } > + > + ret = panthor_alloc_heap_chunk(pool->ptdev, pool->vm, heap, false); > + if (ret) > + goto out_unlock; > + > + chunk = list_last_entry(&heap->chunks, > + struct panthor_heap_chunk, > + node); > + *new_chunk_gpu_va = (chunk->gpu_va & GENMASK_ULL(63, 12)) | > + (heap->chunk_size >> 12); > + ret = 0; > + > +out_unlock: > + up_read(&pool->lock); > + return ret; > +} > + > +static void panthor_heap_pool_release(struct kref *refcount) > +{ > + struct panthor_heap_pool *pool = > + container_of(refcount, struct panthor_heap_pool, refcount); > + > + xa_destroy(&pool->xa); > + kfree(pool); > +} > + > +/** > + * panthor_heap_pool_put() - Release a heap pool reference > + * @pool: Pool to release the reference on. Can be NULL. > + */ > +void panthor_heap_pool_put(struct panthor_heap_pool *pool) > +{ > + if (pool) > + kref_put(&pool->refcount, panthor_heap_pool_release); > +} > + > +/** > + * panthor_heap_pool_get() - Get a heap pool reference > + * @pool: Pool to get the reference on. Can be NULL. > + * > + * Return: @pool. > + */ > +struct panthor_heap_pool * > +panthor_heap_pool_get(struct panthor_heap_pool *pool) > +{ > + if (pool) > + kref_get(&pool->refcount); > + > + return pool; > +} > + > +/** > + * panthor_heap_pool_create() - Create a heap pool > + * @ptdev: Device. > + * @vm: The VM this heap pool will be attached to. > + * > + * Heap pools might contain up to 128 heap contexts, and are per-VM. > + * > + * Return: A valid pointer on success, a negative error code otherwise. > + */ > +struct panthor_heap_pool * > +panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm) > +{ > + size_t bosize = ALIGN(MAX_HEAPS_PER_POOL * > + sizeof(struct panthor_heap_gpu_ctx), > + 4096); > + struct panthor_heap_pool *pool; > + int ret = 0; > + > + pool = kzalloc(sizeof(*pool), GFP_KERNEL); > + if (!pool) > + return ERR_PTR(-ENOMEM); > + > + /* We want a weak ref here: the heap pool belongs to the VM, so we're > + * sure that, as long as the heap pool exists, the VM exists too. > + */ > + pool->vm = vm; > + pool->ptdev = ptdev; > + init_rwsem(&pool->lock); > + xa_init_flags(&pool->xa, XA_FLAGS_ALLOC1); > + kref_init(&pool->refcount); > + > + pool->gpu_va = PANTHOR_GEM_ALLOC_VA; > + pool->bo = panthor_gem_create_and_map(ptdev, vm, bosize, > + DRM_PANTHOR_BO_NO_MMAP, > + DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC, > + &pool->gpu_va, > + (void *)&pool->gpu_contexts); > + if (IS_ERR(pool->bo)) { > + ret = PTR_ERR(pool->bo); > + goto err_destroy_pool; > + } > + > + return pool; > + > +err_destroy_pool: > + panthor_heap_pool_destroy(pool); > + return ERR_PTR(ret); > +} > + > +/** > + * panthor_heap_pool_destroy() - Destroy a heap pool. > + * @pool: Pool to destroy. > + * > + * This function destroys all heap contexts and their resources. Thus > + * preventing any use of the heap context or the chunk attached to them > + * after that point. > + * > + * If the GPU still has access to some heap contexts, a fault should be > + * triggered, which should flag the command stream groups using these > + * context as faulty. > + * > + * The heap pool object is only released when all references to this pool > + * are released. > + */ > +void panthor_heap_pool_destroy(struct panthor_heap_pool *pool) > +{ > + struct panthor_heap *heap; > + unsigned long i; > + > + down_write(&pool->lock); > + xa_for_each(&pool->xa, i, heap) > + drm_WARN_ON(&pool->ptdev->base, panthor_heap_destroy_locked(pool, i)); > + > + if (!IS_ERR_OR_NULL(pool->bo)) > + panthor_gem_unmap_and_put(pool->vm, pool->bo, pool->gpu_va, pool->gpu_contexts); > + > + /* Reflects the fact the pool has been destroyed. */ > + pool->vm = NULL; > + up_write(&pool->lock); > + > + panthor_heap_pool_put(pool); > +} > diff --git a/drivers/gpu/drm/panthor/panthor_heap.h b/drivers/gpu/drm/panthor/panthor_heap.h > new file mode 100644 > index 000000000000..ff6ebdcd412e > --- /dev/null > +++ b/drivers/gpu/drm/panthor/panthor_heap.h > @@ -0,0 +1,36 @@ > +/* SPDX-License-Identifier: GPL-2.0 or MIT */ > +/* Copyright 2023 Collabora ltd. */ > + > +#ifndef __PANTHOR_HEAP_H__ > +#define __PANTHOR_HEAP_H__ > + > +#include <linux/types.h> > + > +struct panthor_device; > +struct panthor_heap_pool; > +struct panthor_vm; > + > +int panthor_heap_create(struct panthor_heap_pool *pool, > + u32 initial_chunk_count, > + u32 chunk_size, > + u32 max_chunks, > + u32 target_in_flight, > + u64 *heap_ctx_gpu_va, > + u64 *first_chunk_gpu_va); > +int panthor_heap_destroy(struct panthor_heap_pool *pool, u32 handle); > + > +struct panthor_heap_pool * > +panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm); > +void panthor_heap_pool_destroy(struct panthor_heap_pool *pool); > + > +struct panthor_heap_pool * > +panthor_heap_pool_get(struct panthor_heap_pool *pool); > +void panthor_heap_pool_put(struct panthor_heap_pool *pool); > + > +int panthor_heap_grow(struct panthor_heap_pool *pool, > + u64 heap_gpu_va, > + u32 renderpasses_in_flight, > + u32 pending_frag_count, > + u64 *new_chunk_gpu_va); > + > +#endif
On Fri, 18 Aug 2023 15:39:03 +0100 Steven Price <steven.price@arm.com> wrote: > I'm not sure whether we should really be describing this structure in > the kernel. Beyond the size the kernel has no reason to be looking at > the internals and the spec does have a warning that the layout may change. Yeah, I guess I just wanted to have that documented somewhere, so people understand what this heap context is about. Was quite obscure to me before that. Anyway, I can move that to some mesa doc, that's not a big deal. > > Interestingly kbase also rounds this size up to ensure that it is at > least a cache line. Which I guess might be required if the CPU and GPU > are not coherent as we zero the context (from the CPU) before use. Makes sense.
diff --git a/drivers/gpu/drm/panthor/panthor_heap.c b/drivers/gpu/drm/panthor/panthor_heap.c new file mode 100644 index 000000000000..39244efc2eaa --- /dev/null +++ b/drivers/gpu/drm/panthor/panthor_heap.c @@ -0,0 +1,550 @@ +// SPDX-License-Identifier: GPL-2.0 or MIT +/* Copyright 2023 Collabora ltd. */ + +#include <linux/iosys-map.h> +#include <linux/rwsem.h> + +#include <drm/panthor_drm.h> + +#include "panthor_device.h" +#include "panthor_gem.h" +#include "panthor_heap.h" +#include "panthor_mmu.h" + +/** + * struct panthor_heap_gpu_ctx - Heap context used by the GPU/FW. + */ +struct panthor_heap_gpu_ctx { + /** + * @first_heap_chunk: GPU VA of the first free heap chunk. + * + * This forms a single-link list, where each chunk points to the + * next free chunk, and the last element points to NULL. + * + * Heap chunks get freed and returned to the heap context when fragment + * jobs picking data from those heap chunks complete. When this happens + * this field is updated to insert the heap chunks that were freed. + * + * When the tiler runs out of memory, it will first check if there + * are free heap chunks in the heap context, and pick those if there are. + * + * When there is no free heap chunks left, the FW will raise a TILER_OOM + * interrupt, letting the kernel driver allocate more heap chunks. + * + * If the heap context reached its heap chunk limit, the FW will wait + * for fragment jobs to consume some data and return chunks to the + * context. + * + * As a last resort, if there is no in-flight fragment jobs, the FW + * will try to execute the exception handler set on the command stream. + * This exception handler is expected to issue fragment job to store + * the partial rendering results, free up some heap chunks. + */ + u64 first_heap_chunk; + + /** @unused1: MBZ. */ + u32 unused1[2]; + + /** + * @vt_started_count: Number of vertex/tiling operations started. + * + * This is marking the beginning of a render pass, and is explicity + * flagged with a HEAP_OPERATION.vt_start instruction. If the render pass + * contains multiple vertex/tiler/IDVS jobs, this HEAP_OPERATION.vt_start + * is only called once. + */ + u32 vt_started_count; + + /** + * @vt_completed_count: Number of completed vertex/tiler jobs. + * + * This is marking the end of the geometry processing part of a render + * pass, and is explicity flagged by the user command stream with + * a HEAP_OPERATION.vt_completed instruction. If the render pass contains + * multiple vertex/tiler/IDVS jobs, this HEAP_OPERATION.vt_end + * instruction is only issued once. + */ + u32 vt_completed_count; + + /** @unused2: MBZ. */ + u32 unused2; + + /** + * @frag_completed_count: Number of completed fragment jobs. + * + * @vt_started_count - @frag_completed_count is the number of in-flight + * render targets that's used by the driver to determine if it's worth + * allocating new chunk or if we should instead wait for fragment jobs + * to complete. + * + * Fragment completion is explicitly flagged by the user command stream + * with a HEAP_OPERATION.frag_end or FINISH_FRAGMENT.frag_end instruction. + */ + u32 frag_completed_count; +}; + +/** + * struct panthor_heap_chunk_header - Heap chunk header + */ +struct panthor_heap_chunk_header { + /** + * @next: Next heap chunk in the list. + * + * This is a GPU VA. + */ + u64 next; + + /** @unknown: MBZ. */ + u32 unknown[14]; +}; + +/** + * struct panthor_heap_chunk - Structure used to keep track of allocated heap chunks. + */ +struct panthor_heap_chunk { + /** @node: Used to insert the heap chunk in panthor_heap::chunks. */ + struct list_head node; + + /** @bo: Buffer object backing the heap chunk. */ + struct panthor_gem_object *bo; + + /** @gpu_va: GPU address of this heap chunk. */ + u64 gpu_va; +}; + +/** + * struct panthor_heap - Structure used to manage tiler heap contexts. + */ +struct panthor_heap { + /** @chunks: List containing all heap chunks allocated so far. */ + struct list_head chunks; + + /** @chunk_size: Size of each chunk. */ + u32 chunk_size; + + /** @max_chunks: Maximum number of chunks. */ + u32 max_chunks; + + /** + * @target_in_flight: Number of in-flight render passes after which + * we'd let the FW wait for fragment job to finish instead of allocating new chunks. + */ + u32 target_in_flight; + + /** @chunk_count: Number of heap chunks currently allocated. */ + u32 chunk_count; +}; + +#define MAX_HEAPS_PER_POOL 128 + +/** + * struct panthor_heap_pool - Pool of heap contexts + * + * The pool is attached to a panthor_file and can't be shared across processes. + */ +struct panthor_heap_pool { + /** @refcount: Reference count. */ + struct kref refcount; + + /** @ptdev: Device. */ + struct panthor_device *ptdev; + + /** @vm: VM this pool is bound to. */ + struct panthor_vm *vm; + + /** @lock: Lock protecting access to @xa. */ + struct rw_semaphore lock; + + /** @xa: Array storing panthor_heap objects. */ + struct xarray xa; + + /** @bo: Buffer object containing the GPU heap contexts. */ + struct panthor_gem_object *bo; + + /** @gpu_contexts: Array of GPU heap contexts. */ + struct panthor_heap_gpu_ctx *gpu_contexts; + + /** @gpu_va: GPU address of the heap contexts. */ + u64 gpu_va; +}; + +static void panthor_free_heap_chunk(struct panthor_vm *vm, + struct panthor_heap_chunk *chunk) +{ + if (!chunk) + return; + + list_del(&chunk->node); + panthor_gem_unmap_and_put(vm, chunk->bo, chunk->gpu_va, NULL); + kfree(chunk); +} + +static int panthor_alloc_heap_chunk(struct panthor_device *ptdev, + struct panthor_vm *vm, + struct panthor_heap *heap, + bool initial_chunk) +{ + struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL); + struct panthor_heap_chunk *chunk; + struct panthor_heap_chunk_header *hdr; + int ret; + + chunk = kmalloc(sizeof(*chunk), GFP_KERNEL); + if (!chunk) + return -ENOMEM; + + chunk->gpu_va = PANTHOR_GEM_ALLOC_VA; + chunk->bo = panthor_gem_create_and_map(ptdev, vm, heap->chunk_size, + DRM_PANTHOR_BO_NO_MMAP, + DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC, + &chunk->gpu_va, + (void **)&hdr); + if (IS_ERR(chunk->bo)) { + ret = PTR_ERR(chunk->bo); + goto err_free_chunk; + } + + memset(hdr, 0, sizeof(*hdr)); + + if (initial_chunk && !list_empty(&heap->chunks)) { + struct panthor_heap_chunk *prev_chunk; + + prev_chunk = list_first_entry(&heap->chunks, + struct panthor_heap_chunk, + node); + + hdr->next = (prev_chunk->gpu_va & GENMASK_ULL(63, 12)) | + (heap->chunk_size >> 12); + } + + map.vaddr = hdr; + drm_gem_vunmap_unlocked(&chunk->bo->base.base, &map); + + if (initial_chunk) + list_add(&chunk->node, &heap->chunks); + else + list_add_tail(&chunk->node, &heap->chunks); + heap->chunk_count++; + + return 0; + +err_free_chunk: + kfree(chunk); + + return ret; +} + +static void panthor_free_heap_chunks(struct panthor_vm *vm, + struct panthor_heap *heap) +{ + struct panthor_heap_chunk *chunk, *tmp; + + list_for_each_entry_safe(chunk, tmp, &heap->chunks, node) { + panthor_free_heap_chunk(vm, chunk); + } + + heap->chunk_count = 0; +} + +static int panthor_alloc_heap_chunks(struct panthor_device *ptdev, + struct panthor_vm *vm, + struct panthor_heap *heap, + u32 chunk_count) +{ + int ret; + u32 i; + + for (i = 0; i < chunk_count; i++) { + ret = panthor_alloc_heap_chunk(ptdev, vm, heap, true); + if (ret) + return ret; + } + + return 0; +} + +static int +panthor_heap_destroy_locked(struct panthor_heap_pool *pool, u32 handle) +{ + struct panthor_heap *heap = NULL; + + heap = xa_erase(&pool->xa, handle); + if (!heap) + return -EINVAL; + + panthor_free_heap_chunks(pool->vm, heap); + kfree(heap); + return 0; +} + +/** + * panthor_heap_destroy() - Destroy a heap context + * @pool: Pool this context belongs to. + * @handle: Handle returned by panthor_heap_create(). + */ +int panthor_heap_destroy(struct panthor_heap_pool *pool, u32 handle) +{ + int ret; + + down_write(&pool->lock); + ret = panthor_heap_destroy_locked(pool, handle); + up_write(&pool->lock); + + return ret; +} + +/** + * panthor_heap_create() - Create a heap context + * @pool: Pool to instantiate the heap context from. + * @initial_chunk_count: Number of chunk allocated at initialization time. + * Must be at least 1. + * @chunk_size: The size of each chunk. Must be a power of two between 256k + * and 2M. + * @max_chunks: Maximum number of chunks that can be allocated. + * @target_in_flight: Maximum number of in-flight render passes. + * @heap_ctx_gpu_va: Pointer holding the GPU address of the allocated heap + * context. + * @first_chunk_gpu_va: Pointer holding the GPU address of the first chunk + * assigned to the heap context. + * + * Return: a positive handle on success, a negative error otherwise. + */ +int panthor_heap_create(struct panthor_heap_pool *pool, + u32 initial_chunk_count, + u32 chunk_size, + u32 max_chunks, + u32 target_in_flight, + u64 *heap_ctx_gpu_va, + u64 *first_chunk_gpu_va) +{ + struct panthor_heap *heap; + struct panthor_heap_gpu_ctx *gpu_ctx; + struct panthor_heap_chunk *first_chunk; + int ret = 0; + u32 id; + + if (initial_chunk_count == 0) + return -EINVAL; + + if (hweight32(chunk_size) != 1 || + chunk_size < SZ_256K || chunk_size > SZ_2M) + return -EINVAL; + + heap = kzalloc(sizeof(*heap), GFP_KERNEL); + if (!heap) + return -ENOMEM; + + INIT_LIST_HEAD(&heap->chunks); + heap->chunk_size = chunk_size; + heap->max_chunks = max_chunks; + heap->target_in_flight = target_in_flight; + + down_write(&pool->lock); + + /* The pool has been destroyed, we can't create a new heap. */ + if (!pool->vm) { + ret = -EINVAL; + goto out_unlock; + } + + ret = xa_alloc(&pool->xa, &id, heap, XA_LIMIT(1, MAX_HEAPS_PER_POOL), GFP_KERNEL); + if (ret) { + kfree(heap); + goto out_unlock; + } + + gpu_ctx = &pool->gpu_contexts[id]; + memset(gpu_ctx, 0, sizeof(*gpu_ctx)); + + ret = panthor_alloc_heap_chunks(pool->ptdev, pool->vm, heap, + initial_chunk_count); + if (ret) { + panthor_heap_destroy_locked(pool, id); + goto out_unlock; + } + + *heap_ctx_gpu_va = pool->gpu_va + (sizeof(*pool->gpu_contexts) * id); + + first_chunk = list_first_entry(&heap->chunks, + struct panthor_heap_chunk, + node); + *first_chunk_gpu_va = first_chunk->gpu_va; + ret = id; + +out_unlock: + up_write(&pool->lock); + return ret; +} + +/** + * panthor_heap_grow() - Make a heap context grow. + * @pool: The pool this heap belongs to. + * @heap_gpu_va: The GPU address of the heap context. + * @renderpasses_in_flight: Number of render passes currently in-flight. + * @pending_frag_count: Number of fragment jobs waiting for execution/completion. + */ +int panthor_heap_grow(struct panthor_heap_pool *pool, + u64 heap_gpu_va, + u32 renderpasses_in_flight, + u32 pending_frag_count, + u64 *new_chunk_gpu_va) +{ + u64 heap_id = (heap_gpu_va - pool->gpu_va) / + sizeof(struct panthor_heap_gpu_ctx); + struct panthor_heap_chunk *chunk; + struct panthor_heap *heap; + int ret; + + down_read(&pool->lock); + heap = xa_load(&pool->xa, heap_id); + if (!heap) { + ret = -EINVAL; + goto out_unlock; + } + + /* If we reached the target in-flight render passes, or if we + * reached the maximum number of chunks, let the FW figure another way to + * find some memory (wait for render passes to finish, or call the exception + * handler provided by the userspace driver, if any). + */ + if (renderpasses_in_flight > heap->target_in_flight || + (pending_frag_count > 0 && heap->chunk_count >= heap->max_chunks)) { + ret = -EBUSY; + goto out_unlock; + } else if (heap->chunk_count >= heap->max_chunks) { + ret = -ENOMEM; + goto out_unlock; + } + + ret = panthor_alloc_heap_chunk(pool->ptdev, pool->vm, heap, false); + if (ret) + goto out_unlock; + + chunk = list_last_entry(&heap->chunks, + struct panthor_heap_chunk, + node); + *new_chunk_gpu_va = (chunk->gpu_va & GENMASK_ULL(63, 12)) | + (heap->chunk_size >> 12); + ret = 0; + +out_unlock: + up_read(&pool->lock); + return ret; +} + +static void panthor_heap_pool_release(struct kref *refcount) +{ + struct panthor_heap_pool *pool = + container_of(refcount, struct panthor_heap_pool, refcount); + + xa_destroy(&pool->xa); + kfree(pool); +} + +/** + * panthor_heap_pool_put() - Release a heap pool reference + * @pool: Pool to release the reference on. Can be NULL. + */ +void panthor_heap_pool_put(struct panthor_heap_pool *pool) +{ + if (pool) + kref_put(&pool->refcount, panthor_heap_pool_release); +} + +/** + * panthor_heap_pool_get() - Get a heap pool reference + * @pool: Pool to get the reference on. Can be NULL. + * + * Return: @pool. + */ +struct panthor_heap_pool * +panthor_heap_pool_get(struct panthor_heap_pool *pool) +{ + if (pool) + kref_get(&pool->refcount); + + return pool; +} + +/** + * panthor_heap_pool_create() - Create a heap pool + * @ptdev: Device. + * @vm: The VM this heap pool will be attached to. + * + * Heap pools might contain up to 128 heap contexts, and are per-VM. + * + * Return: A valid pointer on success, a negative error code otherwise. + */ +struct panthor_heap_pool * +panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm) +{ + size_t bosize = ALIGN(MAX_HEAPS_PER_POOL * + sizeof(struct panthor_heap_gpu_ctx), + 4096); + struct panthor_heap_pool *pool; + int ret = 0; + + pool = kzalloc(sizeof(*pool), GFP_KERNEL); + if (!pool) + return ERR_PTR(-ENOMEM); + + /* We want a weak ref here: the heap pool belongs to the VM, so we're + * sure that, as long as the heap pool exists, the VM exists too. + */ + pool->vm = vm; + pool->ptdev = ptdev; + init_rwsem(&pool->lock); + xa_init_flags(&pool->xa, XA_FLAGS_ALLOC1); + kref_init(&pool->refcount); + + pool->gpu_va = PANTHOR_GEM_ALLOC_VA; + pool->bo = panthor_gem_create_and_map(ptdev, vm, bosize, + DRM_PANTHOR_BO_NO_MMAP, + DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC, + &pool->gpu_va, + (void *)&pool->gpu_contexts); + if (IS_ERR(pool->bo)) { + ret = PTR_ERR(pool->bo); + goto err_destroy_pool; + } + + return pool; + +err_destroy_pool: + panthor_heap_pool_destroy(pool); + return ERR_PTR(ret); +} + +/** + * panthor_heap_pool_destroy() - Destroy a heap pool. + * @pool: Pool to destroy. + * + * This function destroys all heap contexts and their resources. Thus + * preventing any use of the heap context or the chunk attached to them + * after that point. + * + * If the GPU still has access to some heap contexts, a fault should be + * triggered, which should flag the command stream groups using these + * context as faulty. + * + * The heap pool object is only released when all references to this pool + * are released. + */ +void panthor_heap_pool_destroy(struct panthor_heap_pool *pool) +{ + struct panthor_heap *heap; + unsigned long i; + + down_write(&pool->lock); + xa_for_each(&pool->xa, i, heap) + drm_WARN_ON(&pool->ptdev->base, panthor_heap_destroy_locked(pool, i)); + + if (!IS_ERR_OR_NULL(pool->bo)) + panthor_gem_unmap_and_put(pool->vm, pool->bo, pool->gpu_va, pool->gpu_contexts); + + /* Reflects the fact the pool has been destroyed. */ + pool->vm = NULL; + up_write(&pool->lock); + + panthor_heap_pool_put(pool); +} diff --git a/drivers/gpu/drm/panthor/panthor_heap.h b/drivers/gpu/drm/panthor/panthor_heap.h new file mode 100644 index 000000000000..ff6ebdcd412e --- /dev/null +++ b/drivers/gpu/drm/panthor/panthor_heap.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ +/* Copyright 2023 Collabora ltd. */ + +#ifndef __PANTHOR_HEAP_H__ +#define __PANTHOR_HEAP_H__ + +#include <linux/types.h> + +struct panthor_device; +struct panthor_heap_pool; +struct panthor_vm; + +int panthor_heap_create(struct panthor_heap_pool *pool, + u32 initial_chunk_count, + u32 chunk_size, + u32 max_chunks, + u32 target_in_flight, + u64 *heap_ctx_gpu_va, + u64 *first_chunk_gpu_va); +int panthor_heap_destroy(struct panthor_heap_pool *pool, u32 handle); + +struct panthor_heap_pool * +panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm); +void panthor_heap_pool_destroy(struct panthor_heap_pool *pool); + +struct panthor_heap_pool * +panthor_heap_pool_get(struct panthor_heap_pool *pool); +void panthor_heap_pool_put(struct panthor_heap_pool *pool); + +int panthor_heap_grow(struct panthor_heap_pool *pool, + u64 heap_gpu_va, + u32 renderpasses_in_flight, + u32 pending_frag_count, + u64 *new_chunk_gpu_va); + +#endif
Tiler heap growing requires some kernel driver involvement: when the tiler runs out of heap memory, it will raise an exception which is either directly handled by the firmware if some free heap chunks are available in the heap context, or passed back to the kernel otherwise. The heap helpers will be used by the scheduler logic to allocate more heap chunks to a heap context, when such a situation happens. Heap context creation is explicitly requested by userspace (using the TILER_HEAP_CREATE ioctl), and the returned context is attached to a queue through some command stream instruction. All the kernel does is keep the list of heap chunks allocated to a context, so they can be freed when TILER_HEAP_DESTROY is called, or extended when the FW requests a new chunk. v2: - Rename the driver (pancsf -> panthor) - Split the driver addition commit - Document the code - Fix various bugs Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> --- drivers/gpu/drm/panthor/panthor_heap.c | 550 +++++++++++++++++++++++++ drivers/gpu/drm/panthor/panthor_heap.h | 36 ++ 2 files changed, 586 insertions(+) create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h