diff --git a/.bcc.metadata b/.bcc.metadata index 7891d2b..49f05c8 100644 --- a/.bcc.metadata +++ b/.bcc.metadata @@ -1 +1 @@ -7c555629ea7bbd69fa22827076c11113cf2af104 SOURCES/bcc-0.26.0.tar.gz +26ec7f9fc22494b9b6f20cd38ca216edc130704e SOURCES/bcc-0.30.0.tar.gz diff --git a/.gitignore b/.gitignore index a679cb4..a4e91d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/bcc-0.26.0.tar.gz +SOURCES/bcc-0.30.0.tar.gz diff --git a/SOURCES/bcc-0.26.0-killsnoop-add-missing-s-and-T-options-to-the-synopsi.patch b/SOURCES/bcc-0.26.0-killsnoop-add-missing-s-and-T-options-to-the-synopsi.patch deleted file mode 100644 index 79edaf2..0000000 --- a/SOURCES/bcc-0.26.0-killsnoop-add-missing-s-and-T-options-to-the-synopsi.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 64f9c355a62f78000270d025b479b7eeba7349e9 Mon Sep 17 00:00:00 2001 -From: Jerome Marchand -Date: Wed, 11 Jan 2023 16:46:32 +0100 -Subject: [PATCH] killsnoop: add missing -s and -T options to the synopsis - -The -s option is missing from the synopsis of the killsnoop manpage, -example file and the comment on top of the tool itself. -Also, -T option is missing from the example file. - -Signed-off-by: Jerome Marchand ---- - man/man8/killsnoop.8 | 2 +- - tools/killsnoop.py | 2 +- - tools/killsnoop_example.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/man8/killsnoop.8 b/man/man8/killsnoop.8 -index 3f63d2ee..cb2a975e 100644 ---- a/man/man8/killsnoop.8 -+++ b/man/man8/killsnoop.8 -@@ -2,7 +2,7 @@ - .SH NAME - killsnoop \- Trace signals issued by the kill() syscall. Uses Linux eBPF/bcc. - .SH SYNOPSIS --.B killsnoop [\-h] [\-x] [-p PID] [-T PID] -+.B killsnoop [\-h] [\-x] [-p PID] [-T PID] [-s SIGNAL] - .SH DESCRIPTION - killsnoop traces the kill() syscall, to show signals sent via this method. This - may be useful to troubleshoot failing applications, where an unknown mechanism -diff --git a/tools/killsnoop.py b/tools/killsnoop.py -index c0166f1d..9cce8dcc 100755 ---- a/tools/killsnoop.py -+++ b/tools/killsnoop.py -@@ -4,7 +4,7 @@ - # killsnoop Trace signals issued by the kill() syscall. - # For Linux, uses BCC, eBPF. Embedded C. - # --# USAGE: killsnoop [-h] [-x] [-p PID] [-T PID] -+# USAGE: killsnoop [-h] [-x] [-p PID] [-T PID] [-s SIGNAL] - # - # Copyright (c) 2015 Brendan Gregg. - # Licensed under the Apache License, Version 2.0 (the "License") -diff --git a/tools/killsnoop_example.txt b/tools/killsnoop_example.txt -index 904fe6ef..97c3ad70 100644 ---- a/tools/killsnoop_example.txt -+++ b/tools/killsnoop_example.txt -@@ -19,7 +19,7 @@ The second line showed the same signal sent, this time resulting in a -3 - USAGE message: - - # ./killsnoop -h --usage: killsnoop [-h] [-x] [-p PID] -+usage: killsnoop [-h] [-x] [-p PID] [-T PID] [-s SIGNAL] - - Trace signals issued by the kill() syscall - --- -2.39.2 - diff --git a/SOURCES/bcc-0.26.0-sync-with-latest-libbpf-repo.patch b/SOURCES/bcc-0.26.0-sync-with-latest-libbpf-repo.patch deleted file mode 100644 index 3f77c5e..0000000 --- a/SOURCES/bcc-0.26.0-sync-with-latest-libbpf-repo.patch +++ /dev/null @@ -1,363 +0,0 @@ -From 34f77c4aaaa039fd2ef3d51b8b61db30fc34912f Mon Sep 17 00:00:00 2001 -From: Yonghong Song -Date: Wed, 19 Apr 2023 23:46:53 -0700 -Subject: [PATCH] sync with latest libbpf repo - -Sync libbpf submodule up to the following commit: - 44b0bc9ad70a ci: Regenerate latest vmlinux.h for old kernel CI tests. - -Signed-off-by: Yonghong Song ---- - src/cc/compat/linux/virtual_bpf.h | 141 ++++++++++++++++++++++++++---- - src/cc/export/helpers.h | 6 +- - 2 files changed, 126 insertions(+), 21 deletions(-) - -diff --git a/src/cc/compat/linux/virtual_bpf.h b/src/cc/compat/linux/virtual_bpf.h -index be3a4627..a182123e 100644 ---- a/src/cc/compat/linux/virtual_bpf.h -+++ b/src/cc/compat/linux/virtual_bpf.h -@@ -1034,6 +1034,7 @@ enum bpf_attach_type { - BPF_PERF_EVENT, - BPF_TRACE_KPROBE_MULTI, - BPF_LSM_CGROUP, -+ BPF_STRUCT_OPS, - __MAX_BPF_ATTACH_TYPE - }; - -@@ -1109,7 +1110,7 @@ enum bpf_link_type { - */ - #define BPF_F_STRICT_ALIGNMENT (1U << 0) - --/* If BPF_F_ANY_ALIGNMENT is used in BPF_PROF_LOAD command, the -+/* If BPF_F_ANY_ALIGNMENT is used in BPF_PROG_LOAD command, the - * verifier will allow any alignment whatsoever. On platforms - * with strict alignment requirements for loads ands stores (such - * as sparc and mips) the verifier validates that all loads and -@@ -1157,6 +1158,11 @@ enum bpf_link_type { - */ - #define BPF_F_XDP_HAS_FRAGS (1U << 5) - -+/* If BPF_F_XDP_DEV_BOUND_ONLY is used in BPF_PROG_LOAD command, the loaded -+ * program becomes device-bound but can access XDP metadata. -+ */ -+#define BPF_F_XDP_DEV_BOUND_ONLY (1U << 6) -+ - /* link_create.kprobe_multi.flags used in LINK_CREATE command for - * BPF_TRACE_KPROBE_MULTI attach type to create return probe. - */ -@@ -1262,6 +1268,9 @@ enum { - - /* Create a map that is suitable to be an inner map with dynamic max entries */ - BPF_F_INNER_MAP = (1U << 12), -+ -+/* Create a map that will be registered/unregesitered by the backed bpf_link */ -+ BPF_F_LINK = (1U << 13), - }; - - /* Flags for BPF_PROG_QUERY. */ -@@ -1399,6 +1408,11 @@ union bpf_attr { - __aligned_u64 fd_array; /* array of FDs */ - __aligned_u64 core_relos; - __u32 core_relo_rec_size; /* sizeof(struct bpf_core_relo) */ -+ /* output: actual total log contents size (including termintaing zero). -+ * It could be both larger than original log_size (if log was -+ * truncated), or smaller (if log buffer wasn't filled completely). -+ */ -+ __u32 log_true_size; - }; - - struct { /* anonymous struct used by BPF_OBJ_* commands */ -@@ -1484,6 +1498,11 @@ union bpf_attr { - __u32 btf_size; - __u32 btf_log_size; - __u32 btf_log_level; -+ /* output: actual total log contents size (including termintaing zero). -+ * It could be both larger than original log_size (if log was -+ * truncated), or smaller (if log buffer wasn't filled completely). -+ */ -+ __u32 btf_log_true_size; - }; - - struct { -@@ -1503,7 +1522,10 @@ union bpf_attr { - } task_fd_query; - - struct { /* struct used by BPF_LINK_CREATE command */ -- __u32 prog_fd; /* eBPF program to attach */ -+ union { -+ __u32 prog_fd; /* eBPF program to attach */ -+ __u32 map_fd; /* struct_ops to attach */ -+ }; - union { - __u32 target_fd; /* object to attach to */ - __u32 target_ifindex; /* target ifindex */ -@@ -1544,12 +1566,23 @@ union bpf_attr { - - struct { /* struct used by BPF_LINK_UPDATE command */ - __u32 link_fd; /* link fd */ -- /* new program fd to update link with */ -- __u32 new_prog_fd; -+ union { -+ /* new program fd to update link with */ -+ __u32 new_prog_fd; -+ /* new struct_ops map fd to update link with */ -+ __u32 new_map_fd; -+ }; - __u32 flags; /* extra flags */ -- /* expected link's program fd; is specified only if -- * BPF_F_REPLACE flag is set in flags */ -- __u32 old_prog_fd; -+ union { -+ /* expected link's program fd; is specified only if -+ * BPF_F_REPLACE flag is set in flags. -+ */ -+ __u32 old_prog_fd; -+ /* expected link's map fd; is specified only -+ * if BPF_F_REPLACE flag is set. -+ */ -+ __u32 old_map_fd; -+ }; - } link_update; - - struct { -@@ -1643,17 +1676,17 @@ union bpf_attr { - * Description - * This helper is a "printk()-like" facility for debugging. It - * prints a message defined by format *fmt* (of size *fmt_size*) -- * to file *\/sys/kernel/debug/tracing/trace* from DebugFS, if -+ * to file *\/sys/kernel/tracing/trace* from TraceFS, if - * available. It can take up to three additional **u64** - * arguments (as an eBPF helpers, the total number of arguments is - * limited to five). - * - * Each time the helper is called, it appends a line to the trace. -- * Lines are discarded while *\/sys/kernel/debug/tracing/trace* is -- * open, use *\/sys/kernel/debug/tracing/trace_pipe* to avoid this. -+ * Lines are discarded while *\/sys/kernel/tracing/trace* is -+ * open, use *\/sys/kernel/tracing/trace_pipe* to avoid this. - * The format of the trace is customizable, and the exact output - * one will get depends on the options set in -- * *\/sys/kernel/debug/tracing/trace_options* (see also the -+ * *\/sys/kernel/tracing/trace_options* (see also the - * *README* file under the same directory). However, it usually - * defaults to something like: - * -@@ -2002,6 +2035,9 @@ union bpf_attr { - * sending the packet. This flag was added for GRE - * encapsulation, but might be used with other protocols - * as well in the future. -+ * **BPF_F_NO_TUNNEL_KEY** -+ * Add a flag to tunnel metadata indicating that no tunnel -+ * key should be set in the resulting tunnel header. - * - * Here is a typical usage on the transmit path: - * -@@ -2645,6 +2681,11 @@ union bpf_attr { - * Use with BPF_F_ADJ_ROOM_ENCAP_L2 flag to further specify the - * L2 type as Ethernet. - * -+ * * **BPF_F_ADJ_ROOM_DECAP_L3_IPV4**, -+ * **BPF_F_ADJ_ROOM_DECAP_L3_IPV6**: -+ * Indicate the new IP header version after decapsulating the outer -+ * IP header. Used when the inner and outer IP versions are different. -+ * - * A call to this helper is susceptible to change the underlying - * packet buffer. Therefore, at load time, all checks on pointers - * previously done by the verifier are invalidated and must be -@@ -2789,7 +2830,7 @@ union bpf_attr { - * - * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size) - * Description -- * For en eBPF program attached to a perf event, retrieve the -+ * For an eBPF program attached to a perf event, retrieve the - * value of the event counter associated to *ctx* and store it in - * the structure pointed by *buf* and of size *buf_size*. Enabled - * and running times are also stored in the structure (see -@@ -3122,6 +3163,11 @@ union bpf_attr { - * **BPF_FIB_LOOKUP_OUTPUT** - * Perform lookup from an egress perspective (default is - * ingress). -+ * **BPF_FIB_LOOKUP_SKIP_NEIGH** -+ * Skip the neighbour table lookup. *params*->dmac -+ * and *params*->smac will not be set as output. A common -+ * use case is to call **bpf_redirect_neigh**\ () after -+ * doing **bpf_fib_lookup**\ (). - * - * *ctx* is either **struct xdp_md** for XDP programs or - * **struct sk_buff** tc cls_act programs. -@@ -4952,6 +4998,12 @@ union bpf_attr { - * different maps if key/value layout matches across maps. - * Every bpf_timer_set_callback() can have different callback_fn. - * -+ * *flags* can be one of: -+ * -+ * **BPF_F_TIMER_ABS** -+ * Start the timer in absolute expire value instead of the -+ * default relative one. -+ * - * Return - * 0 on success. - * **-EINVAL** if *timer* was not initialized with bpf_timer_init() earlier -@@ -5294,7 +5346,7 @@ union bpf_attr { - * Return - * Nothing. Always succeeds. - * -- * long bpf_dynptr_read(void *dst, u32 len, struct bpf_dynptr *src, u32 offset, u64 flags) -+ * long bpf_dynptr_read(void *dst, u32 len, const struct bpf_dynptr *src, u32 offset, u64 flags) - * Description - * Read *len* bytes from *src* into *dst*, starting from *offset* - * into *src*. -@@ -5304,22 +5356,36 @@ union bpf_attr { - * of *src*'s data, -EINVAL if *src* is an invalid dynptr or if - * *flags* is not 0. - * -- * long bpf_dynptr_write(struct bpf_dynptr *dst, u32 offset, void *src, u32 len, u64 flags) -+ * long bpf_dynptr_write(const struct bpf_dynptr *dst, u32 offset, void *src, u32 len, u64 flags) - * Description - * Write *len* bytes from *src* into *dst*, starting from *offset* - * into *dst*. -- * *flags* is currently unused. -+ * -+ * *flags* must be 0 except for skb-type dynptrs. -+ * -+ * For skb-type dynptrs: -+ * * All data slices of the dynptr are automatically -+ * invalidated after **bpf_dynptr_write**\ (). This is -+ * because writing may pull the skb and change the -+ * underlying packet buffer. -+ * -+ * * For *flags*, please see the flags accepted by -+ * **bpf_skb_store_bytes**\ (). - * Return - * 0 on success, -E2BIG if *offset* + *len* exceeds the length - * of *dst*'s data, -EINVAL if *dst* is an invalid dynptr or if *dst* -- * is a read-only dynptr or if *flags* is not 0. -+ * is a read-only dynptr or if *flags* is not correct. For skb-type dynptrs, -+ * other errors correspond to errors returned by **bpf_skb_store_bytes**\ (). - * -- * void *bpf_dynptr_data(struct bpf_dynptr *ptr, u32 offset, u32 len) -+ * void *bpf_dynptr_data(const struct bpf_dynptr *ptr, u32 offset, u32 len) - * Description - * Get a pointer to the underlying dynptr data. - * - * *len* must be a statically known value. The returned data slice - * is invalidated whenever the dynptr is invalidated. -+ * -+ * skb and xdp type dynptrs may not use bpf_dynptr_data. They should -+ * instead use bpf_dynptr_slice and bpf_dynptr_slice_rdwr. - * Return - * Pointer to the underlying dynptr data, NULL if the dynptr is - * read-only, if the dynptr is invalid, or if the offset and length -@@ -5415,7 +5481,7 @@ union bpf_attr { - * Drain samples from the specified user ring buffer, and invoke - * the provided callback for each such sample: - * -- * long (\*callback_fn)(struct bpf_dynptr \*dynptr, void \*ctx); -+ * long (\*callback_fn)(const struct bpf_dynptr \*dynptr, void \*ctx); - * - * If **callback_fn** returns 0, the helper will continue to try - * and drain the next sample, up to a maximum of -@@ -5765,6 +5831,7 @@ enum { - BPF_F_ZERO_CSUM_TX = (1ULL << 1), - BPF_F_DONT_FRAGMENT = (1ULL << 2), - BPF_F_SEQ_NUMBER = (1ULL << 3), -+ BPF_F_NO_TUNNEL_KEY = (1ULL << 4), - }; - - /* BPF_FUNC_skb_get_tunnel_key flags. */ -@@ -5804,6 +5871,8 @@ enum { - BPF_F_ADJ_ROOM_ENCAP_L4_UDP = (1ULL << 4), - BPF_F_ADJ_ROOM_NO_CSUM_RESET = (1ULL << 5), - BPF_F_ADJ_ROOM_ENCAP_L2_ETH = (1ULL << 6), -+ BPF_F_ADJ_ROOM_DECAP_L3_IPV4 = (1ULL << 7), -+ BPF_F_ADJ_ROOM_DECAP_L3_IPV6 = (1ULL << 8), - }; - - enum { -@@ -6339,6 +6408,9 @@ struct bpf_link_info { - struct { - __u32 ifindex; - } xdp; -+ struct { -+ __u32 map_id; -+ } struct_ops; - }; - } __attribute__((aligned(8))); - -@@ -6735,6 +6807,7 @@ struct bpf_raw_tracepoint_args { - enum { - BPF_FIB_LOOKUP_DIRECT = (1U << 0), - BPF_FIB_LOOKUP_OUTPUT = (1U << 1), -+ BPF_FIB_LOOKUP_SKIP_NEIGH = (1U << 2), - }; - - enum { -@@ -6902,6 +6975,21 @@ struct bpf_list_node { - __u64 :64; - } __attribute__((aligned(8))); - -+struct bpf_rb_root { -+ __u64 :64; -+ __u64 :64; -+} __attribute__((aligned(8))); -+ -+struct bpf_rb_node { -+ __u64 :64; -+ __u64 :64; -+ __u64 :64; -+} __attribute__((aligned(8))); -+ -+struct bpf_refcount { -+ __u32 :32; -+} __attribute__((aligned(4))); -+ - struct bpf_sysctl { - __u32 write; /* Sysctl is being read (= 0) or written (= 1). - * Allows 1,2,4-byte read, but no write. -@@ -7051,5 +7139,22 @@ struct bpf_core_relo { - enum bpf_core_relo_kind kind; - }; - -+/* -+ * Flags to control bpf_timer_start() behaviour. -+ * - BPF_F_TIMER_ABS: Timeout passed is absolute time, by default it is -+ * relative to current time. -+ */ -+enum { -+ BPF_F_TIMER_ABS = (1ULL << 0), -+}; -+ -+/* BPF numbers iterator state */ -+struct bpf_iter_num { -+ /* opaque iterator state; having __u64 here allows to preserve correct -+ * alignment requirements in vmlinux.h, generated from BTF -+ */ -+ __u64 __opaque[1]; -+} __attribute__((aligned(8))); -+ - #endif /* _UAPI__LINUX_BPF_H__ */ - )********" -diff --git a/src/cc/export/helpers.h b/src/cc/export/helpers.h -index d7b869e0..e989440a 100644 ---- a/src/cc/export/helpers.h -+++ b/src/cc/export/helpers.h -@@ -1006,13 +1006,13 @@ static void (*bpf_ringbuf_submit_dynptr)(struct bpf_dynptr *ptr, __u64 flags) = - (void *)BPF_FUNC_ringbuf_submit_dynptr; - static void (*bpf_ringbuf_discard_dynptr)(struct bpf_dynptr *ptr, __u64 flags) = - (void *)BPF_FUNC_ringbuf_discard_dynptr; --static long (*bpf_dynptr_read)(void *dst, __u32 len, struct bpf_dynptr *src, __u32 offset, -+static long (*bpf_dynptr_read)(void *dst, __u32 len, const struct bpf_dynptr *src, __u32 offset, - __u64 flags) = - (void *)BPF_FUNC_dynptr_read; --static long (*bpf_dynptr_write)(struct bpf_dynptr *dst, __u32 offset, void *src, __u32 len, -+static long (*bpf_dynptr_write)(const struct bpf_dynptr *dst, __u32 offset, void *src, __u32 len, - __u64 flags) = - (void *)BPF_FUNC_dynptr_write; --static void *(*bpf_dynptr_data)(struct bpf_dynptr *ptr, __u32 offset, __u32 len) = -+static void *(*bpf_dynptr_data)(const struct bpf_dynptr *ptr, __u32 offset, __u32 len) = - (void *)BPF_FUNC_dynptr_data; - static __s64 (*bpf_tcp_raw_gen_syncookie_ipv4)(struct iphdr *iph, struct tcphdr *th, - __u32 th_len) = --- -2.41.0 - diff --git a/SOURCES/bcc-0.26.0-tools-compactsnoop.py-Fix-raw_tracepoint-Invalid-arg.patch b/SOURCES/bcc-0.26.0-tools-compactsnoop.py-Fix-raw_tracepoint-Invalid-arg.patch deleted file mode 100644 index ab540be..0000000 --- a/SOURCES/bcc-0.26.0-tools-compactsnoop.py-Fix-raw_tracepoint-Invalid-arg.patch +++ /dev/null @@ -1,71 +0,0 @@ -From cc35f70515cb0f3b8032b8fb68f9f37a844e74c8 Mon Sep 17 00:00:00 2001 -From: Rong Tao -Date: Fri, 10 Feb 2023 23:28:55 +0800 -Subject: [PATCH] tools/compactsnoop.py: Fix raw_tracepoint Invalid argument - error - -kernel commit abd4349ff9b8("mm: compaction: cleanup the compaction trace -events") change the arguments of 'mm_compaction_begin' from (start_pfn, -migrate_pfn, free_pfn, end_pfn, sync) to (cc, start_pfn, end_pfn, sync), -and change the arguments of 'mm_compaction_end' from (start_pfn, -migrate_pfn, free_pfn, end_pfn, sync, ret) to (cc, start_pfn, end_pfn, -sync, ret). - -Replacing RAW_TRACEPOINT_PROBE with TRACEPOINT_PROBE solves this problem -and guarantees compatibility. - - $ sudo ./compactsnoop.py - bpf_attach_raw_tracepoint (mm_compaction_begin): Invalid argument - Traceback (most recent call last): - File "/home/sdb/Git/bcc/tools/./compactsnoop.py", line 292, in - b = BPF(text=bpf_text) - ^^^^^^^^^^^^^^^^^^ - File "/usr/lib/python3.11/site-packages/bcc/__init__.py", line 483, in __init__ - self._trace_autoload() - File "/usr/lib/python3.11/site-packages/bcc/__init__.py", line 1462, in _trace_autoload - self.attach_raw_tracepoint(tp=tp, fn_name=fn.name) - File "/usr/lib/python3.11/site-packages/bcc/__init__.py", line 1055, in attach_raw_tracepoint - raise Exception("Failed to attach BPF to raw tracepoint") - Exception: Failed to attach BPF to raw tracepoint - -Signed-off-by: Rong Tao ---- - tools/compactsnoop.py | 13 ++++--------- - 1 file changed, 4 insertions(+), 9 deletions(-) - -diff --git a/tools/compactsnoop.py b/tools/compactsnoop.py -index 2643e8ed..2b395dec 100755 ---- a/tools/compactsnoop.py -+++ b/tools/compactsnoop.py -@@ -237,11 +237,9 @@ RAW_TRACEPOINT_PROBE(mm_compaction_suitable) - return 0; - } - --RAW_TRACEPOINT_PROBE(mm_compaction_begin) -+TRACEPOINT_PROBE(compaction, mm_compaction_begin) - { -- // TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, -- // unsigned long free_pfn, unsigned long zone_end, bool sync) -- bool sync = (bool)ctx->args[4]; -+ bool sync = args->sync; - - u64 id = bpf_get_current_pid_tgid(); - struct val_t *valp = start.lookup(&id); -@@ -255,12 +253,9 @@ RAW_TRACEPOINT_PROBE(mm_compaction_begin) - return 0; - } - --RAW_TRACEPOINT_PROBE(mm_compaction_end) -+TRACEPOINT_PROBE(compaction, mm_compaction_end) - { -- // TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn, -- // unsigned long free_pfn, unsigned long zone_end, bool sync, -- // int status) -- submit_event(ctx, ctx->args[5]); -+ submit_event(args, args->status); - return 0; - } - """ --- -2.39.2 - diff --git a/SOURCES/bcc-0.26.0-tools-deadlock-Add-an-option-to-set-the-maximum-numb.patch b/SOURCES/bcc-0.26.0-tools-deadlock-Add-an-option-to-set-the-maximum-numb.patch deleted file mode 100644 index 70410ac..0000000 --- a/SOURCES/bcc-0.26.0-tools-deadlock-Add-an-option-to-set-the-maximum-numb.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0e9384ec4c88d2da2d23475f58ec9bff7eb48639 Mon Sep 17 00:00:00 2001 -From: Jerome Marchand -Date: Tue, 25 Apr 2023 16:04:05 +0200 -Subject: [PATCH] tools/deadlock: Add an option to set the maximum number of - stack traces - -Commit 77f5252d ("tools/deadlock: support specifies maxnum of threads -and edge cases (#3455)") allow to set the maximum number of threads -and edge cases to be able to reduce the memory usage of the deadlock -tool. It however let the size of the map of stack traces fixed. It's -current size, 640k (actually rounded up to 1M) takes 1Gb of vmalloced -kernel memory. - -This patch adds an option to make the maximum number of stack traces -user defined. It also set the default value to 64k, in line with the -current default for the number of edge cases and threads. - -It fix the following issue on system with limited memory ressources: -could not open bpf map: stack_traces, error: Cannot allocate memory -Traceback (most recent call last): - File "/tmp/./deadlock.py", line 577, in - main() - File "/tmp/./deadlock.py", line 489, in main - bpf = BPF(text=text) - File "/usr/lib/python3.9/site-packages/bcc/__init__.py", line 479, in __init__ - raise Exception("Failed to compile BPF module %s" % (src_file or "")) -Exception: Failed to compile BPF module - -Signed-off-by: Jerome Marchand ---- - tools/deadlock.c | 2 +- - tools/deadlock.py | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tools/deadlock.c b/tools/deadlock.c -index 006dc121..6ae405ba 100644 ---- a/tools/deadlock.c -+++ b/tools/deadlock.c -@@ -60,7 +60,7 @@ struct thread_created_leaf_t { - BPF_HASH(thread_to_parent, u32, struct thread_created_leaf_t); - - // Stack traces when threads are created and when mutexes are locked/unlocked. --BPF_STACK_TRACE(stack_traces, 655360); -+BPF_STACK_TRACE(stack_traces, MAX_TRACES); - - // The first argument to the user space function we are tracing - // is a pointer to the mutex M held by thread T. -diff --git a/tools/deadlock.py b/tools/deadlock.py -index 12de099f..f7eb4ce0 100755 ---- a/tools/deadlock.py -+++ b/tools/deadlock.py -@@ -467,6 +467,13 @@ import time - help='Specifies the maximum number of edge cases that can be recorded. ' - 'default 65536. Note. 88 bytes per edge case.' - ) -+ parser.add_argument( -+ '-s', '--stacktraces', type=int, default=65536, -+ help='Specifies the maximum number of stack traces that can be recorded. ' -+ 'This number is rounded up to the next power of two.' -+ 'default 65536. Note. 1 kbytes vmalloced per stack trace.' -+ ) -+ - args = parser.parse_args() - if not args.binary: - try: -@@ -479,6 +486,7 @@ import time - text = f.read() - text = text.replace('MAX_THREADS', str(args.threads)); - text = text.replace('MAX_EDGES', str(args.edges)); -+ text = text.replace('MAX_TRACES', str(args.stacktraces)); - bpf = BPF(text=text) - - # Trace where threads are created --- -2.39.2 - diff --git a/SOURCES/bcc-0.26.0-tools-funcslower-fix-printing-of-folded-stacks.patch b/SOURCES/bcc-0.26.0-tools-funcslower-fix-printing-of-folded-stacks.patch deleted file mode 100644 index 1569468..0000000 --- a/SOURCES/bcc-0.26.0-tools-funcslower-fix-printing-of-folded-stacks.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 29f0fa3693d679102680fece9ed5e606e291c5fa Mon Sep 17 00:00:00 2001 -From: Jerome Marchand -Date: Fri, 7 Apr 2023 14:30:54 +0200 -Subject: [PATCH] tools/funcslower: fix printing of folded stacks - -When trying to print folded stack, funcslower tries to join bytes to a -string. Let's perform that operation with bytes only, and decode -before printing. -Also, decode symbols name before printing for the default stack -format, to avoid unsightly b'xxx' output. - -It fixes the following error: - -Exception ignored on calling ctypes callback function: .raw_cb_ at 0x7f200541e5e0> -Traceback (most recent call last): - File "/usr/lib/python3.9/site-packages/bcc/table.py", line 982, in raw_cb_ - callback(cpu, data, size) - File "/usr/share/bcc/tools/funcslower", line 340, in print_event - print_stack(event) - File "/usr/share/bcc/tools/funcslower", line 324, in print_stack - print("%s %d" % (";".join(line), 1)) -TypeError: sequence item 1: expected str instance, bytes found - -Signed-off-by: Jerome Marchand ---- - tools/funcslower.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/funcslower.py b/tools/funcslower.py -index 6df7f24c..4b3798a0 100755 ---- a/tools/funcslower.py -+++ b/tools/funcslower.py -@@ -317,17 +317,17 @@ earliest_ts = 0 - # print folded stack output - user_stack = list(user_stack) - kernel_stack = list(kernel_stack) -- line = [event.comm.decode('utf-8', 'replace')] + \ -+ line = [event.comm] + \ - [b.sym(addr, event.tgid_pid) for addr in reversed(user_stack)] + \ - (do_delimiter and ["-"] or []) + \ - [b.ksym(addr) for addr in reversed(kernel_stack)] -- print("%s %d" % (";".join(line), 1)) -+ print("%s %d" % (b';'.join(line).decode('utf-8', 'replace'), 1)) - else: - # print default multi-line stack output. - for addr in kernel_stack: -- print(" %s" % b.ksym(addr)) -+ print(" %s" % b.ksym(addr).decode('utf-8', 'replace')) - for addr in user_stack: -- print(" %s" % b.sym(addr, event.tgid_pid)) -+ print(" %s" % b.sym(addr, event.tgid_pid).decode('utf-8', 'replace')) - - def print_event(cpu, data, size): - event = b["events"].event(data) --- -2.39.2 - diff --git a/SOURCES/bcc-0.26.0-tools-nfsslower.py-Fix-uninitialized-struct-pad-erro.patch b/SOURCES/bcc-0.26.0-tools-nfsslower.py-Fix-uninitialized-struct-pad-erro.patch deleted file mode 100644 index 863b89c..0000000 --- a/SOURCES/bcc-0.26.0-tools-nfsslower.py-Fix-uninitialized-struct-pad-erro.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 9965f8397950d8aa1bc1a5decbc2250d0627a798 Mon Sep 17 00:00:00 2001 -From: Rong Tao -Date: Fri, 10 Feb 2023 22:16:56 +0800 -Subject: [PATCH] tools/nfsslower.py: Fix uninitialized struct pad error - -The verifier is unhappy, if data struct _pad_ is not initialized, see [0][1]. - - $ sudo ./nfsslower.py - ... - ; bpf_perf_event_output(ctx, (void *)bpf_pseudo_fd(1, -2), CUR_CPU_IDENTIFIER, &data, sizeof(data)); - 83: (79) r1 = *(u64 *)(r10 -144) ; R1_w=ctx(off=0,imm=0) R10=fp0 - 84: (18) r3 = 0xffffffff ; R3_w=4294967295 - 86: (b7) r5 = 96 ; R5_w=96 - 87: (85) call bpf_perf_event_output#25 - invalid indirect read from stack R4 off -136+92 size 96 - processed 84 insns (limit 1000000) max_states_per_insn 0 total_states 4 peak_states 4 mark_read 4 - ... - raise Exception("Failed to load BPF program %s: %s" % - Exception: Failed to load BPF program b'raw_tracepoint__nfs_commit_done': Permission denied - -[0] https://github.com/iovisor/bcc/issues/2623 -[1] https://github.com/iovisor/bcc/pull/4453 - -Signed-off-by: Rong Tao ---- - tools/nfsslower.py | 29 +++++++++++++++++++++-------- - 1 file changed, 21 insertions(+), 8 deletions(-) - -diff --git a/tools/nfsslower.py b/tools/nfsslower.py -index 34756f72..99f63f0f 100755 ---- a/tools/nfsslower.py -+++ b/tools/nfsslower.py -@@ -195,8 +195,11 @@ static int trace_exit(struct pt_regs *ctx, int type) - - // populate output struct - u32 size = PT_REGS_RC(ctx); -- struct data_t data = {.type = type, .size = size, .delta_us = delta_us, -- .pid = pid}; -+ struct data_t data = {}; -+ data.type = type; -+ data.size = size; -+ data.delta_us = delta_us; -+ data.pid = pid; - data.ts_us = ts / 1000; - data.offset = valp->offset; - bpf_get_current_comm(&data.task, sizeof(data.task)); -@@ -280,9 +283,14 @@ RAW_TRACEPOINT_PROBE(nfs_commit_done) - u64 ts = bpf_ktime_get_ns(); - u64 delta_us = (ts - cp->ts) / 1000; - u32 pid = bpf_get_current_pid_tgid() >> 32; -- struct data_t data = {.type = TRACE_COMMIT, .offset = cp->offset, -- .size = cp->count, .ts_us = ts/1000, .delta_us = delta_us, -- .pid = pid}; -+ -+ struct data_t data = {}; -+ data.type = TRACE_COMMIT; -+ data.offset = cp->offset; -+ data.size = cp->count; -+ data.ts_us = ts/1000; -+ data.delta_us = delta_us; -+ data.pid = pid; - - commitinfo.delete(&key); - bpf_get_current_comm(&data.task, sizeof(data.task)); -@@ -325,9 +333,14 @@ int trace_nfs_commit_done(struct pt_regs *ctx, void *task, void *calldata) - u64 ts = bpf_ktime_get_ns(); - u64 delta_us = (ts - cp->ts) / 1000; - u32 pid = bpf_get_current_pid_tgid() >> 32; -- struct data_t data = {.type = TRACE_COMMIT, .offset = cp->offset, -- .size = cp->count, .ts_us = ts/1000, .delta_us = delta_us, -- .pid = pid}; -+ -+ struct data_t data = {}; -+ data.type = TRACE_COMMIT; -+ data.offset = cp->offset; -+ data.size = cp->count; -+ data.ts_us = ts/1000; -+ data.delta_us = delta_us; -+ data.pid = pid; - - commitinfo.delete(&key); - bpf_get_current_comm(&data.task, sizeof(data.task)); --- -2.39.2 - diff --git a/SOURCES/bcc-0.26.0-tools-readahead-Fix-Failed-to-attach-BPF-program-ent.patch b/SOURCES/bcc-0.26.0-tools-readahead-Fix-Failed-to-attach-BPF-program-ent.patch deleted file mode 100644 index 1f1c0be..0000000 --- a/SOURCES/bcc-0.26.0-tools-readahead-Fix-Failed-to-attach-BPF-program-ent.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 02fce045ce02fe81d8649ce63ce81d5cdf3e3a72 Mon Sep 17 00:00:00 2001 -From: Rong Tao -Date: Mon, 30 Jan 2023 17:39:35 +0800 -Subject: [PATCH] tools/readahead: Fix: Failed to attach BPF program - entry__do_page_cache_readahead - -since commit 56a4d67c264e("mm/readahead: Switch to page_cache_ra_order") switch -do_page_cache_ra() to page_cache_ra_order() (v5.17), and commit bb3c579e25e5 -("mm/filemap: Add filemap_alloc_folio") swap __page_cache_alloc() to -filemap_alloc_folio() (since v5.15) - -Reprocude the error(fedora37, 6.1.7-200.fc37.aarch64): - - $ sudo ./readahead.py - cannot attach kprobe, probe entry may not exist - Traceback (most recent call last): - File "/home/rongtao/Git/bcc/tools/./readahead.py", line 159, in - b.attach_kprobe(event=ra_event, fn_name="entry__do_page_cache_readahead") - File "/usr/lib/python3.11/site-packages/bcc/__init__.py", line 840, in attach_kprobe - raise Exception("Failed to attach BPF program %s to kprobe %s" % - Exception: Failed to attach BPF program b'entry__do_page_cache_readahead' to kprobe b'do_page_cache_ra' - -Signed-off-by: Rong Tao ---- - tools/readahead.py | 69 +++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 56 insertions(+), 13 deletions(-) - -diff --git a/tools/readahead.py b/tools/readahead.py -index f2afdcb3..adad2ea8 100755 ---- a/tools/readahead.py -+++ b/tools/readahead.py -@@ -12,6 +12,7 @@ - # - # 20-Aug-2020 Suchakra Sharma Ported from bpftrace to BCC - # 17-Sep-2021 Hengqi Chen Migrated to kfunc -+# 30-Jan-2023 Rong Tao Support more kfunc/kprobe, introduce folio - - from __future__ import print_function - from bcc import BPF -@@ -38,6 +39,7 @@ args = parser.parse_args() - bpf_text = """ - #include - #include -+#include - - BPF_HASH(flag, u32, u8); // used to track if we are in do_page_cache_readahead() - BPF_HASH(birth, struct page*, u64); // used to track timestamps of cache alloc'ed page -@@ -65,7 +67,7 @@ int exit__do_page_cache_readahead(struct pt_regs *ctx) { - int exit__page_cache_alloc(struct pt_regs *ctx) { - u32 pid; - u64 ts; -- struct page *retval = (struct page*) PT_REGS_RC(ctx); -+ struct page *retval = (struct page*) GET_RETVAL_PAGE; - u32 zero = 0; // static key for accessing pages[0] - pid = bpf_get_current_pid_tgid(); - u8 *f = flag.lookup(&pid); -@@ -111,6 +113,23 @@ KRETFUNC_PROBE(RA_FUNC) - return 0; - } - -+KFUNC_PROBE(mark_page_accessed, struct page *arg0) -+{ -+ u64 ts, delta; -+ u32 zero = 0; // static key for accessing pages[0] -+ u64 *bts = birth.lookup(&arg0); -+ -+ if (bts != NULL) { -+ delta = bpf_ktime_get_ns() - *bts; -+ dist.atomic_increment(bpf_log2l(delta/1000000)); -+ pages.atomic_increment(zero, -1); -+ birth.delete(&arg0); // remove the entry from hashmap -+ } -+ return 0; -+} -+""" -+ -+bpf_text_kfunc_cache_alloc_ret_page = """ - KRETFUNC_PROBE(__page_cache_alloc, gfp_t gfp, struct page *retval) - { - u64 ts; -@@ -125,18 +144,22 @@ KRETFUNC_PROBE(__page_cache_alloc, gfp_t gfp, struct page *retval) - } - return 0; - } -+""" - --KFUNC_PROBE(mark_page_accessed, struct page *arg0) -+bpf_text_kfunc_cache_alloc_ret_folio = """ -+KRETFUNC_PROBE(filemap_alloc_folio, gfp_t gfp, unsigned int order, -+ struct folio *retval) - { -- u64 ts, delta; -+ u64 ts; - u32 zero = 0; // static key for accessing pages[0] -- u64 *bts = birth.lookup(&arg0); -+ u32 pid = bpf_get_current_pid_tgid(); -+ u8 *f = flag.lookup(&pid); -+ struct page *page = folio_page(retval, 0); - -- if (bts != NULL) { -- delta = bpf_ktime_get_ns() - *bts; -- dist.atomic_increment(bpf_log2l(delta/1000000)); -- pages.atomic_increment(zero, -1); -- birth.delete(&arg0); // remove the entry from hashmap -+ if (f != NULL && *f == 1) { -+ ts = bpf_ktime_get_ns(); -+ birth.update(&page, &ts); -+ pages.atomic_increment(zero); - } - return 0; - } -@@ -145,20 +168,40 @@ KFUNC_PROBE(mark_page_accessed, struct page *arg0) - if BPF.support_kfunc(): - if BPF.get_kprobe_functions(b"__do_page_cache_readahead"): - ra_func = "__do_page_cache_readahead" -- else: -+ elif BPF.get_kprobe_functions(b"do_page_cache_ra"): - ra_func = "do_page_cache_ra" -+ elif BPF.get_kprobe_functions(b"page_cache_ra_order"): -+ ra_func = "page_cache_ra_order" -+ else: -+ print("Not found any kfunc.") -+ exit() - bpf_text += bpf_text_kfunc.replace("RA_FUNC", ra_func) -+ if BPF.get_kprobe_functions(b"__page_cache_alloc"): -+ bpf_text += bpf_text_kfunc_cache_alloc_ret_page -+ else: -+ bpf_text += bpf_text_kfunc_cache_alloc_ret_folio - b = BPF(text=bpf_text) - else: - bpf_text += bpf_text_kprobe -- b = BPF(text=bpf_text) - if BPF.get_kprobe_functions(b"__do_page_cache_readahead"): - ra_event = "__do_page_cache_readahead" -- else: -+ elif BPF.get_kprobe_functions(b"do_page_cache_ra"): - ra_event = "do_page_cache_ra" -+ elif BPF.get_kprobe_functions(b"page_cache_ra_order"): -+ ra_event = "page_cache_ra_order" -+ else: -+ print("Not found any kprobe.") -+ exit() -+ if BPF.get_kprobe_functions(b"__page_cache_alloc"): -+ cache_func = "__page_cache_alloc" -+ bpf_text = bpf_text.replace('GET_RETVAL_PAGE', 'PT_REGS_RC(ctx)') -+ else: -+ cache_func = "filemap_alloc_folio" -+ bpf_text = bpf_text.replace('GET_RETVAL_PAGE', 'folio_page((struct folio *)PT_REGS_RC(ctx), 0)') -+ b = BPF(text=bpf_text) - b.attach_kprobe(event=ra_event, fn_name="entry__do_page_cache_readahead") - b.attach_kretprobe(event=ra_event, fn_name="exit__do_page_cache_readahead") -- b.attach_kretprobe(event="__page_cache_alloc", fn_name="exit__page_cache_alloc") -+ b.attach_kretprobe(event=cache_func, fn_name="exit__page_cache_alloc") - b.attach_kprobe(event="mark_page_accessed", fn_name="entry_mark_page_accessed") - - # header --- -2.39.1 - diff --git a/SOURCES/bcc-0.26.0-tools-slabratetop-Fix-error-incomplete-definition-of.patch b/SOURCES/bcc-0.26.0-tools-slabratetop-Fix-error-incomplete-definition-of.patch deleted file mode 100644 index 626e849..0000000 --- a/SOURCES/bcc-0.26.0-tools-slabratetop-Fix-error-incomplete-definition-of.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 533db3453a09695f79368792cdd5fbe2ddeaa55e Mon Sep 17 00:00:00 2001 -From: Rong Tao -Date: Sun, 22 Jan 2023 15:44:46 +0800 -Subject: [PATCH] tools/slabratetop: Fix error: incomplete definition of type - 'struct slab' - -kernel commit 40f3bf0cb04c("mm: Convert struct page to struct slab in functions -used by other subsystems") introduce slab_address() function, commit 6e48a966dfd1 -("mm/kasan: Convert to struct folio and struct slab") linux/kasan.h adds a -dependency on the slab struct, This leads to the following problems: - - $ sudo ./slabratetop.py - In file included from /virtual/main.c:13: - include/linux/slub_def.h:162:26: warning: call to undeclared function 'slab_address'; - ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - void *object = x - (x - slab_address(slab)) % cache->size; - ^ - include/linux/slub_def.h:162:46: error: invalid operands to binary expression ('void *' and 'unsigned int') - void *object = x - (x - slab_address(slab)) % cache->size; - ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ - include/linux/slub_def.h:164:8: error: incomplete definition of type 'struct slab' - (slab->objects - 1) * cache->size; - ~~~~^ - include/linux/kasan.h:13:8: note: forward declaration of 'struct slab' - struct slab; - ^ - ... - -At first, I wanted to fix this with a kernel patch [1], however, bcc as a -downstream project of the kernel, this issue should be solved inside the bcc -project. This is agreed by kernel maintainer and bcc maintainer @yonghong-song. - -This solution is provided by @yonghong-song [0]. - -[0] https://github.com/iovisor/bcc/issues/4438 -[1] https://lore.kernel.org/all/tencent_ABA832E296819D1053D6C625ADCAF76BC706@qq.com/ - -Signed-off-by: Rong Tao -Signed-off-by: Yonghong Song ---- - tools/slabratetop.py | 76 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 76 insertions(+) - -diff --git a/tools/slabratetop.py b/tools/slabratetop.py -index ac44b2bd..8fbcac5e 100755 ---- a/tools/slabratetop.py -+++ b/tools/slabratetop.py -@@ -14,6 +14,9 @@ - # Licensed under the Apache License, Version 2.0 (the "License") - # - # 15-Oct-2016 Brendan Gregg Created this. -+# 23-Jan-2023 Rong Tao Introduce kernel internal data structure and -+# functions to temporarily solve problem for -+# >=5.16(TODO: fix this workaround) - - from __future__ import print_function - from bcc import BPF -@@ -65,6 +68,79 @@ bpf_text = """ - // 5.9, but it does not hurt to have it here for versions 5.4 to 5.8. - struct memcg_cache_params {}; - -+// introduce kernel interval slab structure and slab_address() function, solved -+// 'undefined' error for >=5.16. TODO: we should fix this workaround if BCC -+// framework support BTF/CO-RE. -+struct slab { -+ unsigned long __page_flags; -+ -+#if defined(CONFIG_SLAB) -+ -+ struct kmem_cache *slab_cache; -+ union { -+ struct { -+ struct list_head slab_list; -+ void *freelist; /* array of free object indexes */ -+ void *s_mem; /* first object */ -+ }; -+ struct rcu_head rcu_head; -+ }; -+ unsigned int active; -+ -+#elif defined(CONFIG_SLUB) -+ -+ struct kmem_cache *slab_cache; -+ union { -+ struct { -+ union { -+ struct list_head slab_list; -+#ifdef CONFIG_SLUB_CPU_PARTIAL -+ struct { -+ struct slab *next; -+ int slabs; /* Nr of slabs left */ -+ }; -+#endif -+ }; -+ /* Double-word boundary */ -+ void *freelist; /* first free object */ -+ union { -+ unsigned long counters; -+ struct { -+ unsigned inuse:16; -+ unsigned objects:15; -+ unsigned frozen:1; -+ }; -+ }; -+ }; -+ struct rcu_head rcu_head; -+ }; -+ unsigned int __unused; -+ -+#elif defined(CONFIG_SLOB) -+ -+ struct list_head slab_list; -+ void *__unused_1; -+ void *freelist; /* first free block */ -+ long units; -+ unsigned int __unused_2; -+ -+#else -+#error "Unexpected slab allocator configured" -+#endif -+ -+ atomic_t __page_refcount; -+#ifdef CONFIG_MEMCG -+ unsigned long memcg_data; -+#endif -+}; -+ -+// slab_address() will not be used, and NULL will be returned directly, which -+// can avoid adaptation of different kernel versions -+static inline void *slab_address(const struct slab *slab) -+{ -+ return NULL; -+} -+ - #ifdef CONFIG_SLUB - #include - #else --- -2.39.1 - diff --git a/SOURCES/bcc-0.30.0-RHEL-Centos-tools-fix-alignment-in-tp_args-for-bio-t.patch b/SOURCES/bcc-0.30.0-RHEL-Centos-tools-fix-alignment-in-tp_args-for-bio-t.patch new file mode 100644 index 0000000..aa03d05 --- /dev/null +++ b/SOURCES/bcc-0.30.0-RHEL-Centos-tools-fix-alignment-in-tp_args-for-bio-t.patch @@ -0,0 +1,61 @@ +From 8a9da1d866dfb69ad1ca59bdc50a799ba2da3a0c Mon Sep 17 00:00:00 2001 +From: Jerome Marchand +Date: Thu, 24 Oct 2024 16:56:14 +0200 +Subject: [PATCH] RHEL/Centos: tools: fix alignment in tp_args for bio tools + +The padding in tp_args is wrong on RHEL 9 / c9s kernel because of the +kernel commit 6bc27040eb90 ("sched: Add support for lazy preemption") +which added a common field to tracepoints. + +Now the dev field is at an offset of 12 bytes as shown by +block_io_start/done format file. + +Signed-off-by: Jerome Marchand +--- + tools/biolatency.py | 2 +- + tools/biosnoop.py | 2 +- + tools/biotop.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/biolatency.py b/tools/biolatency.py +index 03b48a4c..ac150ea2 100755 +--- a/tools/biolatency.py ++++ b/tools/biolatency.py +@@ -88,7 +88,7 @@ typedef struct ext_val { + } ext_val_t; + + struct tp_args { +- u64 __unused__; ++ u32 __unused__[3]; + dev_t dev; + sector_t sector; + unsigned int nr_sector; +diff --git a/tools/biosnoop.py b/tools/biosnoop.py +index f0fef98b..819e953f 100755 +--- a/tools/biosnoop.py ++++ b/tools/biosnoop.py +@@ -66,7 +66,7 @@ struct val_t { + }; + + struct tp_args { +- u64 __unused__; ++ u32 __unused__[3]; + dev_t dev; + sector_t sector; + unsigned int nr_sector; +diff --git a/tools/biotop.py b/tools/biotop.py +index 879c6b8f..4c3a1c9a 100755 +--- a/tools/biotop.py ++++ b/tools/biotop.py +@@ -91,7 +91,7 @@ struct val_t { + }; + + struct tp_args { +- u64 __unused__; ++ u32 __unused__[3]; + dev_t dev; + sector_t sector; + unsigned int nr_sector; +-- +2.47.0 + diff --git a/SOURCES/bcc-0.30.0-clang-fail-when-the-kheaders-ownership-is-wrong-4928.patch b/SOURCES/bcc-0.30.0-clang-fail-when-the-kheaders-ownership-is-wrong-4928.patch new file mode 100644 index 0000000..4d4f864 --- /dev/null +++ b/SOURCES/bcc-0.30.0-clang-fail-when-the-kheaders-ownership-is-wrong-4928.patch @@ -0,0 +1,76 @@ +From 5bc97bbc50b1ccf0c63f320ee73a2c0abe84b596 Mon Sep 17 00:00:00 2001 +From: Jerome Marchand +Date: Fri, 17 May 2024 15:36:07 +0200 +Subject: [PATCH] clang: fail when the kheaders ownership is wrong (#4928) + (#4985) + +file_exists_and_ownedby() returns -1 when the file exists but its +ownership is unexpected, which is very misleading since anything non +zero is interpreted as true and a function with such a name is +expected to return a boolean. So currently all this does, is write a +warning message, and continues as if nothing is wrong. + +Make file_exists_and_ownedby() returns false when the ownership is +wrong and have get_proc_kheaders() fails when this happen. Also have +all the *exists* functions return bool to avoid such issues in the +future. + +Signed-off-by: Jerome Marchand +--- + src/cc/frontends/clang/kbuild_helper.cc | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/src/cc/frontends/clang/kbuild_helper.cc b/src/cc/frontends/clang/kbuild_helper.cc +index 9409e4cc..5d3ad9c2 100644 +--- a/src/cc/frontends/clang/kbuild_helper.cc ++++ b/src/cc/frontends/clang/kbuild_helper.cc +@@ -140,20 +140,26 @@ int KBuildHelper::get_flags(const char *uname_machine, vector *cflags) { + return 0; + } + +-static inline int file_exists_and_ownedby(const char *f, uid_t uid) ++static inline bool file_exists(const char *f) ++{ ++ struct stat buffer; ++ return (stat(f, &buffer) == 0); ++} ++ ++static inline bool file_exists_and_ownedby(const char *f, uid_t uid) + { + struct stat buffer; + int ret = stat(f, &buffer) == 0; + if (ret) { + if (buffer.st_uid != uid) { + std::cout << "ERROR: header file ownership unexpected: " << std::string(f) << "\n"; +- return -1; ++ return false; + } + } + return ret; + } + +-static inline int proc_kheaders_exists(void) ++static inline bool proc_kheaders_exists(void) + { + return file_exists_and_ownedby(PROC_KHEADERS_PATH, 0); + } +@@ -231,8 +237,14 @@ int get_proc_kheaders(std::string &dirpath) + uname_data.release); + dirpath = std::string(dirpath_tmp); + +- if (file_exists_and_ownedby(dirpath_tmp, 0)) +- return 0; ++ if (file_exists(dirpath_tmp)) { ++ if (file_exists_and_ownedby(dirpath_tmp, 0)) ++ return 0; ++ else ++ // The path exists, but is owned by a non-root user ++ // Something fishy is going on ++ return -EEXIST; ++ } + + // First time so extract it + return extract_kheaders(dirpath, uname_data); +-- +2.44.0 + diff --git a/SPECS/bcc.spec b/SPECS/bcc.spec index 5aeca4f..7418c26 100644 --- a/SPECS/bcc.spec +++ b/SPECS/bcc.spec @@ -10,7 +10,7 @@ %endif %endif -%ifarch x86_64 ppc64 ppc64le aarch64 +%ifarch x86_64 ppc64 ppc64le aarch64 s390x %bcond_without libbpf_tools %else %bcond_with libbpf_tools @@ -24,20 +24,15 @@ Name: bcc -Version: 0.26.0 -Release: 4%{?dist} +Version: 0.30.0 +Release: 7%{?dist} Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %%{name}-%%{version}-tools-nfsslower.py-Fix-uninitialized-struct-pad-erro.patch -Patch1: %%{name}-%%{version}-tools-slabratetop-Fix-error-incomplete-definition-of.patch -Patch2: %%{name}-%%{version}-tools-readahead-Fix-Failed-to-attach-BPF-program-ent.patch -Patch3: %%{name}-%%{version}-tools-compactsnoop.py-Fix-raw_tracepoint-Invalid-arg.patch -Patch4: %%{name}-%%{version}-killsnoop-add-missing-s-and-T-options-to-the-synopsi.patch -Patch5: %%{name}-%%{version}-tools-funcslower-fix-printing-of-folded-stacks.patch -Patch6: %%{name}-%%{version}-tools-deadlock-Add-an-option-to-set-the-maximum-numb.patch -Patch7: %%{name}-%%{version}-sync-with-latest-libbpf-repo.patch +Patch0: %%{name}-%%{version}-clang-fail-when-the-kheaders-ownership-is-wrong-4928.patch +Patch1: %%{name}-%%{version}-RHEL-Centos-tools-fix-alignment-in-tp_args-for-bio-t.patch + # Arches will be included as upstream support is added and dependencies are # satisfied in the respective arches @@ -121,6 +116,9 @@ Summary: Command line tools for BPF Compiler Collection (BCC) Requires: bcc = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release} Requires: python3-netaddr +%ifnarch s390x +Requires: python3-pyelftools +%endif %description tools Command line tools for BPF Compiler Collection (BCC) @@ -257,10 +255,62 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/ %if %{with libbpf_tools} %files -n libbpf-tools +%ifarch s390x +%exclude %{_sbindir}/bpf-numamove +%endif +# RHEL doesn't provide btrfs or f2fs +%exclude %{_sbindir}/bpf-btrfs* +%exclude %{_sbindir}/bpf-f2fs* %{_sbindir}/bpf-* %endif %changelog +* Thu Nov 07 2024 Jerome Marchand - 0.30.0-7 +- Fic bio* tools (RHEL-65192) + +* Thu Jul 04 2024 Jerome Marchand - 0.30.0-6 +- Rebuild with LLVM 18 (RHEL-28684) + +* Fri May 31 2024 Jerome Marchand - 0.30.0-5 +- Drop python3-pyelftools dependency on s390x until it is available + +* Tue May 21 2024 Jerome Marchand - 0.30.0-4 +- Exclude btrfs and f2fs libbpf tools (RHEL-36579) + +* Mon May 20 2024 Jerome Marchand - 0.30.0-3 +- Really prevent the loading of compromised headers (RHEL-28769, CVE-2024-2314) +- Add python3-pyelftools dependency (RHEL-36583) + +* Fri May 03 2024 Jerome Marchand - 0.30.0-2 +- Rebuild (distrobaker didn't take last build) + +* Wed Apr 10 2024 Jerome Marchand - 0.30.0-1 +- Rebase bcc to 0.30.0 (RHEL-29031) +- Exclude bpf-numamove on s390x (RHEL-32327) + +* Wed Dec 13 2023 Jerome Marchand - 0.28.0-5 +- Fix libbpf bio tools (RHEL-19368) +- Add S390x support to libbpf-tools (RHEL-16325) +- Power enhancements(RHEL-11477) + +* Tue Nov 21 2023 Jerome Marchand - 0.28.0-4 +- Rebuild with LLVM 17 in the side tag (RHEL-10591) + +* Tue Nov 21 2023 Jerome Marchand - 0.28.0-3 +- Rebuild with LLVM 17 (RHEL-10591) + +* Mon Nov 06 2023 Jerome Marchand - 0.28.0-2 +- Fix trace tool (RHEL-8605) + +* Mon Oct 23 2023 Jerome Marchand - 0.28.0-1 +- Rebase to v0.28.0 (RHEL-9976) +- Rebuild with LLVM 17 (RHEL-10591) +- Fix bpf-biosnoop out of bound access (RHEL-8664) +- Fix kvmexit missing VM exit reasons and statistics (RHEL-8702) +- Fix multi-word array type handling (RHEL-8674) +- Fix tcpstates -Y (RHEL-8490) +- Fix bio tools (RHEL-8553) + * Wed Aug 09 2023 Jerome Marchand - 0.26.0-4 - Fix tcpretrans (rhbz#2226967)