Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync branches #392

Merged
merged 13 commits into from
Jul 24, 2024
Merged

Sync branches #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
84ef155
update_libbpf: sync branches
thiagoftsm Jul 12, 2024
a1f971c
update_libbpf: Update CentOS 7 image
thiagoftsm Jul 12, 2024
020cb78
update_libbpf: Rename directory
thiagoftsm Jul 12, 2024
749f501
update_libbpf: Try to use external repo
thiagoftsm Jul 12, 2024
ea3969a
update_libbpf: Fix copy and paste
thiagoftsm Jul 12, 2024
bd886a3
update_libbpf: Add binaries for CentOS 7
thiagoftsm Jul 14, 2024
6dd46a9
update_libbpf: Modify Workflow
thiagoftsm Jul 14, 2024
f02e907
update_libbpf: Modify release
thiagoftsm Jul 14, 2024
1869bc0
update_libbpf: Fix YML
thiagoftsm Jul 14, 2024
e733712
update_libbpf: Add LFS
thiagoftsm Jul 16, 2024
0c41f87
update_libbpf: Update the path in workflow
thiagoftsm Jul 24, 2024
ed3e987
update_libbpf: Add LFS option
thiagoftsm Jul 24, 2024
df4206b
update_libbpf: Remove CentOS 7
thiagoftsm Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.3.10.rhf.o filter=lfs diff=lfs merge=lfs -text
9 changes: 0 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,13 @@ jobs:
- '4.16.18'
- '4.18.0'
- '4.14.291'
- '3.10.0'
libc:
- static
- glibc
- musl
exclude:
# excludes static on 3.10.0 (https://github.com/netdata/kernel-collector/issues/153)
- kernel_version: 3.10.0
libc: static
- kernel_version: 5.4.17
libc: static
# excludes musl on 3.10.0
- kernel_version: 3.10.0
libc: musl
- kernel_version: 5.4.17
libc: musl
runs-on: ubuntu-latest
Expand All @@ -54,8 +47,6 @@ jobs:
os=oracle8
elif [ ${{ matrix.kernel_version }} = "4.18.0" ]; then
os=centos8
elif [ ${{ matrix.kernel_version }} = "3.10.0" ]; then
os=centos7
else
os=generic
fi
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,13 @@
- '4.16.18'
- '4.18.0'
- '4.14.291'
- '3.10.0'
libc:
- static
- glibc
- musl
exclude:
# excludes static on 3.10.0 (https://github.com/netdata/kernel-collector/issues/153)
- kernel_version: 3.10.0
libc: static
- kernel_version: 5.4.17
libc: static
# excludes musl on 3.10.0
- kernel_version: 3.10.0
libc: musl
- kernel_version: 5.4.17
libc: musl
runs-on: ubuntu-latest
Expand All @@ -48,6 +41,7 @@
with:
submodules: true
fetch-depth: 0
lfs: true
- name: Run build.sh
run: |
if [ ${{ matrix.kernel_version }} = "5.14.0" ]; then
Expand All @@ -56,8 +50,6 @@
os=oracle8
elif [ ${{ matrix.kernel_version }} = "4.18.0" ]; then
os=centos8
elif [ ${{ matrix.kernel_version }} = "3.10.0" ]; then
os=centos7
else
os=generic
fi
Expand Down Expand Up @@ -85,16 +77,17 @@
path: artifacts
merge-multiple: true
- name: Set release_tag
run: |

Check failure on line 80 in .github/workflows/release.yml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:1:41: Double quote to prevent globbing and word splitting [shellcheck]

Raw Output:
.github/workflows/release.yml:80:9: shellcheck reported issue in this script: SC2086:info:1:41: Double quote to prevent globbing and word splitting [shellcheck]
echo "RELEASE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Consolidate Artifacts
run: |

Check failure on line 83 in .github/workflows/release.yml

View workflow job for this annotation

GitHub Actions / actionlint 

[actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2231:info:3:41: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt  [shellcheck]

Raw Output:
.github/workflows/release.yml:83:9: shellcheck reported issue in this script: SC2231:info:3:41: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt  [shellcheck]
mkdir -p final-artifacts
for libc in static glibc musl; do
for pkg in artifacts/netdata_ebpf-*_*-${libc}.tar.xz; do
mkdir -p "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}"
tar -C "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}" -xvf "${pkg}"
done
if [ "${libc}" == "glibc" ]; then cp -R CentOS7/* "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}"; fi
tar -C "packages/netdata-kernel-collector-${libc}-${RELEASE_TAG}" -Jcvf "final-artifacts/netdata-kernel-collector-${libc}-${RELEASE_TAG}.tar.xz" ./
done
cd final-artifacts && sha256sum ./*.tar.xz > sha256sums.txt
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

*.ll
*.o*
!CentOS7/*.o*

*.skel.h
*.a
Expand Down
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_btrfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_cachestat.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_dc.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_disk.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_ext4.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_fd.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_fdatasync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_fsync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_hardirq.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_mdflush.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_mount.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_msync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_network_viewer.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_nfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_oomkill.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_process.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_shm.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_socket.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_softirq.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_swap.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_sync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_sync_file_range.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_syncfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_vfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_xfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/pnetdata_ebpf_zfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_btrfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_cachestat.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_dc.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_disk.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_ext4.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_fd.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_fdatasync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_fsync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_hardirq.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_mdflush.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_mount.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_msync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_network_viewer.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_nfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_oomkill.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_process.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_shm.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_socket.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_softirq.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_swap.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_sync.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_sync_file_range.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_syncfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_vfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_xfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions CentOS7/rnetdata_ebpf_zfs.3.10.rhf.o
View file
Open in desktop
Git LFS file not shown
49 changes: 0 additions & 49 deletions Dockerfile.glibc.centos7
View file
Open in desktop

This file was deleted.

Empty file removed kernel-patches/3.10.0-1160.108.1.el7/.gitkeep
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion libbpf
Open in desktop
Submodule libbpf updated 15 files
+2 −2 .github/workflows/pahole.yml
+3 −0 .mailmap
+1 −1 BPF-CHECKPOINT-COMMIT
+1 −1 CHECKPOINT-COMMIT
+2 −0 include/uapi/linux/bpf.h
+1 −1 src/Makefile
+489 −207 src/btf.c
+36 −0 src/btf.h
+177 −0 src/btf_iter.c
+519 −0 src/btf_relocate.c
+89 −22 src/libbpf.c
+18 −0 src/libbpf.h
+4 −0 src/libbpf.map
+27 −2 src/libbpf_internal.h
+45 −24 src/linker.c