Commit 3a56e241 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.11/io_uring-20240714' of git://git.kernel.dk/linux 

Pull io_uring updates from Jens Axboe:
 "Here are the io_uring updates queued up for 6.11.

  Nothing major this time around, various minor improvements and
  cleanups/fixes. This contains:

   - Add bind/listen opcodes. Main motivation is to support direct
     descriptors, to avoid needing a regular fd just for doing these two
     operations (Gabriel)

   - Probe fixes (Gabriel)

   - Treat io-wq work flags as atomics. Not fixing a real issue, but may
     as well and it silences a KCSAN warning (me)

   - Cleanup of rsrc __set_current_state() usage (me)

   - Add 64-bit for {m,f}advise operations (me)

   - Improve performance of data ring messages (me)

   - Fix for ring message overflow posting (Pavel)

   - Fix for freezer interaction with TWA_NOTIFY_SIGNAL. Not strictly an
     io_uring thing, but since TWA_NOTIFY_SIGNAL was originally added
     for faster task_work signaling for io_uring, bundling it with this
     pull (Pavel)

   - Add Pavel as a co-maintainer

   - Various cleanups (me, Thorsten)"

* tag 'for-6.11/io_uring-20240714' of git://git.kernel.dk/linux: (28 commits)
  io_uring/net: check socket is valid in io_bind()/io_listen()
  kernel: rerun task_work while freezing in get_signal()
  io_uring/io-wq: limit retrying worker initialisation
  io_uring/napi: Remove unnecessary s64 cast
  io_uring/net: cleanup io_recv_finish() bundle handling
  io_uring/msg_ring: fix overflow posting
  MAINTAINERS: change Pavel Begunkov from io_uring reviewer to maintainer
  io_uring/msg_ring: use kmem_cache_free() to free request
  io_uring/msg_ring: check for dead submitter task
  io_uring/msg_ring: add an alloc cache for io_kiocb entries
  io_uring/msg_ring: improve handling of target CQE posting
  io_uring: add io_add_aux_cqe() helper
  io_uring: add remote task_work execution helper
  io_uring/msg_ring: tighten requirement for remote posting
  io_uring: Allocate only necessary memory in io_probe
  io_uring: Fix probe of disabled operations
  io_uring: Introduce IORING_OP_LISTEN
  io_uring: Introduce IORING_OP_BIND
  net: Split a __sys_listen helper for io_uring
  net: Split a __sys_bind helper for io_uring
  ...
parents 4f5e249e ad00e629

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11551,7 +11551,7 @@ F: include/linux/iosys-map.h 








IO_URING









M:	Jens Axboe <axboe@kernel.dk>









R:	Pavel Begunkov <asml.silence@gmail.com>









M:	Pavel Begunkov <asml.silence@gmail.com>









L:	io-uring@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.dk/linux-block
































include/linux/io_uring_types.h



+4
−10






























Original line number
Diff line number
Diff line







@@ -50,7 +50,7 @@ struct io_wq_work_list {

















struct io_wq_work {









	struct io_wq_work_node list;









	unsigned flags;









	atomic_t flags;









	/* place it here instead of io_kiocb as it fills padding and saves 4B */









	int cancel_seq;









};








@@ -210,14 +210,6 @@ struct io_submit_state {







	struct blk_plug		plug;









};



















struct io_ev_fd {









	struct eventfd_ctx	*cq_ev_fd;









	unsigned int		eventfd_async: 1;









	struct rcu_head		rcu;









	atomic_t		refs;









	atomic_t		ops;









};



















struct io_alloc_cache {









	void			**entries;









	unsigned int		nr_cached;








@@ -372,7 +364,6 @@ struct io_ring_ctx {







	struct io_restriction		restrictions;



















	/* slow path rsrc auxilary data, used by update/register */









	struct io_mapped_ubuf		*dummy_ubuf;









	struct io_rsrc_data		*file_data;









	struct io_rsrc_data		*buf_data;


















@@ -405,6 +396,9 @@ struct io_ring_ctx {







	struct callback_head		poll_wq_task_work;









	struct list_head		defer_list;



















	struct io_alloc_cache		msg_cache;









	spinlock_t			msg_lock;



















#ifdef CONFIG_NET_RX_BUSY_POLL









	struct list_head	napi_list;	/* track busy poll napi_id */









	spinlock_t		napi_lock;	/* napi_list lock */
































include/linux/socket.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -442,11 +442,14 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,







extern int __sys_socket(int family, int type, int protocol);









extern struct file *__sys_socket_file(int family, int type, int protocol);









extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);









extern int __sys_bind_socket(struct socket *sock, struct sockaddr_storage *address,









			     int addrlen);









extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,









			      int addrlen, int file_flags);









extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,









			 int addrlen);









extern int __sys_listen(int fd, int backlog);









extern int __sys_listen_socket(struct socket *sock, int backlog);









extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,









			     int __user *usockaddr_len);









extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,
































include/uapi/linux/io_uring.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -257,6 +257,8 @@ enum io_uring_op {







	IORING_OP_FUTEX_WAITV,









	IORING_OP_FIXED_FD_INSTALL,









	IORING_OP_FTRUNCATE,









	IORING_OP_BIND,









	IORING_OP_LISTEN,



















	/* this goes last, obviously */









	IORING_OP_LAST,
































io_uring/Makefile



+3
−3






























Original line number
Diff line number
Diff line







@@ -4,9 +4,9 @@

















obj-$(CONFIG_IO_URING)		+= io_uring.o opdef.o kbuf.o rsrc.o notif.o \









					tctx.o filetable.o rw.o net.o poll.o \









					uring_cmd.o openclose.o sqpoll.o \









					xattr.o nop.o fs.o splice.o sync.o \









					msg_ring.o advise.o openclose.o \









					eventfd.o uring_cmd.o openclose.o \









					sqpoll.o xattr.o nop.o fs.o splice.o \









					sync.o msg_ring.o advise.o openclose.o \









					epoll.o statx.o timeout.o fdinfo.o \









					cancel.o waitid.o register.o \









					truncate.o memmap.o