summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
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-17 22:57:36 +0000
commit7399dd25bcd81e61dca21bd187aa7217231eb8c4 (patch)
treeb862cb634469efdea34e8f5fe204442ec3e7793e /meta/recipes-kernel
parent1df9f7d6946c9a0ee0749ed8646446eb56878846 (diff)
downloadopenembedded-core-contrib-7399dd25bcd81e61dca21bd187aa7217231eb8c4.tar.gz
openembedded-core-contrib-7399dd25bcd81e61dca21bd187aa7217231eb8c4.tar.bz2
openembedded-core-contrib-7399dd25bcd81e61dca21bd187aa7217231eb8c4.zip
lttng-modules: upgrade 2.10.7 -> 2.10.8
Drop backported patch already applied upstream. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-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 @@
-From 9e67b4c94b94493123d38379bd9b3eceae23a6f1 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-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 <laoar.shao@gmail.com>
- 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 <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Upstream-Status: Backport
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- 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.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'
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"
-SRC_URI[sha256sum] = "f049428d3d131e103a7a7038d184731bf7bcdce00503fc19a2c9b5693ecbb3b5"
+SRC_URI[md5sum] = "54bd9fca61487bbec1b3fca2f2213c98"
+SRC_URI[sha256sum] = "fe1d269bca723e8948af871c322c37d3900e647cdc5eb3efbe821e434beee44c"
export INSTALL_MOD_DIR="kernel/lttng-modules"