| From 526f13c844cd29f89bd3e924867d9ddfe3c40ade Mon Sep 17 00:00:00 2001 |
| From: Michael Jeanson <mjeanson@efficios.com> |
| Date: Wed, 15 Jun 2022 12:07:16 -0400 |
| Subject: [PATCH 3/3] fix: workqueue: Fix type of cpu in trace event (v5.19) |
| |
| See upstream commit : |
| |
| commit 873a400938b31a1e443c4d94b560b78300787540 |
| Author: Wonhyuk Yang <vvghjk1234@gmail.com> |
| Date: Wed May 4 11:32:03 2022 +0900 |
| |
| workqueue: Fix type of cpu in trace event |
| |
| The trace event "workqueue_queue_work" use unsigned int type for |
| req_cpu, cpu. This casue confusing cpu number like below log. |
| |
| $ cat /sys/kernel/debug/tracing/trace |
| cat-317 [001] ...: workqueue_queue_work: ... req_cpu=8192 cpu=4294967295 |
| |
| So, change unsigned type to signed type in the trace event. After |
| applying this patch, cpu number will be printed as -1 instead of |
| 4294967295 as folllows. |
| |
| $ cat /sys/kernel/debug/tracing/trace |
| cat-1338 [002] ...: workqueue_queue_work: ... req_cpu=8192 cpu=-1 |
| |
| Upstream-Status: Backport |
| |
| Change-Id: I478083c350b6ec314d87e9159dc5b342b96daed7 |
| Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| --- |
| include/instrumentation/events/workqueue.h | 49 ++++++++++++++++++++-- |
| 1 file changed, 46 insertions(+), 3 deletions(-) |
| |
| diff --git a/include/instrumentation/events/workqueue.h b/include/instrumentation/events/workqueue.h |
| index 023b65a8..5693cf89 100644 |
| --- a/include/instrumentation/events/workqueue.h |
| +++ b/include/instrumentation/events/workqueue.h |
| @@ -28,10 +28,35 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, |
| ) |
| ) |
| |
| +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) |
| /** |
| * workqueue_queue_work - called when a work gets queued |
| * @req_cpu: the requested cpu |
| - * @cwq: pointer to struct cpu_workqueue_struct |
| + * @pwq: pointer to struct pool_workqueue |
| + * @work: pointer to struct work_struct |
| + * |
| + * This event occurs when a work is queued immediately or once a |
| + * delayed work is actually queued on a workqueue (ie: once the delay |
| + * has been reached). |
| + */ |
| +LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, |
| + |
| + TP_PROTO(int req_cpu, struct pool_workqueue *pwq, |
| + struct work_struct *work), |
| + |
| + TP_ARGS(req_cpu, pwq, work), |
| + |
| + TP_FIELDS( |
| + ctf_integer_hex(void *, work, work) |
| + ctf_integer_hex(void *, function, work->func) |
| + ctf_integer(int, req_cpu, req_cpu) |
| + ) |
| +) |
| +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) |
| +/** |
| + * workqueue_queue_work - called when a work gets queued |
| + * @req_cpu: the requested cpu |
| + * @pwq: pointer to struct pool_workqueue |
| * @work: pointer to struct work_struct |
| * |
| * This event occurs when a work is queued immediately or once a |
| @@ -40,17 +65,34 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, |
| */ |
| LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, |
| |
| -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) |
| TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq, |
| struct work_struct *work), |
| |
| TP_ARGS(req_cpu, pwq, work), |
| + |
| + TP_FIELDS( |
| + ctf_integer_hex(void *, work, work) |
| + ctf_integer_hex(void *, function, work->func) |
| + ctf_integer(unsigned int, req_cpu, req_cpu) |
| + ) |
| +) |
| #else |
| +/** |
| + * workqueue_queue_work - called when a work gets queued |
| + * @req_cpu: the requested cpu |
| + * @cwq: pointer to struct cpu_workqueue_struct |
| + * @work: pointer to struct work_struct |
| + * |
| + * This event occurs when a work is queued immediately or once a |
| + * delayed work is actually queued on a workqueue (ie: once the delay |
| + * has been reached). |
| + */ |
| +LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, |
| + |
| TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq, |
| struct work_struct *work), |
| |
| TP_ARGS(req_cpu, cwq, work), |
| -#endif |
| |
| TP_FIELDS( |
| ctf_integer_hex(void *, work, work) |
| @@ -58,6 +100,7 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, |
| ctf_integer(unsigned int, req_cpu, req_cpu) |
| ) |
| ) |
| +#endif |
| |
| /** |
| * workqueue_activate_work - called when a work gets activated |
| -- |
| 2.19.1 |
| |