mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 19:37:10 +00:00
Bruce Ashfield
cb3194828a
lttng hasn't released 2.10.9, but the stable/2.10 branch contains changes that we need to build against the 5.0 kernel. We add them here as patches, and we can drop them in the future when lttng is updated. (From OE-Core rev: f8bcf3486d44ebd867e9089d4dbd3b56726c9075) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
184 lines
5.1 KiB
Diff
184 lines
5.1 KiB
Diff
From d11b568681f87c2df6ecb0516d3f16d153f24bd2 Mon Sep 17 00:00:00 2001
|
|
From: Michael Jeanson <mjeanson@efficios.com>
|
|
Date: Wed, 9 Jan 2019 14:59:17 -0500
|
|
Subject: [PATCH 7/9] Fix: SUNRPC: Simplify defining common RPC trace events
|
|
(v5.0)
|
|
|
|
See upstream commit :
|
|
|
|
commit dc5820bd21d84ee34770b0a1e2fca9378f8f7456
|
|
Author: Chuck Lever <chuck.lever@oracle.com>
|
|
Date: Wed Dec 19 11:00:16 2018 -0500
|
|
|
|
SUNRPC: Simplify defining common RPC trace events
|
|
|
|
Clean up, no functional change is expected.
|
|
|
|
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
|
|
Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/d11b568681f87c2df6ecb0516d3f16d153f24bd2
|
|
|
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
|
---
|
|
instrumentation/events/lttng-module/rpc.h | 99 ++++++++++++++++-------
|
|
1 file changed, 72 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h
|
|
index a4ac557..4239280 100644
|
|
--- a/instrumentation/events/lttng-module/rpc.h
|
|
+++ b/instrumentation/events/lttng-module/rpc.h
|
|
@@ -8,7 +8,32 @@
|
|
#include <linux/sunrpc/sched.h>
|
|
#include <linux/sunrpc/clnt.h>
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
|
|
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
|
|
+
|
|
+ TP_PROTO(const struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task),
|
|
+
|
|
+ TP_FIELDS(
|
|
+ ctf_integer(unsigned int, task_id, task->tk_pid)
|
|
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
|
|
+ ctf_integer(int, status, task->tk_status)
|
|
+ )
|
|
+)
|
|
+
|
|
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
|
|
+ TP_PROTO(const struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task)
|
|
+)
|
|
+
|
|
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
|
|
+ TP_PROTO(const struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task)
|
|
+)
|
|
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
|
|
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
|
|
|
|
TP_PROTO(struct rpc_task *task),
|
|
@@ -21,6 +46,18 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
|
|
ctf_integer(int, status, task->tk_status)
|
|
)
|
|
)
|
|
+
|
|
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
|
|
+ TP_PROTO(struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task)
|
|
+)
|
|
+
|
|
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
|
|
+ TP_PROTO(struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task)
|
|
+)
|
|
#else
|
|
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
|
|
|
|
@@ -34,7 +71,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
|
|
ctf_integer(int, status, task->tk_status)
|
|
)
|
|
)
|
|
-#endif
|
|
|
|
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
|
|
TP_PROTO(struct rpc_task *task),
|
|
@@ -47,8 +83,15 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
|
|
|
|
TP_ARGS(task)
|
|
)
|
|
+#endif
|
|
|
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
|
|
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status,
|
|
+ TP_PROTO(const struct rpc_task *task),
|
|
+
|
|
+ TP_ARGS(task)
|
|
+)
|
|
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
|
|
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
TP_PROTO(const struct rpc_task *task),
|
|
|
|
@@ -60,7 +103,33 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
ctf_integer(int, status, task->tk_status)
|
|
)
|
|
)
|
|
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
|
|
+LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
+ TP_PROTO(struct rpc_task *task, int status),
|
|
+
|
|
+ TP_ARGS(task, status),
|
|
+
|
|
+ TP_FIELDS(
|
|
+ ctf_integer(unsigned int, task_id, task->tk_pid)
|
|
+ ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
|
|
+ ctf_integer(int, status, status)
|
|
+ )
|
|
+)
|
|
+#else
|
|
+LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
+ TP_PROTO(struct rpc_task *task, int status),
|
|
+
|
|
+ TP_ARGS(task, status),
|
|
+
|
|
+ TP_FIELDS(
|
|
+ ctf_integer_hex(const struct rpc_task *, task, task)
|
|
+ ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
|
|
+ ctf_integer(int, status, status)
|
|
+ )
|
|
+)
|
|
+#endif
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
|
|
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
|
|
|
|
TP_PROTO(const struct rpc_task *task, const void *action),
|
|
@@ -130,18 +199,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
|
|
)
|
|
|
|
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
|
|
-LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
- TP_PROTO(struct rpc_task *task, int status),
|
|
-
|
|
- TP_ARGS(task, status),
|
|
-
|
|
- TP_FIELDS(
|
|
- ctf_integer(unsigned int, task_id, task->tk_pid)
|
|
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
|
|
- ctf_integer(int, status, status)
|
|
- )
|
|
-)
|
|
-
|
|
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
|
|
|
|
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
|
|
@@ -211,18 +268,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
|
|
)
|
|
|
|
#else
|
|
-LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
|
|
- TP_PROTO(struct rpc_task *task, int status),
|
|
-
|
|
- TP_ARGS(task, status),
|
|
-
|
|
- TP_FIELDS(
|
|
- ctf_integer_hex(const struct rpc_task *, task, task)
|
|
- ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
|
|
- ctf_integer(int, status, status)
|
|
- )
|
|
-)
|
|
-
|
|
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
|
|
|
|
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
|
|
--
|
|
2.19.1
|
|
|