Commit 25b00775 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

workqueue: Replace call_rcu_sched() with call_rcu() 



Now that call_rcu()'s callback is not invoked until after all
preempt-disable regions of code have completed (in addition to explicitly
marked RCU read-side critical sections), call_rcu() can be used in place
of call_rcu_sched().  This commit therefore makes that change.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
parent cb2f5536

kernel/workqueue.c

+4 −4
Original line number Diff line number Diff line
@@ -3396,7 +3396,7 @@ static void put_unbound_pool(struct worker_pool *pool) 
	del_timer_sync(&pool->mayday_timer);



	/* sched-RCU protected to allow dereferences from get_work_pool() */

	call_rcu_sched(&pool->rcu, rcu_free_pool);

	call_rcu(&pool->rcu, rcu_free_pool);

}



/**
@@ -3503,14 +3503,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work) 
	put_unbound_pool(pool);

	mutex_unlock(&wq_pool_mutex);



	call_rcu_sched(&pwq->rcu, rcu_free_pwq);

	call_rcu(&pwq->rcu, rcu_free_pwq);



	/*

	 * If we're the last pwq going away, @wq is already dead and no one

	 * is gonna access it anymore.  Schedule RCU free.

	 */

	if (is_last)

		call_rcu_sched(&wq->rcu, rcu_free_wq);

		call_rcu(&wq->rcu, rcu_free_wq);

}



/**
@@ -4195,7 +4195,7 @@ void destroy_workqueue(struct workqueue_struct *wq) 
		 * The base ref is never dropped on per-cpu pwqs.  Directly

		 * schedule RCU free.

		 */

		call_rcu_sched(&wq->rcu, rcu_free_wq);

		call_rcu(&wq->rcu, rcu_free_wq);

	} else {

		/*

		 * We're the sole accessor of @wq at this point.  Directly

CRA Git | Maintained and supported by SUSTech CRA and CCSE