FAILED: patch "[PATCH] io_uring/futex: only mark private futex waits as inflight" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 4d327bbd1cd2485783553b6b2b401aa475f90dd0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082442-slogan-feminine-7a8d@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4d327bbd1cd2485783553b6b2b401aa475f90dd0 Mon Sep 17 00:00:00 2001
From: Jens Axboe <[email protected]>
Date: Thu, 30 Jul 2026 06:50:47 -0600
Subject: [PATCH] io_uring/futex: only mark private futex waits as inflight
Inflight tracking of futex wait requests exists to ensure that do_exit() -> io_uring_files_cancel() cancels them before the mm goes away, as a private futex wait depends on the mm private futex hash staying alive for the duration of the request.
Shared futexes have no such dependency. A FLAGS_SHARED request always resolves to either an inode based key or an mm-shared key, both of which fail futex_key_is_private() and hence always hash into the global futex hash, whose lifetime isn't tied to the mm.
Only mark vectored futex waits as inflight if the futex is private.
io_uring/futex.c +13 -4
@@ -154,14 +154,16 @@ int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_futex_wait_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);int ret; ret =io_futex_prep (req, sqe);if (unlikely (ret))return ret; -/* Mark as inflight, so file exit cancelation will find it */ -io_req_track_inflight (req); +/* inflight tracking only needed for mm private hash */ +if (!(iof->futex_flags &FLAGS_SHARED )) +io_req_track_inflight (req);return 0 ; }
@@ -186,6 +188,7 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);struct io_futexv_data *ifd; +unsigned int i;int ret;/* No flags or mask supported for waitv */
@@ -210,8 +213,14 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return ret; } -/* Mark as inflight, so file exit cancelation will find it */ -io_req_track_inflight (req); +/* inflight tracking only needed for mm private hash */ +for (i =0 ; i < iof->futex_nr; i++) { +if (!(ifd->futexv[i].w.flags &FLAGS_SHARED )) { +io_req_track_inflight (req); +break ; + } + } + iof->futexv_unqueued =0 ; req->flags |=REQ_F_ASYNC_DATA ; req->async_data = ifd;
Sasha Levin
maintainerPATCH 1/2 io_uring/futex: don't mark futex wake requests as inflight
From: Jens Axboe <[email protected]>
[ Upstream commit 73e7019097473fc9f83a334ef2c6ab3343709fef ]
Commit 079afb081c42 ("io_uring/futex: mark wait requests as inflight") added inflight tracking to ensure that do_exit() -> io_uring_files_cancel() finds and cancels pending futex waits before the mm goes away, as a private futex wait depends on the mm private futex hash staying alive for the duration of the request. However, as io_futex_prep() is shared between FUTEX_WAIT and FUTEX_WAKE, wake requests got marked as inflight as well.
A futex wake executes fully inline at issue time and never depends on the mm staying alive after completion, hence there's no need to track it. Kill it.
Stable-dep-of: 4d327bbd1cd2 ("io_uring/futex: only mark private futex waits as inflight")
--- io_uring/futex.c | 11 +++++++++++ io_uring/futex.h | 1 + io_uring/opdef.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-)
io_uring/futex.c +11 -0
@@ -144,6 +144,17 @@ int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) !futex_validate_input(iof->futex_flags, iof->futex_mask)) return -EINVAL; +return 0 ; +} + +int io_futex_wait_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ +int ret; + + ret =io_futex_prep (req, sqe); +if (unlikely (ret)) +return ret; +/* Mark as inflight, so file exit cancelation will find it */ io_req_track_inflight (req);return 0 ;
io_uring/futex.h +1 -0
@@ -3,6 +3,7 @@#include "cancel.h" int io_futex_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_futex_wait_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_futexv_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_futex_wait (struct io_kiocb *req,unsigned int issue_flags);int io_futexv_wait (struct io_kiocb *req,unsigned int issue_flags);
io_uring/opdef.c +1 -1
@@ -466,7 +466,7 @@ const struct io_issue_def io_issue_defs[] = { }, [IORING_OP_FUTEX_WAIT] = {#if defined(CONFIG_FUTEX ) - .prep = io_futex_prep, + .prep = io_futex_wait_prep, .issue = io_futex_wait, #else .prep = io_eopnotsupp_prep,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 io_uring/futex: only mark private futex waits as inflight
From: Jens Axboe <[email protected]>
[ Upstream commit 4d327bbd1cd2485783553b6b2b401aa475f90dd0 ]
Inflight tracking of futex wait requests exists to ensure that do_exit() -> io_uring_files_cancel() cancels them before the mm goes away, as a private futex wait depends on the mm private futex hash staying alive for the duration of the request.
Shared futexes have no such dependency. A FLAGS_SHARED request always resolves to either an inode based key or an mm-shared key, both of which fail futex_key_is_private() and hence always hash into the global futex hash, whose lifetime isn't tied to the mm.
Only mark vectored futex waits as inflight if the futex is private.
--- io_uring/futex.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
io_uring/futex.c +13 -4
@@ -149,14 +149,16 @@ int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_futex_wait_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { + struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);int ret; ret =io_futex_prep (req, sqe);if (unlikely (ret))return ret; -/* Mark as inflight, so file exit cancelation will find it */ -io_req_track_inflight (req); +/* inflight tracking only needed for mm private hash */ +if (!(iof->futex_flags &FLAGS_SHARED )) +io_req_track_inflight (req);return 0 ; }
@@ -179,6 +181,7 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_futex *iof = io_kiocb_to_cmd(req, struct io_futex);struct futex_vector *futexv; +unsigned int i;int ret;/* No flags or mask supported for waitv */
@@ -202,8 +205,14 @@ int io_futexv_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)return ret; } -/* Mark as inflight, so file exit cancelation will find it */ -io_req_track_inflight (req); +/* inflight tracking only needed for mm private hash */ +for (i =0 ; i < iof->futex_nr; i++) { +if (!(futexv[i].w.flags &FLAGS_SHARED )) { +io_req_track_inflight (req); +break ; + } + } + iof->futexv_owned =0 ; iof->futexv_unqueued =0 ; req->flags |=REQ_F_ASYNC_DATA ;
Signature · 1 line
2.53.0