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

!9993 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/DC25XYR52ROC3MVRSB3P5HE7DP7Y5DS5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACR2Y 
 
Link:https://gitee.com/openeuler/kernel/pulls/9993

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 205cf90f 9be748b7

io_uring/io-wq.c

+24 −23
Original line number Diff line number Diff line
@@ -21,10 +21,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 {
@@ -40,7 +40,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;
@@ -53,7 +54,6 @@ struct io_worker { 


	unsigned long create_state;

	struct callback_head create_work;

	int create_index;



	union {

		struct rcu_head rcu;
@@ -167,7 +167,7 @@ static inline struct io_wqe_acct *io_work_get_acct(struct io_wqe *wqe, 


static inline struct io_wqe_acct *io_wqe_get_acct(struct io_worker *worker)

{

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

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

}



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



	raw_spin_lock(&wqe->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);

	preempt_disable();
@@ -389,7 +389,7 @@ static void io_wqe_dec_running(struct io_worker *worker) 
	struct io_wqe_acct *acct = io_wqe_get_acct(worker);

	struct io_wqe *wqe = worker->wqe;



	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) && io_acct_run_queue(acct)) {
@@ -409,8 +409,8 @@ static void __io_worker_busy(struct io_wqe *wqe, struct io_worker *worker, 
			     struct io_wq_work *work)

	__must_hold(wqe->lock)

{

	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);

		hlist_nulls_del_init_rcu(&worker->nulls_node);

	}

}
@@ -425,8 +425,8 @@ static void __io_worker_busy(struct io_wqe *wqe, struct io_worker *worker, 
static void __io_worker_idle(struct io_wqe *wqe, struct io_worker *worker)

	__must_hold(wqe->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, &wqe->free_list);

	}

}
@@ -615,7 +615,8 @@ static int io_wqe_worker(void *data) 
	bool 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);
@@ -671,11 +672,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_wqe_inc_running(worker);

}
@@ -689,12 +690,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);



	raw_spin_lock(&worker->wqe->lock);

	io_wqe_dec_running(worker);
@@ -712,7 +713,7 @@ static void io_init_new_worker(struct io_wqe *wqe, struct io_worker *worker, 
	raw_spin_lock(&wqe->lock);

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

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

	worker->flags |= IO_WORKER_F_FREE;

	set_bit(IO_WORKER_F_FREE, &worker->flags);

	raw_spin_unlock(&wqe->lock);

	wake_up_new_task(tsk);

}
@@ -816,7 +817,7 @@ static bool create_io_worker(struct io_wq *wq, struct io_wqe *wqe, 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_wqe_worker, worker, wqe->node);

	if (!IS_ERR(tsk)) {
@@ -904,7 +905,7 @@ static bool io_wq_work_match_item(struct io_wq_work *work, void *data) 
static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work)

{

	struct io_wqe_acct *acct = io_work_get_acct(wqe, work);

	unsigned work_flags = work->flags;

	unsigned long work_flags = work->flags;

	bool do_create;



	/*