Hi Linus,
Here's a set of fixes/changes that didn't make the first cut, either
because they got queued before I sent the early merge request, or fixes
that came in afterwards. In detail:
- Don't set MSG_NOSIGNAL on recv/recvmsg opcodes, as AF_PACKET will
error out (David)
- Fix for spurious poll wakeups (me)
- Fix for a file leak for buffered reads in certain conditions (Joseph)
- Don't allow registered buffers of mixed types (Pavel)
- Improve handling of huge pages for registered buffers (Pavel)
- Provided buffer ring size calculation fix (Wojciech)
- Minor cleanups (me)
Please pull!
The following changes since commit 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2:
Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next (2023-02-21 18:24:12 -0800)
are available in the Git repository at:
git://git.kernel.dk/linux.git tags/io_uring-6.3-2023-03-03
for you to fetch changes up to 1947ddf9b3d5b886ba227bbfd3d6f501af08b5b0:
io_uring/poll: don't pass in wake func to io_init_poll_iocb() (2023-03-01 10:06:53 -0700)
----------------------------------------------------------------
io_uring-6.3-2023-03-03
----------------------------------------------------------------
David Lamparter (1):
io_uring: remove MSG_NOSIGNAL from recvmsg
Jens Axboe (5):
io_uring: consolidate the put_ref-and-return section of adding work
io_uring: rename 'in_idle' to 'in_cancel'
io_uring/rsrc: always initialize 'folio' to NULL
io_uring/poll: allow some retries for poll triggering spuriously
io_uring/poll: don't pass in wake func to io_init_poll_iocb()
Joseph Qi (1):
io_uring: fix fget leak when fs don't support nowait buffered read
Pavel Begunkov (5):
io_uring/rsrc: fix a comment in io_import_fixed()
io_uring: remove unused wq_list_merge
io_uring/rsrc: disallow multi-source reg buffers
io_uring/rsrc: optimise single entry advance
io_uring/rsrc: optimise registered huge pages
Wojciech Lukowicz (1):
io_uring: fix size calculation when registering buf ring
include/linux/io_uring_types.h | 2 +-
io_uring/io_uring.c | 32 +++++++++++------------
io_uring/kbuf.c | 2 +-
io_uring/net.c | 2 +-
io_uring/poll.c | 26 ++++++++++++++-----
io_uring/poll.h | 1 +
io_uring/rsrc.c | 58 ++++++++++++++++++++++++++++++++----------
io_uring/slist.h | 22 ----------------
io_uring/tctx.c | 2 +-
9 files changed, 85 insertions(+), 62 deletions(-)
--
Jens Axboe
