Commit 0ae6d7bc authored by Daniel Vetter's avatar Daniel Vetter

drm/nouveau: try to protect nbo->pin_refcount

... by moving the bo_pin/bo_unpin manipulation of the pin_refcount
under the protection of the ttm reservation lock. pin/unpin seems
to get called from all over the place, so atm this is completely racy.

After this patch there are only a few places in cleanup functions
left which access ->pin_refcount without locking. But I'm hoping that
those are safe and some other code invariant guarantees that this
won't blow up.

In any case, I only need to fix up pin/unpin to make ->pageflip work
safely, so let's keep it at that.

Add a comment to the header to explain the new locking rule.
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 59ad1465
...@@ -300,17 +300,18 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) ...@@ -300,17 +300,18 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
struct ttm_buffer_object *bo = &nvbo->bo; struct ttm_buffer_object *bo = &nvbo->bo;
int ret; int ret;
ret = ttm_bo_reserve(bo, false, false, false, 0);
if (ret)
goto out;
if (nvbo->pin_refcnt && !(memtype & (1 << bo->mem.mem_type))) { if (nvbo->pin_refcnt && !(memtype & (1 << bo->mem.mem_type))) {
NV_ERROR(drm, "bo %p pinned elsewhere: 0x%08x vs 0x%08x\n", bo, NV_ERROR(drm, "bo %p pinned elsewhere: 0x%08x vs 0x%08x\n", bo,
1 << bo->mem.mem_type, memtype); 1 << bo->mem.mem_type, memtype);
return -EINVAL; ret = -EINVAL;
goto out;
} }
if (nvbo->pin_refcnt++) if (nvbo->pin_refcnt++)
return 0;
ret = ttm_bo_reserve(bo, false, false, false, 0);
if (ret)
goto out; goto out;
nouveau_bo_placement_set(nvbo, memtype, 0); nouveau_bo_placement_set(nvbo, memtype, 0);
...@@ -328,10 +329,8 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) ...@@ -328,10 +329,8 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
break; break;
} }
} }
ttm_bo_unreserve(bo);
out: out:
if (unlikely(ret)) ttm_bo_unreserve(bo);
nvbo->pin_refcnt--;
return ret; return ret;
} }
...@@ -342,13 +341,13 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) ...@@ -342,13 +341,13 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo)
struct ttm_buffer_object *bo = &nvbo->bo; struct ttm_buffer_object *bo = &nvbo->bo;
int ret; int ret;
if (--nvbo->pin_refcnt)
return 0;
ret = ttm_bo_reserve(bo, false, false, false, 0); ret = ttm_bo_reserve(bo, false, false, false, 0);
if (ret) if (ret)
return ret; return ret;
if (--nvbo->pin_refcnt)
goto out;
nouveau_bo_placement_set(nvbo, bo->mem.placement, 0); nouveau_bo_placement_set(nvbo, bo->mem.placement, 0);
ret = nouveau_bo_validate(nvbo, false, false); ret = nouveau_bo_validate(nvbo, false, false);
...@@ -365,6 +364,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) ...@@ -365,6 +364,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo)
} }
} }
out:
ttm_bo_unreserve(bo); ttm_bo_unreserve(bo);
return ret; return ret;
} }
......
...@@ -28,6 +28,8 @@ struct nouveau_bo { ...@@ -28,6 +28,8 @@ struct nouveau_bo {
struct nouveau_drm_tile *tile; struct nouveau_drm_tile *tile;
struct drm_gem_object *gem; struct drm_gem_object *gem;
/* protect by the ttm reservation lock */
int pin_refcnt; int pin_refcnt;
struct ttm_bo_kmap_obj dma_buf_vmap; struct ttm_bo_kmap_obj dma_buf_vmap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment