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

workqueue: kill RT workqueue 



With stop_machine() converted to use cpu_stop, RT workqueue doesn't
have any user left.  Kill RT workqueue support.

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

include/linux/workqueue.h

+9 −11
Original line number Diff line number Diff line
@@ -181,12 +181,11 @@ static inline void destroy_work_on_stack(struct work_struct *work) { } 




extern struct workqueue_struct *

__create_workqueue_key(const char *name, int singlethread,

		       int freezeable, int rt, struct lock_class_key *key,

		       const char *lock_name);

__create_workqueue_key(const char *name, int singlethread, int freezeable,

		       struct lock_class_key *key, const char *lock_name);



#ifdef CONFIG_LOCKDEP

#define __create_workqueue(name, singlethread, freezeable, rt)	\

#define __create_workqueue(name, singlethread, freezeable)	\

({								\

	static struct lock_class_key __key;			\

	const char *__lock_name;				\
@@ -197,19 +196,18 @@ __create_workqueue_key(const char *name, int singlethread, 
		__lock_name = #name;				\

								\

	__create_workqueue_key((name), (singlethread),		\

			       (freezeable), (rt), &__key,	\

			       (freezeable), &__key,		\

			       __lock_name);			\

})

#else

#define __create_workqueue(name, singlethread, freezeable, rt)	\

	__create_workqueue_key((name), (singlethread), (freezeable), (rt), \

#define __create_workqueue(name, singlethread, freezeable)	\

	__create_workqueue_key((name), (singlethread), (freezeable), \

			       NULL, NULL)

#endif



#define create_workqueue(name) __create_workqueue((name), 0, 0, 0)

#define create_rt_workqueue(name) __create_workqueue((name), 0, 0, 1)

#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1, 0)

#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0, 0)

#define create_workqueue(name) __create_workqueue((name), 0, 0)

#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1)

#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)



extern void destroy_workqueue(struct workqueue_struct *wq);

kernel/workqueue.c

+0 −6
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ struct workqueue_struct { 
	const char *name;

	int singlethread;

	int freezeable;		/* Freeze threads during suspend */

	int rt;

#ifdef CONFIG_LOCKDEP

	struct lockdep_map lockdep_map;

#endif
@@ -947,7 +946,6 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu) 


static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)

{

	struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };

	struct workqueue_struct *wq = cwq->wq;

	const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d";

	struct task_struct *p;
@@ -963,8 +961,6 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) 
	 */

	if (IS_ERR(p))

		return PTR_ERR(p);

	if (cwq->wq->rt)

		sched_setscheduler_nocheck(p, SCHED_FIFO, &param);

	cwq->thread = p;



	trace_workqueue_creation(cwq->thread, cpu);
@@ -986,7 +982,6 @@ static void start_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) 
struct workqueue_struct *__create_workqueue_key(const char *name,

						int singlethread,

						int freezeable,

						int rt,

						struct lock_class_key *key,

						const char *lock_name)

{
@@ -1008,7 +1003,6 @@ struct workqueue_struct *__create_workqueue_key(const char *name, 
	lockdep_init_map(&wq->lockdep_map, lock_name, key, 0);

	wq->singlethread = singlethread;

	wq->freezeable = freezeable;

	wq->rt = rt;

	INIT_LIST_HEAD(&wq->list);



	if (singlethread) {