drm/ttm: Add a bo list reserve fastpath
Subsystems (3)
PATCH 1/1 drm/ttm: Add a bo list reserve fastpath
Makes it possible to reserve a list of buffer objects with a single spin lock / unlock if there is no contention.
Should improve cpu usage on SMP kernels.
Signed-off-by Thomas Hellstrom <[email protected]>
--- drivers/gpu/drm/ttm/ttm_bo.c | 32 +++++----- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 117 +++++++++++++++++++++++++++++--- include/drm/ttm/ttm_bo_api.h | 38 ++++++++++ include/drm/ttm/ttm_bo_driver.h | 14 ++++ include/drm/ttm/ttm_execbuf_util.h | 6 ++- 5 files changed, 180 insertions(+), 27 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +16 -16
@@ -169,7 +169,7 @@ int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible) }EXPORT_SYMBOL (ttm_bo_wait_unreserved); -static void ttm_bo_add_to_lru (struct ttm_buffer_object *bo) +void ttm_bo_add_to_lru (struct ttm_buffer_object *bo) {struct ttm_bo_device *bdev = bo->bdev;struct ttm_mem_type_manager *man;
@@ -191,11 +191,7 @@ static void ttm_bo_add_to_lru(struct ttm_buffer_object *bo) } } -/** -* Call with the lru_lock held. -*/ - -static int ttm_bo_del_from_lru (struct ttm_buffer_object *bo) +int ttm_bo_del_from_lru (struct ttm_buffer_object *bo) {int put_count =0 ;
@@ -267,6 +263,15 @@ static void ttm_bo_ref_bug(struct kref *list_kref)BUG (); } +void ttm_bo_list_ref_sub (struct ttm_buffer_object *bo,int count, +bool never_free) +{ +while (count--) +kref_put (&bo->list_kref, + (never_free || (count >=0 )) ? ttm_bo_ref_bug : + ttm_bo_release_list); +} +int ttm_bo_reserve (struct ttm_buffer_object *bo,bool interruptible,bool no_wait,bool use_sequence,uint32_t sequence)
@@ -282,8 +287,7 @@ int ttm_bo_reserve(struct ttm_buffer_object *bo, put_count =ttm_bo_del_from_lru (bo);spin_unlock (&glob->lru_lock); -while (put_count--) -kref_put (&bo->list_kref, ttm_bo_ref_bug); +ttm_bo_list_ref_sub (bo, put_count, true);return ret; }
@@ -496,8 +500,7 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)spin_unlock (&glob->lru_lock);ttm_bo_cleanup_memtype_use (bo); -while (put_count--) -kref_put (&bo->list_kref, ttm_bo_ref_bug); +ttm_bo_list_ref_sub (bo, put_count, true);return ; }else {
@@ -580,8 +583,7 @@ retry:spin_unlock (&glob->lru_lock);ttm_bo_cleanup_memtype_use (bo); -while (put_count--) -kref_put (&bo->list_kref, ttm_bo_ref_bug); +ttm_bo_list_ref_sub (bo, put_count, true);return 0 ; }
@@ -802,8 +804,7 @@ retry:BUG_ON (ret !=0 ); -while (put_count--) -kref_put (&bo->list_kref, ttm_bo_ref_bug); +ttm_bo_list_ref_sub (bo, put_count, true); ret =ttm_bo_evict (bo, interruptible, no_wait_reserve, no_wait_gpu);ttm_bo_unreserve (bo);
@@ -1783,8 +1784,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) put_count =ttm_bo_del_from_lru (bo);spin_unlock (&glob->lru_lock); -while (put_count--) -kref_put (&bo->list_kref, ttm_bo_ref_bug); +ttm_bo_list_ref_sub (bo, put_count, true);/** * Wait for GPU, then move to system cached.
drivers/gpu/drm/ttm/ttm_execbuf_util.c +107 -10
148 lines not on this page · raw message
include/drm/ttm/ttm_bo_api.h +38 -0
@@ -364,6 +364,44 @@ extern int ttm_bo_validate(struct ttm_buffer_object *bo,*/ extern void ttm_bo_unref (struct ttm_buffer_object **bo); + +/** +* ttm_bo_list_ref_sub +* +* @bo: The buffer object. +* @count: The number of references with which to decrease @bo::list_kref; +* @never_free: The refcount should not reach zero with this operation. +* +* Release @count lru list references to this buffer object. +*/ +extern void ttm_bo_list_ref_sub (struct ttm_buffer_object *bo,int count, +bool never_free); + +/** +* ttm_bo_add_to_lru +* +* @bo: The buffer object. +* +* Add this bo to the relevant mem type lru and, if it's backed by +* system pages (ttms) to the swap list. +* This function must be called with struct ttm_bo_global::lru_lock held, and +* is typically called immediately prior to unreserving a bo. +*/ +extern void ttm_bo_add_to_lru (struct ttm_buffer_object *bo); + +/** +* ttm_bo_del_from_lru +* +* @bo: The buffer object. +* +* Remove this bo from all lru lists used to lookup and reserve an object. +* This function must be called with struct ttm_bo_global::lru_lock held, +* and is usually called just immediately after the bo has been reserved to +* avoid recursive reservation from lru lists. +*/ +extern int ttm_bo_del_from_lru (struct ttm_buffer_object *bo); + +/** * ttm_bo_lock_delayed_workqueue *
include/drm/ttm/ttm_bo_driver.h +14 -0
@@ -864,6 +864,20 @@ extern int ttm_bo_reserve(struct ttm_buffer_object *bo,bool interruptible, bool no_wait, bool use_sequence, uint32_t sequence); + +/** +* ttm_bo_reserve_locked: +* +* Similar to ttm_bo_reserve, but must be called with the glob::lru_lock +* spinlock held, and will not remove reserved buffers from the lru lists. +* The function may release the LRU spinlock if it needs to sleep. +*/ + +extern int ttm_bo_reserve_locked (struct ttm_buffer_object *bo, +bool interruptible, +bool no_wait,bool use_sequence, +uint32_t sequence); +/** * ttm_bo_unreserve *
include/drm/ttm/ttm_execbuf_util.h +5 -1
@@ -41,7 +41,9 @@* @bo: refcounted buffer object pointer. * @new_sync_obj_arg: New sync_obj_arg for @bo, to be used once * adding a new sync object. -* @reservied: Indicates whether @bo has been reserved for validation. +* @reserved: Indicates whether @bo has been reserved for validation. +* @removed: Indicates whether @bo has been removed from lru lists. +* @put_count: Number of outstanding references on bo::list_kref. */ struct ttm_validate_buffer {
@@ -49,6 +51,8 @@ struct ttm_validate_buffer {struct ttm_buffer_object *bo;void *new_sync_obj_arg;bool reserved; +bool removed; +int put_count; };/**
Signature · 1 line
1.6.2.5