Unverified Commit 0244354d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11097 io_uring: lock overflowing for IOPOLL 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ELNTUTP5O6FK22NWMAKFZ2GOGC2PCOQO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALIEY 
 
Link:https://gitee.com/openeuler/kernel/pulls/11097

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents c9789334 588b89ce

io_uring/io_uring.c

+16 −2
Original line number Diff line number Diff line
@@ -2472,12 +2472,26 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events, 


	io_init_req_batch(&rb);

	while (!list_empty(done)) {

		struct io_uring_cqe *cqe;

		unsigned cflags;



		req = list_first_entry(done, struct io_kiocb, inflight_entry);

		list_del(&req->inflight_entry);



		io_fill_cqe_req(req, req->result, io_put_rw_kbuf(req));

		cflags = io_put_rw_kbuf(req);

		(*nr_events)++;



		cqe = io_get_cqe(ctx);

		if (cqe) {

			WRITE_ONCE(cqe->user_data, req->user_data);

			WRITE_ONCE(cqe->res, req->result);

			WRITE_ONCE(cqe->flags, cflags);

		} else {

			spin_lock(&ctx->completion_lock);

			io_cqring_event_overflow(ctx, req->user_data,

							req->result, cflags);

			spin_unlock(&ctx->completion_lock);

		}



		if (req_ref_put_and_test(req))

			io_req_free_batch(&rb, req, &ctx->submit_state);

	}