From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 12/61] drm/i915: Reject more ioctls for userptr
Date: Mon, 12 Oct 2020 16:46:17 +0200 [thread overview]
Message-ID: <20201012144706.555345-13-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20201012144706.555345-1-maarten.lankhorst@linux.intel.com>
Allow set_domain to fail silently, waiting for idle should be good enough.
set_tiling and set_caching are rejected with -ENXIO, there's no valid reason
to allow it.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 +++-
drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++++++
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 ++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cf1417ff54d7..a7e3f61c5777 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17357,7 +17357,7 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
struct drm_i915_private *i915 = to_i915(obj->base.dev);
- if (obj->userptr.mm) {
+ if (i915_gem_object_is_userptr(obj)) {
drm_dbg(&i915->drm,
"attempting to use a userptr for a framebuffer, denied\n");
return -EINVAL;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
index 7c90a63c273d..43c22648b074 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@ -543,7 +543,9 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
* considered to be outside of any cache domain.
*/
if (i915_gem_object_is_proxy(obj)) {
- err = -ENXIO;
+ /* silently allow userptr to complete */
+ if (!i915_gem_object_is_userptr(obj))
+ err = -ENXIO;
goto out;
}
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index e0c1e2817bee..436ff0d4951f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -528,6 +528,12 @@ void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
enum fb_op_origin origin);
+static inline bool
+i915_gem_object_is_userptr(struct drm_i915_gem_object *obj)
+{
+ return obj->userptr.mm;
+}
+
static inline void
i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
enum fb_op_origin origin)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
index 9c1293c99d88..3fd63fdd7466 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -721,7 +721,8 @@ static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {
.name = "i915_gem_object_userptr",
.flags = I915_GEM_OBJECT_IS_SHRINKABLE |
I915_GEM_OBJECT_NO_MMAP |
- I915_GEM_OBJECT_ASYNC_CANCEL,
+ I915_GEM_OBJECT_ASYNC_CANCEL |
+ I915_GEM_OBJECT_IS_PROXY,
.get_pages = i915_gem_userptr_get_pages,
.put_pages = i915_gem_userptr_put_pages,
.dmabuf_export = i915_gem_userptr_dmabuf_export,
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-10-12 14:47 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 14:46 [Intel-gfx] [PATCH v2 00/61] drm/i915: Remove obj->mm.lock! Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 01/61] drm/i915: Move cmd parser pinning to execbuffer Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 02/61] drm/i915: Add missing -EDEADLK handling to execbuf pinning Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 03/61] drm/i915: Do not share hwsp across contexts any more, v3 Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 04/61] drm/i915: Ensure we hold the object mutex in pin correctly Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 05/61] drm/i915: Add gem object locking to madvise Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 06/61] drm/i915: Move HAS_STRUCT_PAGE to obj->flags Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 07/61] drm/i915: Rework struct phys attachment handling Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 08/61] drm/i915: Convert i915_gem_object_attach_phys() to ww locking Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 09/61] drm/i915: make lockdep slightly happier about execbuf Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 10/61] drm/i915: Disable userptr pread/pwrite support Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 11/61] drm/i915: No longer allow exporting userptr through dma-buf Maarten Lankhorst
2020-10-12 14:46 ` Maarten Lankhorst [this message]
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 13/61] drm/i915: Reject UNSYNCHRONIZED for userptr Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 14/61] drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v2 Maarten Lankhorst
2020-10-12 17:05 ` Thomas Hellström (Intel)
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 15/61] drm/i915: Flatten obj->mm.lock Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 16/61] drm/i915: Pin timeline map after first timeline pin, v2 Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 17/61] drm/i915: Populate logical context during first pin Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 18/61] drm/i915: Make ring submission compatible with obj->mm.lock removal, v2 Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 19/61] drm/i915: Handle ww locking in init_status_page Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 20/61] drm/i915: Rework clflush to work correctly without obj->mm.lock Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 21/61] drm/i915: Pass ww ctx to intel_pin_to_display_plane Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 22/61] drm/i915: Add object locking to vm_fault_cpu Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 23/61] drm/i915: Move pinning to inside engine_wa_list_verify() Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 24/61] drm/i915: Take reservation lock around i915_vma_pin Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 25/61] drm/i915: Make intel_init_workaround_bb more compatible with ww locking Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 26/61] drm/i915: Make __engine_unpark() " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 27/61] drm/i915: Take obj lock around set_domain ioctl Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 28/61] drm/i915: Defer pin calls in buffer pool until first use by caller Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 29/61] drm/i915: Fix pread/pwrite to work with new locking rules Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 30/61] drm/i915: Fix workarounds selftest, part 1 Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 31/61] drm/i915: Prepare for obj->mm.lock removal Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 32/61] drm/i915: Add igt_spinner_pin() to allow for ww locking around spinner Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 33/61] drm/i915: Add ww locking around vm_access() Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 34/61] drm/i915: Increase ww locking for perf Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 35/61] drm/i915: Lock ww in ucode objects correctly Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 36/61] drm/i915: Add ww locking to dma-buf ops Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 37/61] drm/i915: Add missing ww lock in intel_dsb_prepare Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 38/61] drm/i915: Fix ww locking in shmem_create_from_object Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 39/61] drm/i915: Use a single page table lock for each gtt Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 40/61] drm/i915/selftests: Prepare huge_pages testcases for obj->mm.lock removal Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 41/61] drm/i915/selftests: Prepare client blit " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 42/61] drm/i915/selftests: Prepare coherency tests " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 43/61] drm/i915/selftests: Prepare context " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 44/61] drm/i915/selftests: Prepare dma-buf " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 45/61] drm/i915/selftests: Prepare execbuf " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 46/61] drm/i915/selftests: Prepare mman testcases " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 47/61] drm/i915/selftests: Prepare object tests " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 48/61] drm/i915/selftests: Prepare object blit " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 49/61] drm/i915/selftests: Prepare igt_gem_utils " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 50/61] drm/i915/selftests: Prepare context selftest " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 51/61] drm/i915/selftests: Prepare hangcheck " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 52/61] drm/i915/selftests: Prepare execlists " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 53/61] drm/i915/selftests: Prepare mocs tests " Maarten Lankhorst
2020-10-12 14:46 ` [Intel-gfx] [PATCH v2 54/61] drm/i915/selftests: Prepare ring submission " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 55/61] drm/i915/selftests: Prepare timeline tests " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 56/61] drm/i915/selftests: Prepare i915_request " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 57/61] drm/i915/selftests: Prepare memory region " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 58/61] drm/i915/selftests: Prepare cs engine " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 59/61] drm/i915/selftests: Prepare gtt " Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 60/61] drm/i915: Finally remove obj->mm.lock Maarten Lankhorst
2020-10-12 14:47 ` [Intel-gfx] [PATCH v2 61/61] drm/i915: Keep userpointer bindings if seqcount is unchanged Maarten Lankhorst
2020-10-12 16:45 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove obj->mm.lock! (rev2) Patchwork
2020-10-12 16:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-10-12 16:49 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2020-10-12 17:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-10-12 19:57 ` [Intel-gfx] ✗ Fi.CI.IGT: 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=20201012144706.555345-13-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--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: 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