diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch | 67 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb) | 5 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch | 17 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb) | 4 |
5 files changed, 14 insertions, 83 deletions
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch deleted file mode 100644 index 92e12df17..000000000 --- a/poky/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/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb index f6c865a87..d29737775 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.7.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.9.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] = "09df0ac2e8f245740a2f32411d10c0d1" +SRC_URI[sha256sum] = "a1855bbd02d0f71ebd180e9872309862036624f012442ab9cc5852eb60340145" export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch index 62a097859..0998fc386 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch @@ -16,17 +16,17 @@ Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> Signed-off-by: He Zhe <zhe.he@windriver.com> Upstream-Status: Pending --- - src/bin/lttng-sessiond/cmd.c | 8 -------- + src/bin/lttng-sessiond/cmd.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c -index 73b4ce3..36f62ee 100644 +index cf30b8e..cc41a48 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c -@@ -689,14 +689,6 @@ close_sock: - free(rsock); +@@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain, + */ - error: + close_sock: - if (ret != LTTNG_OK) { - /* - * The consumer output for this session should not be used anymore @@ -35,9 +35,8 @@ index 73b4ce3..36f62ee 100644 - */ - consumer->enabled = 0; - } - return ret; - } + (void) relayd_close(rsock); + free(rsock); -- -1.7.9.5 - +2.17.1 diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/poky/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb index 0314b5363..5e3fc1aab 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb @@ -34,8 +34,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://lttng-sessiond.service \ " -SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96" -SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c" +SRC_URI[md5sum] = "f9c2b35810790f5bd802483eb14cb301" +SRC_URI[sha256sum] = "2c45144acf8dc6fcd655be7370a022e9c03c8b7419af489c9c2e786a335006db" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb index d79a47931..b5c43200d 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb @@ -23,8 +23,8 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ " -SRC_URI[md5sum] = "4863cc2f9f0a070b42438bb646bbba06" -SRC_URI[sha256sum] = "07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d" +SRC_URI[md5sum] = "ffcfa8c1ba9a52f002d240e936e9afa2" +SRC_URI[sha256sum] = "9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b" CVE_PRODUCT = "ust" |