From: Thomas Hellström <thomas.hellstrom@xxxxxxxxx>
We may need to create hwsp objects at request treate time in the
middle of a ww transaction. Since we typically don't have easy
access to the ww_acquire_context, lock the hwsp objects isolated
for pinning/mapping only at create time.
For later binding to the ggtt, make sure lockdep allows
binding of already pinned pages to the ggtt without the
underlying object lock held.
Signed-off-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxx>
Cc: Matthew Auld <matthew.auld@xxxxxxxxx>
---
drivers/gpu/drm/i915/gt/intel_timeline.c | 58 ++++++++++++++----------
drivers/gpu/drm/i915/i915_vma.c | 13 ++++--
2 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index 512afacd2bdc..a58228d1cd3b 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -24,25 +24,43 @@ struct intel_timeline_hwsp {
struct list_head free_link;
struct i915_vma *vma;
u64 free_bitmap;
+ void *vaddr;
};
-static struct i915_vma *__hwsp_alloc(struct intel_gt *gt)
+static int __hwsp_alloc(struct intel_gt *gt, struct intel_timeline_hwsp *hwsp)
{
struct drm_i915_private *i915 = gt->i915;
struct drm_i915_gem_object *obj;
- struct i915_vma *vma;
+ int ret;
obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
if (IS_ERR(obj))
- return ERR_CAST(obj);
+ return PTR_ERR(obj);
+ i915_gem_object_lock_isolated(obj);
i915_gem_object_set_cache_coherency(obj, I915_CACHE_LLC);
- vma = i915_vma_instance(obj, >->ggtt->vm, NULL);
- if (IS_ERR(vma))
- i915_gem_object_put(obj);
+ hwsp->vma = i915_vma_instance(obj, >->ggtt->vm, NULL);
+ if (IS_ERR(hwsp->vma)) {
+ ret = PTR_ERR(hwsp->vma);
+ goto out_unlock;
+ }
+
+ /* Pin early so we can call i915_ggtt_pin unlocked. */
+ hwsp->vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
+ if (IS_ERR(hwsp->vaddr)) {
+ ret = PTR_ERR(hwsp->vaddr);
+ goto out_unlock;
+ }
+
+ i915_gem_object_unlock(obj);
+ return 0;
+
+out_unlock:
+ i915_gem_object_unlock(obj);
+ i915_gem_object_put(obj);
- return vma;
+ return ret;
}
static struct i915_vma *
@@ -59,7 +77,7 @@ hwsp_alloc(struct intel_timeline *timeline, unsigned int *cacheline)
hwsp = list_first_entry_or_null(>->hwsp_free_list,
typeof(*hwsp), free_link);
if (!hwsp) {
- struct i915_vma *vma;
+ int ret;
spin_unlock_irq(>->hwsp_lock);
@@ -67,17 +85,16 @@ hwsp_alloc(struct intel_timeline *timeline, unsigned int *cacheline)
if (!hwsp)
return ERR_PTR(-ENOMEM);
- vma = __hwsp_alloc(timeline->gt);
- if (IS_ERR(vma)) {
+ ret = __hwsp_alloc(timeline->gt, hwsp);
+ if (ret) {
kfree(hwsp);
- return vma;
+ return ERR_PTR(ret);
}
GT_TRACE(timeline->gt, "new HWSP allocated\n");
- vma->private = hwsp;
+ hwsp->vma->private = hwsp;
hwsp->gt = timeline->gt;
- hwsp->vma = vma;
hwsp->free_bitmap = ~0ull;
hwsp->gt_timelines = gt;
@@ -113,9 +130,12 @@ static void __idle_hwsp_free(struct intel_timeline_hwsp *hwsp, int cacheline)
/* And if no one is left using it, give the page back to the system */
if (hwsp->free_bitmap == ~0ull) {
- i915_vma_put(hwsp->vma);
list_del(&hwsp->free_link);
+ spin_unlock_irqrestore(>->hwsp_lock, flags);
+ i915_gem_object_unpin_map(hwsp->vma->obj);
+ i915_vma_put(hwsp->vma);
kfree(hwsp);
+ return;
}
spin_unlock_irqrestore(>->hwsp_lock, flags);
@@ -134,7 +154,6 @@ static void __idle_cacheline_free(struct intel_timeline_cacheline *cl)
{
GEM_BUG_ON(!i915_active_is_idle(&cl->active));
- i915_gem_object_unpin_map(cl->hwsp->vma->obj);
i915_vma_put(cl->hwsp->vma);
__idle_hwsp_free(cl->hwsp, ptr_unmask_bits(cl->vaddr, CACHELINE_BITS));
@@ -165,7 +184,6 @@ static struct intel_timeline_cacheline *
cacheline_alloc(struct intel_timeline_hwsp *hwsp, unsigned int cacheline)
{
struct intel_timeline_cacheline *cl;
- void *vaddr;
GEM_BUG_ON(cacheline >= BIT(CACHELINE_BITS));
@@ -173,15 +191,9 @@ cacheline_alloc(struct intel_timeline_hwsp *hwsp, unsigned int cacheline)
if (!cl)
return ERR_PTR(-ENOMEM);
- vaddr = i915_gem_object_pin_map(hwsp->vma->obj, I915_MAP_WB);
- if (IS_ERR(vaddr)) {
- kfree(cl);
- return ERR_CAST(vaddr);
- }
-
i915_vma_get(hwsp->vma);
cl->hwsp = hwsp;
- cl->vaddr = page_pack_bits(vaddr, cacheline);
+ cl->vaddr = page_pack_bits(hwsp->vaddr, cacheline);
i915_active_init(&cl->active, __cacheline_active, __cacheline_retire);
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index caa9b041616b..8e8c80ccbe32 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -862,10 +862,15 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,
unsigned int bound;
int err;
-#ifdef CONFIG_PROVE_LOCKING
- if (debug_locks && lockdep_is_held(&vma->vm->i915->drm.struct_mutex))
- WARN_ON(!ww);
-#endif
+ if (IS_ENABLED(CONFIG_PROVE_LOCKING) && debug_locks) {
+ bool pinned_bind_wo_alloc =
+ vma->obj && i915_gem_object_has_pinned_pages(vma->obj) &&
+ !vma->vm->allocate_va_range;
+
+ if (lockdep_is_held(&vma->vm->i915->drm.struct_mutex) &&
+ !pinned_bind_wo_alloc)
+ WARN_ON(!ww);
+ }
BUILD_BUG_ON(PIN_GLOBAL != I915_VMA_GLOBAL_BIND);
BUILD_BUG_ON(PIN_USER != I915_VMA_LOCAL_BIND);
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
