drm/ttm/nouveau: consolidate slowpath reserve
Subsystems (4)
Dave Airlie
maintainerPATCH 1/1 drm/ttm/nouveau: consolidate slowpath reserve
From: Dave Airlie <[email protected]>
The WARN_ON in the non-underscore path is off questionable value (can we drop it from the non-slowpath?). At least for nouveau where it's just looked up the gem object we know the ttm object has a reference always so we can skip the check.
It's probably nouveau could use execbut utils here at some point but for now align the code between them to always call the __ versions, and remove the non underscored version.
--- drivers/gpu/drm/nouveau/nouveau_gem.c | 6 ++--- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 10 +-------- include/drm/ttm/ttm_bo_driver.h | 31 +++++++++++--------------- 3 files changed, 17 insertions(+), 30 deletions(-)
drivers/gpu/drm/nouveau/nouveau_gem.c +3 -3
@@ -422,15 +422,15 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,break ; } - ret =ttm_bo_reserve (&nvbo->bo, true, false, &op->ticket); + ret =__ttm_bo_reserve (&nvbo->bo, true, false, &op->ticket);if (ret) {list_splice_tail_init (&vram_list, &op->list);list_splice_tail_init (&gart_list, &op->list);list_splice_tail_init (&both_list, &op->list);validate_fini_no_ticket (op, chan,NULL ,NULL );if (unlikely (ret == -EDEADLK )) { - ret =ttm_bo_reserve_slowpath (&nvbo->bo, true, - &op->ticket); + ret =__ttm_bo_reserve_slowpath (&nvbo->bo, true, + &op->ticket);if (!ret) res_bo = nvbo; }
drivers/gpu/drm/ttm/ttm_execbuf_util.c +1 -9
@@ -119,13 +119,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,ttm_eu_backoff_reservation_reverse (list, entry);if (ret == -EDEADLK ) { -if (intr) { - ret =dma_resv_lock_slow_interruptible (bo->base.resv, - ticket); - }else { -dma_resv_lock_slow (bo->base.resv, ticket); - ret =0 ; - } + ret =__ttm_bo_reserve_slowpath (bo, intr, ticket); }if (!ret && entry->num_shared)
@@ -133,8 +127,6 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket, entry->num_shared);if (unlikely (ret !=0 )) { -if (ret == -EINTR ) - ret = -ERESTARTSYS ;if (ticket) {ww_acquire_done (ticket);ww_acquire_fini (ticket);
include/drm/ttm/ttm_bo_driver.h +13 -18
@@ -695,7 +695,7 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo, }/** -* ttm_bo_reserve_slowpath: +* __ttm_bo_reserve_slowpath: * @bo: A pointer to a struct ttm_buffer_object. * @interruptible: Sleep interruptible if waiting. * @sequence: Set (@bo)->sequence to this value after lock
@@ -704,24 +704,19 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,* from all our other reservations. Because there are no other reservations * held by us, this function cannot deadlock any more. */ -static inline int ttm_bo_reserve_slowpath (struct ttm_buffer_object *bo, -bool interruptible, -struct ww_acquire_ctx *ticket) +static inline int __ttm_bo_reserve_slowpath (struct ttm_buffer_object *bo, +bool interruptible, +struct ww_acquire_ctx *ticket) { -int ret =0 ; - -WARN_ON (!kref_read (&bo->kref)); - -if (interruptible) - ret =dma_resv_lock_slow_interruptible (bo->base.resv, - ticket); -else -dma_resv_lock_slow (bo->base.resv, ticket); - -if (ret == -EINTR ) - ret = -ERESTARTSYS ; - -return ret; +if (interruptible) { +int ret =dma_resv_lock_slow_interruptible (bo->base.resv, + ticket); +if (ret == -EINTR ) + ret = -ERESTARTSYS ; +return ret; + } +dma_resv_lock_slow (bo->base.resv, ticket); +return 0 ; }/**
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 28.07.20 um 08:24 schrieb Dave Airlie:
Quoted 6 lines
From: Dave Airlie <[email protected]>
The
WARN_ONin the non-underscore path is off questionable value (can we drop it from the non-slowpath?). At least for nouveau where it's just looked up the gem object we know the ttm object has a reference always so we can skip the check.
Yeah, agreed. Wanted to look into removing that for quite some time as well.
Quoted 3 lines
It's probably nouveau could use execbut utils here at some point but for now align the code between them to always call the __ versions, and remove the non underscored version.
Can we do it the other way around and remove all uses of the __ versions of the functions instead and then merge the __ version into the normal one without the WARN_ON()?
Christian.
Quoted 99 lines
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/nouveau/nouveau_gem.c | 6 ++--- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 10 +-------- include/drm/ttm/ttm_bo_driver.h | 31 +++++++++++--------------- 3 files changed, 17 insertions(+), 30 deletions(-)drivers/gpu/drm/nouveau/nouveau_gem.c +3
-3@@ -422,15 +422,15 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,break ; } - ret =ttm_bo_reserve (&nvbo->bo, true, false, &op->ticket); + ret =__ttm_bo_reserve (&nvbo->bo, true, false, &op->ticket);if (ret) {list_splice_tail_init (&vram_list, &op->list);list_splice_tail_init (&gart_list, &op->list);list_splice_tail_init (&both_list, &op->list);validate_fini_no_ticket (op, chan,NULL ,NULL );if (unlikely (ret == -EDEADLK )) { - ret =ttm_bo_reserve_slowpath (&nvbo->bo, true, - &op->ticket); + ret =__ttm_bo_reserve_slowpath (&nvbo->bo, true, + &op->ticket);if (!ret) res_bo = nvbo; }drivers/gpu/drm/ttm/ttm_execbuf_util.c +1
-9@@ -119,13 +119,7 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,ttm_eu_backoff_reservation_reverse (list, entry);if (ret == -EDEADLK ) { -if (intr) { - ret =dma_resv_lock_slow_interruptible (bo->base.resv, - ticket); - }else { -dma_resv_lock_slow (bo->base.resv, ticket); - ret =0 ; - } + ret =__ttm_bo_reserve_slowpath (bo, intr, ticket); }if (!ret && entry->num_shared)@@ -133,8 +127,6 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket, entry->num_shared);if (unlikely (ret !=0 )) { -if (ret == -EINTR ) - ret = -ERESTARTSYS ;if (ticket) {ww_acquire_done (ticket);ww_acquire_fini (ticket);include/drm/ttm/ttm_bo_driver.h +6
-18@@ -695,7 +695,7 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo, }/** -* ttm_bo_reserve_slowpath: +* __ttm_bo_reserve_slowpath: * @bo: A pointer to a struct ttm_buffer_object. * @interruptible: Sleep interruptible if waiting. * @sequence: Set (@bo)->sequence to this value after lock @@ -704,24 +704,19 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,* from all our other reservations. Because there are no other reservations * held by us, this function cannot deadlock any more. */ -static inline int ttm_bo_reserve_slowpath (struct ttm_buffer_object *bo, -bool interruptible, -struct ww_acquire_ctx *ticket) +static inline int __ttm_bo_reserve_slowpath (struct ttm_buffer_object *bo, +bool interruptible, +struct ww_acquire_ctx *ticket) { -int ret =0 ; - -WARN_ON (!kref_read (&bo->kref)); - -if (interruptible) - ret =dma_resv_lock_slow_interruptible (bo->base.resv, - ticket); -else -dma_resv_lock_slow (bo->base.resv, ticket); - -if (ret == -EINTR ) - ret = -ERESTARTSYS ; - -return ret; +if (interruptible) { + int ret = dma_resv_lock_slow_interruptible(bo->base.resv,
include/drm/ttm/ttm_bo_driver.h static inline int ttm_bo_reserve(struct ttm_buffer_object *bo, · line 722
Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7
-0+ ticket); +if (ret == -EINTR ) + ret = -ERESTARTSYS ; +return ret; + } +dma_resv_lock_slow (bo->base.resv, ticket); +return 0 ; }/**
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerQuoted 11 lines · Christian König
Am 28.07.20 um 08:24 schrieb Dave Airlie:
Quoted 6 lines
From: Dave Airlie <[email protected]>
The
WARN_ONin the non-underscore path is off questionable value (can we drop it from the non-slowpath?). At least for nouveau where it's just looked up the gem object we know the ttm object has a reference always so we can skip the check.Yeah, agreed. Wanted to look into removing that for quite some time as well.
Quoted 7 lines
Quoted 3 lines
It's probably nouveau could use execbut utils here at some point but for now align the code between them to always call the __ versions, and remove the non underscored version.
Can we do it the other way around and remove all uses of the __ versions of the functions instead and then merge the __ version into the normal one without the
WARN_ON()?
Yes sounds like a plan, I just wasn't sure the WARN_ON had value, bit since you agree is dubious at best, I'm happy to rip it out.
Will send a v2 tomorrow.
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel