* [Intel-gfx] [PATCH] drm/i915/gem: Hold the obj->vma.lock while walking the vma.list
@ 2019-12-04 16:45 Chris Wilson
2019-12-04 16:58 ` Matthew Auld
2019-12-04 23:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wilson @ 2019-12-04 16:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld
Remember to take the lock before walking the obj->vma.list so that the
nodes do not change beneath us! E.g.,
i915_gem_object_bump_inactive_ggtt: i915_gem_object_bump_inactive_ggtt:387 GEM_BUG_ON(vma->vm != &i915->ggtt.vm)
Closes: https://gitlab.freedesktop.org/drm/intel/issues/691
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
index f2064950622b..808eb327a29b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@ -379,8 +379,11 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj)
struct i915_vma *vma;
GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
+ if (!atomic_read(&obj->bind_count))
+ return;
mutex_lock(&i915->ggtt.vm.mutex);
+ spin_lock(&obj->vma.lock);
for_each_ggtt_vma(vma, obj) {
if (!drm_mm_node_allocated(&vma->node))
continue;
@@ -388,6 +391,7 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj)
GEM_BUG_ON(vma->vm != &i915->ggtt.vm);
list_move_tail(&vma->vm_link, &vma->vm->bound_list);
}
+ spin_unlock(&obj->vma.lock);
mutex_unlock(&i915->ggtt.vm.mutex);
if (i915_gem_object_is_shrinkable(obj)) {
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gem: Hold the obj->vma.lock while walking the vma.list
2019-12-04 16:45 [Intel-gfx] [PATCH] drm/i915/gem: Hold the obj->vma.lock while walking the vma.list Chris Wilson
@ 2019-12-04 16:58 ` Matthew Auld
2019-12-04 23:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Matthew Auld @ 2019-12-04 16:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development, Matthew Auld
On Wed, 4 Dec 2019 at 16:45, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> Remember to take the lock before walking the obj->vma.list so that the
> nodes do not change beneath us! E.g.,
>
> i915_gem_object_bump_inactive_ggtt: i915_gem_object_bump_inactive_ggtt:387 GEM_BUG_ON(vma->vm != &i915->ggtt.vm)
>
> Closes: https://gitlab.freedesktop.org/drm/intel/issues/691
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gem: Hold the obj->vma.lock while walking the vma.list
2019-12-04 16:45 [Intel-gfx] [PATCH] drm/i915/gem: Hold the obj->vma.lock while walking the vma.list Chris Wilson
2019-12-04 16:58 ` Matthew Auld
@ 2019-12-04 23:16 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2019-12-04 23:16 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gem: Hold the obj->vma.lock while walking the vma.list
URL : https://patchwork.freedesktop.org/series/70451/
State : failure
== Summary ==
Applying: drm/i915/gem: Hold the obj->vma.lock while walking the vma.list
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_domain.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-04 23:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04 16:45 [Intel-gfx] [PATCH] drm/i915/gem: Hold the obj->vma.lock while walking the vma.list Chris Wilson
2019-12-04 16:58 ` Matthew Auld
2019-12-04 23:16 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.