diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-21 10:30:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-21 10:30:15 -0700 |
| commit | d07de43e3f05576fd275c8c82e413d91932119a5 (patch) | |
| tree | 1f323aa1de34b05e30332006e43ea5ccc022fa0c | |
| parent | Merge tag 'perf-urgent-2025-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | io_uring/net: don't clear REQ_F_NEED_CLEANUP unconditionally (diff) | |
| download | wireguard-linux-d07de43e3f05576fd275c8c82e413d91932119a5.tar.xz wireguard-linux-d07de43e3f05576fd275c8c82e413d91932119a5.zip | |
Merge tag 'io_uring-6.14-20250321' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe:
"Single fix heading to stable, fixing an issue with io_req_msg_cleanup()
sometimes too eagerly clearing cleanup flags"
* tag 'io_uring-6.14-20250321' of git://git.kernel.dk/linux:
io_uring/net: don't clear REQ_F_NEED_CLEANUP unconditionally
| -rw-r--r-- | io_uring/net.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 5d0b56ff50ee..a288c75bb92c 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -148,7 +148,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) io_alloc_cache_kasan(&hdr->free_iov, &hdr->free_iov_nr); if (io_alloc_cache_put(&req->ctx->netmsg_cache, hdr)) { req->async_data = NULL; - req->flags &= ~REQ_F_ASYNC_DATA; + req->flags &= ~(REQ_F_ASYNC_DATA|REQ_F_NEED_CLEANUP); } } @@ -441,7 +441,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) static void io_req_msg_cleanup(struct io_kiocb *req, unsigned int issue_flags) { - req->flags &= ~REQ_F_NEED_CLEANUP; io_netmsg_recycle(req, issue_flags); } |