Commit ac9e806c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull qorkqueue updates from Tejun Heo:
 "Tracepoint and comment updates only"

* 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Use %s instead of function name
  workqueue: tracing the name of the workqueue instead of it's address
  workqueue: fix annotation for WQ_SYSFS
parents 4b3bd22b e9ad2eb3

include/linux/workqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ enum { 
	WQ_MEM_RECLAIM		= 1 << 3, /* may be used for memory reclaim */

	WQ_HIGHPRI		= 1 << 4, /* high priority */

	WQ_CPU_INTENSIVE	= 1 << 5, /* cpu intensive workqueue */

	WQ_SYSFS		= 1 << 6, /* visible in sysfs, see wq_sysfs_register() */

	WQ_SYSFS		= 1 << 6, /* visible in sysfs, see workqueue_sysfs_register() */



	/*

	 * Per-cpu workqueues are generally preferred because they tend to

include/trace/events/workqueue.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ TRACE_EVENT(workqueue_queue_work, 
	TP_STRUCT__entry(

		__field( void *,	work	)

		__field( void *,	function)

		__field( void *,	workqueue)

		__field( const char *,	workqueue)

		__field( unsigned int,	req_cpu	)

		__field( unsigned int,	cpu	)

	),
@@ -38,12 +38,12 @@ TRACE_EVENT(workqueue_queue_work, 
	TP_fast_assign(

		__entry->work		= work;

		__entry->function	= work->func;

		__entry->workqueue	= pwq->wq;

		__entry->workqueue	= pwq->wq->name;

		__entry->req_cpu	= req_cpu;

		__entry->cpu		= pwq->pool->cpu;

	),



	TP_printk("work struct=%p function=%ps workqueue=%p req_cpu=%u cpu=%u",

	TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%u cpu=%u",

		  __entry->work, __entry->function, __entry->workqueue,

		  __entry->req_cpu, __entry->cpu)

);

kernel/workqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -2964,8 +2964,8 @@ void drain_workqueue(struct workqueue_struct *wq) 


		if (++flush_cnt == 10 ||

		    (flush_cnt % 100 == 0 && flush_cnt <= 1000))

			pr_warn("workqueue %s: drain_workqueue() isn't complete after %u tries\n",

				wq->name, flush_cnt);

			pr_warn("workqueue %s: %s() isn't complete after %u tries\n",

				wq->name, __func__, flush_cnt);



		mutex_unlock(&wq->mutex);

		goto reflush;