Skip to content

Commit e059a7a

Browse files
Gustavo PadovanAlex Shi
Gustavo Padovan
authored and
Alex Shi
committed
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: Gustavo 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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 3ed605bc8a0a688d8750a1e2eff39c854418c5cf) Signed-off-by: Alex Shi <alex.shi@linaro.org> Conflicts: drop drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
1 parent 722feb6 commit e059a7a

5 files changed

Lines changed: 24 additions & 27 deletions

File tree

‎drivers/gpu/drm/i915/i915_drv.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3475,11 +3475,6 @@ static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev)
34753475
return VGACNTRL;
34763476
}
34773477

3478-
static inline void __user *to_user_ptr(u64 address)
3479-
{
3480-
return (void __user *)(uintptr_t)address;
3481-
}
3482-
34833478
static inline unsigned long msecs_to_jiffies_timeout(const unsigned int m)
34843479
{
34853480
unsigned long j = msecs_to_jiffies(m);

‎drivers/gpu/drm/i915/i915_gem.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,
324324
{
325325
struct drm_device *dev = obj->base.dev;
326326
void *vaddr = obj->phys_handle->vaddr + args->offset;
327-
char __user *user_data = to_user_ptr(args->data_ptr);
327+
char __user *user_data = u64_to_user_ptr(args->data_ptr);
328328
int ret = 0;
329329

330330
/* We manually control the domain here and pretend that it
@@ -605,7 +605,7 @@ i915_gem_shmem_pread(struct drm_device *dev,
605605
int needs_clflush = 0;
606606
struct sg_page_iter sg_iter;
607607

608-
user_data = to_user_ptr(args->data_ptr);
608+
user_data = u64_to_user_ptr(args->data_ptr);
609609
remain = args->size;
610610

611611
obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -692,7 +692,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
692692
return 0;
693693

694694
if (!access_ok(VERIFY_WRITE,
695-
to_user_ptr(args->data_ptr),
695+
u64_to_user_ptr(args->data_ptr),
696696
args->size))
697697
return -EFAULT;
698698

@@ -783,7 +783,7 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev,
783783
if (ret)
784784
goto out_unpin;
785785

786-
user_data = to_user_ptr(args->data_ptr);
786+
user_data = u64_to_user_ptr(args->data_ptr);
787787
remain = args->size;
788788

789789
offset = i915_gem_obj_ggtt_offset(obj) + args->offset;
@@ -907,7 +907,7 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
907907
int needs_clflush_before = 0;
908908
struct sg_page_iter sg_iter;
909909

910-
user_data = to_user_ptr(args->data_ptr);
910+
user_data = u64_to_user_ptr(args->data_ptr);
911911
remain = args->size;
912912

913913
obj_do_bit17_swizzling = i915_gem_object_needs_bit17_swizzle(obj);
@@ -1036,12 +1036,12 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
10361036
return 0;
10371037

10381038
if (!access_ok(VERIFY_READ,
1039-
to_user_ptr(args->data_ptr),
1039+
u64_to_user_ptr(args->data_ptr),
10401040
args->size))
10411041
return -EFAULT;
10421042

10431043
if (likely(!i915.prefault_disable)) {
1044-
ret = fault_in_multipages_readable(to_user_ptr(args->data_ptr),
1044+
ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),
10451045
args->size);
10461046
if (ret)
10471047
return -EFAULT;

‎drivers/gpu/drm/i915/i915_gem_execbuffer.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ i915_gem_execbuffer_relocate_vma(struct i915_vma *vma,
492492
struct drm_i915_gem_exec_object2 *entry = vma->exec_entry;
493493
int remain, ret;
494494

495-
user_relocs = to_user_ptr(entry->relocs_ptr);
495+
user_relocs = u64_to_user_ptr(entry->relocs_ptr);
496496

497497
remain = entry->relocation_count;
498498
while (remain) {
@@ -833,7 +833,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
833833
u64 invalid_offset = (u64)-1;
834834
int j;
835835

836-
user_relocs = to_user_ptr(exec[i].relocs_ptr);
836+
user_relocs = u64_to_user_ptr(exec[i].relocs_ptr);
837837

838838
if (copy_from_user(reloc+total, user_relocs,
839839
exec[i].relocation_count * sizeof(*reloc))) {
@@ -977,7 +977,7 @@ validate_exec_list(struct drm_device *dev,
977977
invalid_flags |= EXEC_OBJECT_NEEDS_GTT;
978978

979979
for (i = 0; i < count; i++) {
980-
char __user *ptr = to_user_ptr(exec[i].relocs_ptr);
980+
char __user *ptr = u64_to_user_ptr(exec[i].relocs_ptr);
981981
int length; /* limited by fault_in_pages_readable() */
982982

983983
if (exec[i].flags & invalid_flags)
@@ -1635,7 +1635,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
16351635
return -ENOMEM;
16361636
}
16371637
ret = copy_from_user(exec_list,
1638-
to_user_ptr(args->buffers_ptr),
1638+
u64_to_user_ptr(args->buffers_ptr),
16391639
sizeof(*exec_list) * args->buffer_count);
16401640
if (ret != 0) {
16411641
DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1671,7 +1671,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
16711671
ret = i915_gem_do_execbuffer(dev, data, file, &exec2, exec2_list);
16721672
if (!ret) {
16731673
struct drm_i915_gem_exec_object __user *user_exec_list =
1674-
to_user_ptr(args->buffers_ptr);
1674+
u64_to_user_ptr(args->buffers_ptr);
16751675

16761676
/* Copy the new buffer offsets back to the user's exec list. */
16771677
for (i = 0; i < args->buffer_count; i++) {
@@ -1723,7 +1723,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
17231723
return -ENOMEM;
17241724
}
17251725
ret = copy_from_user(exec2_list,
1726-
to_user_ptr(args->buffers_ptr),
1726+
u64_to_user_ptr(args->buffers_ptr),
17271727
sizeof(*exec2_list) * args->buffer_count);
17281728
if (ret != 0) {
17291729
DRM_DEBUG("copy %d exec entries failed %d\n",
@@ -1736,7 +1736,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
17361736
if (!ret) {
17371737
/* Copy the new buffer offsets back to the user's exec list. */
17381738
struct drm_i915_gem_exec_object2 __user *user_exec_list =
1739-
to_user_ptr(args->buffers_ptr);
1739+
u64_to_user_ptr(args->buffers_ptr);
17401740
int i;
17411741

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

‎drivers/gpu/drm/msm/msm_gem_submit.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
#define BO_LOCKED 0x4000
2929
#define BO_PINNED 0x2000
3030

31-
static inline void __user *to_user_ptr(u64 address)
32-
{
33-
return (void __user *)(uintptr_t)address;
34-
}
35-
3631
static struct msm_gem_submit *submit_create(struct drm_device *dev,
3732
struct msm_gpu *gpu, int nr)
3833
{
@@ -77,7 +72,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
7772
struct drm_gem_object *obj;
7873
struct msm_gem_object *msm_obj;
7974
void __user *userptr =
80-
to_user_ptr(args->bos + (i * sizeof(submit_bo)));
75+
u64_to_user_ptr(args->bos + (i * sizeof(submit_bo)));
8176

8277
ret = copy_from_user_inatomic(&submit_bo, userptr, sizeof(submit_bo));
8378
if (unlikely(ret)) {
@@ -274,7 +269,7 @@ static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *ob
274269
for (i = 0; i < nr_relocs; i++) {
275270
struct drm_msm_gem_submit_reloc submit_reloc;
276271
void __user *userptr =
277-
to_user_ptr(relocs + (i * sizeof(submit_reloc)));
272+
u64_to_user_ptr(relocs + (i * sizeof(submit_reloc)));
278273
uint32_t iova, off;
279274
bool valid;
280275

@@ -374,7 +369,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
374369
for (i = 0; i < args->nr_cmds; i++) {
375370
struct drm_msm_gem_submit_cmd submit_cmd;
376371
void __user *userptr =
377-
to_user_ptr(args->cmds + (i * sizeof(submit_cmd)));
372+
u64_to_user_ptr(args->cmds + (i * sizeof(submit_cmd)));
378373
struct msm_gem_object *msm_obj;
379374
uint32_t iova;
380375

‎include/linux/kernel.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353

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

56+
#define u64_to_user_ptr(x) ( \
57+
{ \
58+
typecheck(u64, x); \
59+
(void __user *)(uintptr_t)x; \
60+
} \
61+
)
62+
5663
/*
5764
* This looks more complex than it should be. But we need to
5865
* get the type for the ~ right in round_down (it needs to be

0 commit comments

Comments
 (0)