| Message ID | 20221020114814.63133-2-ammar.faizi@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Clean up clang `-Wshorten-64-to-32` warnings | expand |
On 10/20/22 6:52 PM, Ammar Faizi wrote: > From: Dylan Yudaken<dylany@fb.com> > > 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/20221019145042.446477-1-dylany@meta.com > Signed-off-by: Dylan Yudaken<dylany@fb.com> > Co-authored-by: Ammar Faizi<ammarfaizi2@gnuweeb.org> > Signed-off-by: Ammar Faizi<ammarfaizi2@gnuweeb.org> BTW, before it's too late. I think we should be consistent on the cast style: (type) a or (type)a What do you think?
On 10/20/22 5:12 AM, Ammar Faizi wrote: > On 10/20/22 6:52 PM, Ammar Faizi wrote: >> From: Dylan Yudaken<dylany@fb.com> >> >> 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/20221019145042.446477-1-dylany@meta.com >> Signed-off-by: Dylan Yudaken<dylany@fb.com> >> Co-authored-by: Ammar Faizi<ammarfaizi2@gnuweeb.org> >> Signed-off-by: Ammar Faizi<ammarfaizi2@gnuweeb.org> > > BTW, before it's too late. I think we should be consistent on the cast > style: > > (type) a > > or > > (type)a > > What do you think? I tend to prefer (type) a, but sometimes if you have multiple casts or the lines become too long, I'll do (type)a. I don't think it's super important in terms of style, as it isn't that prevalent.
diff --git a/src/arch/syscall-defs.h b/src/arch/syscall-defs.h index 4afb2af..7660574 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..912851a 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..1885731 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..c61d572 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)