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

Commit ae930e0f authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: gut system_nrt[_freezable]_wq() 



Now that all workqueues are non-reentrant, system[_freezable]_wq() are
equivalent to system_nrt[_freezable]_wq().  Replace the latter with
wrappers around system[_freezable]_wq().  The wrapping goes through
inline functions so that __deprecated can be added easily.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 606a5020

include/linux/workqueue.h

+14 −9
Original line number Diff line number Diff line
@@ -297,10 +297,6 @@ enum { 
 * system_long_wq is similar to system_wq but may host long running

 * works.  Queue flushing might take relatively long.

 *

 * system_nrt_wq is non-reentrant and guarantees that any given work

 * item is never executed in parallel by multiple CPUs.  Queue

 * flushing might take relatively long.

 *

 * system_unbound_wq is unbound workqueue.  Workers are not bound to

 * any specific CPU, not concurrency managed, and all queued works are

 * executed immediately as long as max_active limit is not reached and
@@ -308,16 +304,25 @@ enum { 
 *

 * system_freezable_wq is equivalent to system_wq except that it's

 * freezable.

 *

 * system_nrt_freezable_wq is equivalent to system_nrt_wq except that

 * it's freezable.

 */

extern struct workqueue_struct *system_wq;

extern struct workqueue_struct *system_long_wq;

extern struct workqueue_struct *system_nrt_wq;

extern struct workqueue_struct *system_unbound_wq;

extern struct workqueue_struct *system_freezable_wq;

extern struct workqueue_struct *system_nrt_freezable_wq;



static inline struct workqueue_struct *__system_nrt_wq(void)

{

	return system_wq;

}



static inline struct workqueue_struct *__system_nrt_freezable_wq(void)

{

	return system_freezable_wq;

}



/* equivlalent to system_wq and system_freezable_wq, deprecated */

#define system_nrt_wq			__system_nrt_wq()

#define system_nrt_freezable_wq		__system_nrt_freezable_wq()



extern struct workqueue_struct *

__alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,

kernel/workqueue.c

+1 −9
Original line number Diff line number Diff line
@@ -274,14 +274,10 @@ struct workqueue_struct *system_highpri_wq __read_mostly; 
EXPORT_SYMBOL_GPL(system_highpri_wq);

struct workqueue_struct *system_long_wq __read_mostly;

EXPORT_SYMBOL_GPL(system_long_wq);

struct workqueue_struct *system_nrt_wq __read_mostly;

EXPORT_SYMBOL_GPL(system_nrt_wq);

struct workqueue_struct *system_unbound_wq __read_mostly;

EXPORT_SYMBOL_GPL(system_unbound_wq);

struct workqueue_struct *system_freezable_wq __read_mostly;

EXPORT_SYMBOL_GPL(system_freezable_wq);

struct workqueue_struct *system_nrt_freezable_wq __read_mostly;

EXPORT_SYMBOL_GPL(system_nrt_freezable_wq);



#define CREATE_TRACE_POINTS

#include <trace/events/workqueue.h>
@@ -3838,16 +3834,12 @@ static int __init init_workqueues(void) 
	system_wq = alloc_workqueue("events", 0, 0);

	system_highpri_wq = alloc_workqueue("events_highpri", WQ_HIGHPRI, 0);

	system_long_wq = alloc_workqueue("events_long", 0, 0);

	system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0);

	system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,

					    WQ_UNBOUND_MAX_ACTIVE);

	system_freezable_wq = alloc_workqueue("events_freezable",

					      WQ_FREEZABLE, 0);

	system_nrt_freezable_wq = alloc_workqueue("events_nrt_freezable",

			WQ_NON_REENTRANT | WQ_FREEZABLE, 0);

	BUG_ON(!system_wq || !system_highpri_wq || !system_long_wq ||

	       !system_nrt_wq || !system_unbound_wq || !system_freezable_wq ||

	       !system_nrt_freezable_wq);

	       !system_unbound_wq || !system_freezable_wq);

	return 0;

}

early_initcall(init_workqueues);