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@linux.intel.com> Subject: [PATCH v7 01/15] drm/i915: Untangle the vma pages_mutex Date: Mon, 31 May 2021 14:19:26 +0200 [thread overview] Message-ID: <20210531121940.267032-2-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210531121940.267032-1-thomas.hellstrom@linux.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@linux.intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index b319fd3f91cc..0f227f28b280 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; } -- 2.31.1
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@linux.intel.com> Subject: [Intel-gfx] [PATCH v7 01/15] drm/i915: Untangle the vma pages_mutex Date: Mon, 31 May 2021 14:19:26 +0200 [thread overview] Message-ID: <20210531121940.267032-2-thomas.hellstrom@linux.intel.com> (raw) In-Reply-To: <20210531121940.267032-1-thomas.hellstrom@linux.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@linux.intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index b319fd3f91cc..0f227f28b280 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; } -- 2.31.1 _______________________________________________ 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-31 12:20 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-31 12:19 [PATCH v7 00/15] Move LMEM (VRAM) management over to TTM Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` Thomas Hellström [this message] 2021-05-31 12:19 ` [Intel-gfx] [PATCH v7 01/15] drm/i915: Untangle the vma pages_mutex Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 02/15] drm/i915: Don't free shared locks while shared Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 03/15] drm/i915: Fix i915_sg_page_sizes to record dma segments rather than physical pages Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 04/15] drm/i915/ttm Initialize the ttm device and memory managers Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 05/15] drm/i915/ttm: Embed a ttm buffer object in the i915 gem object Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:36 ` Christian König 2021-05-31 12:36 ` [Intel-gfx] " Christian König 2021-05-31 13:08 ` Thomas Hellström 2021-05-31 13:08 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 07/15] drm: Add a prefetching memcpy_from_wc Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:37 ` Christian König 2021-05-31 12:37 ` [Intel-gfx] " Christian König 2021-05-31 12:19 ` [PATCH v7 08/15] drm/ttm: Use drm_memcpy_from_wc for TTM bo moves Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 15:53 ` kernel test robot 2021-05-31 12:19 ` [PATCH v7 09/15] drm/ttm: Document and optimize ttm_bo_pipeline_gutting() Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 10/15] drm/ttm, drm/amdgpu: Allow the driver some control over swapping Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 11/15] drm/i915/ttm: Introduce a TTM i915 gem object backend Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 12/15] drm/i915/lmem: Verify checks for lmem residency Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 13/15] drm/i915: Disable mmap ioctl for gen12+ Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 14/15] drm/vma: Add a driver_private member to vma_node Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 12:19 ` [PATCH v7 15/15] drm/i915: Use ttm mmap handling for ttm bo's Thomas Hellström 2021-05-31 12:19 ` [Intel-gfx] " Thomas Hellström 2021-05-31 17:17 ` Thomas Hellström (Intel) 2021-05-31 12:31 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Move LMEM (VRAM) management over to TTM (rev3) Patchwork 2021-05-31 12:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-05-31 13:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-05-31 15:50 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20210531121940.267032-2-thomas.hellstrom@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /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.