Commit cb0861ae authored by Li Lingfeng's avatar Li Lingfeng Committed by Jialin Zhang
Browse files

Revert "[Huawei] io_uring: fix soft lockup in io_submit_sqes()" 

Offering: HULK
hulk inclusion
category: feature
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC



-------------------------------

This reverts commit ac02c0bf.

We need to apply patch 788d0824269bef (io_uring: import 5.15-stable
io_uring) to move io_uring to separate directory and solve
the problem of CVE-2023-0240.
Revert this patch and add it again after patch 788d0824269bef to
reduce conflicts.

Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent eb278e9b

fs/io_uring.c

+0 −3
Original line number Diff line number Diff line
@@ -6705,9 +6705,6 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) 
		err = io_submit_sqe(req, sqe, &link, &state.comp);

		if (err)

			goto fail_req;

		/* to avoid doing too much in one submit round */

		if (submitted > IORING_MAX_ENTRIES / 2)

			cond_resched();

	}



	if (unlikely(submitted != nr)) {