Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'io_uring-6.10-20240523' of git://git.kernel.dk/linux
Pull io_uring fixes from Jens Axboe:
"Single fix here for a regression in 6.9, and then a simple cleanup
removing some dead code"
* tag 'io_uring-6.10-20240523' of git://git.kernel.dk/linux:
io_uring: remove checks for NULL 'sq_offset'
io_uring/sqpoll: ensure that normal task_work is also run timely
+6
-6
+2
-4
io_uring/io_uring.c
+2
-4
io_uring/io_uring.c
···
2597
2597
#endif
2598
2598
2599
2599
if (ctx->flags & IORING_SETUP_NO_SQARRAY) {
2600
-
if (sq_offset)
2601
-
*sq_offset = SIZE_MAX;
2600
+
*sq_offset = SIZE_MAX;
2602
2601
return off;
2603
2602
}
2604
2603
2605
-
if (sq_offset)
2606
-
*sq_offset = off;
2604
+
*sq_offset = off;
2607
2605
2608
2606
sq_array_size = array_size(sizeof(u32), sq_entries);
2609
2607
if (sq_array_size == SIZE_MAX)
+4
-2
io_uring/sqpoll.c
+4
-2
io_uring/sqpoll.c
···
238
238
if (*retry_list) {
239
239
*retry_list = io_handle_tw_list(*retry_list, &count, max_entries);
240
240
if (count >= max_entries)
241
-
return count;
241
+
goto out;
242
242
max_entries -= count;
243
243
}
244
-
245
244
*retry_list = tctx_task_work_run(tctx, max_entries, &count);
245
+
out:
246
+
if (task_work_pending(current))
247
+
task_work_run();
246
248
return count;
247
249
}
248
250