Commit 108893dd authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/net: fix notif cqe reordering 



send zc is not restricted to !IO_URING_F_UNLOCKED anymore and so
we can't use task-tw ordering trick to order notification cqes
with requests completions. In this case leave it alone and let
io_send_zc_cleanup() flush it.

Cc: stable@vger.kernel.org
Fixes: 53bdc88a ("io_uring/notif: order notif vs send CQEs")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0031f3a00d492e814a4a0935a2029a46d9c9ba06.1664486545.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6f10ae8a

io_uring/net.c

+19 −5
Original line number Diff line number Diff line
@@ -1127,8 +1127,14 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags) 
	else if (zc->done_io)

		ret = zc->done_io;



	/*

	 * If we're in io-wq we can't rely on tw ordering guarantees, defer

	 * flushing notif to io_send_zc_cleanup()

	 */

	if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		io_notif_flush(zc->notif);

		req->flags &= ~REQ_F_NEED_CLEANUP;

	}

	io_req_set_res(req, ret, IORING_CQE_F_MORE);

	return IOU_OK;

}
@@ -1182,8 +1188,10 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) 
		req_set_fail(req);

	}

	/* fast path, check for non-NULL to avoid function call */

	if (kmsg->free_iov)

	if (kmsg->free_iov) {

		kfree(kmsg->free_iov);

		kmsg->free_iov = NULL;

	}



	io_netmsg_recycle(req, issue_flags);

	if (ret >= 0)
@@ -1191,8 +1199,14 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) 
	else if (sr->done_io)

		ret = sr->done_io;



	/*

	 * If we're in io-wq we can't rely on tw ordering guarantees, defer

	 * flushing notif to io_send_zc_cleanup()

	 */

	if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		io_notif_flush(sr->notif);

		req->flags &= ~REQ_F_NEED_CLEANUP;

	}

	io_req_set_res(req, ret, IORING_CQE_F_MORE);

	return IOU_OK;

}