Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 494E7C433F5 for ; Thu, 18 Nov 2021 14:12:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D1A661107 for ; Thu, 18 Nov 2021 14:12:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0D1A661107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26F426E9B2; Thu, 18 Nov 2021 14:12:33 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 266396E9B2; Thu, 18 Nov 2021 14:12:32 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="221069436" X-IronPort-AV: E=Sophos;i="5.87,245,1631602800"; d="scan'208";a="221069436" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 06:12:31 -0800 X-IronPort-AV: E=Sophos;i="5.87,245,1631602800"; d="scan'208";a="473161562" Received: from davidmor-mobl1.ger.corp.intel.com (HELO [10.252.9.238]) ([10.252.9.238]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2021 06:12:30 -0800 Message-ID: <0a17bd6b-4090-cb66-4e41-23a71d220440@intel.com> Date: Thu, 18 Nov 2021 14:12:28 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH v4 1/6] drm/i915: Add support for moving fence waiting Content-Language: en-GB To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20211118130230.154988-1-thomas.hellstrom@linux.intel.com> <20211118130230.154988-2-thomas.hellstrom@linux.intel.com> From: Matthew Auld In-Reply-To: <20211118130230.154988-2-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 18/11/2021 13:02, Thomas Hellström wrote: > From: Maarten Lankhorst > > For now, we will only allow async migration when TTM is used, > so the paths we care about are related to TTM. > > The mmap path is handled by having the fence in ttm_bo->moving, > when pinning, the binding only becomes available after the moving > fence is signaled, and pinning a cpu map will only work after > the moving fence signals. > > This should close all holes where userspace can read a buffer > before it's fully migrated. > > v2: > - Fix a couple of SPARSE warnings > v3: > - Fix a NULL pointer dereference > v4: > - Ditch the moving fence waiting for i915_vma_pin_iomap() and > replace with a verification that the vma is already bound. > (Matthew Auld) > - Squash with a previous patch introducing moving fence waiting and > accessing interfaces (Matthew Auld) > - Rename to indicated that we also add support for sync waiting. > > Co-developed-by: Thomas Hellström > Signed-off-by: Thomas Hellström > Signed-off-by: Maarten Lankhorst > --- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 52 ++++++++++++++++++++++ > drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 +++ > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 6 +++ > drivers/gpu/drm/i915/i915_vma.c | 36 ++++++++++++++- > 4 files changed, 99 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c > index 591ee3cb7275..7b7d9415c9cb 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -33,6 +33,7 @@ > #include "i915_gem_object.h" > #include "i915_memcpy.h" > #include "i915_trace.h" > +#include "i915_gem_ttm.h" Nit: Ordering. > > static struct kmem_cache *slab_objects; > > @@ -726,6 +727,57 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { > .export = i915_gem_prime_export, > }; > > +/** > + * i915_gem_object_get_moving_fence - Get the object's moving fence if any > + * @obj: The object whose moving fence to get. > + * > + * A non-signaled moving fence means that there is an async operation > + * pending on the object that needs to be waited on before setting up > + * any GPU- or CPU PTEs to the object's pages. > + * > + * Return: A refcounted pointer to the object's moving fence if any, > + * NULL otherwise. > + */ > +struct dma_fence * > +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) > +{ > + return dma_fence_get(i915_gem_to_ttm(obj)->moving); > +} > + > +/** > + * i915_gem_object_wait_moving_fence - Wait for the object's moving fence if any > + * @obj: The object whose moving fence to wait for. > + * @intr: Whether to wait interruptible. > + * > + * If the moving fence signaled without an error, it is detached from the > + * object and put. > + * > + * Return: 0 if successful, -ERESTARTSYS if the wait was interrupted, > + * negative error code if the async operation represented by the > + * moving fence failed. > + */ > +int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, > + bool intr) > +{ > + struct dma_fence *fence = i915_gem_to_ttm(obj)->moving; > + int ret; > + > + assert_object_held(obj); > + if (!fence) > + return 0; > + > + ret = dma_fence_wait(fence, intr); > + if (ret) > + return ret; > + > + if (fence->error) > + return fence->error; > + > + i915_gem_to_ttm(obj)->moving = NULL; > + dma_fence_put(fence); > + return 0; > +} > + > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > #include "selftests/huge_gem_object.c" > #include "selftests/huge_pages.c" > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h > index 133963b46135..66f20b803b01 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h > @@ -517,6 +517,12 @@ i915_gem_object_finish_access(struct drm_i915_gem_object *obj) > i915_gem_object_unpin_pages(obj); > } > > +struct dma_fence * > +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj); > + > +int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, > + bool intr); > + > void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, > unsigned int cache_level); > bool i915_gem_object_can_bypass_llc(struct drm_i915_gem_object *obj); > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > index c4f684b7cc51..49c6e55c68ce 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c > @@ -418,6 +418,12 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, > } > > if (!ptr) { > + err = i915_gem_object_wait_moving_fence(obj, true); > + if (err) { > + ptr = ERR_PTR(err); > + goto err_unpin; > + } > + > if (GEM_WARN_ON(type == I915_MAP_WC && > !static_cpu_has(X86_FEATURE_PAT))) > ptr = ERR_PTR(-ENODEV); > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index 0896656896d0..00d3daf72329 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -354,6 +354,25 @@ int i915_vma_wait_for_bind(struct i915_vma *vma) > return err; > } > > +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) > +static int i915_vma_verify_bind_complete(struct i915_vma *vma) > +{ > + int err = 0; > + > + if (i915_active_has_exclusive(&vma->active)) { > + struct dma_fence *fence = > + i915_active_fence_get(&vma->active.excl); if (!fence) return 0; ? > + > + if (dma_fence_is_signaled(fence)) > + err = fence->error; > + else > + err = -EBUSY; dma_fence_put(fence); ? Reviewed-by: Matthew Auld > + } > + > + return err; > +} > +#endif > + > /** > * i915_vma_bind - Sets up PTEs for an VMA in it's corresponding address space. > * @vma: VMA to map > @@ -428,6 +447,13 @@ int i915_vma_bind(struct i915_vma *vma, > work->pinned = i915_gem_object_get(vma->obj); > } > } else { > + if (vma->obj) { > + int ret; > + > + ret = i915_gem_object_wait_moving_fence(vma->obj, true); > + if (ret) > + return ret; > + } > vma->ops->bind_vma(vma->vm, NULL, vma, cache_level, bind_flags); > } > > @@ -449,6 +475,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) > > GEM_BUG_ON(!i915_vma_is_ggtt(vma)); > GEM_BUG_ON(!i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND)); > + GEM_BUG_ON(i915_vma_verify_bind_complete(vma)); > > ptr = READ_ONCE(vma->iomap); > if (ptr == NULL) { > @@ -867,6 +894,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, > u64 size, u64 alignment, u64 flags) > { > struct i915_vma_work *work = NULL; > + struct dma_fence *moving = NULL; > intel_wakeref_t wakeref = 0; > unsigned int bound; > int err; > @@ -892,7 +920,8 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, > if (flags & PIN_GLOBAL) > wakeref = intel_runtime_pm_get(&vma->vm->i915->runtime_pm); > > - if (flags & vma->vm->bind_async_flags) { > + moving = vma->obj ? i915_gem_object_get_moving_fence(vma->obj) : NULL; > + if (flags & vma->vm->bind_async_flags || moving) { > /* lock VM */ > err = i915_vm_lock_objects(vma->vm, ww); > if (err) > @@ -906,6 +935,8 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, > > work->vm = i915_vm_get(vma->vm); > > + dma_fence_work_chain(&work->base, moving); > + > /* Allocate enough page directories to used PTE */ > if (vma->vm->allocate_va_range) { > err = i915_vm_alloc_pt_stash(vma->vm, > @@ -1010,7 +1041,10 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, > err_rpm: > if (wakeref) > intel_runtime_pm_put(&vma->vm->i915->runtime_pm, wakeref); > + if (moving) > + dma_fence_put(moving); > vma_put_pages(vma); > + > return err; > } > >