From dfb9fd8d21259c7d35ce287fa87d62fc93d91903 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 25 Jun 2022 15:18:28 +0200 Subject: [PATCH] 5.18-stable patches added patches: io_uring-use-original-request-task-for-inflight-tracking.patch --- ...l-request-task-for-inflight-tracking.patch | 35 +++++++++++++++++++ queue-5.18/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-5.18/io_uring-use-original-request-task-for-inflight-tracking.patch diff --git a/queue-5.18/io_uring-use-original-request-task-for-inflight-tracking.patch b/queue-5.18/io_uring-use-original-request-task-for-inflight-tracking.patch new file mode 100644 index 00000000000..260c173bec0 --- /dev/null +++ b/queue-5.18/io_uring-use-original-request-task-for-inflight-tracking.patch @@ -0,0 +1,35 @@ +From 386e4fb6962b9f248a80f8870aea0870ca603e89 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Thu, 23 Jun 2022 11:06:43 -0600 +Subject: io_uring: use original request task for inflight tracking + +From: Jens Axboe + +commit 386e4fb6962b9f248a80f8870aea0870ca603e89 upstream. + +In prior kernels, we did file assignment always at prep time. This meant +that req->task == current. But after deferring that assignment and then +pushing the inflight tracking back in, we've got the inflight tracking +using current when it should in fact now be using req->task. + +Fixup that error introduced by adding the inflight tracking back after +file assignments got modifed. + +Fixes: 9cae36a094e7 ("io_uring: reinstate the inflight tracking") +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + fs/io_uring.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/io_uring.c ++++ b/fs/io_uring.c +@@ -1647,7 +1647,7 @@ static inline void io_req_track_inflight + { + if (!(req->flags & REQ_F_INFLIGHT)) { + req->flags |= REQ_F_INFLIGHT; +- atomic_inc(¤t->io_uring->inflight_tracked); ++ atomic_inc(&req->task->io_uring->inflight_tracked); + } + } + diff --git a/queue-5.18/series b/queue-5.18/series index da6a1a9ed11..0bcb01a9465 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -9,3 +9,4 @@ fsnotify-consistent-behavior-for-parent-not-watching-children.patch bpf-fix-calling-global-functions-from-bpf_prog_type_ext-programs.patch selftests-bpf-add-selftest-for-calling-global-functions-from-freplace.patch dt-bindings-nvmem-sfp-add-clock-properties.patch +io_uring-use-original-request-task-for-inflight-tracking.patch -- 2.47.3