ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-02-22 17:06:54 -08:00
parent 4b3bd22b12 e9ad2eb3d9
commit ac9e806c9c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/workqueue.h
View File

@@ -311,7 +311,7 @@ enum {
WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */
WQ_HIGHPRI = 1 << 4, /* high priority */ WQ_HIGHPRI = 1 << 4, /* high priority */
WQ_CPU_INTENSIVE = 1 << 5, /* cpu intensive workqueue */ 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 * Per-cpu workqueues are generally preferred because they tend to

6
include/trace/events/workqueue.h
View File

@@ -30,7 +30,7 @@ TRACE_EVENT(workqueue_queue_work,
TP_STRUCT__entry( TP_STRUCT__entry(
__field( void *, work ) __field( void *, work )
__field( void *, function) __field( void *, function)
__field( void *, workqueue) __field( const char *, workqueue)
__field( unsigned int, req_cpu ) __field( unsigned int, req_cpu )
__field( unsigned int, cpu ) __field( unsigned int, cpu )
), ),
@@ -38,12 +38,12 @@ TRACE_EVENT(workqueue_queue_work,
TP_fast_assign( TP_fast_assign(
__entry->work = work; __entry->work = work;
__entry->function = work->func; __entry->function = work->func;
__entry->workqueue = pwq->wq; __entry->workqueue = pwq->wq->name;
__entry->req_cpu = req_cpu; __entry->req_cpu = req_cpu;
__entry->cpu = pwq->pool->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->work, __entry->function, __entry->workqueue,
__entry->req_cpu, __entry->cpu) __entry->req_cpu, __entry->cpu)
); );

4
kernel/workqueue.c
View File

@@ -2964,8 +2964,8 @@ reflush:
if (++flush_cnt == 10 || if (++flush_cnt == 10 ||
(flush_cnt % 100 == 0 && flush_cnt <= 1000)) (flush_cnt % 100 == 0 && flush_cnt <= 1000))
pr_warn("workqueue %s: drain_workqueue() isn't complete after %u tries\n", pr_warn("workqueue %s: %s() isn't complete after %u tries\n",
wq->name, flush_cnt); wq->name, __func__, flush_cnt);
mutex_unlock(&wq->mutex); mutex_unlock(&wq->mutex);
goto reflush; goto reflush;