Re: [RFC v4 02/18] bpf: Move u64_to_ptr() to BPF headers and inline it
flat view
From: Arnd Bergmann <arnd@arndb.de>
Date: 2016-10-26 07:22:53
Also in:
cgroups, lkml, netdev
On Wednesday, October 26, 2016 8:56:38 AM CEST Mickaël Salaün wrote:
quoted hunk ↗ jump to hunk
include/linux/bpf.h | 6 ++++++ kernel/bpf/syscall.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c201017b5730..cf87db6daf27 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h@@ -283,6 +283,12 @@ static inline void bpf_long_memcpy(void *dst, const void *src, u32 size) /* verify correctness of eBPF program */ int bpf_check(struct bpf_prog **fp, union bpf_attr *attr); + +/* helper to convert user pointers passed inside __aligned_u64 fields */ +static inline void __user *u64_to_ptr(__u64 val) +{ + return (void __user *) (unsigned long) val; +} #else
We already have at least six copies of this helper: fs/btrfs/qgroup.c:#define u64_to_ptr(x) ((struct btrfs_qgroup *)(uintptr_t)x) kernel/bpf/syscall.c:static void __user *u64_to_ptr(__u64 val) drivers/staging/android/ion/ion_test.c:#define u64_to_uptr(x) ((void __user *)(unsigned long)(x)) drivers/firewire/core-cdev.c:static void __user *u64_to_uptr(u64 value) drivers/staging/android/ion/ion_test.c:#define u64_to_uptr(x) ((void __user *)(unsigned long)(x)) include/linux/kernel.h:#define u64_to_user_ptr(x) ( \ Just use the one in linux/kernel.h Arnd