From d06b7fd291076a423a83b9630471baeaef9d4f43 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Tue, 9 Oct 2018 19:44:31 +0800 Subject: lttng-modules: Fix build failure by syncing up with kernel 4.19 linux-yocto-dev has been upreved to v4.19. This patch backports a patch from upstream to make lttng-modules sync up with linux-yocto-dev and later linux-yocto, and fix the following do_compile error. | tmp/work/qemux86_64-poky-linux/lttng-modules/2.10.7-r0/lttng-modules-2.10.7/probes/../probes/lttng-tracepoint-event-impl.h:143:6: error: conflict ing types for 'trace_sock_exceed_buf_limit' | void trace_##_name(_proto); | ^~~~~~ Signed-off-by: He Zhe Signed-off-by: Richard Purdie --- ...ose-sk-wmem-in-sock_exceed_buf_limit-trac.patch | 67 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb | 1 + 2 files changed, 68 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch new file mode 100644 index 0000000000..92e12df177 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch @@ -0,0 +1,67 @@ +From 9e67b4c94b94493123d38379bd9b3eceae23a6f1 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Fri, 7 Sep 2018 12:21:12 -0400 +Subject: [PATCH] Fix: net: expose sk wmem in sock_exceed_buf_limit tracepoint + (4.19) + +See upstream commit: + + commit d6f19938eb031ee2158272757db33258153ae59c + Author: Yafang Shao + Date: Sun Jul 1 23:31:30 2018 +0800 + + net: expose sk wmem in sock_exceed_buf_limit tracepoint + + Currently trace_sock_exceed_buf_limit() only show rmem info, + but wmem limit may also be hit. + So expose wmem info in this tracepoint as well. + + Regarding memcg, I think it is better to introduce a new tracepoint(if + that is needed), i.e. trace_memcg_limit_hit other than show memcg info in + trace_sock_exceed_buf_limit. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Upstream-Status: Backport +Signed-off-by: He Zhe +--- + instrumentation/events/lttng-module/sock.h | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h +index 5cd02ca..cd0c92b 100644 +--- a/instrumentation/events/lttng-module/sock.h ++++ b/instrumentation/events/lttng-module/sock.h +@@ -21,7 +21,28 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full, + ) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) ++ ++LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit, ++ ++ TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind), ++ ++ TP_ARGS(sk, prot, allocated, kind), ++ ++ TP_FIELDS( ++ ctf_string(name, prot->name) ++ ctf_array(long, sysctl_mem, prot->sysctl_mem, 3) ++ ctf_integer(long, allocated, allocated) ++ ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot)) ++ ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc)) ++ ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot)) ++ ctf_integer(int, wmem_alloc, refcount_read(&sk->sk_wmem_alloc)) ++ ctf_integer(int, wmem_queued, sk->sk_wmem_queued) ++ ctf_integer(int, kind, kind) ++ ) ++) ++ ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) + + LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit, + +-- +2.7.4 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb index 4f14106047..f6c865a875 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb @@ -15,6 +15,7 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux' SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ + file://0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch \ " SRC_URI[md5sum] = "d3cb4520948083bf1573a2e4cb7406aa" -- cgit 1.2.3-korg