From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
To: Matthew Auld <matthew.william.auld@gmail.com>
Cc: matthew.brost@intel.com, paulo.r.zanoni@intel.com,
tvrtko.ursulin@intel.com, jani.nikula@intel.com,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
thomas.hellstrom@intel.com, lionel.g.landwerlin@intel.com,
jason@jlekstrand.net, andi.shyti@linux.intel.com,
daniel.vetter@intel.com, christian.koenig@amd.com,
matthew.auld@intel.com
Subject: Re: [PATCH v6 20/20] drm/i915/vm_bind: Async vm_unbind support
Date: Wed, 9 Nov 2022 12:11:29 -0800 [thread overview]
Message-ID: <Y2wJcYU4GvB+dLWD@nvishwa1-DESK> (raw)
In-Reply-To: <CAM0jSHP6N321s4obATyEfVH1wUH2MEkU-bFy_yHShc=0M59=+w@mail.gmail.com>
On Wed, Nov 09, 2022 at 05:52:54PM +0000, Matthew Auld wrote:
>On Mon, 7 Nov 2022 at 08:53, Niranjana Vishwanathapura
><niranjana.vishwanathapura@intel.com> wrote:
>>
>> Asynchronously unbind the vma upon vm_unbind call.
>> Fall back to synchronous unbind if backend doesn't support
>> async unbind or if async unbind fails.
>>
>> No need for vm_unbind out fence support as i915 will internally
>> handle all sequencing and user need not try to sequence any
>> operation with the unbind completion.
>>
>> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_vma.c | 51 ++++++++++++++++++++++++++++++---
>> drivers/gpu/drm/i915/i915_vma.h | 1 +
>> 2 files changed, 48 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
>> index 08218e3a2f12..03c966fad87b 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.c
>> +++ b/drivers/gpu/drm/i915/i915_vma.c
>> @@ -42,6 +42,8 @@
>> #include "i915_vma.h"
>> #include "i915_vma_resource.h"
>>
>> +static struct dma_fence *__i915_vma_unbind_async(struct i915_vma *vma);
>> +
>> static inline void assert_vma_held_evict(const struct i915_vma *vma)
>> {
>> /*
>> @@ -1711,7 +1713,7 @@ void i915_vma_reopen(struct i915_vma *vma)
>> spin_unlock_irq(>->closed_lock);
>> }
>>
>> -static void force_unbind(struct i915_vma *vma)
>> +static void force_unbind(struct i915_vma *vma, bool async)
>> {
>> if (!drm_mm_node_allocated(&vma->node))
>> return;
>> @@ -1725,7 +1727,21 @@ static void force_unbind(struct i915_vma *vma)
>> i915_vma_set_purged(vma);
>>
>> atomic_and(~I915_VMA_PIN_MASK, &vma->flags);
>> - WARN_ON(__i915_vma_unbind(vma));
>> + if (async) {
>> + struct dma_fence *fence;
>> +
>> + fence = __i915_vma_unbind_async(vma);
>> + if (IS_ERR_OR_NULL(fence)) {
>> + async = false;
>> + } else {
>> + dma_resv_add_fence(vma->obj->base.resv, fence,
>> + DMA_RESV_USAGE_READ);
>> + dma_fence_put(fence);
>> + }
>> + }
>> +
>> + if (!async)
>> + WARN_ON(__i915_vma_unbind(vma));
>> GEM_BUG_ON(drm_mm_node_allocated(&vma->node));
>> }
>>
>> @@ -1785,7 +1801,7 @@ void i915_vma_destroy_locked(struct i915_vma *vma)
>> {
>> lockdep_assert_held(&vma->vm->mutex);
>>
>> - force_unbind(vma);
>> + force_unbind(vma, false);
>> list_del_init(&vma->vm_link);
>> release_references(vma, vma->vm->gt, false);
>> }
>> @@ -1796,7 +1812,34 @@ void i915_vma_destroy(struct i915_vma *vma)
>> bool vm_ddestroy;
>>
>> mutex_lock(&vma->vm->mutex);
>> - force_unbind(vma);
>> + force_unbind(vma, false);
>> + list_del_init(&vma->vm_link);
>> + vm_ddestroy = vma->vm_ddestroy;
>> + vma->vm_ddestroy = false;
>> +
>> + /* vma->vm may be freed when releasing vma->vm->mutex. */
>> + gt = vma->vm->gt;
>> + mutex_unlock(&vma->vm->mutex);
>> + release_references(vma, gt, vm_ddestroy);
>> +}
>> +
>> +void i915_vma_destroy_async(struct i915_vma *vma)
>
>Where are we calling this? I can't find it.
Ah, got missed out in this patch. It should be called from vm_unbind
path. Will fix it.
Thanks,
Niranjana
>
>> +{
>> + bool vm_ddestroy, async = vma->obj->mm.rsgt;
>> + struct intel_gt *gt;
>> +
>> + if (dma_resv_reserve_fences(vma->obj->base.resv, 1))
>> + async = false;
>> +
>> + mutex_lock(&vma->vm->mutex);
>> + /*
>> + * Ensure any asynchronous binding is complete while using
>> + * async unbind as we will be releasing the vma here.
>> + */
>> + if (async && i915_active_wait(&vma->active))
>> + async = false;
>> +
>> + force_unbind(vma, async);
>> list_del_init(&vma->vm_link);
>> vm_ddestroy = vma->vm_ddestroy;
>> vma->vm_ddestroy = false;
>> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
>> index 737ef310d046..25f15965dab8 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.h
>> +++ b/drivers/gpu/drm/i915/i915_vma.h
>> @@ -272,6 +272,7 @@ void i915_vma_reopen(struct i915_vma *vma);
>>
>> void i915_vma_destroy_locked(struct i915_vma *vma);
>> void i915_vma_destroy(struct i915_vma *vma);
>> +void i915_vma_destroy_async(struct i915_vma *vma);
>>
>> #define assert_vma_held(vma) dma_resv_assert_held((vma)->obj->base.resv)
>>
>> --
>> 2.21.0.rc0.32.g243a4c7e27
>>
next prev parent reply other threads:[~2022-11-09 20:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 8:51 [PATCH v6 00/20] drm/i915/vm_bind: Add VM_BIND functionality Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 01/20] drm/i915/vm_bind: Expose vm lookup function Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 02/20] drm/i915/vm_bind: Add __i915_sw_fence_await_reservation() Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 03/20] drm/i915/vm_bind: Expose i915_gem_object_max_page_size() Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 04/20] drm/i915/vm_bind: Add support to create persistent vma Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 05/20] drm/i915/vm_bind: Implement bind and unbind of object Niranjana Vishwanathapura
2022-11-10 1:28 ` Zanoni, Paulo R
2022-11-10 16:32 ` Niranjana Vishwanathapura
2022-11-10 21:21 ` Zanoni, Paulo R
2022-11-07 8:51 ` [PATCH v6 06/20] drm/i915/vm_bind: Support for VM private BOs Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 07/20] drm/i915/vm_bind: Add support to handle object evictions Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 08/20] drm/i915/vm_bind: Support persistent vma activeness tracking Niranjana Vishwanathapura
2022-11-07 8:51 ` [PATCH v6 09/20] drm/i915/vm_bind: Add out fence support Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 10/20] drm/i915/vm_bind: Abstract out common execbuf functions Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 11/20] drm/i915/vm_bind: Use common execbuf functions in execbuf path Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 12/20] drm/i915/vm_bind: Implement I915_GEM_EXECBUFFER3 ioctl Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 13/20] drm/i915/vm_bind: Update i915_vma_verify_bind_complete() Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 14/20] drm/i915/vm_bind: Expose i915_request_await_bind() Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 15/20] drm/i915/vm_bind: Handle persistent vmas in execbuf3 Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 16/20] drm/i915/vm_bind: userptr dma-resv changes Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 17/20] drm/i915/vm_bind: Limit vm_bind mode to non-recoverable contexts Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 18/20] drm/i915/vm_bind: Add uapi for user to enable vm_bind_mode Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 19/20] drm/i915/vm_bind: Render VM_BIND documentation Niranjana Vishwanathapura
2022-11-07 8:52 ` [PATCH v6 20/20] drm/i915/vm_bind: Async vm_unbind support Niranjana Vishwanathapura
2022-11-08 1:39 ` Zanoni, Paulo R
2022-11-08 15:46 ` Niranjana Vishwanathapura
2022-11-09 17:52 ` Matthew Auld
2022-11-09 20:11 ` Niranjana Vishwanathapura [this message]
2022-11-09 21:13 ` Andi Shyti
2022-11-10 0:28 ` Niranjana Vishwanathapura
2022-11-10 0:16 ` [PATCH v6 00/20] drm/i915/vm_bind: Add VM_BIND functionality Zanoni, Paulo R
2022-11-10 5:49 ` Niranjana Vishwanathapura
2022-11-10 14:47 ` [Intel-gfx] " Tvrtko Ursulin
2022-11-10 15:05 ` Matthew Auld
2022-11-10 21:37 ` Zanoni, Paulo R
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=Y2wJcYU4GvB+dLWD@nvishwa1-DESK \
--to=niranjana.vishwanathapura@intel.com \
--cc=andi.shyti@linux.intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jason@jlekstrand.net \
--cc=lionel.g.landwerlin@intel.com \
--cc=matthew.auld@intel.com \
--cc=matthew.brost@intel.com \
--cc=matthew.william.auld@gmail.com \
--cc=paulo.r.zanoni@intel.com \
--cc=thomas.hellstrom@intel.com \
--cc=tvrtko.ursulin@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: 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).