diff options
| author | Felix Moessbauer <felix.moessbauer@siemens.com> | 2024-10-17 13:50:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-22 15:39:25 +0200 |
| commit | b12ef2d4dfee3ca13258388868d9b78f3fae1c33 (patch) | |
| tree | 85387bbf043714ebffa772f36355c1c142953c9a /io_uring | |
| parent | 66b98c4f18b067984a2baac0fa9276bfc78d50b1 (diff) | |
| download | linux-b12ef2d4dfee3ca13258388868d9b78f3fae1c33.tar.gz linux-b12ef2d4dfee3ca13258388868d9b78f3fae1c33.tar.bz2 linux-b12ef2d4dfee3ca13258388868d9b78f3fae1c33.zip | |
io_uring/sqpoll: do not put cpumask on stack
commit 7f44beadcc11adb98220556d2ddbe9c97aa6d42d upstream.
Putting the cpumask on the stack is deprecated for a long time (since
2d3854a37e8), as these can be big. Given that, change the on-stack
allocation of allowed_mask to be dynamically allocated.
Fixes: f011c9cf04c0 ("io_uring/sqpoll: do not allow pinning outside of cpuset")
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
Link: https://lore.kernel.org/r/20240916111150.1266191-1-felix.moessbauer@siemens.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index b670895e5a37..502a8e201400 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -8572,15 +8572,22 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx, return 0; if (p->flags & IORING_SETUP_SQ_AFF) { - struct cpumask allowed_mask; + cpumask_var_t allowed_mask; int cpu = p->sq_thread_cpu; ret = -EINVAL; if (cpu >= nr_cpu_ids || !cpu_online(cpu)) goto err_sqpoll; - cpuset_cpus_allowed(current, &allowed_mask); - if (!cpumask_test_cpu(cpu, &allowed_mask)) + ret = -ENOMEM; + if (!alloc_cpumask_var(&allowed_mask, GFP_KERNEL)) + goto err_sqpoll; + ret = -EINVAL; + cpuset_cpus_allowed(current, allowed_mask); + if (!cpumask_test_cpu(cpu, allowed_mask)) { + free_cpumask_var(allowed_mask); goto err_sqpoll; + } + free_cpumask_var(allowed_mask); sqd->sq_cpu = cpu; } else { sqd->sq_cpu = -1; |