Commit f13a48bd authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

SLOW_WORK: Move slow_work's proc file to debugfs 



Move slow_work's debugging proc file to debugfs.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Requested-and-acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent df87f8c0

Documentation/slow-work.txt

+2 −2
Original line number Diff line number Diff line
@@ -279,9 +279,9 @@ The slow-work thread pool has a number of configurables: 
VIEWING EXECUTING AND QUEUED ITEMS

==================================



If CONFIG_SLOW_WORK_PROC is enabled, a proc file is made available:

If CONFIG_SLOW_WORK_DEBUG is enabled, a debugfs file is made available:



	/proc/slow_work_rq

	/sys/kernel/debug/slow_work/runqueue



through which the list of work items being executed and the queues of items to

be executed may be viewed.  The owner of a work item is given the chance to

include/linux/slow-work.h

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/timer.h>



struct slow_work;

#ifdef CONFIG_SLOW_WORK_PROC

#ifdef CONFIG_SLOW_WORK_DEBUG

struct seq_file;

#endif
@@ -42,8 +42,8 @@ struct slow_work_ops { 
	/* execute a work item */

	void (*execute)(struct slow_work *work);



#ifdef CONFIG_SLOW_WORK_PROC

	/* describe a work item for /proc */

#ifdef CONFIG_SLOW_WORK_DEBUG

	/* describe a work item for debugfs */

	void (*desc)(struct slow_work *work, struct seq_file *m);

#endif

};
@@ -64,7 +64,7 @@ struct slow_work { 
#define SLOW_WORK_DELAYED	5	/* item is struct delayed_slow_work with active timer */

	const struct slow_work_ops *ops; /* operations table for this item */

	struct list_head	link;	/* link in queue */

#ifdef CONFIG_SLOW_WORK_PROC

#ifdef CONFIG_SLOW_WORK_DEBUG

	struct timespec		mark;	/* jiffies at which queued or exec begun */

#endif

};

init/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -1098,12 +1098,12 @@ config SLOW_WORK 


	  See Documentation/slow-work.txt.



config SLOW_WORK_PROC

	bool "Slow work debugging through /proc"

config SLOW_WORK_DEBUG

	bool "Slow work debugging through debugfs"

	default n

	depends on SLOW_WORK && PROC_FS

	depends on SLOW_WORK && DEBUG_FS

	help

	  Display the contents of the slow work run queue through /proc,

	  Display the contents of the slow work run queue through debugfs,

	  including items currently executing.



	  See Documentation/slow-work.txt.

kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ obj-$(CONFIG_X86_DS) += trace/ 
obj-$(CONFIG_RING_BUFFER) += trace/

obj-$(CONFIG_SMP) += sched_cpupri.o

obj-$(CONFIG_SLOW_WORK) += slow-work.o

obj-$(CONFIG_SLOW_WORK_PROC) += slow-work-proc.o

obj-$(CONFIG_SLOW_WORK_DEBUG) += slow-work-debugfs.o

obj-$(CONFIG_PERF_EVENTS) += perf_event.o



ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)

kernel/slow-work-proc.c→kernel/slow-work-debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void slow_work_print_mark(struct seq_file *m, struct slow_work *work) 
}



/*

 * Describe a slow work item for /proc

 * Describe a slow work item for debugfs

 */

static int slow_work_runqueue_show(struct seq_file *m, void *v)

{
@@ -211,7 +211,7 @@ static const struct seq_operations slow_work_runqueue_ops = { 
};



/*

 * open "/proc/slow_work_rq" to list queue contents

 * open "/sys/kernel/debug/slow_work/runqueue" to list queue contents

 */

static int slow_work_runqueue_open(struct inode *inode, struct file *file)

{