[net-next,3/4] bpf: Use the sockptr_t helpers

Commit Message

David Laight Dec. 25, 2023, 9:57 a.m. UTC

bpfptr_t is defined as sockptr_t but the bpfptr_is_kernel(),
bpfptr_is_null(), KERNEL_BPFPTR() and USER_BPFPTR() helpers are
copies of the sockptr ones.
Instead implement in terms of the sockptr helpers.

Signed-off-by: David Laight <[e-mail]>
---
 include/linux/bpfptr.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch

diff --git a/include/linux/bpfptr.h b/include/linux/bpfptr.h
index 79b2f78eec1a..862e87350477 100644
--- a/include/linux/bpfptr.h
+++ b/include/linux/bpfptr.h
@@ -10,17 +10,17 @@  typedef sockptr_t bpfptr_t;
 
 static inline bool bpfptr_is_kernel(bpfptr_t bpfptr)
 {
-	return bpfptr.is_kernel;
+	return sockptr_is_kernel(bpfptr);
 }
 
 static inline bpfptr_t KERNEL_BPFPTR(void *p)
 {
-	return (bpfptr_t) { .kernel = p, .is_kernel = true };
+	return KERNEL_SOCKPTR(p);
 }
 
 static inline bpfptr_t USER_BPFPTR(void __user *p)
 {
-	return (bpfptr_t) { .user = p };
+	return USER_SOCKPTR(p);
 }
 
 static inline bpfptr_t make_bpfptr(u64 addr, bool is_kernel)
@@ -33,9 +33,7 @@  static inline bpfptr_t make_bpfptr(u64 addr, bool is_kernel)
 
 static inline bool bpfptr_is_null(bpfptr_t bpfptr)
 {
-	if (bpfptr_is_kernel(bpfptr))
-		return !bpfptr.kernel;
-	return !bpfptr.user;
+	return sockptr_is_null(bpfptr);
 }
 
 static inline void bpfptr_add(bpfptr_t *bpfptr, size_t val)