From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- ...trfs-Remove-unnecessary-fs_info-parameter.patch | 116 +++++++++++++++++++++ ...ose-sk-wmem-in-sock_exceed_buf_limit-trac.patch | 67 ++++++++++++ 2 files changed, 183 insertions(+) create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch create mode 100644 poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-net-expose-sk-wmem-in-sock_exceed_buf_limit-trac.patch (limited to 'poky/meta/recipes-kernel/lttng/lttng-modules') diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch new file mode 100644 index 000000000..0fe4ee829 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-btrfs-Remove-unnecessary-fs_info-parameter.patch @@ -0,0 +1,116 @@ +From 51ab0b1da29354375a19f865abcd233dd2178295 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 18 Jun 2018 14:53:19 -0400 +Subject: [PATCH] Fix: btrfs: Remove unnecessary fs_info parameter + +See upstream commit: + + commit 3dca5c942dac60164e6a6e89172f25b86af07ce7 + Author: Qu Wenruo + Date: Thu Apr 26 14:24:25 2018 +0800 + + btrfs: trace: Remove unnecessary fs_info parameter for btrfs__reserve_extent event class + + fs_info can be extracted from btrfs_block_group_cache, and all + btrfs_block_group_cache is created by btrfs_create_block_group_cache() + with fs_info initialized, no need to worry about NULL pointer + dereference. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Upstream-Status: Backport +Signed-off-by: He Zhe +--- + instrumentation/events/lttng-module/btrfs.h | 54 ++++++++++++++++++++++++++++- + 1 file changed, 53 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h +index 75cc73b..fd1b6b8 100644 +--- a/instrumentation/events/lttng-module/btrfs.h ++++ b/instrumentation/events/lttng-module/btrfs.h +@@ -1658,8 +1658,57 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f + + #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0)) ++LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, ++ ++ btrfs_find_free_extent, ++ ++ TP_PROTO(const struct btrfs_fs_info *info, u64 num_bytes, u64 empty_size, ++ u64 data), ++ ++ TP_ARGS(info, num_bytes, empty_size, data), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) ++ ctf_integer(u64, num_bytes, num_bytes) ++ ctf_integer(u64, empty_size, empty_size) ++ ctf_integer(u64, data, data) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len), ++ ++ TP_FIELDS( ++ ctf_array(u8, fsid, block_group->fs_info->fsid, BTRFS_UUID_SIZE) ++ ctf_integer(u64, bg_objectid, block_group->key.objectid) ++ ctf_integer(u64, flags, block_group->flags) ++ ctf_integer(u64, start, start) ++ ctf_integer(u64, len, len) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster, ++ ++ TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start, ++ u64 len), ++ ++ TP_ARGS(block_group, start, len) ++) + ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) + LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + + btrfs_find_free_extent, +@@ -1670,6 +1719,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + TP_ARGS(info, num_bytes, empty_size, data), + + TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, num_bytes, num_bytes) + ctf_integer(u64, empty_size, empty_size) + ctf_integer(u64, data, data) +@@ -1685,6 +1735,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent, + TP_ARGS(info, block_group, start, len), + + TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, bg_objectid, block_group->key.objectid) + ctf_integer(u64, flags, block_group->flags) + ctf_integer(u64, start, start) +@@ -1722,6 +1773,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, + TP_ARGS(info, num_bytes, empty_size, data), + + TP_FIELDS( ++ ctf_array(u8, fsid, info->fsid, BTRFS_UUID_SIZE) + ctf_integer(u64, num_bytes, num_bytes) + ctf_integer(u64, empty_size, empty_size) + ctf_integer(u64, data, data) +-- +2.13.3 + 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 new file mode 100644 index 000000000..92e12df17 --- /dev/null +++ b/poky/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 + -- cgit v1.2.3