Commit 0a35d162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block 

Pull io_uring fixes from Jens Axboe:
 "Two minor tweaks:

   - While we still can, adjust the send/recv based flags to be in
     ->ioprio rather than in ->addr2. This is consistent with eg accept,
     and also doesn't waste a full 64-bit field for flags (Pavel)

   - 5.18-stable fix for re-importing provided buffers. Not much real
     world relevance here as it'll only impact non-pollable files gone
     async, which is more of a practical test case rather than something
     that is used in the wild (Dylan)"

* tag 'io_uring-5.19-2022-07-01' of git://git.kernel.dk/linux-block:
  io_uring: fix provided buffer import
  io_uring: keep sendrecv flags in ioprio
parents d516e221 09007af2

fs/io_uring.c

+12 −7
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ static const struct io_op_def io_op_defs[] = { 
		.unbound_nonreg_file	= 1,

		.pollout		= 1,

		.needs_async_setup	= 1,

		.ioprio			= 1,

		.async_size		= sizeof(struct io_async_msghdr),

	},

	[IORING_OP_RECVMSG] = {
@@ -1191,6 +1192,7 @@ static const struct io_op_def io_op_defs[] = { 
		.pollin			= 1,

		.buffer_select		= 1,

		.needs_async_setup	= 1,

		.ioprio			= 1,

		.async_size		= sizeof(struct io_async_msghdr),

	},

	[IORING_OP_TIMEOUT] = {
@@ -1266,6 +1268,7 @@ static const struct io_op_def io_op_defs[] = { 
		.unbound_nonreg_file	= 1,

		.pollout		= 1,

		.audit_skip		= 1,

		.ioprio			= 1,

	},

	[IORING_OP_RECV] = {

		.needs_file		= 1,
@@ -1273,6 +1276,7 @@ static const struct io_op_def io_op_defs[] = { 
		.pollin			= 1,

		.buffer_select		= 1,

		.audit_skip		= 1,

		.ioprio			= 1,

	},

	[IORING_OP_OPENAT2] = {

	},
@@ -4314,18 +4318,19 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags) 
		if (unlikely(ret < 0))

			return ret;

	} else {

		rw = req->async_data;

		s = &rw->s;



		/*

		 * Safe and required to re-import if we're using provided

		 * buffers, as we dropped the selected one before retry.

		 */

		if (req->flags & REQ_F_BUFFER_SELECT) {

		if (io_do_buffer_select(req)) {

			ret = io_import_iovec(READ, req, &iovec, s, issue_flags);

			if (unlikely(ret < 0))

				return ret;

		}



		rw = req->async_data;

		s = &rw->s;

		/*

		 * We come here from an earlier attempt, restore our state to

		 * match in case it doesn't. It's cheap enough that we don't
@@ -6075,12 +6080,12 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
{

	struct io_sr_msg *sr = &req->sr_msg;



	if (unlikely(sqe->file_index))

	if (unlikely(sqe->file_index || sqe->addr2))

		return -EINVAL;



	sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));

	sr->len = READ_ONCE(sqe->len);

	sr->flags = READ_ONCE(sqe->addr2);

	sr->flags = READ_ONCE(sqe->ioprio);

	if (sr->flags & ~IORING_RECVSEND_POLL_FIRST)

		return -EINVAL;

	sr->msg_flags = READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL;
@@ -6311,12 +6316,12 @@ static int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
{

	struct io_sr_msg *sr = &req->sr_msg;



	if (unlikely(sqe->file_index))

	if (unlikely(sqe->file_index || sqe->addr2))

		return -EINVAL;



	sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));

	sr->len = READ_ONCE(sqe->len);

	sr->flags = READ_ONCE(sqe->addr2);

	sr->flags = READ_ONCE(sqe->ioprio);

	if (sr->flags & ~IORING_RECVSEND_POLL_FIRST)

		return -EINVAL;

	sr->msg_flags = READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL;

include/uapi/linux/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ enum io_uring_op { 
#define IORING_ASYNC_CANCEL_ANY	(1U << 2)



/*

 * send/sendmsg and recv/recvmsg flags (sqe->addr2)

 * send/sendmsg and recv/recvmsg flags (sqe->ioprio)

 *

 * IORING_RECVSEND_POLL_FIRST	If set, instead of first attempting to send

 *				or receive and arm poll if that yields an