io_uring: de-unionise io_kiocb (010e8e6b) · Commits · 戴 / test

fs/io_uring.c

+14 −45

Original line number	Diff line number	Diff line
		@@ -600,7 +600,6 @@ enum {
		struct async_poll {
		struct io_poll_iocb poll;
		struct io_poll_iocb *double_poll;
		struct io_wq_work work;
		};

		/*
		@@ -656,22 +655,12 @@ struct io_kiocb {
		struct list_head inflight_entry;

		struct percpu_ref *fixed_file_refs;

		union {
		/*
		* Only commands that never go async can use the below fields,
		* obviously. Right now only IORING_OP_POLL_ADD uses them, and
		* async armed poll handlers for regular commands. The latter
		* restore the work, if needed.
		*/
		struct {
		struct callback_head task_work;
		/* for polled requests, i.e. IORING_OP_POLL_ADD and async armed poll */
		struct hlist_node hash_node;
		struct async_poll *apoll;
		};
		struct io_wq_work work;
		};
		struct callback_head task_work;
		};

		struct io_defer_entry {
		struct list_head list;
		@@ -4668,10 +4657,6 @@ static void io_async_task_func(struct callback_head *cb)
		io_poll_remove_double(req, apoll->double_poll);
		spin_unlock_irq(&ctx->completion_lock);

		/* restore ->work in case we need to retry again */
		if (req->flags & REQ_F_WORK_INITIALIZED)
		memcpy(&req->work, &apoll->work, sizeof(req->work));

		if (!READ_ONCE(apoll->poll.canceled))
		__io_req_task_submit(req);
		else
		@@ -4763,9 +4748,6 @@ static bool io_arm_poll_handler(struct io_kiocb *req)
		apoll->double_poll = NULL;

		req->flags \|= REQ_F_POLLED;
		if (req->flags & REQ_F_WORK_INITIALIZED)
		memcpy(&apoll->work, &req->work, sizeof(req->work));

		io_get_req_task(req);
		req->apoll = apoll;
		INIT_HLIST_NODE(&req->hash_node);
		@@ -4784,8 +4766,6 @@ static bool io_arm_poll_handler(struct io_kiocb *req)
		if (ret) {
		io_poll_remove_double(req, apoll->double_poll);
		spin_unlock_irq(&ctx->completion_lock);
		if (req->flags & REQ_F_WORK_INITIALIZED)
		memcpy(&req->work, &apoll->work, sizeof(req->work));
		kfree(apoll->double_poll);
		kfree(apoll);
		return false;
		@@ -4828,14 +4808,6 @@ static bool io_poll_remove_one(struct io_kiocb *req)
		do_complete = __io_poll_remove_one(req, &apoll->poll);
		if (do_complete) {
		io_put_req(req);
		/*
		* restore ->work because we will call
		* io_req_clean_work below when dropping the
		* final reference.
		*/
		if (req->flags & REQ_F_WORK_INITIALIZED)
		memcpy(&req->work, &apoll->work,
		sizeof(req->work));
		kfree(apoll->double_poll);
		kfree(apoll);
		}
		@@ -4969,9 +4941,6 @@ static int io_poll_add(struct io_kiocb *req)
		struct io_poll_table ipt;
		__poll_t mask;

		/* ->work is in union with hash_node and others */
		io_req_clean_work(req);

		INIT_HLIST_NODE(&req->hash_node);
		ipt.pt._qproc = io_poll_queue_proc;

Admin message