[PATCH 63/74] fast-execbuf2-ioctl
Chris Wilson
chris at chris-wilson.co.uk
Sun Jul 16 19:01:04 UTC 2017
---
drivers/gpu/drm/i915/i915_drv.c | 2 +-
drivers/gpu/drm/i915/i915_drv.h | 5 ++-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 69 ++++++++++++++++++++++--------
3 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8177a8ec3e40..4a6d13d0f86e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2641,7 +2641,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
DRM_IOCTL_DEF_DRV(I915_HWS_ADDR, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(I915_GEM_INIT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),
- DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER2_WR, i915_gem_execbuffer2, DRM_AUTH|DRM_RENDER_ALLOW),
+ DRM_DRIVER_IOCTL_DEF(I915_GEM_EXECBUFFER2_WR, i915_gem_execbuffer2_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(I915_GEM_PIN, i915_gem_reject_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(I915_GEM_UNPIN, i915_gem_reject_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
DRM_DRIVER_IOCTL_DEF(I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_RENDER_ALLOW),
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c233b864850a..95c060c29405 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3260,8 +3260,9 @@ long i915_gem_sw_finish_ioctl(struct file *filp,
unsigned long data);
int i915_gem_execbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-int i915_gem_execbuffer2(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
+long i915_gem_execbuffer2_ioctl(struct file *filp,
+ unsigned int cmd,
+ unsigned long data);
long i915_gem_busy_ioctl(struct file *filp,
unsigned int cmd,
unsigned long arg);
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 1df4f809cb10..92193fbc733e 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -2514,49 +2514,71 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
return err;
}
-int
-i915_gem_execbuffer2(struct drm_device *dev, void *data,
- struct drm_file *file)
+long
+i915_gem_execbuffer2_ioctl(struct file *filp,
+ unsigned int cmd,
+ unsigned long data)
{
const size_t sz = (sizeof(struct drm_i915_gem_exec_object2) +
sizeof(struct i915_vma *) +
sizeof(unsigned int));
- struct drm_i915_gem_execbuffer2 *args = data;
+ struct drm_i915_gem_execbuffer2 __user *user = (typeof(user))data;
+ struct drm_i915_gem_execbuffer2 arg;
struct drm_i915_gem_exec_object2 *exec2_list;
struct drm_syncobj **syncobjs;
+ struct drm_file *file = filp->private_data;
int err;
- if (args->buffer_count < 1 || args->buffer_count > SIZE_MAX / sz - 1) {
- DRM_DEBUG("execbuf2 with %d buffers\n", args->buffer_count);
+ if (unlikely(!(file->authenticated || drm_is_render_client(file))))
+ return -EACCES;
+
+ user_access_begin();
+ unsafe_get_user(arg.buffers_ptr, &user->buffers_ptr, err_user);
+ unsafe_get_user(arg.buffer_count, &user->buffer_count, err_user);
+ unsafe_get_user(arg.batch_start_offset,
+ &user->batch_start_offset, err_user);
+ unsafe_get_user(arg.batch_len, &user->batch_len, err_user);
+ unsafe_get_user(arg.DR1, &user->DR1, err_user);
+ unsafe_get_user(arg.DR4, &user->DR4, err_user);
+ unsafe_get_user(arg.num_cliprects, &user->num_cliprects, err_user);
+ unsafe_get_user(arg.cliprects_ptr, &user->cliprects_ptr, err_user);
+ unsafe_get_user(arg.flags, &user->flags, err_user);
+ unsafe_get_user(arg.rsvd1, &user->rsvd1, err_user);
+ unsafe_get_user(arg.rsvd2, &user->rsvd2, err_user);
+ user_access_end();
+
+ if (arg.buffer_count < 1 || arg.buffer_count > SIZE_MAX / sz - 1) {
+ DRM_DEBUG("execbuf2 with %d buffers\n", arg.buffer_count);
return -EINVAL;
}
- if (!i915_gem_check_execbuffer(args))
+ if (!i915_gem_check_execbuffer(&arg))
return -EINVAL;
/* Allocate an extra slot for use by the command parser */
- exec2_list = kvmalloc_array(args->buffer_count + 1, sz,
+ exec2_list = kvmalloc_array(arg.buffer_count + 1, sz,
__GFP_NOWARN | GFP_TEMPORARY);
if (exec2_list == NULL) {
DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
- args->buffer_count);
+ arg.buffer_count);
return -ENOMEM;
}
if (copy_from_user(exec2_list,
- u64_to_user_ptr(args->buffers_ptr),
- sizeof(*exec2_list) * args->buffer_count)) {
- DRM_DEBUG("copy %d exec entries failed\n", args->buffer_count);
+ u64_to_user_ptr(arg.buffers_ptr),
+ sizeof(*exec2_list) * arg.buffer_count)) {
+ DRM_DEBUG("copy %d exec entries failed\n", arg.buffer_count);
kvfree(exec2_list);
return -EFAULT;
}
- syncobjs = get_syncobj_array(args, file);
+ syncobjs = get_syncobj_array(&arg, file);
if (IS_ERR(syncobjs)) {
kvfree(exec2_list);
return PTR_ERR(syncobjs);
}
- err = i915_gem_do_execbuffer(dev, file, args, exec2_list, syncobjs);
+ err = i915_gem_do_execbuffer(file->minor->dev, file, &arg,
+ exec2_list, syncobjs);
/*
* Now that we have begun execution of the batchbuffer, we ignore
@@ -2564,14 +2586,14 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
* updated the associated relocations, we try to write out the current
* object locations irrespective of any error.
*/
- if (args->flags & __EXEC_HAS_RELOC) {
+ if (arg.flags & __EXEC_HAS_RELOC) {
struct drm_i915_gem_exec_object2 __user *user_exec_list =
- u64_to_user_ptr(args->buffers_ptr);
+ u64_to_user_ptr(arg.buffers_ptr);
unsigned int i;
/* Copy the new buffer offsets back to the user's exec list. */
user_access_begin();
- for (i = 0; i < args->buffer_count; i++) {
+ for (i = 0; i < arg.buffer_count; i++) {
if (!(exec2_list[i].offset & UPDATE))
continue;
@@ -2585,8 +2607,17 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
user_access_end();
}
- args->flags &= ~__I915_EXEC_UNKNOWN_FLAGS;
- put_syncobj_array(args, syncobjs);
+ if (!err && arg.flags & I915_EXEC_FENCE_OUT) {
+ user_access_begin();
+ unsafe_put_user(arg.rsvd2, &user->rsvd2, ignore_error);
+ignore_error:
+ user_access_end();
+ }
+ put_syncobj_array(&arg, syncobjs);
kvfree(exec2_list);
return err;
+
+err_user:
+ user_access_end();
+ return -EFAULT;
}
--
2.13.2
More information about the Intel-gfx-trybot
mailing list