Commit b6e7eed8 authored by Shenghui Wang's avatar Shenghui Wang Committed by Greg Kroah-Hartman

io_uring: use cpu_online() to check p->sq_thread_cpu instead of cpu_possible()

[ Upstream commit 7889f44d ]

This issue is found by running liburing/test/io_uring_setup test.

When test run, the testcase "attempt to bind to invalid cpu" would not
pass with messages like:
   io_uring_setup(1, 0xbfc2f7c8), \
flags: IORING_SETUP_SQPOLL|IORING_SETUP_SQ_AFF, \
resv: 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000, \
sq_thread_cpu: 2
   expected -1, got 3
   FAIL

On my system, there is:
   CPU(s) possible : 0-3
   CPU(s) online   : 0-1
   CPU(s) offline  : 2-3
   CPU(s) present  : 0-1

The sq_thread_cpu 2 is offline on my system, so the bind should fail.
But cpu_possible() will pass the check. We shouldn't be able to bind
to an offline cpu. Use cpu_online() to do the check.

After the change, the testcase run as expected: EINVAL will be returned
for cpu offlined.
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarShenghui Wang <shhuiw@foxmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e983250f
...@@ -2334,7 +2334,7 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx, ...@@ -2334,7 +2334,7 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx,
nr_cpu_ids); nr_cpu_ids);
ret = -EINVAL; ret = -EINVAL;
if (!cpu_possible(cpu)) if (!cpu_online(cpu))
goto err; goto err;
ctx->sqo_thread = kthread_create_on_cpu(io_sq_thread, ctx->sqo_thread = kthread_create_on_cpu(io_sq_thread,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment