.bcc.metadata

@@ -1 +1 @@
-26ec7f9fc22494b9b6f20cd38ca216edc130704e SOURCES/bcc-0.30.0.tar.gz
+896d0249470dedfabfcc9a4c8b4089a55b793277  SOURCES/bcc-0.24.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/bcc-0.30.0.tar.gz
+SOURCES/bcc-0.24.0.tar.gz

SOURCES/bcc-0.24.0-RHEL-libbpf-version-fixes.patch

@@ -0,0 +1,324 @@
+From 8f2951559127ffb93c3e36d5fc9d870768826ae9 Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Thu, 24 Mar 2022 16:08:17 +0100
+Subject: [PATCH 2/2] RHEL: libbpf version fixes
+
+Revert "bcc: Replace deprecated libbpf APIs" since the libbpf version
+provided in RHEL 8 doesn't provide the new APIs.
+
+Remove BPF_MAP_TYPE_BLOOM_FILTER from bps since the libbpf version in
+RHEL 8, doesn't provide bloom filter map.
+
+Rename btf__load_vmlinux_btf into libbpf_find_kernel_btf. The function
+has been renamed upstream for naming consistency, but RHEL 8 libbpf
+still uses the old name.
+
+Add definition of struct bpf_core_relo.
+---
+ introspection/bps.c   |  1 -
+ libbpf-tools/ksnoop.c |  2 +-
+ src/cc/bcc_btf.cc     | 73 ++++++++++++++++++++++++++++++++++++-
+ src/cc/libbpf.c       | 84 +++++++------------------------------------
+ 4 files changed, 85 insertions(+), 75 deletions(-)
+
+diff --git a/introspection/bps.c b/introspection/bps.c
+index 232b23d4..6ec02e6c 100644
+--- a/introspection/bps.c
++++ b/introspection/bps.c
+@@ -80,7 +80,6 @@ static const char * const map_type_strings[] = {
+   [BPF_MAP_TYPE_RINGBUF] = "ringbuf",
+   [BPF_MAP_TYPE_INODE_STORAGE] = "inode_storage",
+   [BPF_MAP_TYPE_TASK_STORAGE] = "task_storage",
+-  [BPF_MAP_TYPE_BLOOM_FILTER] = "bloom_filter",
+ };
+ 
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+diff --git a/libbpf-tools/ksnoop.c b/libbpf-tools/ksnoop.c
+index 69c58403..a6ea6107 100644
+--- a/libbpf-tools/ksnoop.c
++++ b/libbpf-tools/ksnoop.c
+@@ -347,7 +347,7 @@ static struct btf *get_btf(const char *name)
+ 		name && strlen(name) > 0 ? name : "vmlinux");
+ 
+ 	if (!vmlinux_btf) {
+-		vmlinux_btf = btf__load_vmlinux_btf();
++		vmlinux_btf = libbpf_find_kernel_btf();
+ 		if (!vmlinux_btf) {
+ 			err = -errno;
+ 			p_err("No BTF, cannot determine type info: %s", strerror(-err));
+diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc
+index 7f551ae8..c78ba823 100644
+--- a/src/cc/bcc_btf.cc
++++ b/src/cc/bcc_btf.cc
+@@ -170,6 +170,77 @@ static int btf_ext_setup_line_info(struct btf_ext *btf_ext)
+         return btf_ext_setup_info(btf_ext, &param);
+ }
+ 
++/* bpf_core_relo_kind encodes which aspect of captured field/type/enum value
++ * has to be adjusted by relocations.
++ */
++enum bpf_core_relo_kind {
++	BPF_FIELD_BYTE_OFFSET = 0,	/* field byte offset */
++	BPF_FIELD_BYTE_SIZE = 1,	/* field size in bytes */
++	BPF_FIELD_EXISTS = 2,		/* field existence in target kernel */
++	BPF_FIELD_SIGNED = 3,		/* field signedness (0 - unsigned, 1 - signed) */
++	BPF_FIELD_LSHIFT_U64 = 4,	/* bitfield-specific left bitshift */
++	BPF_FIELD_RSHIFT_U64 = 5,	/* bitfield-specific right bitshift */
++	BPF_TYPE_ID_LOCAL = 6,		/* type ID in local BPF object */
++	BPF_TYPE_ID_TARGET = 7,		/* type ID in target kernel */
++	BPF_TYPE_EXISTS = 8,		/* type existence in target kernel */
++	BPF_TYPE_SIZE = 9,		/* type size in bytes */
++	BPF_ENUMVAL_EXISTS = 10,	/* enum value existence in target kernel */
++	BPF_ENUMVAL_VALUE = 11,		/* enum value integer value */
++};
++
++/* The minimum bpf_core_relo checked by the loader
++ *
++ * CO-RE relocation captures the following data:
++ * - insn_off - instruction offset (in bytes) within a BPF program that needs
++ *   its insn->imm field to be relocated with actual field info;
++ * - type_id - BTF type ID of the "root" (containing) entity of a relocatable
++ *   type or field;
++ * - access_str_off - offset into corresponding .BTF string section. String
++ *   interpretation depends on specific relocation kind:
++ *     - for field-based relocations, string encodes an accessed field using
++ *     a sequence of field and array indices, separated by colon (:). It's
++ *     conceptually very close to LLVM's getelementptr ([0]) instruction's
++ *     arguments for identifying offset to a field.
++ *     - for type-based relocations, strings is expected to be just "0";
++ *     - for enum value-based relocations, string contains an index of enum
++ *     value within its enum type;
++ *
++ * Example to provide a better feel.
++ *
++ *   struct sample {
++ *       int a;
++ *       struct {
++ *           int b[10];
++ *       };
++ *   };
++ *
++ *   struct sample *s = ...;
++ *   int x = &s->a;     // encoded as "0:0" (a is field #0)
++ *   int y = &s->b[5];  // encoded as "0:1:0:5" (anon struct is field #1, 
++ *                      // b is field #0 inside anon struct, accessing elem #5)
++ *   int z = &s[10]->b; // encoded as "10:1" (ptr is used as an array)
++ *
++ * type_id for all relocs in this example  will capture BTF type id of
++ * `struct sample`.
++ *
++ * Such relocation is emitted when using __builtin_preserve_access_index()
++ * Clang built-in, passing expression that captures field address, e.g.:
++ *
++ * bpf_probe_read(&dst, sizeof(dst),
++ *		  __builtin_preserve_access_index(&src->a.b.c));
++ *
++ * In this case Clang will emit field relocation recording necessary data to
++ * be able to find offset of embedded `a.b.c` field within `src` struct.
++ *
++ *   [0] https://llvm.org/docs/LangRef.html#getelementptr-instruction
++ */
++struct bpf_core_relo {
++	__u32   insn_off;
++	__u32   type_id;
++	__u32   access_str_off;
++	enum bpf_core_relo_kind kind;
++};
++
+ static int btf_ext_setup_core_relos(struct btf_ext *btf_ext)
+ {
+         struct btf_ext_sec_setup_param param = {
+@@ -597,7 +668,7 @@ int BTF::load(uint8_t *btf_sec, uintptr_t btf_sec_size,
+     return -1;
+   }
+ 
+-  if (btf__load_into_kernel(btf)) {
++  if (btf__load(btf)) {
+     btf__free(btf);
+     warning("Loading .BTF section failed\n");
+     return -1;
+diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
+index e6403299..7410ae1a 100644
+--- a/src/cc/libbpf.c
++++ b/src/cc/libbpf.c
+@@ -297,25 +297,6 @@ static uint64_t ptr_to_u64(void *ptr)
+   return (uint64_t) (unsigned long) ptr;
+ }
+ 
+-static int libbpf_bpf_map_create(struct bpf_create_map_attr *create_attr)
+-{
+-  LIBBPF_OPTS(bpf_map_create_opts, p);
+-
+-  p.map_flags = create_attr->map_flags;
+-  p.numa_node = create_attr->numa_node;
+-  p.btf_fd = create_attr->btf_fd;
+-  p.btf_key_type_id = create_attr->btf_key_type_id;
+-  p.btf_value_type_id = create_attr->btf_value_type_id;
+-  p.map_ifindex = create_attr->map_ifindex;
+-  if (create_attr->map_type == BPF_MAP_TYPE_STRUCT_OPS)
+-    p.btf_vmlinux_value_type_id = create_attr->btf_vmlinux_value_type_id;
+-  else
+-    p.inner_map_fd = create_attr->inner_map_fd;
+-
+-  return bpf_map_create(create_attr->map_type, create_attr->name, create_attr->key_size,
+-                        create_attr->value_size, create_attr->max_entries, &p);
+-}
+-
+ int bcc_create_map_xattr(struct bpf_create_map_attr *attr, bool allow_rlimit)
+ {
+   unsigned name_len = attr->name ? strlen(attr->name) : 0;
+@@ -323,7 +304,7 @@ int bcc_create_map_xattr(struct bpf_create_map_attr *attr, bool allow_rlimit)
+ 
+   memcpy(map_name, attr->name, min(name_len, BPF_OBJ_NAME_LEN - 1));
+   attr->name = map_name;
+-  int ret = libbpf_bpf_map_create(attr);
++  int ret = bpf_create_map_xattr(attr);
+ 
+   if (ret < 0 && errno == EPERM) {
+     if (!allow_rlimit)
+@@ -335,7 +316,7 @@ int bcc_create_map_xattr(struct bpf_create_map_attr *attr, bool allow_rlimit)
+       rl.rlim_max = RLIM_INFINITY;
+       rl.rlim_cur = rl.rlim_max;
+       if (setrlimit(RLIMIT_MEMLOCK, &rl) == 0)
+-        ret = libbpf_bpf_map_create(attr);
++        ret = bpf_create_map_xattr(attr);
+     }
+   }
+ 
+@@ -345,12 +326,12 @@ int bcc_create_map_xattr(struct bpf_create_map_attr *attr, bool allow_rlimit)
+     attr->btf_fd = 0;
+     attr->btf_key_type_id = 0;
+     attr->btf_value_type_id = 0;
+-    ret = libbpf_bpf_map_create(attr);
++    ret = bpf_create_map_xattr(attr);
+   }
+ 
+   if (ret < 0 && name_len && (errno == E2BIG || errno == EINVAL)) {
+     map_name[0] = '\0';
+-    ret = libbpf_bpf_map_create(attr);
++    ret = bpf_create_map_xattr(attr);
+   }
+ 
+   if (ret < 0 && errno == EPERM) {
+@@ -363,7 +344,7 @@ int bcc_create_map_xattr(struct bpf_create_map_attr *attr, bool allow_rlimit)
+       rl.rlim_max = RLIM_INFINITY;
+       rl.rlim_cur = rl.rlim_max;
+       if (setrlimit(RLIMIT_MEMLOCK, &rl) == 0)
+-        ret = libbpf_bpf_map_create(attr);
++        ret = bpf_create_map_xattr(attr);
+     }
+   }
+   return ret;
+@@ -627,47 +608,6 @@ int bpf_prog_get_tag(int fd, unsigned long long *ptag)
+   return 0;
+ }
+ 
+-static int libbpf_bpf_prog_load(const struct bpf_load_program_attr *load_attr,
+-                                char *log_buf, size_t log_buf_sz)
+-{
+-  LIBBPF_OPTS(bpf_prog_load_opts, p);
+-
+-  if (!load_attr || !log_buf != !log_buf_sz) {
+-    errno = EINVAL;
+-    return -EINVAL;
+-  }
+-
+-  p.expected_attach_type = load_attr->expected_attach_type;
+-  switch (load_attr->prog_type) {
+-  case BPF_PROG_TYPE_STRUCT_OPS:
+-  case BPF_PROG_TYPE_LSM:
+-    p.attach_btf_id = load_attr->attach_btf_id;
+-    break;
+-  case BPF_PROG_TYPE_TRACING:
+-  case BPF_PROG_TYPE_EXT:
+-    p.attach_btf_id = load_attr->attach_btf_id;
+-    p.attach_prog_fd = load_attr->attach_prog_fd;
+-    break;
+-  default:
+-    p.prog_ifindex = load_attr->prog_ifindex;
+-    p.kern_version = load_attr->kern_version;
+-  }
+-  p.log_level = load_attr->log_level;
+-  p.log_buf = log_buf;
+-  p.log_size = log_buf_sz;
+-  p.prog_btf_fd = load_attr->prog_btf_fd;
+-  p.func_info_rec_size = load_attr->func_info_rec_size;
+-  p.func_info_cnt = load_attr->func_info_cnt;
+-  p.func_info = load_attr->func_info;
+-  p.line_info_rec_size = load_attr->line_info_rec_size;
+-  p.line_info_cnt = load_attr->line_info_cnt;
+-  p.line_info = load_attr->line_info;
+-  p.prog_flags = load_attr->prog_flags;
+-
+-  return bpf_prog_load(load_attr->prog_type, load_attr->name, load_attr->license,
+-                       load_attr->insns, load_attr->insns_cnt, &p);
+-}
+-
+ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+                         char *log_buf, unsigned log_buf_size, bool allow_rlimit)
+ {
+@@ -750,7 +690,7 @@ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+     attr->name = prog_name;
+   }
+ 
+-  ret = libbpf_bpf_prog_load(attr, attr_log_buf, attr_log_buf_size);
++  ret = bpf_load_program_xattr(attr, attr_log_buf, attr_log_buf_size);
+ 
+   // func_info/line_info may not be supported in old kernels.
+   if (ret < 0 && attr->func_info && errno == EINVAL) {
+@@ -761,14 +701,14 @@ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+     attr->line_info = NULL;
+     attr->line_info_cnt = 0;
+     attr->line_info_rec_size = 0;
+-    ret = libbpf_bpf_prog_load(attr, attr_log_buf, attr_log_buf_size);
++    ret = bpf_load_program_xattr(attr, attr_log_buf, attr_log_buf_size);
+   }
+ 
+   // BPF object name is not supported on older Kernels.
+   // If we failed due to this, clear the name and try again.
+   if (ret < 0 && name_len && (errno == E2BIG || errno == EINVAL)) {
+     prog_name[0] = '\0';
+-    ret = libbpf_bpf_prog_load(attr, attr_log_buf, attr_log_buf_size);
++    ret = bpf_load_program_xattr(attr, attr_log_buf, attr_log_buf_size);
+   }
+ 
+   if (ret < 0 && errno == EPERM) {
+@@ -787,7 +727,7 @@ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+       rl.rlim_max = RLIM_INFINITY;
+       rl.rlim_cur = rl.rlim_max;
+       if (setrlimit(RLIMIT_MEMLOCK, &rl) == 0)
+-        ret = libbpf_bpf_prog_load(attr, attr_log_buf, attr_log_buf_size);
++        ret = bpf_load_program_xattr(attr, attr_log_buf, attr_log_buf_size);
+     }
+   }
+ 
+@@ -805,7 +745,7 @@ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+       // If logging is not already enabled, enable it and do the syscall again.
+       if (attr->log_level == 0) {
+         attr->log_level = 1;
+-        ret = libbpf_bpf_prog_load(attr, log_buf, log_buf_size);
++        ret = bpf_load_program_xattr(attr, log_buf, log_buf_size);
+       }
+       // Print the log message and return.
+       bpf_print_hints(ret, log_buf);
+@@ -829,7 +769,7 @@ int bcc_prog_load_xattr(struct bpf_load_program_attr *attr, int prog_len,
+         goto return_result;
+       }
+       tmp_log_buf[0] = 0;
+-      ret = libbpf_bpf_prog_load(attr, tmp_log_buf, tmp_log_buf_size);
++      ret = bpf_load_program_xattr(attr, tmp_log_buf, tmp_log_buf_size);
+       if (ret < 0 && errno == ENOSPC) {
+         // Temporary buffer size is not enough. Double it and try again.
+         free(tmp_log_buf);
+@@ -1369,7 +1309,7 @@ int kernel_struct_has_field(const char *struct_name, const char *field_name)
+   struct btf *btf;
+   int i, ret, btf_id;
+ 
+-  btf = btf__load_vmlinux_btf();
++  btf = libbpf_find_kernel_btf();
+   ret = libbpf_get_error(btf);
+   if (ret)
+     return -1;
+-- 
+2.35.3
+

SOURCES/bcc-0.24.0-libbpf-Allow-kernel_struct_has_field-to-reach-field-.patch

@@ -0,0 +1,69 @@
+From e9ae2826b8712d491362771233ed6bf21ae1a07a Mon Sep 17 00:00:00 2001
+From: Jerome Marchand <jmarchan@redhat.com>
+Date: Thu, 19 May 2022 16:37:40 +0200
+Subject: [PATCH 3/3] libbpf: Allow kernel_struct_has_field to reach field in
+ unnamed struct or union
+
+Some field can belong to unnamed struct or union. In C, they are
+accessed as if their belong directly to the parent struct or union but
+this is not the case for BTF.
+
+When looking for a field, kernel_struct_has_field should also look
+reccursively into unnamed structs or unions.
+---
+ src/cc/libbpf.c | 28 ++++++++++++++++++----------
+ 1 file changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
+index 7410ae1a..e98b8852 100644
+--- a/src/cc/libbpf.c
++++ b/src/cc/libbpf.c
+@@ -1302,12 +1302,27 @@ bool bpf_has_kernel_btf(void)
+   return true;
+ }
+ 
++static int find_member_by_name(struct btf *btf, const struct btf_type *btf_type, const char *field_name) {
++  const struct btf_member *btf_member = btf_members(btf_type);
++  int i;
++
++  for (i = 0; i < btf_vlen(btf_type); i++, btf_member++) {
++    const char *name = btf__name_by_offset(btf, btf_member->name_off);
++    if (!strcmp(name, field_name)) {
++      return 1;
++    } else if (name[0] == '\0') {
++      if (find_member_by_name(btf, btf__type_by_id(btf, btf_member->type), field_name))
++        return 1;
++    }
++  }
++  return 0;
++}
++
+ int kernel_struct_has_field(const char *struct_name, const char *field_name)
+ {
+   const struct btf_type *btf_type;
+-  const struct btf_member *btf_member;
+   struct btf *btf;
+-  int i, ret, btf_id;
++  int ret, btf_id;
+ 
+   btf = libbpf_find_kernel_btf();
+   ret = libbpf_get_error(btf);
+@@ -1321,14 +1336,7 @@ int kernel_struct_has_field(const char *struct_name, const char *field_name)
+   }
+ 
+   btf_type = btf__type_by_id(btf, btf_id);
+-  btf_member = btf_members(btf_type);
+-  for (i = 0; i < btf_vlen(btf_type); i++, btf_member++) {
+-    if (!strcmp(btf__name_by_offset(btf, btf_member->name_off), field_name)) {
+-      ret = 1;
+-      goto cleanup;
+-    }
+-  }
+-  ret = 0;
++  ret = find_member_by_name(btf, btf_type, field_name);
+ 
+ cleanup:
+   btf__free(btf);
+-- 
+2.35.3
+

SOURCES/bcc-0.30.0-RHEL-Centos-tools-fix-alignment-in-tp_args-for-bio-t.patch

@@ -1,61 +0,0 @@
-From 8a9da1d866dfb69ad1ca59bdc50a799ba2da3a0c Mon Sep 17 00:00:00 2001
-From: Jerome Marchand <jmarchan@redhat.com>
-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 <jmarchan@redhat.com>
----
- 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
-

SOURCES/bcc-0.30.0-clang-fail-when-the-kheaders-ownership-is-wrong-4928.patch

@@ -1,76 +0,0 @@
-From 5bc97bbc50b1ccf0c63f320ee73a2c0abe84b596 Mon Sep 17 00:00:00 2001
-From: Jerome Marchand <jmarchan@redhat.com>
-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 <jmarchan@redhat.com>
----
- 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<string> *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
-

SPECS/bcc.spec

@@ -1,20 +1,5 @@
-# We don't want to bring luajit in RHEL
-%if 0%{?rhel} > 0
+# luajit is not available RHEL 8
 %bcond_with lua
-%else
-# luajit is not available for some architectures
-%ifarch ppc64 ppc64le s390x
-%bcond_with lua
-%else
-%bcond_without lua
-%endif
-%endif
-
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x
-%bcond_without libbpf_tools
-%else
-%bcond_with libbpf_tools
-%endif
 
 %bcond_with llvm_static
 
@@ -22,21 +7,20 @@
 %global with_llvm_shared 1
 %endif
 
-
 Name:           bcc
-Version:        0.30.0
-Release:        7%{?dist}
+Version:        0.24.0
+Release:        2%{?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}-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
-
+Patch0:         %{name}-%{version}-Manpages-remove-unstable-statement.patch
+Patch1:         %{name}-%{version}-RHEL-libbpf-version-fixes.patch
+Patch2:         %{name}-%{version}-libbpf-Allow-kernel_struct_has_field-to-reach-field-.patch
 
 # Arches will be included as upstream support is added and dependencies are
 # satisfied in the respective arches
-ExclusiveArch:  x86_64 %{power64} aarch64 s390x armv7hl
+ExcludeArch: i686
 
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.7
@@ -44,7 +28,6 @@ BuildRequires:  flex
 BuildRequires:  libxml2-devel
 BuildRequires:  python3-devel
 BuildRequires:  elfutils-libelf-devel
-BuildRequires:  elfutils-debuginfod-client-devel
 BuildRequires:  llvm-devel
 BuildRequires:  clang-devel
 %if %{with llvm_static}
@@ -54,12 +37,11 @@ BuildRequires:  ncurses-devel
 %if %{with lua}
 BuildRequires:  pkgconfig(luajit)
 %endif
-BuildRequires:  libbpf-devel >= 2:0.8.0, libbpf-static >= 2:0.8.0
+BuildRequires:  libbpf-devel >= 0.5.0, libbpf-static >= 0.5.0
 
-Requires:       libbpf >= 2:0.8.0
+Requires:       libbpf >= 0.5.0
 Requires:       tar
 Recommends:     kernel-devel
-
 Recommends:     %{name}-tools = %{version}-%{release}
 
 %description
@@ -75,7 +57,6 @@ performance analysis and network traffic control.
 %package devel
 Summary:        Shared library for BPF Compiler Collection (BCC)
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Suggests:       elfutils-debuginfod-client
 
 %description devel
 The %{name}-devel package contains libraries and header files for developing
@@ -85,7 +66,9 @@ application that use BPF Compiler Collection (BCC).
 %package doc
 Summary:        Examples for BPF Compiler Collection (BCC)
 Recommends:     python3-%{name} = %{version}-%{release}
+%if %{with lua}
 Recommends:     %{name}-lua = %{version}-%{release}
+%endif
 BuildArch:      noarch
 
 %description doc
@@ -94,8 +77,8 @@ Examples for BPF Compiler Collection (BCC)
 
 %package -n python3-%{name}
 Summary:        Python3 bindings for BPF Compiler Collection (BCC)
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-%{name}}
 
 %description -n python3-%{name}
 Python3 bindings for BPF Compiler Collection (BCC)
@@ -116,65 +99,39 @@ 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)
 
-%if %{with libbpf_tools}
-%package -n libbpf-tools
-Summary:        Command line libbpf tools for BPF Compiler Collection (BCC)
-BuildRequires:  bpftool
-
-%description -n libbpf-tools
-Command line libbpf tools for BPF Compiler Collection (BCC)
-%endif
-
 %prep
 %autosetup -p1
 
-
 %build
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake . \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \
         -DCMAKE_USE_LIBBPF_PACKAGE:BOOL=TRUE \
         %{?with_llvm_shared:-DENABLE_LLVM_SHARED=1}
-%cmake_build
-
-# It was discussed and agreed to package libbpf-tools with
-# 'bpf-' prefix (https://github.com/iovisor/bcc/pull/3263)
-# Installing libbpf-tools binaries in temp directory and
-# renaming them in there and the install code will just
-# take them.
-%if %{with libbpf_tools}
-pushd libbpf-tools;
-make BPFTOOL=bpftool LIBBPF_OBJ=%{_libdir}/libbpf.a CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
-make DESTDIR=./tmp-install prefix= install
-(
-    cd tmp-install/bin
-    for file in *; do
-        mv $file bpf-$file
-    done
-    # now fix the broken symlinks
-    for file in `find . -type l`; do
-        dest=$(readlink "$file")
-        ln -s -f bpf-$dest $file
-    done
-)
-popd
-%endif
+%make_build
+
 
 %install
-%cmake_install
+%make_install
 
 # Fix python shebangs
+# This messes the timestamp and rpmdiff complains about it
+# Let's set the all thing according to a reference file
+touch -r %{buildroot}%{_datadir}/%{name}/examples/hello_world.py %{_tmppath}/timestamp
+
 find %{buildroot}%{_datadir}/%{name}/{tools,examples} -type f -exec \
   sed -i -e '1s=^#!/usr/bin/python\([0-9.]\+\)\?$=#!%{__python3}=' \
          -e '1s=^#!/usr/bin/env python\([0-9.]\+\)\?$=#!%{__python3}=' \
          -e '1s=^#!/usr/bin/env bcc-lua$=#!/usr/bin/bcc-lua=' {} \;
 
+for i in `find %{buildroot}%{_datadir}/%{name}/examples/` ; do
+    touch -h -r %{_tmppath}/timestamp $i
+done
+
 # Move man pages to the right location
 mkdir -p %{buildroot}%{_mandir}
 mv %{buildroot}%{_datadir}/%{name}/man/* %{buildroot}%{_mandir}/
@@ -184,24 +141,16 @@ for i in `find %{buildroot}%{_mandir} -name "*.gz"`; do
   tname=$(basename $i)
   rename $tname %{name}-$tname $i
 done
-mkdir -p %{buildroot}%{_docdir}/%{name}
-mv %{buildroot}%{_datadir}/%{name}/examples %{buildroot}%{_docdir}/%{name}/
-
-# Delete old tools we don't want to ship
-rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
+# Fix the symlink too
+for i in `find %{buildroot}%{_mandir} -lname \*.gz` ; do
+    target=`readlink $i`;
+    ln -sf bcc-$target $i;
+done
 
 # We cannot run the test suit since it requires root and it makes changes to
 # the machine (e.g, IP address)
 #%check
 
-%if %{with libbpf_tools}
-mkdir -p %{buildroot}/%{_sbindir}
-# We cannot use `install` because some of the tools are symlinks and `install`
-# follows those. Since all the tools already have the correct permissions set,
-# we just need to copy them to the right place while preserving those
-cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/
-%endif
-
 %ldconfig_scriptlets
 
 %files
@@ -222,29 +171,39 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/
 %{python3_sitelib}/%{name}*
 
 %files doc
-%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/examples/
+# % dir % {_docdir}/% {name}
+%doc %{_datadir}/%{name}/examples/
+%if %{without lua}
+%exclude %{_datadir}/%{name}/examples/lua
+%endif
 
 %files tools
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/tools/
-%{_datadir}/%{name}/introspection/
-%if 0%{?rhel} > 0
-# inject relies on BPF_KPROBE_OVERRIDE which is not set on RHEL
+%dir %{_datadir}/%{name}/tools
+%dir %{_datadir}/%{name}/introspection
+%{_datadir}/%{name}/tools/*
+%{_datadir}/%{name}/introspection/*
+%exclude %{_datadir}/%{name}/tools/old/
+# inject relies on BPF_KPROBE_OVERRIDE which is not set on RHEL 8
 %exclude %{_datadir}/%{name}/tools/inject
 %exclude %{_datadir}/%{name}/tools/doc/inject_example.txt
 %exclude %{_mandir}/man8/bcc-inject.8.gz
-# Neither btrfs nor zfs are available on RHEL
+# Neither btrfs nor zfs are available on RHEL8
 %exclude %{_datadir}/%{name}/tools/btrfs*
 %exclude %{_datadir}/%{name}/tools/doc/btrfs*
 %exclude %{_mandir}/man8/bcc-btrfs*
 %exclude %{_datadir}/%{name}/tools/zfs*
 %exclude %{_datadir}/%{name}/tools/doc/zfs*
 %exclude %{_mandir}/man8/bcc-zfs*
-# criticalstat relies on CONFIG_PREEMPTIRQ_EVENTS which is disabled on RHEL
+# criticalstat relies on CONFIG_PREEMPTIRQ_EVENTS which is disabled on RHEL 8
 %exclude %{_datadir}/%{name}/tools/criticalstat
 %exclude %{_datadir}/%{name}/tools/doc/criticalstat_example.txt
 %exclude %{_mandir}/man8/bcc-criticalstat.8.gz
+# compactsnoop is only supported on x86_64
+%ifnarch x86_64
+%exclude %{_datadir}/%{name}/tools/compactsnoop
+%exclude %{_datadir}/%{name}/tools/doc/compactsnoop_example.txt
+%exclude %{_mandir}/man8/bcc-compactsnoop.8.gz
 %endif
 %{_mandir}/man8/*
 
@@ -253,272 +212,143 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/
 %{_bindir}/bcc-lua
 %endif
 
-%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 <jmarchan@redhat.com> - 0.30.0-7
-- Fic bio* tools (RHEL-65192)
-
-* Thu Jul 04 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-6
-- Rebuild with LLVM 18 (RHEL-28684)
-
-* Fri May 31 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-5
-- Drop python3-pyelftools dependency on s390x until it is available
-
-* Tue May 21 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-4
-- Exclude btrfs and f2fs libbpf tools (RHEL-36579)
-
-* Mon May 20 2024 Jerome Marchand <jmarchan@redhat.com> - 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 <jmarchan@redhat.com> - 0.30.0-2
-- Rebuild (distrobaker didn't take last build)
-
-* Wed Apr 10 2024 Jerome Marchand <jmarchan@redhat.com> - 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 <jmarchan@redhat.com> - 0.28.0-5
-- Fix libbpf bio tools (RHEL-19368)
-- Add S390x support to libbpf-tools (RHEL-16325)
-- Power enhancements(RHEL-11477)
+* Tue Jun 04 2024 Eugene Zamriy <ezamriy@msvsphere-os.ru> - 0.24.0-2
+- Rebuilt for MSVSphere 8.9
 
-* Tue Nov 21 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-4
-- Rebuild with LLVM 17 in the side tag (RHEL-10591)
+* Thu Jun 23 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.0-2
+- Rebuild on libbpf 0.5.0
 
-* Tue Nov 21 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-3
-- Rebuild with LLVM 17 (RHEL-10591)
+* Thu Jun 09 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.0-1
+- Rebase to bcc-0.24.0
+- Rebuild on LLVM 14
 
-* Mon Nov 06 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-2
-- Fix trace tool (RHEL-8605)
+* Mon Dec 06 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-6
+- Add excplicit requirement in bcc-tools for rpmdiff
 
-* Mon Oct 23 2023 Jerome Marchand <jmarchan@redhat.com> - 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 <jmarchan@redhat.com> - 0.26.0-4
-- Fix tcpretrans (rhbz#2226967)
-
-* Fri May 12 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-3
-- Rebuild with LLVM 16 (rhbz#2050112)
-- Fix compactsnoop (rhbz#2042236)
-- Fix killsnoop documentation (rhbz#2075500)
-- Fix funcslower (rhbz#2075415)
-- Fix deadlock memory usage issue (rhbz#2050112)
-- Fix nfsslower (rhbz#2180934)
-- Use upstream fix for nfsslower unititialized struct issue
-
-* Wed Mar 15 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-2
-- Rebuild with the right rhel-target
-
-* Fri Mar 10 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-1
-- Rebase to v0.26.0
-
-* Thu Jan 05 2023 Jerome Marchand <jmarchan@redhat.com> - 0.25.0-2
-- Rebuild for libbpf 1.0
-
-* Tue Dec 20 2022 Jerome Marchand <jmarchan@redhat.com> - 0.25.0-1
-- Rebase to v0.25.0
-- Misc documentation and man pages fixes
-
-* Tue Aug 23 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-4
-- Fix mdflush tool (rhbz#2108001)
-
-* Fri Jul 01 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-3
-- Rebuild for libbpf 0.6.0
-
-* Wed May 18 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-2
-- Rebuild (previous build failed with UNKNOWN_KOJI_ERROR)
-
-* Thu Mar 24 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.0-1
-- Rebase to v0.24.0
-- Fix cmake build
-
-* Fri Feb 25 2022 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-10
-- Remove deprecated python_provides macro (needed for gating)
-
-* Thu Feb 24 2022 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-9
-- Fix bio tools (rhbz#2039595)
-
-* Mon Nov 22 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-8
-- Rebuild for LLVM 13
-
-* Thu Oct 14 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-7
-- Sync with latest libbpf (fixes BPF_F_BROADCAST breakages of rhbz#1992430)
-- Fix cpudist, mdflush, readahead and threadsnoop (rhbz#1992430)
+* Tue Nov 23 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-5
 - Handle the renaming of task_struct_>state field
-- Drop tools that relies on features disabled on RHEL
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.20.0-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Aug 03 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-5
-- Add gating
+- Rebuild for LLVM 13
 
-* Mon Jul 26 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-4
-- Don't require bcc-tools by default (#1967550)
-- Add explicit bcc requirement to bcc-tools
+* Fri Jul 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-4
 - Build bcc from standard sources
+- Don't require bcc-tools by default
 
-* Wed Jun 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-3
-- Don't ignore LDFLAGS for libbpf-tools
+* Wed Jun 09 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-3
+- Rebuild on LLVM 12
 
-* Wed Jun 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-2
-- Don't override cflags for libbpf-tools
+* Fri Apr 30 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-2
+- Fix BPF src_file.
 
-* Thu May 27 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-1
-- Rebase to bcc 0.20.0
+* Tue Apr 27 2021 Jerome Marchand <jmarchan@redhat.com> - 0.19.0-1
+- Rebased to version 0.19.0
+- Remove hard dependency on kernel-devel
 
-* Thu May 13 2021 Tom Stellard <tstellar@redhat.com> - 0.18.0-6
-- Rebuild for LLVM 12
+* Fri Jan 22 2021 Jerome Marchand <jmarchan@redhat.com> - 0.16.0-2
+- Build with libbpf package
+- spec file cleanups
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.18.0-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon Oct 26 2020 Jerome Marchand <jmarchan@redhat.com> - 0.16.0-1
+- Rebase on bcc-0.16.0
+- Fix IPv6 ports
 
-* Thu Feb 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.18.0-4
-- Disable lua for RHEL
+* Wed Sep 02 2020 Jerome Marchand <jmarchan@redhat.com> - 0.14.0-4
+- Fix KFUNC_PROBE return value
+- Forbid trampolines on unsupported arches
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Tue Jul 21 2020 Jerome Marchand <jmarchan@redhat.com> - 0.14.0-3
+- Add KBUILD_MODNAME flag to default cflags
 
-* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 0.18.0-2
-- Rebuild for clang-11.1.0
+* Thu Jun 11 2020 Jerome Marchand <jmarchan@redhat.com> - 0.14.0-2
+- Remove criticalstat manpage
+- Remove compactsnoop on non x86_64
+- Suggest to use --binary in deadlock
+- Remove non-existent argument from tcpconnect man page
+- Suggest to install the proper kernel-devel version
+- Fix dbstat and dbslower
 
-* Tue Jan  5 15:08:26 CET 2021 Rafael dos Santos <rdossant@redhat.com> - 0.18.0-1
-- Rebase to latest upstream (#1912875)
+* Wed Apr 22 2020 Jerome Marchand <jmarchan@redhat.com> - 0.14.0-1
+- Rebase on bcc-0.14.0
 
-* Fri Oct 30 11:25:46 CET 2020 Rafael dos Santos <rdossant@redhat.com> - 0.17.0-1
-- Rebase to latest upstream (#1871417)
+* Wed Dec 04 2019 Jerome Marchand <jmarchan@redhat.com> - 0.11.0-2
+- Add -c option ton the synopsis of tcpretrans manpage
 
-* Mon Oct 12 2020 Jerome Marchand <jmarchan@redhat.com> - 0.16.0.3
-- Rebuild for LLVM 11.0.0-rc6
+* Tue Nov 26 2019 Jerome Marchand <jmarchan@redhat.com> - 0.11.0-1
+- Rebase to bcc-0.11.0
+- Reinstate the unstable comment patch that has been removed by mistake
 
-* Fri Aug 28 2020 Rafael dos Santos <rdossant@redhat.com> - 0.16.0-2
-- Enable build for armv7hl
+* Thu Oct 17 2019 Jerome Marchand <jmarchan@redhat.com> - 0.10.0-1
+- Rebase to bcc-0.10.0
+- Drop criticalstat
+- Fix regression on vfscount and runqslower
+- Rebuild on LLVM 9
 
-* Sun Aug 23 2020 Rafael dos Santos <rdossant@redhat.com> - 0.16.0-1
-- Rebase to latest upstream (#1871417)
+* Tue Aug 06 2019 Jerome Marchand <jmarchan@redhat.com> - 0.8.0-4
+- remove unstable statement from the man pages
 
-* Tue Aug 04 2020 Rafael dos Santos <rdossant@redhat.com> - 0.15.0-6
-- Fix build with cmake (#1863243)
+* Wed Jul 03 2019 Jerome Marchand <jmarchan@redhat.com> - 0.8.0-3
+- fix b.support_raw_tracepoint
+- fix runqslower warning
 
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-5
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Wed May 15 2019 Jerome Marchand <jmarchan@redhat.com> - 0.8.0-2
+- Rebuild for llvm 8
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Thu Apr 11 2019 Jerome Marchand <jmarchan@redhat.com> - 0.8.0-1
+- Rebase on bcc-8.0.0
+- Replace the temporary s390x workaround by a proper fix
+- Remove the doc of excluded tool from the package
+- Fix print_log2_hist
+- Fix yet a few other python3 bytes vs strings issues
 
-* Thu Jul 09 2020 Tom Stellard <tstellar@redhat.com> - 0.15.0-3
-- Drop llvm-static dependency
-- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_statically_linking_executables
+* Mon Mar 25 2019 Jerome Marchand <jmarchan@redhat.com> - 0.7.0-6
+- Add CI gating
 
-* Thu Jul 02 2020 Rafael dos Santos <rdossant@redhat.com> - 0.15.0-2
-- Reinstate a function needed by bpftrace
+* Thu Dec 13 2018 Jerome Marchand <jmarchan@redhat.com> - 0.7.0-5
+- Fix biolatency -D
+- Fix biotop manpage
+- Rebuild for LLVM 7.0.1 (from Tom Stellard)
 
-* Tue Jun 23 2020 Rafael dos Santos <rdossant@redhat.com> - 0.15.0-1
-- Rebase to latest upstream version (#1849239)
+* Mon Dec 10 2018 Jerome Marchand <jmarchan@redhat.com> - 0.7.0-4
+- Fix bio* tools
 
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.14.0-2
-- Rebuilt for Python 3.9
+* Mon Nov 05 2018 Jerome Marchand <jmarchan@redhat.com> - 0.7.0-3
+- Fix multiple bytes/string encoding issues
+- Fix misc covscan warning
 
-* Tue Apr 21 2020 Rafael dos Santos <rdossant@redhat.com> - 0.14.0-1
-- Rebase to latest upstream version (#1826281)
+* Mon Oct 15 2018 Tom Stellard <tstellar@redhat.com> - 0.7.0-2
+- Drop explicit dependency on clang-libs
 
-* Wed Feb 26 2020 Rafael dos Santos <rdossant@redhat.com> - 0.13.0-1
-- Rebase to latest upstream version (#1805072)
+* Fri Oct 12 2018 Jerome Marchand <jmarchan@redhat.com> - 0.7.0-1
+- Rebase on bcc-7.0.0
+- Remove useless tools (zfs*, btrfs* and inject) 
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Thu Sep 20 2018 Jerome Marchand <jmarchan@redhat.com> - 0.6.1-1
+- Rebase on bcc-0.6.1
 
-* Mon Jan 06 2020 Tom Stellard <tstellar@redhat.com> - 0.12.0-2
-- Link against libclang-cpp.so
-- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
+* Thu Sep 20 2018 Jerome Marchand <jmarchan@redhat.com> - 0.6.0-6
+- llcstat: print a nicer error message on virtual machine
+- Add NSS support to sslsniff
+- Fixes miscellaneous error uncovered by covscan
 
-* Tue Dec 17 2019 Rafael dos Santos <rdossant@redhat.com> - 0.12.0-1
-- Rebase to latest upstream version (#1758417)
-
-* Thu Dec 05 2019 Jiri Olsa <jolsa@redhat.com> - 0.11.0-2
-- Add libbpf support
-
-* Fri Oct 04 2019 Rafael dos Santos <rdossant@redhat.com> - 0.11.0-1
-- Rebase to latest upstream version (#1758417)
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-3
-- Rebuilt for Python 3.8
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed May 29 2019 Rafael dos Santos <rdossant@redhat.com> - 0.10.0-1
-- Rebase to latest upstream version (#1714902)
-
-* Thu Apr 25 2019 Rafael dos Santos <rdossant@redhat.com> - 0.9.0-1
-- Rebase to latest upstream version (#1686626)
-- Rename libbpf header to libbcc_bpf
-
-* Mon Apr 22 2019 Neal Gompa <ngompa@datto.com> - 0.8.0-5
-- Make the Python 3 bindings package noarch
-- Small cleanups to the spec
-
-* Tue Mar 19 2019 Rafael dos Santos <rdossant@redhat.com> - 0.8.0-4
-- Add s390x support (#1679310)
-
-* Wed Feb 20 2019 Rafael dos Santos <rdossant@redhat.com> - 0.8.0-3
-- Add aarch64 support (#1679310)
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 17 2019 Rafael dos Santos <rdossant@redhat.com> - 0.8.0-1
-- Rebase to new released version
-
-* Thu Nov 01 2018 Rafael dos Santos <rdossant@redhat.com> - 0.7.0-4
-- Fix attaching to usdt probes (#1634684)
-
-* Mon Oct 22 2018 Rafael dos Santos <rdossant@redhat.com> - 0.7.0-3
-- Fix encoding of non-utf8 characters (#1516678)
-- Fix str-bytes conversion in killsnoop (#1637515)
-
-* Sat Oct 06 2018 Rafael dos Santos <rdossant@redhat.com> - 0.7.0-2
-- Fix str/bytes conversion in uflow (#1636293)
-
-* Tue Sep 25 2018 Rafael Fonseca <r4f4rfs@gmail.com> - 0.7.0-1
-- Rebase to new released version
+* Wed Aug 08 2018 Tom Stellard <tstellar@redhat.com> - 0.6.0-5
+- Use llvm-toolset-6.0 prefix for clang-libs dependency
 
-* Wed Aug 22 2018 Rafael Fonseca <r4f4rfs@gmail.com> - 0.6.1-2
-- Fix typo when mangling shebangs.
+* Fri Aug 03 2018 Tom Stellard <tstellar@redhat.com> - 0.6.0-4
+- Rebuld for llvm-toolset-6.0
 
-* Thu Aug 16 2018 Rafael Fonseca <r4f4rfs@gmail.com> - 0.6.1-1
-- Rebase to new released version (#1609485)
+* Wed Jul 18 2018 Jerome Marchand <jmarchan@redhat.com> - 0.6.0-3
+ - Disable lua on all arches
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jun 26 2018 Jerome Marchand <jmarchan@redhat.com> - 0.6.0-2
+- Add clang-libs requirement
+- Fix manpages symlinks
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-2
-- Rebuilt for Python 3.7
+* Tue Jun 19 2018 Jerome Marchand <jmarchan@redhat.com> - 0.6.0-1
+- Rebase on bcc-0.6.0
 
-* Mon Jun 18 2018 Rafael dos Santos <rdossant@redhat.com> - 0.6.0-1
-- Rebase to new released version (#1591989)
+* Thu May 24 2018 Jerome Marchand <jmarchan@redhat.com> - 0.5.0-5
+- Enables build on ppc64(le) and s390x arches
 
 * Thu Apr 05 2018 Rafael Santos <rdossant@redhat.com> - 0.5.0-4
 - Resolves #1555627 - fix compilation error with latest llvm/clang