superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io_uring: deduplicate array_size in io_allocate_scq_urings 

A minor cleanup precomputing the sq size first instead of branching
array_size() in io_allocate_scq_urings().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1354/merge
Pavel Begunkov 2025-10-16 14:23:17 +01:00 committed by Jens Axboe
parent ab673c1bca
commit 12aced0a55
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
io_uring/io_uring.c
View File

@ -3610,6 +3610,7 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
struct io_uring_region_desc rd; struct io_uring_region_desc rd;
struct io_rings *rings; struct io_rings *rings;
size_t size, sq_array_offset; size_t size, sq_array_offset;
size_t sqe_size;
int ret; int ret;
/* make sure these are sane, as we already accounted them */ /* make sure these are sane, as we already accounted them */
@ -3639,10 +3640,11 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
rings->sq_ring_entries = p->sq_entries; rings->sq_ring_entries = p->sq_entries;
rings->cq_ring_entries = p->cq_entries; rings->cq_ring_entries = p->cq_entries;
sqe_size = sizeof(struct io_uring_sqe);
if (p->flags & IORING_SETUP_SQE128) if (p->flags & IORING_SETUP_SQE128)
size = array_size(2 * sizeof(struct io_uring_sqe), p->sq_entries); sqe_size *= 2;
else
size = array_size(sizeof(struct io_uring_sqe), p->sq_entries); size = array_size(sqe_size, p->sq_entries);
if (size == SIZE_MAX) { if (size == SIZE_MAX) {
io_rings_free(ctx); io_rings_free(ctx);
return -EOVERFLOW; return -EOVERFLOW;