Commit c7adbe2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux 

Pull io_uring fixes from Jens Axboe:

 - Fix for sigmask restoring while waiting for events (Alexey)

 - Typo fix in comment (Haiyue)

 - Fix for a msg_control retstore on SEND_ZC retries (Pavel)

* tag 'io_uring-6.9-20240412' of git://git.kernel.dk/linux:
  io-uring: correct typo in comment for IOU_F_TWQ_LAZY_WAKE
  io_uring/net: restore msg_control on sendzc retry
  io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
parents 90d3eaaf ff81dade

include/linux/io_uring_types.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ enum { 
	 * A hint to not wake right away but delay until there are enough of

	 * tw's queued to match the number of CQEs the task is waiting for.

	 *

	 * Must not be used wirh requests generating more than one CQE.

	 * Must not be used with requests generating more than one CQE.

	 * It's also ignored unless IORING_SETUP_DEFER_TASKRUN is set.

	 */

	IOU_F_TWQ_LAZY_WAKE			= 1,

io_uring/io_uring.c

+13 −13
Original line number Diff line number Diff line
@@ -2602,19 +2602,6 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
	if (__io_cqring_events_user(ctx) >= min_events)

		return 0;



	if (sig) {

#ifdef CONFIG_COMPAT

		if (in_compat_syscall())

			ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig,

						      sigsz);

		else

#endif

			ret = set_user_sigmask(sig, sigsz);



		if (ret)

			return ret;

	}



	init_waitqueue_func_entry(&iowq.wq, io_wake_function);

	iowq.wq.private = current;

	INIT_LIST_HEAD(&iowq.wq.entry);
@@ -2633,6 +2620,19 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
		io_napi_adjust_timeout(ctx, &iowq, &ts);

	}



	if (sig) {

#ifdef CONFIG_COMPAT

		if (in_compat_syscall())

			ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig,

						      sigsz);

		else

#endif

			ret = set_user_sigmask(sig, sigsz);



		if (ret)

			return ret;

	}



	io_napi_busy_loop(ctx, &iowq);



	trace_io_uring_cqring_wait(ctx, min_events);

io_uring/net.c

+1 −0
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) 


	if (req_has_async_data(req)) {

		kmsg = req->async_data;

		kmsg->msg.msg_control_user = sr->msg_control;

	} else {

		ret = io_sendmsg_copy_hdr(req, &iomsg);

		if (ret)