Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e06ffa1e authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Tejun Heo
Browse files

workqueue: use percpu allocator for cwq on UP 



I notice that the commit bbddff makes percpu allocator can work on UP,
So we don't need the magic way for UP.

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent fde7d904

kernel/workqueue.c

+3 −19
Original line number Diff line number Diff line
@@ -474,13 +474,8 @@ static struct cpu_workqueue_struct *get_cwq(unsigned int cpu, 
					    struct workqueue_struct *wq)

{

	if (!(wq->flags & WQ_UNBOUND)) {

		if (likely(cpu < nr_cpu_ids)) {

#ifdef CONFIG_SMP

		if (likely(cpu < nr_cpu_ids))

			return per_cpu_ptr(wq->cpu_wq.pcpu, cpu);

#else

			return wq->cpu_wq.single;

#endif

		}

	} else if (likely(cpu == WORK_CPU_UNBOUND))

		return wq->cpu_wq.single;

	return NULL;
@@ -2897,13 +2892,8 @@ static int alloc_cwqs(struct workqueue_struct *wq) 
	const size_t size = sizeof(struct cpu_workqueue_struct);

	const size_t align = max_t(size_t, 1 << WORK_STRUCT_FLAG_BITS,

				   __alignof__(unsigned long long));

#ifdef CONFIG_SMP

	bool percpu = !(wq->flags & WQ_UNBOUND);

#else

	bool percpu = false;

#endif



	if (percpu)

	if (!(wq->flags & WQ_UNBOUND))

		wq->cpu_wq.pcpu = __alloc_percpu(size, align);

	else {

		void *ptr;
@@ -2927,13 +2917,7 @@ static int alloc_cwqs(struct workqueue_struct *wq) 


static void free_cwqs(struct workqueue_struct *wq)

{

#ifdef CONFIG_SMP

	bool percpu = !(wq->flags & WQ_UNBOUND);

#else

	bool percpu = false;

#endif



	if (percpu)

	if (!(wq->flags & WQ_UNBOUND))

		free_percpu(wq->cpu_wq.pcpu);

	else if (wq->cpu_wq.single) {

		/* the pointer to free is stored right after the cwq */