From: Felix Moessbauer <felix.moessbauer@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20240916111150.1266191-1-felix.moessbauer@xxxxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/sqpoll.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -395,15 +395,22 @@ __cold int io_sq_offload_create(struct i
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;
Patches currently in stable-queue which might be from felix.moessbauer@xxxxxxxxxxx are
queue-6.1/io_uring-io-wq-do-not-allow-pinning-outside-of-cpuset.patch
queue-6.1/io_uring-sqpoll-do-not-put-cpumask-on-stack.patch
queue-6.1/io_uring-sqpoll-do-not-allow-pinning-outside-of-cpuset.patch
queue-6.1/io_uring-sqpoll-retain-test-for-whether-the-cpu-is-valid.patch
queue-6.1/io_uring-io-wq-inherit-cpuset-of-cgroup-in-io-worker.patch
