From: Jens Axboe <axboe@kernel.dk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: io-uring <io-uring@vger.kernel.org>
Subject: [GIT PULL] io_uring fixes for 7.1-rc2
Date: Thu, 30 Apr 2026 19:49:35 -0600 [thread overview]
Message-ID: <8f3dd419-e06b-4b83-aaa4-7f7bafc098b4@kernel.dk> (raw)
Hi Linus,
Small batch of fixes for io_uring for the 7.1-rc2 kernel release. This
pull request contains:
- Remove dead struct io_buffer_list member.
- Fix for incrementally consumed buffers with recvmsg multishot, which
requires a minimum value left in a buffer for any receive for the
headers. If there's still a bit of buffer left but it's smaller than
that value, then userspace will see a spurious -EFAULT returned in the
CQE.
- Locking fix for the DEFER_TASKRUN retry list, which otherwise could
race with fallback cancelations. If the task is exiting with task_work
left in both the normal and retry list AND the exit cleanup races with
the task running task work, then entries could either be doubly
completed or lost.
- Cap NAPI busy poll timeout to something sane, to avoid syzbot running
into excessive polling and triggering warnings around that.
Please pull!
The following changes since commit 254f49634ee16a731174d2ae34bc50bd5f45e731:
Linux 7.1-rc1 (2026-04-26 14:19:00 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git tags/io_uring-7.1-20260430
for you to fetch changes up to 17666e2d7592c3e85260cafd3950121524acc2c5:
io_uring/tw: serialize ctx->retry_llist with ->uring_lock (2026-04-30 06:57:20 -0600)
----------------------------------------------------------------
io_uring-7.1-20260430
----------------------------------------------------------------
Jens Axboe (3):
io_uring/kbuf: kill dead struct io_buffer_list 'nr_entries' member
io_uring/napi: cap busy_poll_to 10 msec
io_uring/tw: serialize ctx->retry_llist with ->uring_lock
Martin Michaelis (1):
io_uring/kbuf: support min length left for incremental buffers
include/uapi/linux/io_uring.h | 3 ++-
io_uring/kbuf.c | 9 +++++++--
io_uring/kbuf.h | 8 +++++++-
io_uring/napi.c | 2 ++
io_uring/tw.c | 12 +++++++++++-
5 files changed, 29 insertions(+), 5 deletions(-)
--
Jens Axboe
reply other threads:[~2026-05-01 1:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f3dd419-e06b-4b83-aaa4-7f7bafc098b4@kernel.dk \
--to=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox