Commit c0d8c036 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'io_uring-6.14' into for-6.15/io_uring 

Merge mainline fixes into 6.15 branch, as upcoming patches depend on
fixes that went into the 6.14 mainline branch.

* io_uring-6.14:
  io_uring/net: save msg_control for compat
  io_uring/rw: clean up mshot forced sync mode
  io_uring/rw: move ki_complete init into prep
  io_uring/rw: don't directly use ki_complete
  io_uring/rw: forbid multishot async reads
  io_uring/rsrc: remove unused constants
  io_uring: fix spelling error in uapi io_uring.h
  io_uring: prevent opcode speculation
  io-wq: backoff when retrying worker creation
parents 5d309914 6ebf0518

include/uapi/linux/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ enum io_uring_op { 
 *				result 	will be the number of buffers send, with

 *				the starting buffer ID in cqe->flags as per

 *				usual for provided buffer usage. The buffers

 *				will be	contigious from the starting buffer ID.

 *				will be	contiguous from the starting buffer ID.

 */

#define IORING_RECVSEND_POLL_FIRST	(1U << 0)

#define IORING_RECV_MULTISHOT		(1U << 1)

io_uring/io-wq.c

+18 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct io_worker { 


	union {

		struct rcu_head rcu;

		struct work_struct work;

		struct delayed_work work;

	};

};
@@ -784,6 +784,18 @@ static inline bool io_should_retry_thread(struct io_worker *worker, long err) 
	}

}



static void queue_create_worker_retry(struct io_worker *worker)

{

	/*

	 * We only bother retrying because there's a chance that the

	 * failure to create a worker is due to some temporary condition

	 * in the forking task (e.g. outstanding signal); give the task

	 * some time to clear that condition.

	 */

	schedule_delayed_work(&worker->work,

			      msecs_to_jiffies(worker->init_retries * 5));

}



static void create_worker_cont(struct callback_head *cb)

{

	struct io_worker *worker;
@@ -823,12 +835,13 @@ static void create_worker_cont(struct callback_head *cb) 


	/* re-create attempts grab a new worker ref, drop the existing one */

	io_worker_release(worker);

	schedule_work(&worker->work);

	queue_create_worker_retry(worker);

}



static void io_workqueue_create(struct work_struct *work)

{

	struct io_worker *worker = container_of(work, struct io_worker, work);

	struct io_worker *worker = container_of(work, struct io_worker,

						work.work);

	struct io_wq_acct *acct = io_wq_get_acct(worker);



	if (!io_queue_worker_create(worker, acct, create_worker_cont))
@@ -866,8 +879,8 @@ static bool create_io_worker(struct io_wq *wq, struct io_wq_acct *acct) 
		kfree(worker);

		goto fail;

	} else {

		INIT_WORK(&worker->work, io_workqueue_create);

		schedule_work(&worker->work);

		INIT_DELAYED_WORK(&worker->work, io_workqueue_create);

		queue_create_worker_retry(worker);

	}



	return true;

io_uring/io_uring.c

+2 −0
Original line number Diff line number Diff line
@@ -2071,6 +2071,8 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req, 
		req->opcode = 0;

		return io_init_fail_req(req, -EINVAL);

	}

	opcode = array_index_nospec(opcode, IORING_OP_LAST);



	def = &io_issue_defs[opcode];

	if (unlikely(sqe_flags & ~SQE_COMMON_FLAGS)) {

		/* enforce forwards compatibility on users */

io_uring/net.c

+3 −1
Original line number Diff line number Diff line
@@ -323,7 +323,9 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, 
		if (unlikely(ret))

			return ret;



		return __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);

		ret = __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);

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

		return ret;

	}

#endif

io_uring/rsrc.h

+0 −6
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 


#include <linux/lockdep.h>



#define IO_NODE_ALLOC_CACHE_MAX 32



#define IO_RSRC_TAG_TABLE_SHIFT	(PAGE_SHIFT - 3)

#define IO_RSRC_TAG_TABLE_MAX	(1U << IO_RSRC_TAG_TABLE_SHIFT)

#define IO_RSRC_TAG_TABLE_MASK	(IO_RSRC_TAG_TABLE_MAX - 1)



enum {

	IORING_RSRC_FILE		= 0,

	IORING_RSRC_BUFFER		= 1,