diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2025-11-10 13:04:50 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-11-11 07:53:33 -0700 |
| commit | 7bb21a52e2d435b9edffe3b40264ab4462e338e0 (patch) | |
| tree | e613d36d346b31b60a5016bf7e570fad71d8eeda /io_uring/io_uring.c | |
| parent | 4aed5b4e6d276d2308d0ea8932b0c6ebfd3d19f8 (diff) | |
io_uring: pass sq entries in the params struct
There is no need to pass the user requested number of SQ entries
separately from the main parameter structure io_uring_params. Initialise
it at the beginning and stop passing it in favour of struct
io_uring_params::sq_entries.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/io_uring.c')
| -rw-r--r-- | io_uring/io_uring.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index d11d0e9723a1..023b0e3a829c 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -3479,8 +3479,10 @@ static int io_uring_sanitise_params(struct io_uring_params *p) return 0; } -int io_uring_fill_params(unsigned entries, struct io_uring_params *p) +int io_uring_fill_params(struct io_uring_params *p) { + unsigned entries = p->sq_entries; + if (!entries) return -EINVAL; if (entries > IORING_MAX_ENTRIES) { @@ -3542,7 +3544,7 @@ int io_uring_fill_params(unsigned entries, struct io_uring_params *p) return 0; } -static __cold int io_uring_create(unsigned entries, struct io_uring_params *p, +static __cold int io_uring_create(struct io_uring_params *p, struct io_uring_params __user *params) { struct io_ring_ctx *ctx; @@ -3554,7 +3556,7 @@ static __cold int io_uring_create(unsigned entries, struct io_uring_params *p, if (ret) return ret; - ret = io_uring_fill_params(entries, p); + ret = io_uring_fill_params(p); if (unlikely(ret)) return ret; @@ -3693,7 +3695,8 @@ static long io_uring_setup(u32 entries, struct io_uring_params __user *params) if (p.flags & ~IORING_SETUP_FLAGS) return -EINVAL; - return io_uring_create(entries, &p, params); + p.sq_entries = entries; + return io_uring_create(&p, params); } static inline int io_uring_allowed(void) |