From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Daniel Vetter" <daniel.vetter@intel.com>, "Jon Bloomfield" <jon.bloomfield@intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Matthew Auld" <matthew.auld@intel.com>, "Lionel Landwerlin" <lionel.g.landwerlin@intel.com>, "Dave Airlie" <airlied@redhat.com>, "Jason Ekstrand" <jason@jlekstrand.net> Subject: [PATCH 1/9] drm/i915: Drop code to handle set-vm races from execbuf Date: Mon, 2 Aug 2021 17:47:58 +0200 [thread overview] Message-ID: <20210802154806.3710472-2-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210802154806.3710472-1-daniel.vetter@ffwll.ch> Changing the vm from a finalized gem ctx is no longer possible, which means we don't have to check for that anymore. I was pondering whether to keep the check as a WARN_ON, but things go boom real bad real fast if the vm of a vma is wrong. Plus we'd need to also get the ggtt vm for !full-ppgtt platforms. Ditching it all seemed like a better idea. References: ccbc1b97948a ("drm/i915/gem: Don't allow changing the VM on running contexts (v4)") Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Jon Bloomfield <jon.bloomfield@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 538d9d2e52b7..69e47b97d786 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -775,11 +775,7 @@ static int __eb_add_lut(struct i915_execbuffer *eb, /* Check that the context hasn't been closed in the meantime */ err = -EINTR; if (!mutex_lock_interruptible(&ctx->lut_mutex)) { - struct i915_address_space *vm = rcu_access_pointer(ctx->vm); - - if (unlikely(vm && vma->vm != vm)) - err = -EAGAIN; /* user racing with ctx set-vm */ - else if (likely(!i915_gem_context_is_closed(ctx))) + if (likely(!i915_gem_context_is_closed(ctx))) err = radix_tree_insert(&ctx->handles_vma, handle, vma); else err = -ENOENT; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Daniel Vetter" <daniel.vetter@intel.com>, "Jon Bloomfield" <jon.bloomfield@intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Matthew Auld" <matthew.auld@intel.com>, "Lionel Landwerlin" <lionel.g.landwerlin@intel.com>, "Dave Airlie" <airlied@redhat.com>, "Jason Ekstrand" <jason@jlekstrand.net> Subject: [Intel-gfx] [PATCH 1/9] drm/i915: Drop code to handle set-vm races from execbuf Date: Mon, 2 Aug 2021 17:47:58 +0200 [thread overview] Message-ID: <20210802154806.3710472-2-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210802154806.3710472-1-daniel.vetter@ffwll.ch> Changing the vm from a finalized gem ctx is no longer possible, which means we don't have to check for that anymore. I was pondering whether to keep the check as a WARN_ON, but things go boom real bad real fast if the vm of a vma is wrong. Plus we'd need to also get the ggtt vm for !full-ppgtt platforms. Ditching it all seemed like a better idea. References: ccbc1b97948a ("drm/i915/gem: Don't allow changing the VM on running contexts (v4)") Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Jon Bloomfield <jon.bloomfield@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 538d9d2e52b7..69e47b97d786 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -775,11 +775,7 @@ static int __eb_add_lut(struct i915_execbuffer *eb, /* Check that the context hasn't been closed in the meantime */ err = -EINTR; if (!mutex_lock_interruptible(&ctx->lut_mutex)) { - struct i915_address_space *vm = rcu_access_pointer(ctx->vm); - - if (unlikely(vm && vma->vm != vm)) - err = -EAGAIN; /* user racing with ctx set-vm */ - else if (likely(!i915_gem_context_is_closed(ctx))) + if (likely(!i915_gem_context_is_closed(ctx))) err = radix_tree_insert(&ctx->handles_vma, handle, vma); else err = -ENOENT; -- 2.32.0
next prev parent reply other threads:[~2021-08-02 15:48 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-02 15:47 [PATCH 0/9] remove rcu support from i915_address_space Daniel Vetter 2021-08-02 15:47 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:47 ` Daniel Vetter [this message] 2021-08-02 15:47 ` [Intel-gfx] [PATCH 1/9] drm/i915: Drop code to handle set-vm races from execbuf Daniel Vetter 2021-08-02 15:47 ` [PATCH 2/9] drm/i915: Rename i915_gem_context_get_vm_rcu to i915_gem_context_get_eb_vm Daniel Vetter 2021-08-02 15:47 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 3/9] drm/i915: Use i915_gem_context_get_eb_vm in ctx_getparam Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 4/9] drm/i915: Add i915_gem_context_is_full_ppgtt Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 5/9] drm/i915: Use i915_gem_context_get_eb_vm in intel_context_set_gem Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 6/9] drm/i915: Drop __rcu from gem_context->vm Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-03 0:35 ` kernel test robot 2021-08-03 0:35 ` kernel test robot 2021-08-02 15:48 ` [PATCH 7/9] drm/i915: use xa_lock/unlock for fpriv->vm_xa lookups Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 8/9] drm/i915: Stop rcu support for i915_address_space Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 15:48 ` [PATCH 9/9] drm/i915: Split out intel_context_create_user Daniel Vetter 2021-08-02 15:48 ` [Intel-gfx] " Daniel Vetter 2021-08-02 16:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for remove rcu support from i915_address_space Patchwork 2021-08-02 16:45 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-08-02 17:14 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2021-08-03 12:38 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for remove rcu support from i915_address_space (rev2) Patchwork 2021-08-03 12:40 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-08-03 13:09 ` [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=20210802154806.3710472-2-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=airlied@redhat.com \ --cc=chris@chris-wilson.co.uk \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jason@jlekstrand.net \ --cc=jon.bloomfield@intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=lionel.g.landwerlin@intel.com \ --cc=maarten.lankhorst@linux.intel.com \ --cc=matthew.auld@intel.com \ --cc=thomas.hellstrom@linux.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.