[liburing,v2,1/3] liburing: Clean up `-Wshorten-64-to-32` warnings from clang

Commit Message

Ammar Faizi Oct. 20, 2022, 1:14 p.m. UTC

From: Dylan Yudaken <[e-mail]>

liburing has a couple of int shortening issues found by clang. Clean
them all. This cleanup is particularly useful for build systems that
include these files and run with that error enabled.

Link: https://lore.kernel.org/io-uring/[e-mail]
Signed-off-by: Dylan Yudaken <[e-mail]>
Co-authored-by: Ammar Faizi <[e-mail]>
Signed-off-by: Ammar Faizi <[e-mail]>
---
 src/arch/syscall-defs.h |  4 ++--
 src/register.c          |  5 ++++-
 src/setup.c             | 12 ++++++------
 src/syscall.h           |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

Patch

diff --git a/src/arch/syscall-defs.h b/src/arch/syscall-defs.h
index 4afb2af..d351f8b 100644
--- a/src/arch/syscall-defs.h
+++ b/src/arch/syscall-defs.h
@@ -11,9 +11,9 @@  static inline int __sys_open(const char *pathname, int flags, mode_t mode)
 	 * Some architectures don't have __NR_open, but __NR_openat.
 	 */
 #ifdef __NR_open
-	return __do_syscall3(__NR_open, pathname, flags, mode);
+	return (int) __do_syscall3(__NR_open, pathname, flags, mode);
 #else
-	return __do_syscall4(__NR_openat, AT_FDCWD, pathname, flags, mode);
+	return (int) __do_syscall4(__NR_openat, AT_FDCWD, pathname, flags, mode);
 #endif
 }
 
diff --git a/src/register.c b/src/register.c
index 0a2e5af..e849825 100644
--- a/src/register.c
+++ b/src/register.c
@@ -277,8 +277,11 @@  int io_uring_enable_rings(struct io_uring *ring)
 int io_uring_register_iowq_aff(struct io_uring *ring, size_t cpusz,
 			       const cpu_set_t *mask)
 {
+	if (cpusz >= (1U << 31))
+		return -EINVAL;
+
 	return __sys_io_uring_register(ring->ring_fd, IORING_REGISTER_IOWQ_AFF,
-				       mask, cpusz);
+					mask, (int) cpusz);
 }
 
 int io_uring_unregister_iowq_aff(struct io_uring *ring)
diff --git a/src/setup.c b/src/setup.c
index 21283eb..d918f86 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -248,29 +248,29 @@  __cold void io_uring_free_probe(struct io_uring_probe *probe)
 	uring_free(probe);
 }
 
-static inline int __fls(int x)
+static inline int __fls(unsigned long x)
 {
 	if (!x)
 		return 0;
-	return 8 * sizeof(x) - __builtin_clz(x);
+	return 8 * sizeof(x) - __builtin_clzl(x);
 }
 
 static unsigned roundup_pow2(unsigned depth)
 {
-	return 1UL << __fls(depth - 1);
+	return 1U << __fls(depth - 1);
 }
 
-static size_t npages(size_t size, unsigned page_size)
+static size_t npages(size_t size, long page_size)
 {
 	size--;
 	size /= page_size;
-	return __fls(size);
+	return __fls((int) size);
 }
 
 #define KRING_SIZE	320
 
 static size_t rings_size(struct io_uring_params *p, unsigned entries,
-			 unsigned cq_entries, unsigned page_size)
+			 unsigned cq_entries, long page_size)
 {
 	size_t pages, sq_size, cq_size;
 
diff --git a/src/syscall.h b/src/syscall.h
index f750782..8f03dfc 100644
--- a/src/syscall.h
+++ b/src/syscall.h
@@ -23,9 +23,9 @@  static inline void *ERR_PTR(intptr_t n)
 	return (void *) n;
 }
 
-static inline intptr_t PTR_ERR(const void *ptr)
+static inline int PTR_ERR(const void *ptr)
 {
-	return (intptr_t) ptr;
+	return (int) (intptr_t) ptr;
 }
 
 static inline bool IS_ERR(const void *ptr)