diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 15:05:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 15:05:19 -0800 |
| commit | 1b1e9262ca644b5b7f1d12b2f8c2edfff420c5f3 (patch) | |
| tree | dc4dbb5b7d2a69f620568ca266b0deb1c6478a71 | |
| parent | 9e6a39eae450b81c8b2c8cbbfbdf8218e9b40c81 (diff) | |
| parent | 88ec3211e46344a7d10cf6cb5045f839f7785f8e (diff) | |
| download | linux-1b1e9262ca644b5b7f1d12b2f8c2edfff420c5f3.tar.gz | |
Merge tag 'io_uring-5.10-2020-11-13' of git://git.kernel.dk/linux-block
Pull io_uring fix from Jens Axboe:
"A single fix in here, for a missed rounding case at setup time, which
caused an otherwise legitimate setup case to return -EINVAL if used
with unaligned ring size values"
* tag 'io_uring-5.10-2020-11-13' of git://git.kernel.dk/linux-block:
io_uring: round-up cq size before comparing with rounded sq size
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 8018c7076b25ce..c77584de68d7ca 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -9226,6 +9226,7 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p, * to a power-of-two, if it isn't already. We do NOT impose * any cq vs sq ring sizing. */ + p->cq_entries = roundup_pow_of_two(p->cq_entries); if (p->cq_entries < p->sq_entries) return -EINVAL; if (p->cq_entries > IORING_MAX_CQ_ENTRIES) { @@ -9233,7 +9234,6 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p, return -EINVAL; p->cq_entries = IORING_MAX_CQ_ENTRIES; } - p->cq_entries = roundup_pow_of_two(p->cq_entries); } else { p->cq_entries = 2 * p->sq_entries; } |