github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This is the 5.10.126 stable release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmK5XxEACgkQONu9yGCS
 aT4tQw//bsys/vfwoGc72IrVnYgNCY/+9yot3ycCXlG7ia6hP+gJnnEzhJFQlaEv
 6wVMU8NYXtyN3LssMHUkxEx+grayIf/gF4odIuRMkGwAFzTm16l/HqaKk4YQqIA0
 rVhhCs/N8tSwQ33sEGzlbDCziAGt1eu1yPjzUy/0NKiMtdzJ6KyC4AzXWG+T5u7c
 IHYBPWveQQTqczQJx6Qj1FHLUdwPUEN8Ine3Z1pJH5SLJWjTmLxkmw3vDLVH+ApA
 Js5a+QpOO+IH7gk0tuTwe9LYEoLCgyRp2jCFmqCnHXpVXncaGI8341fzhnPbncli
 L8sKGG5RLQpVCstvqPzgxDhLquFWW9nKFh4JO9JUPG/NbJt9w3ORSCJV4XX3lARf
 iAOxvxNTlTFQk6eNTMTQp+GpRCcsRAWF2N9KLgFl/79UT8xCJS3Ia2zuLPveae+X
 Vy9JhwFNC5mValmQIoOlxTZ5IMJzjSf6JgInODqhEeDzJFhTzQmRhfLsFLE05X1U
 YVlNbhNc/AeQae8jInC0Uxyg5xGb0NYC3jtAORQAkNmm/4Hjt696IsTvILJxH3uo
 nFWb7lM1TY8/OAOU7b+jzd3XwDdZ8Fji9tw4Gh042/gFINe/YSvT13nvApDWBoTo
 zdIBydX0S3djgTr6iQoIIhRnVEvEh9feYj7gTAYijbMILwjykLA=
 =TVub
 -----END PGP SIGNATURE-----

Merge 5.10.126 into android12-5.10-lts

Changes in 5.10.126
	io_uring: use separate list entry for iopoll requests
	Linux 5.10.126

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I009061a346f4cc0301da4dd11a0d6c60fc73ed84
This commit is contained in:
Greg Kroah-Hartman 2022-07-28 16:06:41 +02:00
commit f93a6ac3d6
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 5 VERSION = 5
PATCHLEVEL = 10 PATCHLEVEL = 10
SUBLEVEL = 125 SUBLEVEL = 126
EXTRAVERSION = EXTRAVERSION =
NAME = Dare mighty things NAME = Dare mighty things

24
fs/io_uring.c
View File

@ -696,6 +696,8 @@ struct io_kiocb {
*/ */
struct list_head inflight_entry; struct list_head inflight_entry;
struct list_head iopoll_entry;
struct percpu_ref *fixed_file_refs; struct percpu_ref *fixed_file_refs;
struct callback_head task_work; struct callback_head task_work;
/* for polled requests, i.e. IORING_OP_POLL_ADD and async armed poll */ /* for polled requests, i.e. IORING_OP_POLL_ADD and async armed poll */
@ -2350,8 +2352,8 @@ static void io_iopoll_queue(struct list_head *again)
struct io_kiocb *req; struct io_kiocb *req;
do { do {
req = list_first_entry(again, struct io_kiocb, inflight_entry); req = list_first_entry(again, struct io_kiocb, iopoll_entry);
list_del(&req->inflight_entry); list_del(&req->iopoll_entry);
__io_complete_rw(req, -EAGAIN, 0, NULL); __io_complete_rw(req, -EAGAIN, 0, NULL);
} while (!list_empty(again)); } while (!list_empty(again));
} }
@ -2373,14 +2375,14 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
while (!list_empty(done)) { while (!list_empty(done)) {
int cflags = 0; int cflags = 0;
req = list_first_entry(done, struct io_kiocb, inflight_entry); req = list_first_entry(done, struct io_kiocb, iopoll_entry);
if (READ_ONCE(req->result) == -EAGAIN) { if (READ_ONCE(req->result) == -EAGAIN) {
req->result = 0; req->result = 0;
req->iopoll_completed = 0; req->iopoll_completed = 0;
list_move_tail(&req->inflight_entry, &again); list_move_tail(&req->iopoll_entry, &again);
continue; continue;
} }
list_del(&req->inflight_entry); list_del(&req->iopoll_entry);
if (req->flags & REQ_F_BUFFER_SELECTED) if (req->flags & REQ_F_BUFFER_SELECTED)
cflags = io_put_rw_kbuf(req); cflags = io_put_rw_kbuf(req);
@ -2416,7 +2418,7 @@ static int io_do_iopoll(struct io_ring_ctx *ctx, unsigned int *nr_events,
spin = !ctx->poll_multi_file && *nr_events < min; spin = !ctx->poll_multi_file && *nr_events < min;
ret = 0; ret = 0;
list_for_each_entry_safe(req, tmp, &ctx->iopoll_list, inflight_entry) { list_for_each_entry_safe(req, tmp, &ctx->iopoll_list, iopoll_entry) {
struct kiocb *kiocb = &req->rw.kiocb; struct kiocb *kiocb = &req->rw.kiocb;
/* /*
@ -2425,7 +2427,7 @@ static int io_do_iopoll(struct io_ring_ctx *ctx, unsigned int *nr_events,
* and complete those lists first, if we have entries there. * and complete those lists first, if we have entries there.
*/ */
if (READ_ONCE(req->iopoll_completed)) { if (READ_ONCE(req->iopoll_completed)) {
list_move_tail(&req->inflight_entry, &done); list_move_tail(&req->iopoll_entry, &done);
continue; continue;
} }
if (!list_empty(&done)) if (!list_empty(&done))
@ -2437,7 +2439,7 @@ static int io_do_iopoll(struct io_ring_ctx *ctx, unsigned int *nr_events,
/* iopoll may have completed current req */ /* iopoll may have completed current req */
if (READ_ONCE(req->iopoll_completed)) if (READ_ONCE(req->iopoll_completed))
list_move_tail(&req->inflight_entry, &done); list_move_tail(&req->iopoll_entry, &done);
if (ret && spin) if (ret && spin)
spin = false; spin = false;
@ -2670,7 +2672,7 @@ static void io_iopoll_req_issued(struct io_kiocb *req)
struct io_kiocb *list_req; struct io_kiocb *list_req;
list_req = list_first_entry(&ctx->iopoll_list, struct io_kiocb, list_req = list_first_entry(&ctx->iopoll_list, struct io_kiocb,
inflight_entry); iopoll_entry);
if (list_req->file != req->file) if (list_req->file != req->file)
ctx->poll_multi_file = true; ctx->poll_multi_file = true;
} }
@ -2680,9 +2682,9 @@ static void io_iopoll_req_issued(struct io_kiocb *req)
* it to the front so we find it first. * it to the front so we find it first.
*/ */
if (READ_ONCE(req->iopoll_completed)) if (READ_ONCE(req->iopoll_completed))
list_add(&req->inflight_entry, &ctx->iopoll_list); list_add(&req->iopoll_entry, &ctx->iopoll_list);
else else
list_add_tail(&req->inflight_entry, &ctx->iopoll_list); list_add_tail(&req->iopoll_entry, &ctx->iopoll_list);
if ((ctx->flags & IORING_SETUP_SQPOLL) && if ((ctx->flags & IORING_SETUP_SQPOLL) &&
wq_has_sleeper(&ctx->sq_data->wait)) wq_has_sleeper(&ctx->sq_data->wait))