From c7934647dbe8889c55f9f7506a233794f09acdc9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Oct 2024 10:36:18 +0200 Subject: [PATCH] 6.1-stable patches added patches: io_uring-sqpoll-do-not-put-cpumask-on-stack.patch --- ...g-sqpoll-do-not-put-cpumask-on-stack.patch | 50 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 51 insertions(+) create mode 100644 queue-6.1/io_uring-sqpoll-do-not-put-cpumask-on-stack.patch diff --git a/queue-6.1/io_uring-sqpoll-do-not-put-cpumask-on-stack.patch b/queue-6.1/io_uring-sqpoll-do-not-put-cpumask-on-stack.patch new file mode 100644 index 00000000000..26091d43534 --- /dev/null +++ b/queue-6.1/io_uring-sqpoll-do-not-put-cpumask-on-stack.patch @@ -0,0 +1,50 @@ +From 7f44beadcc11adb98220556d2ddbe9c97aa6d42d Mon Sep 17 00:00:00 2001 +From: Felix Moessbauer +Date: Mon, 16 Sep 2024 13:11:50 +0200 +Subject: io_uring/sqpoll: do not put cpumask on stack + +From: Felix Moessbauer + +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 +Link: https://lore.kernel.org/r/20240916111150.1266191-1-felix.moessbauer@siemens.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + 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; diff --git a/queue-6.1/series b/queue-6.1/series index 6e63f54c27a..baf0663e3c7 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -295,3 +295,4 @@ vfio-pci-fix-potential-memory-leak-in-vfio_intx_enable.patch selinux-smack-don-t-bypass-permissions-check-in-inode_setsecctx-hook.patch drm-vmwgfx-prevent-unmapping-active-read-buffers.patch io_uring-sqpoll-retain-test-for-whether-the-cpu-is-valid.patch +io_uring-sqpoll-do-not-put-cpumask-on-stack.patch -- 2.47.3