Commit 1bc88902 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'io_uring-6.16' into for-6.17/io_uring 

Merge in 6.16 io_uring fixes, to avoid clashes with pending net and
settings changes.

* io_uring-6.16:
  io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well
  io_uring/kbuf: flag partial buffer mappings
  io_uring/net: mark iov as dynamically allocated even for single segments
  io_uring: fix resource leak in io_import_dmabuf()
  io_uring: don't assume uaddr alignment in io_vec_fill_bvec
  io_uring/rsrc: don't rely on user vaddr alignment
  io_uring/rsrc: fix folio unpinning
  io_uring: make fallocate be hashed work
parents cf73d997 6f11adcc

io_uring/io_uring.c

+2 −1
Original line number Diff line number Diff line
@@ -1706,11 +1706,12 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) 


io_req_flags_t io_file_get_flags(struct file *file)

{

	struct inode *inode = file_inode(file);

	io_req_flags_t res = 0;



	BUILD_BUG_ON(REQ_F_ISREG_BIT != REQ_F_SUPPORT_NOWAIT_BIT + 1);



	if (S_ISREG(file_inode(file)->i_mode))

	if (S_ISREG(inode->i_mode) && !(inode->i_flags & S_ANON_INODE))

		res |= REQ_F_ISREG;

	if ((file->f_flags & O_NONBLOCK) || (file->f_mode & FMODE_NOWAIT))

		res |= REQ_F_SUPPORT_NOWAIT;

io_uring/kbuf.c

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, 
		if (len > arg->max_len) {

			len = arg->max_len;

			if (!(bl->flags & IOBL_INC)) {

				arg->partial_map = 1;

				if (iov != arg->iovs)

					break;

				buf->len = len;

io_uring/kbuf.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct buf_sel_arg { 
	size_t max_len;

	unsigned short nr_iovs;

	unsigned short mode;

	unsigned buf_group;

	unsigned short buf_group;

	unsigned short partial_map;

};



void __user *io_buffer_select(struct io_kiocb *req, size_t *len,

io_uring/net.c

+21 −13
Original line number Diff line number Diff line
@@ -75,12 +75,17 @@ struct io_sr_msg { 
	u16				flags;

	/* initialised and used only by !msg send variants */

	u16				buf_group;

	bool				retry;

	unsigned short			retry_flags;

	void __user			*msg_control;

	/* used only for send zerocopy */

	struct io_kiocb 		*notif;

};



enum sr_retry_flags {

	IO_SR_MSG_RETRY		= 1,

	IO_SR_MSG_PARTIAL_MAP	= 2,

};



/*

 * Number of times we'll try and do receives if there's more data. If we

 * exceed this limit, then add us to the back of the queue and retry from
@@ -187,7 +192,7 @@ static inline void io_mshot_prep_retry(struct io_kiocb *req, 


	req->flags &= ~REQ_F_BL_EMPTY;

	sr->done_io = 0;

	sr->retry = false;

	sr->retry_flags = 0;

	sr->len = 0; /* get from the provided buffer */

}
@@ -397,7 +402,7 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);



	sr->done_io = 0;

	sr->retry = false;

	sr->retry_flags = 0;

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

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

	if (sr->flags & ~SENDMSG_FLAGS)
@@ -751,7 +756,7 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);



	sr->done_io = 0;

	sr->retry = false;

	sr->retry_flags = 0;



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

		return -EINVAL;
@@ -823,7 +828,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 


		cflags |= io_put_kbufs(req, this_ret, io_bundle_nbufs(kmsg, this_ret),

				      issue_flags);

		if (sr->retry)

		if (sr->retry_flags & IO_SR_MSG_RETRY)

			cflags = req->cqe.flags | (cflags & CQE_F_MASK);

		/* bundle with no more immediate buffers, we're done */

		if (req->flags & REQ_F_BL_EMPTY)
@@ -832,12 +837,12 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret, 
		 * If more is available AND it was a full transfer, retry and

		 * append to this one

		 */

		if (!sr->retry && kmsg->msg.msg_inq > 1 && this_ret > 0 &&

		if (!sr->retry_flags && kmsg->msg.msg_inq > 1 && this_ret > 0 &&

		    !iov_iter_count(&kmsg->msg.msg_iter)) {

			req->cqe.flags = cflags & ~CQE_F_MASK;

			sr->len = kmsg->msg.msg_inq;

			sr->done_io += this_ret;

			sr->retry = true;

			sr->retry_flags |= IO_SR_MSG_RETRY;

			return false;

		}

	} else {
@@ -1077,6 +1082,14 @@ static int io_recv_buf_select(struct io_kiocb *req, struct io_async_msghdr *kmsg 
		if (unlikely(ret < 0))

			return ret;



		if (arg.iovs != &kmsg->fast_iov && arg.iovs != kmsg->vec.iovec) {

			kmsg->vec.nr = ret;

			kmsg->vec.iovec = arg.iovs;

			req->flags |= REQ_F_NEED_CLEANUP;

		}

		if (arg.partial_map)

			sr->retry_flags |= IO_SR_MSG_PARTIAL_MAP;



		/* special case 1 vec, can be a fast path */

		if (ret == 1) {

			sr->buf = arg.iovs[0].iov_base;
@@ -1085,11 +1098,6 @@ static int io_recv_buf_select(struct io_kiocb *req, struct io_async_msghdr *kmsg 
		}

		iov_iter_init(&kmsg->msg.msg_iter, ITER_DEST, arg.iovs, ret,

				arg.out_len);

		if (arg.iovs != &kmsg->fast_iov && arg.iovs != kmsg->vec.iovec) {

			kmsg->vec.nr = ret;

			kmsg->vec.iovec = arg.iovs;

			req->flags |= REQ_F_NEED_CLEANUP;

		}

	} else {

		void __user *buf;
@@ -1275,7 +1283,7 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	int ret;



	zc->done_io = 0;

	zc->retry = false;

	zc->retry_flags = 0;



	if (unlikely(READ_ONCE(sqe->__pad2[0]) || READ_ONCE(sqe->addr3)))

		return -EINVAL;

io_uring/opdef.c

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ const struct io_issue_def io_issue_defs[] = { 
	},

	[IORING_OP_FALLOCATE] = {

		.needs_file		= 1,

		.hash_reg_file          = 1,

		.prep			= io_fallocate_prep,

		.issue			= io_fallocate,

	},