Unverified Commit 1bbf030e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1366 [sync] PR-1324: io_uring: hold uring mutex around poll removal 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1324 
 
PR sync from: Zhong Jinghua <zhongjinghua@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2P2KGVU22TWAYJ5N3JDYWA7EXWJOL2OS/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1366

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5d0d7a6a 632b0576

io_uring/io_uring.c

+3 −0
Original line number Diff line number Diff line
@@ -5811,6 +5811,8 @@ static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags) 
	struct io_kiocb *preq;

	int ret2, ret = 0;



	io_ring_submit_lock(ctx, !(issue_flags & IO_URING_F_NONBLOCK));



	spin_lock(&ctx->completion_lock);

	preq = io_poll_find(ctx, req->poll_update.old_user_data, true);

	if (!preq || !io_poll_disarm(preq)) {
@@ -5842,6 +5844,7 @@ static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags) 
		req_set_fail(req);

	/* complete update request, we're done with it */

	io_req_complete(req, ret);

	io_ring_submit_unlock(ctx, !(issue_flags & IO_URING_F_NONBLOCK));

	return 0;

}