* [PATCH -fixes] ttm: Don't return the bo reserved on error path
@ 2011-11-21 12:05 Thomas Hellstrom
2011-11-22 1:00 ` Jerome Glisse
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Hellstrom @ 2011-11-21 12:05 UTC (permalink / raw)
To: airlied; +Cc: Thomas Hellstrom, dri-devel
An unlikely race could case a bo to be returned reserved on an error path.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 617b646..0bb0f5f 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -574,10 +574,16 @@ retry:
return ret;
spin_lock(&glob->lru_lock);
+
+ if (unlikely(list_empty(&bo->ddestroy))) {
+ spin_unlock(&glob->lru_lock);
+ return 0;
+ }
+
ret = ttm_bo_reserve_locked(bo, interruptible,
no_wait_reserve, false, 0);
- if (unlikely(ret != 0) || list_empty(&bo->ddestroy)) {
+ if (unlikely(ret != 0)) {
spin_unlock(&glob->lru_lock);
return ret;
}
--
1.7.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -fixes] ttm: Don't return the bo reserved on error path
2011-11-21 12:05 [PATCH -fixes] ttm: Don't return the bo reserved on error path Thomas Hellstrom
@ 2011-11-22 1:00 ` Jerome Glisse
0 siblings, 0 replies; 2+ messages in thread
From: Jerome Glisse @ 2011-11-22 1:00 UTC (permalink / raw)
To: Thomas Hellstrom; +Cc: dri-devel
On Mon, Nov 21, 2011 at 01:05:02PM +0100, Thomas Hellstrom wrote:
> An unlikely race could case a bo to be returned reserved on an error path.
>
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
> ---
> drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 617b646..0bb0f5f 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -574,10 +574,16 @@ retry:
> return ret;
>
> spin_lock(&glob->lru_lock);
> +
> + if (unlikely(list_empty(&bo->ddestroy))) {
> + spin_unlock(&glob->lru_lock);
> + return 0;
> + }
> +
> ret = ttm_bo_reserve_locked(bo, interruptible,
> no_wait_reserve, false, 0);
>
> - if (unlikely(ret != 0) || list_empty(&bo->ddestroy)) {
> + if (unlikely(ret != 0)) {
> spin_unlock(&glob->lru_lock);
> return ret;
> }
> --
> 1.7.4.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-22 0:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-21 12:05 [PATCH -fixes] ttm: Don't return the bo reserved on error path Thomas Hellstrom
2011-11-22 1:00 ` Jerome Glisse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox