rpms
/
bcc
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i9c
rpms:c9
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c-beta
rpms:c9-beta
rpms:i8-bcc-0.24.0
rpms:i8c-beta
rpms:c8-beta
...
pull from: rpms:i10c-beta
Branches Tags
rpms:i9c
rpms:c9
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c-beta
rpms:c9-beta
rpms:i8-bcc-0.24.0
rpms:i8c-beta
rpms:c8-beta

No commits in common. 'c9' and 'i10c-beta' have entirely different histories.
c9 ... i10c-beta

3 changed files with 95 additions and 173 deletions
Show Stats

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

@ -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

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

@ -1,4 +1,4 @@
From 5bc97bbc50b1ccf0c63f320ee73a2c0abe84b596 Mon Sep 17 00:00:00 2001 From 32a47d9002269b391c0c7ff76aeb2c015deb4b59 Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com> From: Jerome Marchand <jmarchan@redhat.com>
Date: Fri, 17 May 2024 15:36:07 +0200 Date: Fri, 17 May 2024 15:36:07 +0200
Subject: [PATCH] clang: fail when the kheaders ownership is wrong (#4928) Subject: [PATCH] clang: fail when the kheaders ownership is wrong (#4928)

205
SPECS/bcc.spec
Unescape View File

@ -3,14 +3,14 @@
%bcond_with lua %bcond_with lua
%else %else
# luajit is not available for some architectures # luajit is not available for some architectures
%ifarch ppc64 ppc64le s390x %ifarch ppc64 ppc64le s390x riscv64
%bcond_with lua %bcond_with lua
%else %else
%bcond_without lua %bcond_without lua
%endif %endif
%endif %endif
%ifarch x86_64 ppc64 ppc64le aarch64 s390x %ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
%bcond_without libbpf_tools %bcond_without libbpf_tools
%else %else
%bcond_with libbpf_tools %bcond_with libbpf_tools
@ -25,24 +25,23 @@
Name: bcc Name: bcc
Version: 0.30.0 Version: 0.30.0
Release: 7%{?dist} Release: 2%{?dist}
Summary: BPF Compiler Collection (BCC) Summary: BPF Compiler Collection (BCC)
License: ASL 2.0 License: Apache-2.0
URL: https://github.com/iovisor/bcc URL: https://github.com/iovisor/bcc
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %%{name}-%%{version}-clang-fail-when-the-kheaders-ownership-is-wrong-4928.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 # Arches will be included as upstream support is added and dependencies are
# satisfied in the respective arches # satisfied in the respective arches
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl riscv64
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 2.8.7 BuildRequires: cmake >= 2.8.7
BuildRequires: flex BuildRequires: flex
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
BuildRequires: elfutils-debuginfod-client-devel BuildRequires: elfutils-debuginfod-client-devel
BuildRequires: llvm-devel BuildRequires: llvm-devel
@ -54,9 +53,9 @@ BuildRequires: ncurses-devel
%if %{with lua} %if %{with lua}
BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(luajit)
%endif %endif
BuildRequires: libbpf-devel >= 2:0.8.0, libbpf-static >= 2:0.8.0 BuildRequires: libbpf-devel >= 2:0.8.0-1, libbpf-static >= 2:0.8.0-1
Requires: libbpf >= 2:0.8.0 Requires: libbpf >= 2:0.8.0-1
Requires: tar Requires: tar
Recommends: kernel-devel Recommends: kernel-devel
@ -116,9 +115,7 @@ Summary: Command line tools for BPF Compiler Collection (BCC)
Requires: bcc = %{version}-%{release} Requires: bcc = %{version}-%{release}
Requires: python3-%{name} = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release}
Requires: python3-netaddr Requires: python3-netaddr
%ifnarch s390x
Requires: python3-pyelftools Requires: python3-pyelftools
%endif
%description tools %description tools
Command line tools for BPF Compiler Collection (BCC) Command line tools for BPF Compiler Collection (BCC)
@ -126,6 +123,7 @@ Command line tools for BPF Compiler Collection (BCC)
%if %{with libbpf_tools} %if %{with libbpf_tools}
%package -n libbpf-tools %package -n libbpf-tools
Summary: Command line libbpf tools for BPF Compiler Collection (BCC) Summary: Command line libbpf tools for BPF Compiler Collection (BCC)
BuildRequires: libbpf-devel >= 2:0.8.0-1, libbpf-static >= 2:0.8.0-1
BuildRequires: bpftool BuildRequires: bpftool
%description -n libbpf-tools %description -n libbpf-tools
@ -139,7 +137,7 @@ Command line libbpf tools for BPF Compiler Collection (BCC)
%build %build
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \ -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \
-DCMAKE_USE_LIBBPF_PACKAGE:BOOL=TRUE \ -DCMAKE_USE_LIBBPF_PACKAGE:BOOL=TRUE -DENABLE_NO_PIE=OFF \
%{?with_llvm_shared:-DENABLE_LLVM_SHARED=1} %{?with_llvm_shared:-DENABLE_LLVM_SHARED=1}
%cmake_build %cmake_build
@ -192,7 +190,7 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
# We cannot run the test suit since it requires root and it makes changes to # We cannot run the test suit since it requires root and it makes changes to
# the machine (e.g, IP address) # the machine (e.g, IP address)
#%check # %%check
%if %{with libbpf_tools} %if %{with libbpf_tools}
mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_sbindir}
@ -234,17 +232,16 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/
%exclude %{_datadir}/%{name}/tools/inject %exclude %{_datadir}/%{name}/tools/inject
%exclude %{_datadir}/%{name}/tools/doc/inject_example.txt %exclude %{_datadir}/%{name}/tools/doc/inject_example.txt
%exclude %{_mandir}/man8/bcc-inject.8.gz %exclude %{_mandir}/man8/bcc-inject.8.gz
# Neither btrfs nor zfs are available on RHEL # btrfs f2fs and zfs are not available on RHEL
%exclude %{_datadir}/%{name}/tools/btrfs* %exclude %{_datadir}/%{name}/tools/btrfs*
%exclude %{_datadir}/%{name}/tools/doc/btrfs* %exclude %{_datadir}/%{name}/tools/doc/btrfs*
%exclude %{_mandir}/man8/bcc-btrfs* %exclude %{_mandir}/man8/bcc-btrfs*
%exclude %{_datadir}/%{name}/tools/zfs* %exclude %{_datadir}/%{name}/tools/zfs*
%exclude %{_datadir}/%{name}/tools/doc/zfs* %exclude %{_datadir}/%{name}/tools/doc/zfs*
%exclude %{_mandir}/man8/bcc-zfs* %exclude %{_mandir}/man8/bcc-zfs*
# criticalstat relies on CONFIG_PREEMPTIRQ_EVENTS which is disabled on RHEL %exclude %{_datadir}/%{name}/tools/f2fs*
%exclude %{_datadir}/%{name}/tools/criticalstat %exclude %{_datadir}/%{name}/tools/doc/f2fs*
%exclude %{_datadir}/%{name}/tools/doc/criticalstat_example.txt %exclude %{_mandir}/man8/bcc-f2fs*
%exclude %{_mandir}/man8/bcc-criticalstat.8.gz
%endif %endif
%{_mandir}/man8/* %{_mandir}/man8/*
@ -265,131 +262,117 @@ cp -a libbpf-tools/tmp-install/bin/* %{buildroot}/%{_sbindir}/
%endif %endif
%changelog %changelog
* Thu Nov 07 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-7 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.30.0-2
- Fic bio* tools (RHEL-65192) - Rebuilt for MSVSphere 10
* 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 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.30.0-2
- Drop python3-pyelftools dependency on s390x until it is available - Bump release for June 2024 mass rebuild
* Tue May 21 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-4 * Thu Jun 13 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.1-1
- Exclude btrfs and f2fs libbpf tools (RHEL-36579) - Rebase to the latest version (RHEL-32379)
- Really prevent the loading of compromised headers (CVE-2024-2314)
- Add python3-pyelftools dependency
- Exclude unsupported tools
* Mon May 20 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-3 * Tue Feb 13 2024 Jerome Marchand <jmarchan@redhat.com> - 0.29.1-2
- Really prevent the loading of compromised headers (RHEL-28769, CVE-2024-2314) - Don't use -no-pie flags.
- Add python3-pyelftools dependency (RHEL-36583)
* Fri May 03 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-2 * Mon Feb 05 2024 Jerome Marchand <jmarchan@redhat.com> - 0.29.1-1
- Rebuild (distrobaker didn't take last build) - Rebase to the latest release version (#2253688)
- Enable libbpf-tools on s390x (#2249458)
- Misc 0.29.1 fixes
* Wed Apr 10 2024 Jerome Marchand <jmarchan@redhat.com> - 0.30.0-1 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.0-3
- Rebase bcc to 0.30.0 (RHEL-29031) - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Exclude bpf-numamove on s390x (RHEL-32327)
* Wed Dec 13 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-5 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.0-2
- Fix libbpf bio tools (RHEL-19368) - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
- Add S390x support to libbpf-tools (RHEL-16325)
- Power enhancements(RHEL-11477)
* Tue Nov 21 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-4 * Thu Aug 10 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-1
- Rebuild with LLVM 17 in the side tag (RHEL-10591) - Rebase to the latest release version (#2218440)
- Fix bio tools (#2184370)
- Fix slabratetop
* Tue Nov 21 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-3 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.27.0-4
- Rebuild with LLVM 17 (RHEL-10591) - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Nov 06 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-2 * Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.27.0-3
- Fix trace tool (RHEL-8605) - Rebuilt for Python 3.12
* Mon Oct 23 2023 Jerome Marchand <jmarchan@redhat.com> - 0.28.0-1 * Tue Jun 06 2023 Jerome Marchand <jmarchan@redhat.com> - 0.27.0-2
- Rebase to v0.28.0 (RHEL-9976) - migrated to SPDX license
- 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 * Fri Apr 21 2023 Jerome Marchand <jmarchan@redhat.com> - 0.27.0-1
- Fix tcpretrans (rhbz#2226967) - Rebase to the latest release version (#2117708)
* Fri May 12 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-3 * Mon Apr 03 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-2
- Rebuild with LLVM 16 (rhbz#2050112) - Remove the dependency on distutils (RHBZ#2155029)
- Fix compactsnoop (rhbz#2042236) - Fix macro-in-comment (fedpkg lint warning)
- Fix killsnoop documentation (rhbz#2075500) - Fix bogus changelog date (use commit date)
- 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 * Fri Mar 10 2023 Jerome Marchand <jmarchan@redhat.com> - 0.26.0-1
- Rebase to v0.26.0 - Rebase to the latest release version
* 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 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.0-2
- Rebase to v0.25.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
- Misc documentation and man pages fixes
* Tue Aug 23 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-4 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.24.0-3
- Fix mdflush tool (rhbz#2108001) - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 01 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-3 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.24.0-2
- Rebuild for libbpf 0.6.0 - Rebuilt for Python 3.11
* Wed May 18 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.1-2 * Tue Apr 19 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.0-1
- Rebuild (previous build failed with UNKNOWN_KOJI_ERROR) - Rebase to the latest release version
* Thu Mar 24 2022 Jerome Marchand <jmarchan@redhat.com> - 0.24.0-1
- Rebase to v0.24.0
- Fix cmake build - Fix cmake build
- Add explicit Requires: bcc for bcc-tools
- Remove deprecated python_provide macro
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Feb 25 2022 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-10 * Sun Oct 24 2021 Rafael dos Santos <rdossant@redhat.com> - 0.22.0-2
- Remove deprecated python_provides macro (needed for gating) - Rebuilt for LLVM 13
* Thu Feb 24 2022 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-9 * Thu Sep 16 2021 Rafael dos Santos <rdossant@redhat.com> - 0.22.0-1
- Fix bio tools (rhbz#2039595) - Rebase to latest release version
* Mon Nov 22 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-8 * Mon Aug 02 2021 Rafael dos Santos <rdossant@redhat.com> - 0.21.0-1
- Rebuild for LLVM 13 - Rebase to latest release version
- Add support to libdebuginfod
* Thu Oct 14 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-7 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-5
- Sync with latest libbpf (fixes BPF_F_BROADCAST breakages of rhbz#1992430) - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
- Fix cpudist, mdflush, readahead and threadsnoop (rhbz#1992430)
- 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 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.20.0-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for Python 3.10
Related: rhbz#1991688
* Tue Aug 03 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-5 * Wed Jun 02 2021 Rafael dos Santos <rdossant@redhat.com> - 0.20.0-3
- Add gating - Don't require bcc-tools by default (#1966953)
* Mon Jul 26 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-4 * Tue May 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-2
- Don't require bcc-tools by default (#1967550)
- Add explicit bcc requirement to bcc-tools
- Build bcc from standard sources - Build bcc from standard sources
* Wed Jun 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-3 * Mon May 17 2021 Rafael dos Santos <rdossant@redhat.com> - 0.20.0-1
- Don't ignore LDFLAGS for libbpf-tools - Rebase to latest upstream (#1957727)
* Tue May 11 2021 Jeff Law <jlaw@tachyum.com> - 0.19.0-6
- Re-enable LTO
* Tue May 04 2021 Jiri Olsa <jolsa@redhat.com> - 0.19.0-5
- Keeping kernel-devel as weak dependency, resolves #1955154
* Wed Jun 02 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-2 * Fri Apr 30 2021 Jiri Olsa <jolsa@redhat.com> - 0.19.0-4
- Don't override cflags for libbpf-tools - Removing kernel-devel dependency, resolves #1955154
* Thu May 27 2021 Jerome Marchand <jmarchan@redhat.com> - 0.20.0-1 * Tue Apr 27 2021 Rafael dos Santos <rdossant@redhat.com> - 0.19.0-3
- Rebase to bcc 0.20.0 - Resolves #1869006
* Thu May 13 2021 Tom Stellard <tstellar@redhat.com> - 0.18.0-6 * Mon Mar 22 2021 Jiri Olsa <jolsa@redhat.com> - 0.19.0-2
- Rebuild for LLVM 12 - add libbpf-tools package
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.18.0-5 * Mon Mar 22 2021 Jiri Olsa <jolsa@redhat.com> - 0.19.0-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebase to latest upstream
* Thu Feb 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.18.0-4 * Thu Feb 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.18.0-4
- Disable lua for RHEL - Disable lua for RHEL

Write Preview
Loading…
Cancel
Save