Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a9d26aa authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Bernhard Thoben
Browse files

kernel.h: add u64_to_user_ptr() 



This function had copies in 3 different files. Unify them in kernel.h.

Cc: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Acked-by: Daniel Vetter <daniel.vetter@intel.com>	[drm/i915/]
Acked-by: Rob Clark <robdclark@gmail.com>		[drm/msm/]
Acked-by: Lucas Stach <l.stach@pengutronix.de>		[drm/etinav/]
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 3ed605bc8a0a688d8750a1e2eff39c854418c5cf)
parent 3773b5bd

drivers/gpu/drm/i915/i915_drv.h

+0 −5
Original line number Diff line number Diff line
@@ -1942,11 +1942,6 @@ static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev) 
		return VGACNTRL;

}



static inline void __user *to_user_ptr(u64 address)

{

	return (void __user *)(uintptr_t)address;

}



static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)

{

	unsigned long j = msecs_to_jiffies(m);

drivers/gpu/drm/i915/i915_gem.c

+12 −9
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 
	struct drm_i915_gem_get_aperture *args = data;

	struct drm_i915_gem_object *obj;

	size_t pinned;

	char __user *user_data = u64_to_user_ptr(args->data_ptr);



	pinned = 0;

	mutex_lock(&dev->struct_mutex);
@@ -410,7 +411,7 @@ i915_gem_shmem_pread(struct drm_device *dev, 
	int needs_clflush = 0;

	struct sg_page_iter sg_iter;



	user_data = to_user_ptr(args->data_ptr);

	user_data = u64_to_user_ptr(args->data_ptr);

	remain = args->size;



	obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -515,7 +516,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
		return 0;



	if (!access_ok(VERIFY_WRITE,

		       to_user_ptr(args->data_ptr),

		       u64_to_user_ptr(args->data_ptr),

		       args->size))

		return -EFAULT;
@@ -606,7 +607,7 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev, 
	if (ret)

		goto out_unpin;



	user_data = to_user_ptr(args->data_ptr);

	user_data = u64_to_user_ptr(args->data_ptr);

	remain = args->size;



	offset = obj->gtt_offset + args->offset;
@@ -727,7 +728,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev, 
	int needs_clflush_before = 0;

	struct sg_page_iter sg_iter;



	user_data = to_user_ptr(args->data_ptr);

	user_data = u64_to_user_ptr(args->data_ptr);

	remain = args->size;



	obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -856,14 +857,16 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		return 0;



	if (!access_ok(VERIFY_READ,

		       to_user_ptr(args->data_ptr),

		       u64_to_user_ptr(args->data_ptr),

		       args->size))

		return -EFAULT;



	ret = fault_in_multipages_readable(to_user_ptr(args->data_ptr),

	if (likely(!i915.prefault_disable)) {

		ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),

						   args->size);

		if (ret)

			return -EFAULT;

	}



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+8 −8
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ i915_gem_execbuffer_relocate_object(struct drm_i915_gem_object *obj, 
	struct drm_i915_gem_exec_object2 *entry = obj->exec_entry;

	int remain, ret;



	user_relocs = to_user_ptr(entry->relocs_ptr);

	user_relocs = u64_to_user_ptr(entry->relocs_ptr);



	remain = entry->relocation_count;

	while (remain) {
@@ -616,7 +616,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, 
		u64 invalid_offset = (u64)-1;

		int j;



		user_relocs = to_user_ptr(exec[i].relocs_ptr);

		user_relocs = u64_to_user_ptr(exec[i].relocs_ptr);



		if (copy_from_user(reloc+total, user_relocs,

				   exec[i].relocation_count * sizeof(*reloc))) {
@@ -734,7 +734,7 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec, 
	int relocs_max = INT_MAX / sizeof(struct drm_i915_gem_relocation_entry);



	for (i = 0; i < count; i++) {

		char __user *ptr = to_user_ptr(exec[i].relocs_ptr);

		char __user *ptr = u64_to_user_ptr(exec[i].relocs_ptr);

		int length; /* limited by fault_in_pages_readable() */



		if (exec[i].flags & __EXEC_OBJECT_UNKNOWN_FLAGS)
@@ -1116,7 +1116,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, 
		return -ENOMEM;

	}

	ret = copy_from_user(exec_list,

			     to_user_ptr(args->buffers_ptr),

			     u64_to_user_ptr(args->buffers_ptr),

			     sizeof(*exec_list) * args->buffer_count);

	if (ret != 0) {

		DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1152,7 +1152,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, 
	ret = i915_gem_do_execbuffer(dev, data, file, &exec2, exec2_list);

	if (!ret) {

		struct drm_i915_gem_exec_object __user *user_exec_list =

			to_user_ptr(args->buffers_ptr);

			u64_to_user_ptr(args->buffers_ptr);



		/* Copy the new buffer offsets back to the user's exec list. */

		for (i = 0; i < args->buffer_count; i++) {
@@ -1199,7 +1199,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data, 
		return -ENOMEM;

	}

	ret = copy_from_user(exec2_list,

			     to_user_ptr(args->buffers_ptr),

			     u64_to_user_ptr(args->buffers_ptr),

			     sizeof(*exec2_list) * args->buffer_count);

	if (ret != 0) {

		DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1211,8 +1211,8 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data, 
	ret = i915_gem_do_execbuffer(dev, data, file, args, exec2_list);

	if (!ret) {

		/* Copy the new buffer offsets back to the user's exec list. */

		struct drm_i915_gem_exec_object2 *user_exec_list =

				   to_user_ptr(args->buffers_ptr);

		struct drm_i915_gem_exec_object2 __user *user_exec_list =

				   u64_to_user_ptr(args->buffers_ptr);

		int i;



		for (i = 0; i < args->buffer_count; i++) {

include/linux/kernel.h

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ 


#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))



#define u64_to_user_ptr(x) (		\

{					\

	typecheck(u64, x);		\

	(void __user *)(uintptr_t)x;	\

}					\

)



/*

 * This looks more complex than it should be. But we need to

 * get the type for the ~ right in round_down (it needs to be