From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> Subject: [PATCH 1/7] drm/i915: Untangle the vma pages_mutex Date: Tue, 11 May 2021 15:25:19 +0200 [thread overview] Message-ID: <20210511132525.377190-2-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210511132525.377190-1-thomas.hellstrom@linux.intel.com> From: Thomas Hellström <thomas.hellstrom@intel.com> Any sleeping dma_resv lock taken while the vma pages_mutex is held will cause a lockdep splat. Move the i915_gem_object_pin_pages() call out of the pages_mutex critical section. Signed-off-by: Thomas Hellström <thomas.hellstrom@intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index a6cd0fa62847..7b1c0f4e60d7 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -800,32 +800,37 @@ static bool try_qad_pin(struct i915_vma *vma, unsigned int flags) static int vma_get_pages(struct i915_vma *vma) { int err = 0; + bool pinned_pages = false; if (atomic_add_unless(&vma->pages_count, 1, 0)) return 0; + if (vma->obj) { + err = i915_gem_object_pin_pages(vma->obj); + if (err) + return err; + pinned_pages = true; + } + /* Allocations ahoy! */ - if (mutex_lock_interruptible(&vma->pages_mutex)) - return -EINTR; + if (mutex_lock_interruptible(&vma->pages_mutex)) { + err = -EINTR; + goto unpin; + } if (!atomic_read(&vma->pages_count)) { - if (vma->obj) { - err = i915_gem_object_pin_pages(vma->obj); - if (err) - goto unlock; - } - err = vma->ops->set_pages(vma); - if (err) { - if (vma->obj) - i915_gem_object_unpin_pages(vma->obj); + if (err) goto unlock; - } + pinned_pages = false; } atomic_inc(&vma->pages_count); unlock: mutex_unlock(&vma->pages_mutex); +unpin: + if (pinned_pages) + __i915_gem_object_unpin_pages(vma->obj); return err; } @@ -838,10 +843,10 @@ static void __vma_put_pages(struct i915_vma *vma, unsigned int count) if (atomic_sub_return(count, &vma->pages_count) == 0) { vma->ops->clear_pages(vma); GEM_BUG_ON(vma->pages); - if (vma->obj) - i915_gem_object_unpin_pages(vma->obj); } mutex_unlock(&vma->pages_mutex); + if (vma->obj) + i915_gem_object_unpin_pages(vma->obj); } static void vma_put_pages(struct i915_vma *vma) -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@intel.com> Subject: [Intel-gfx] [PATCH 1/7] drm/i915: Untangle the vma pages_mutex Date: Tue, 11 May 2021 15:25:19 +0200 [thread overview] Message-ID: <20210511132525.377190-2-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210511132525.377190-1-thomas.hellstrom@linux.intel.com> From: Thomas Hellström <thomas.hellstrom@intel.com> Any sleeping dma_resv lock taken while the vma pages_mutex is held will cause a lockdep splat. Move the i915_gem_object_pin_pages() call out of the pages_mutex critical section. Signed-off-by: Thomas Hellström <thomas.hellstrom@intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index a6cd0fa62847..7b1c0f4e60d7 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -800,32 +800,37 @@ static bool try_qad_pin(struct i915_vma *vma, unsigned int flags) static int vma_get_pages(struct i915_vma *vma) { int err = 0; + bool pinned_pages = false; if (atomic_add_unless(&vma->pages_count, 1, 0)) return 0; + if (vma->obj) { + err = i915_gem_object_pin_pages(vma->obj); + if (err) + return err; + pinned_pages = true; + } + /* Allocations ahoy! */ - if (mutex_lock_interruptible(&vma->pages_mutex)) - return -EINTR; + if (mutex_lock_interruptible(&vma->pages_mutex)) { + err = -EINTR; + goto unpin; + } if (!atomic_read(&vma->pages_count)) { - if (vma->obj) { - err = i915_gem_object_pin_pages(vma->obj); - if (err) - goto unlock; - } - err = vma->ops->set_pages(vma); - if (err) { - if (vma->obj) - i915_gem_object_unpin_pages(vma->obj); + if (err) goto unlock; - } + pinned_pages = false; } atomic_inc(&vma->pages_count); unlock: mutex_unlock(&vma->pages_mutex); +unpin: + if (pinned_pages) + __i915_gem_object_unpin_pages(vma->obj); return err; } @@ -838,10 +843,10 @@ static void __vma_put_pages(struct i915_vma *vma, unsigned int count) if (atomic_sub_return(count, &vma->pages_count) == 0) { vma->ops->clear_pages(vma); GEM_BUG_ON(vma->pages); - if (vma->obj) - i915_gem_object_unpin_pages(vma->obj); } mutex_unlock(&vma->pages_mutex); + if (vma->obj) + i915_gem_object_unpin_pages(vma->obj); } static void vma_put_pages(struct i915_vma *vma) -- 2.30.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-11 13:26 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-11 13:25 [PATCH 0/7] drm/i915: Move LMEM (VRAM) management over to TTM Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-11 13:25 ` Thomas Hellström [this message] 2021-05-11 13:25 ` [Intel-gfx] [PATCH 1/7] drm/i915: Untangle the vma pages_mutex Thomas Hellström 2021-05-11 13:25 ` [PATCH 2/7] drm/i915: Don't free shared locks while shared Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-11 13:25 ` [PATCH 3/7] drm/i915/ttm, drm/ttm: Initialize the ttm device and memory managers Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-12 8:57 ` Matthew Auld 2021-05-12 8:57 ` Matthew Auld 2021-05-17 7:18 ` Thomas Hellström 2021-05-17 7:18 ` Thomas Hellström 2021-05-17 7:28 ` Thomas Hellström 2021-05-17 7:28 ` Thomas Hellström 2021-05-11 13:25 ` [PATCH 4/7] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-11 13:25 ` [PATCH 5/7] drm/i915/ttm, drm/ttm: Add a generic TTM memcpy move for page-based iomem Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-17 10:57 ` Jani Nikula 2021-05-17 10:57 ` Jani Nikula 2021-05-18 6:53 ` Thomas Hellström 2021-05-18 6:53 ` Thomas Hellström 2021-05-11 13:25 ` [PATCH 6/7] drm/i915/ttm, drm/ttm: Introduce a TTM i915 gem object backend Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-11 13:58 ` Christian König 2021-05-11 13:58 ` [Intel-gfx] " Christian König 2021-05-11 14:06 ` Thomas Hellström (Intel) 2021-05-11 14:06 ` [Intel-gfx] " Thomas Hellström (Intel) 2021-05-11 14:09 ` Christian König 2021-05-11 14:09 ` [Intel-gfx] " Christian König 2021-05-11 14:28 ` Thomas Hellström 2021-05-11 14:28 ` [Intel-gfx] " Thomas Hellström 2021-05-12 6:57 ` Christian König 2021-05-12 6:57 ` [Intel-gfx] " Christian König 2021-05-12 7:05 ` Thomas Hellström 2021-05-12 7:05 ` [Intel-gfx] " Thomas Hellström 2021-05-12 7:09 ` Christian König 2021-05-12 7:09 ` [Intel-gfx] " Christian König 2021-05-12 13:02 ` Thomas Hellström 2021-05-12 13:02 ` [Intel-gfx] " Thomas Hellström 2021-05-12 13:05 ` Christian König 2021-05-12 13:05 ` [Intel-gfx] " Christian König 2021-05-12 13:25 ` Thomas Hellström 2021-05-12 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-12 11:45 ` Matthew Auld 2021-05-12 11:45 ` Matthew Auld 2021-05-12 11:50 ` Thomas Hellström 2021-05-12 11:50 ` Thomas Hellström 2021-05-11 13:25 ` [PATCH 7/7] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström 2021-05-11 13:25 ` [Intel-gfx] " Thomas Hellström 2021-05-12 7:58 ` Matthew Auld 2021-05-12 7:58 ` Matthew Auld 2021-05-11 16:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Move LMEM (VRAM) management over to TTM Patchwork 2021-05-11 16:24 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-11 16:48 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210511132525.377190-2-thomas.hellstrom@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=thomas.hellstrom@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.