summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-16 13:42:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-19 17:03:24 +0000
commitf9c149e5c715b8d82d572b786e26d3de44315afa (patch)
tree9d76ec4734ed1210896b154a54d600c963207875 /meta/recipes-kernel/lttng
parent40fb7e115b6f9e4fcba30cd2123b2fb5df76bb2f (diff)
downloadpoky-f9c149e5c715b8d82d572b786e26d3de44315afa.tar.gz
lttng-modules: upgrade 2.10.7 -> 2.10.8
Drop backported patch already applied upstream. (From OE-Core rev: 7399dd25bcd81e61dca21bd187aa7217231eb8c4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch67
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb)7
2 files changed, 3 insertions, 71 deletions
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
deleted file mode 100644
index 92e12df177..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From 9e67b4c94b94493123d38379bd9b3eceae23a6f1 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Fri, 7 Sep 2018 12:21:12 -0400
4Subject: [PATCH] Fix: net: expose sk wmem in sock_exceed_buf_limit tracepoint
5 (4.19)
6
7See upstream commit:
8
9 commit d6f19938eb031ee2158272757db33258153ae59c
10 Author: Yafang Shao <laoar.shao@gmail.com>
11 Date: Sun Jul 1 23:31:30 2018 +0800
12
13 net: expose sk wmem in sock_exceed_buf_limit tracepoint
14
15 Currently trace_sock_exceed_buf_limit() only show rmem info,
16 but wmem limit may also be hit.
17 So expose wmem info in this tracepoint as well.
18
19 Regarding memcg, I think it is better to introduce a new tracepoint(if
20 that is needed), i.e. trace_memcg_limit_hit other than show memcg info in
21 trace_sock_exceed_buf_limit.
22
23Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
24Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
25Upstream-Status: Backport
26Signed-off-by: He Zhe <zhe.he@windriver.com>
27---
28 instrumentation/events/lttng-module/sock.h | 23 ++++++++++++++++++++++-
29 1 file changed, 22 insertions(+), 1 deletion(-)
30
31diff --git a/instrumentation/events/lttng-module/sock.h b/instrumentation/events/lttng-module/sock.h
32index 5cd02ca..cd0c92b 100644
33--- a/instrumentation/events/lttng-module/sock.h
34+++ b/instrumentation/events/lttng-module/sock.h
35@@ -21,7 +21,28 @@ LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
36 )
37 )
38
39-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
40+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
41+
42+LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
43+
44+ TP_PROTO(struct sock *sk, struct proto *prot, long allocated, int kind),
45+
46+ TP_ARGS(sk, prot, allocated, kind),
47+
48+ TP_FIELDS(
49+ ctf_string(name, prot->name)
50+ ctf_array(long, sysctl_mem, prot->sysctl_mem, 3)
51+ ctf_integer(long, allocated, allocated)
52+ ctf_integer(int, sysctl_rmem, sk_get_rmem0(sk, prot))
53+ ctf_integer(int, rmem_alloc, atomic_read(&sk->sk_rmem_alloc))
54+ ctf_integer(int, sysctl_wmem, sk_get_wmem0(sk, prot))
55+ ctf_integer(int, wmem_alloc, refcount_read(&sk->sk_wmem_alloc))
56+ ctf_integer(int, wmem_queued, sk->sk_wmem_queued)
57+ ctf_integer(int, kind, kind)
58+ )
59+)
60+
61+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
62
63 LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
64
65--
662.7.4
67
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
index f6c865a875..92e8c319b6 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.8.bb
@@ -15,11 +15,10 @@ COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
15SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 15SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
16 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ 16 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
17 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ 17 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
18 file://0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch \ 18 "
19"
20 19
21SRC_URI[md5sum] = "d3cb4520948083bf1573a2e4cb7406aa" 20SRC_URI[md5sum] = "54bd9fca61487bbec1b3fca2f2213c98"
22SRC_URI[sha256sum] = "f049428d3d131e103a7a7038d184731bf7bcdce00503fc19a2c9b5693ecbb3b5" 21SRC_URI[sha256sum] = "fe1d269bca723e8948af871c322c37d3900e647cdc5eb3efbe821e434beee44c"
23 22
24export INSTALL_MOD_DIR="kernel/lttng-modules" 23export INSTALL_MOD_DIR="kernel/lttng-modules"
25 24