As a prerequisite, complement commit 3d1cb2059d93 ("workqueue: include
workqueue info when printing debug dump of a worker task") to be usable
with kernel modules by exporting the symbol set_worker_desc().
Current built-in user was introduced with commit ef3b101925f2 ("writeback:
set worker desc to identify writeback workers in task dumps").
Can help distinguishing work items which do not have adapter scope.
Description is printed out with task dump for debugging on
WARN, BUG, panic, or magic-sysrq [show-task-states(t)].
Example:
$ echo 0 >| /sys/bus/ccw/drivers/zfcp/0.0.1880/0x50050763031bd327/failed &
$ echo 't' >| /proc/sysrq-trigger
$ dmesg
sysrq: SysRq : Show State
taskPC stack pid father
...
zfcp_q_0.0.1880 S14640 2165 2 0x0200
Call Trace:
([<009df464>] __schedule+0xbf4/0xc78)
[<009df57c>] schedule+0x94/0xc0
[<00168654>] rescuer_thread+0x33c/0x3a0
[<0016f8be>] kthread+0x166/0x178
[<009e71f2>] kernel_thread_starter+0x6/0xc
[<009e71ec>] kernel_thread_starter+0x0/0xc
no locks held by zfcp_q_0.0.1880/2165.
...
kworker/u512:2 D11280 2193 2 0x0200
Workqueue: zfcp_q_0.0.1880 zfcp_scsi_rport_work [zfcp] (zrpd-50050763031bd327)
^
Call Trace:
([<009df464>] __schedule+0xbf4/0xc78)
[<009df57c>] schedule+0x94/0xc0
[<009e50c0>] schedule_timeout+0x488/0x4d0
[<001e425c>] msleep+0x5c/0x78 >>test code only<<
[<03ff8008a21e>] zfcp_scsi_rport_work+0xbe/0x100 [zfcp]
[<00167154>] process_one_work+0x3b4/0x718
[<0016771c>] worker_thread+0x264/0x408
[<0016f8be>] kthread+0x166/0x178
[<009e71f2>] kernel_thread_starter+0x6/0xc
[<009e71ec>] kernel_thread_starter+0x0/0xc
2 locks held by kworker/u512:2/2193:
#0: (name){.+}, at: [<00166f4e>] process_one_work+0x1ae/0x718
#1: ((&(>rport_work)->work)){+.+.+.}, at: [<00166f4e>]
process_one_work+0x1ae/0x718
...
=
Showing busy workqueues and worker pools:
workqueue zfcp_q_0.0.1880: flags=0x2000a
pwq 512: cpus=0-255 flags=0x4 nice=0 active=1/1
in-flight: 2193:zfcp_scsi_rport_work [zfcp]
pool 512: cpus=0-255 flags=0x4 nice=0 hung=0s workers=4 idle: 5 2354 2311
Work items with adapter scope are already identified by the workqueue name
"zfcp_q_" and the work item function name.
Signed-off-by: Steffen Maier
Cc: Tejun Heo
Cc: Lai Jiangshan
Reviewed-by: Benjamin Block
---
drivers/s390/scsi/zfcp_fc.c | 2 ++
drivers/s390/scsi/zfcp_scsi.c | 3 +++
kernel/workqueue.c| 1 +
3 files changed, 6 insertions(+)
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 6162cf57a20a..2ad80c43f674 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -425,6 +425,7 @@ void zfcp_fc_port_did_lookup(struct work_struct *work)
struct zfcp_port *port = container_of(work, struct zfcp_port,
gid_pn_work);
+ set_worker_desc("zgidpn%16llx", port->wwpn); /* < WORKER_DESC_LEN=24 */
ret = zfcp_fc_ns_gid_pn(port);
if (ret) {
/* could not issue gid_pn for some reason */
@@ -559,6 +560,7 @@ void zfcp_fc_link_test_work(struct work_struct *work)
container_of(work, struct zfcp_port, test_link_work);
int retval;
+ set_worker_desc("zadisc%16llx", port->wwpn); /* < WORKER_DESC_LEN=24 */
get_device(>dev);
port->rport_task = RPORT_DEL;
zfcp_scsi_rport_work(>rport_work);
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index fcc832b73960..0f7830ffd40a 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -730,6 +730,9 @@ void zfcp_scsi_rport_work(struct work_struct *work)
struct zfcp_port *port = container_of(work, struct zfcp_port,
rport_work);
+ set_worker_desc("zrp%c-%16llx",
+ (port->rport_task == RPORT_ADD) ? 'a' : 'd',
+ port->wwpn); /* < WORKER_DESC_LEN=24 */
while (port->rport_task) {
if (port->rport_task == RPORT_ADD) {
port->rport_task = RPORT_NONE;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ca7959be8aaa..4e6fa755ebdc 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4350,6 +4350,7 @@ void set_worker_desc(const char *fmt, ...)
worker->desc_valid = true;
}
}
+EXPORT_SYMBOL_GPL(set_worker_desc);
/**
* print_worker_info - print out worker information and description
--
2.16.3
