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

!9989 io_uring/io-wq: Use set_bit() and test_bit() at worker->flags 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CGCU5UWPWZQVRE6SZTZTA5XGY6IJGLCX/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACR2Y 
 
Link:https://gitee.com/openeuler/kernel/pulls/9989

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 24edcc2c dd614634

io_uring/io-wq.c

+24 −23
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
#define WORKER_IDLE_TIMEOUT	(5 * HZ)



enum {

	IO_WORKER_F_UP		= 1,	/* up and active */

	IO_WORKER_F_RUNNING	= 2,	/* account as running */

	IO_WORKER_F_FREE	= 4,	/* worker on free list */

	IO_WORKER_F_BOUND	= 8,	/* is doing bounded work */

	IO_WORKER_F_UP		= 0,	/* up and active */

	IO_WORKER_F_RUNNING	= 1,	/* account as running */

	IO_WORKER_F_FREE	= 2,	/* worker on free list */

	IO_WORKER_F_BOUND	= 3,	/* is doing bounded work */

};



enum {
@@ -44,7 +44,8 @@ enum { 
 */

struct io_worker {

	refcount_t ref;

	unsigned flags;

	int create_index;

	unsigned long flags;

	struct hlist_nulls_node nulls_node;

	struct list_head all_list;

	struct task_struct *task;
@@ -58,7 +59,6 @@ struct io_worker { 


	unsigned long create_state;

	struct callback_head create_work;

	int create_index;



	union {

		struct rcu_head rcu;
@@ -165,7 +165,7 @@ static inline struct io_wq_acct *io_work_get_acct(struct io_wq *wq, 


static inline struct io_wq_acct *io_wq_get_acct(struct io_worker *worker)

{

	return io_get_acct(worker->wq, worker->flags & IO_WORKER_F_BOUND);

	return io_get_acct(worker->wq, test_bit(IO_WORKER_F_BOUND, &worker->flags));

}



static void io_worker_ref_put(struct io_wq *wq)
@@ -225,7 +225,7 @@ static void io_worker_exit(struct io_worker *worker) 
	wait_for_completion(&worker->ref_done);



	raw_spin_lock(&wq->lock);

	if (worker->flags & IO_WORKER_F_FREE)

	if (test_bit(IO_WORKER_F_FREE, &worker->flags))

		hlist_nulls_del_rcu(&worker->nulls_node);

	list_del_rcu(&worker->all_list);

	raw_spin_unlock(&wq->lock);
@@ -410,7 +410,7 @@ static void io_wq_dec_running(struct io_worker *worker) 
	struct io_wq_acct *acct = io_wq_get_acct(worker);

	struct io_wq *wq = worker->wq;



	if (!(worker->flags & IO_WORKER_F_UP))

	if (!test_bit(IO_WORKER_F_UP, &worker->flags))

		return;



	if (!atomic_dec_and_test(&acct->nr_running))
@@ -430,8 +430,8 @@ static void io_wq_dec_running(struct io_worker *worker) 
 */

static void __io_worker_busy(struct io_wq *wq, struct io_worker *worker)

{

	if (worker->flags & IO_WORKER_F_FREE) {

		worker->flags &= ~IO_WORKER_F_FREE;

	if (test_bit(IO_WORKER_F_FREE, &worker->flags)) {

		clear_bit(IO_WORKER_F_FREE, &worker->flags);

		raw_spin_lock(&wq->lock);

		hlist_nulls_del_init_rcu(&worker->nulls_node);

		raw_spin_unlock(&wq->lock);
@@ -444,8 +444,8 @@ static void __io_worker_busy(struct io_wq *wq, struct io_worker *worker) 
static void __io_worker_idle(struct io_wq *wq, struct io_worker *worker)

	__must_hold(wq->lock)

{

	if (!(worker->flags & IO_WORKER_F_FREE)) {

		worker->flags |= IO_WORKER_F_FREE;

	if (!test_bit(IO_WORKER_F_FREE, &worker->flags)) {

		set_bit(IO_WORKER_F_FREE, &worker->flags);

		hlist_nulls_add_head_rcu(&worker->nulls_node, &wq->free_list);

	}

}
@@ -631,7 +631,8 @@ static int io_wq_worker(void *data) 
	bool exit_mask = false, last_timeout = false;

	char buf[TASK_COMM_LEN];



	worker->flags |= (IO_WORKER_F_UP | IO_WORKER_F_RUNNING);

	set_mask_bits(&worker->flags, 0,

		      BIT(IO_WORKER_F_UP) | BIT(IO_WORKER_F_RUNNING));



	snprintf(buf, sizeof(buf), "iou-wrk-%d", wq->task->pid);

	set_task_comm(current, buf);
@@ -695,11 +696,11 @@ void io_wq_worker_running(struct task_struct *tsk) 


	if (!worker)

		return;

	if (!(worker->flags & IO_WORKER_F_UP))

	if (!test_bit(IO_WORKER_F_UP, &worker->flags))

		return;

	if (worker->flags & IO_WORKER_F_RUNNING)

	if (test_bit(IO_WORKER_F_RUNNING, &worker->flags))

		return;

	worker->flags |= IO_WORKER_F_RUNNING;

	set_bit(IO_WORKER_F_RUNNING, &worker->flags);

	io_wq_inc_running(worker);

}
@@ -713,12 +714,12 @@ void io_wq_worker_sleeping(struct task_struct *tsk) 


	if (!worker)

		return;

	if (!(worker->flags & IO_WORKER_F_UP))

	if (!test_bit(IO_WORKER_F_UP, &worker->flags))

		return;

	if (!(worker->flags & IO_WORKER_F_RUNNING))

	if (!test_bit(IO_WORKER_F_RUNNING, &worker->flags))

		return;



	worker->flags &= ~IO_WORKER_F_RUNNING;

	clear_bit(IO_WORKER_F_RUNNING, &worker->flags);

	io_wq_dec_running(worker);

}
@@ -732,7 +733,7 @@ static void io_init_new_worker(struct io_wq *wq, struct io_worker *worker, 
	raw_spin_lock(&wq->lock);

	hlist_nulls_add_head_rcu(&worker->nulls_node, &wq->free_list);

	list_add_tail_rcu(&worker->all_list, &wq->all_list);

	worker->flags |= IO_WORKER_F_FREE;

	set_bit(IO_WORKER_F_FREE, &worker->flags);

	raw_spin_unlock(&wq->lock);

	wake_up_new_task(tsk);

}
@@ -838,7 +839,7 @@ static bool create_io_worker(struct io_wq *wq, int index) 
	init_completion(&worker->ref_done);



	if (index == IO_WQ_ACCT_BOUND)

		worker->flags |= IO_WORKER_F_BOUND;

		set_bit(IO_WORKER_F_BOUND, &worker->flags);



	tsk = create_io_thread(io_wq_worker, worker, NUMA_NO_NODE);

	if (!IS_ERR(tsk)) {
@@ -924,8 +925,8 @@ static bool io_wq_work_match_item(struct io_wq_work *work, void *data) 
void io_wq_enqueue(struct io_wq *wq, struct io_wq_work *work)

{

	struct io_wq_acct *acct = io_work_get_acct(wq, work);

	unsigned long work_flags = work->flags;

	struct io_cb_cancel_data match;

	unsigned work_flags = work->flags;

	bool do_create;



	/*