From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Karol Herbst <kherbst@redhat.com>, linux-kernel@vger.kernel.org
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [Intel-gfx] [PATCH v2] drm/i915: Fix race in __i915_vma_remove_closed
Date: Tue, 3 May 2022 10:36:55 +0100 [thread overview]
Message-ID: <4e3525db-5aa4-fec8-a496-749e08b5f257@linux.intel.com> (raw)
In-Reply-To: <20220420095720.3331609-1-kherbst@redhat.com>
On 20/04/2022 10:57, Karol Herbst wrote:
> i915_vma_reopen checked if the vma is closed before without taking the
> lock. So multiple threads could attempt removing the vma.
>
> Instead the lock needs to be taken before actually checking.
>
> v2: move struct declaration
Fix looks correct to me. In which case it seems breakage was introduced
with:
Fixes: 155ab8836caa ("drm/i915: Move object close under its own lock")
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: <stable@vger.kernel.org> # v5.3+
AFAICT at least. I will add these tags and pull it in unless someone
shouts a correction.
Regards,
Tvrtko
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: dri-devel@lists.freedesktop.org
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5732
> Signed-off-by: Karol Herbst <kherbst@redhat.com>
> ---
> drivers/gpu/drm/i915/i915_vma.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 162e8d83691b..2efdad2b43fa 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -1615,17 +1615,17 @@ void i915_vma_close(struct i915_vma *vma)
>
> static void __i915_vma_remove_closed(struct i915_vma *vma)
> {
> - struct intel_gt *gt = vma->vm->gt;
> -
> - spin_lock_irq(>->closed_lock);
> list_del_init(&vma->closed_link);
> - spin_unlock_irq(>->closed_lock);
> }
>
> void i915_vma_reopen(struct i915_vma *vma)
> {
> + struct intel_gt *gt = vma->vm->gt;
> +
> + spin_lock_irq(>->closed_lock);
> if (i915_vma_is_closed(vma))
> __i915_vma_remove_closed(vma);
> + spin_unlock_irq(>->closed_lock);
> }
>
> static void force_unbind(struct i915_vma *vma)
> @@ -1641,6 +1641,7 @@ static void force_unbind(struct i915_vma *vma)
> static void release_references(struct i915_vma *vma, bool vm_ddestroy)
> {
> struct drm_i915_gem_object *obj = vma->obj;
> + struct intel_gt *gt = vma->vm->gt;
>
> GEM_BUG_ON(i915_vma_is_active(vma));
>
> @@ -1651,7 +1652,9 @@ static void release_references(struct i915_vma *vma, bool vm_ddestroy)
>
> spin_unlock(&obj->vma.lock);
>
> + spin_lock_irq(>->closed_lock);
> __i915_vma_remove_closed(vma);
> + spin_unlock_irq(>->closed_lock);
>
> if (vm_ddestroy)
> i915_vm_resv_put(vma->vm);
next prev parent reply other threads:[~2022-05-03 9:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 9:57 [PATCH v2] drm/i915: Fix race in __i915_vma_remove_closed Karol Herbst
2022-05-02 14:39 ` Karol Herbst
2022-05-03 9:36 ` Tvrtko Ursulin [this message]
2022-05-04 15:20 ` [Intel-gfx] " Tvrtko Ursulin
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=4e3525db-5aa4-fec8-a496-749e08b5f257@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kherbst@redhat.com \
--cc=linux-kernel@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).