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

Jump to bottom

Build fixes for linux 6.7 #1492

Merged
merged 7 commits into from
Mar 13, 2024
Merged

Build fixes for linux 6.7 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92911c5
linux 6.7 fixes
ovalenti Mar 4, 2024
f091105
Build for 6.7 kernels
ovalenti Mar 5, 2024
f0aea06
From 6.7 and on, build using fc39
ovalenti Mar 6, 2024
b4d409e
Bump module version to force rebuild
ovalenti Mar 6, 2024
abd573e
Use fc39 for linux 6.6 as well
ovalenti Mar 6, 2024
2836b6e
Unblock 6.8
ovalenti Mar 7, 2024
1267fc6
Update falco ref, since github wants to merge things...
ovalenti Mar 12, 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
2 changes: 1 addition & 1 deletion falcosecurity-libs
Open in desktop
Submodule falcosecurity-libs updated 6 files
+8 −0 driver/bpf/fillers.h
+4 −0 driver/modern_bpf/definitions/struct_flavors.h
+9 −1 driver/modern_bpf/programs/attached/events/sched_process_exec.bpf.c
+9 −1 driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/execve.bpf.c
+9 −1 driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/execveat.bpf.c
+22 −0 driver/ppm_fillers.c
2 changes: 0 additions & 2 deletions kernel-modules/BLOCKLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,3 @@
# https://github.com/falcosecurity/libs/issues/918
# Since kmods are not supported anyway, block these combination
~.*\.el8_9\..* * mod
6.7.* * *
6.8.* * *
2 changes: 1 addition & 1 deletion kernel-modules/MODULE_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.9.0
2.9.1-rc1
26 changes: 26 additions & 0 deletions kernel-modules/build/fc39.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM registry.fedoraproject.org/fedora:39 AS builder

ENV DISTRO=fc39

RUN dnf -y install \
make \
cmake \
gcc-c++ \
llvm \
clang \
elfutils-libelf-devel \
gettext \
kmod && \
# We trick Debian builds into thinking they have the required GCC binary
ln -s /usr/bin/gcc /usr/bin/gcc-10 && \
ln -s /usr/bin/gcc /usr/bin/gcc-11 && \
ln -s /usr/bin/gcc /usr/bin/gcc-12 && \
# We also trick Amazon Linux
ln -s /usr/bin/gcc /usr/bin/gcc10-gcc && \
ln -s /usr/bin/ld.bfd /usr/bin/gcc10-ld.bfd && \
ln -s /usr/bin/objdump /usr/bin/gcc10-objdump

COPY /build-kos /scripts/
COPY /build-wrapper.sh /scripts/compile.sh

ENTRYPOINT /scripts/compile.sh
7 changes: 6 additions & 1 deletion kernel-modules/build/kernel-splitter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,14 @@ def match(self, task):

def main(task_file):
oracle_kernels = r"(?:.*el7uek.*)"
fc36_kernels = r"(?:(?:5\.[1-9]\d+\..*)|(:?[6-9]\.\d+\..*))"
fc39_kernels = r"(?:(?:6\.[6-9]\..*)|(?:6\.[1-9][0-9]\..*)|(:?[7-9]\.\d+\..*))"
fc36_kernels = r"(?:(?:5\.[1-9]\d+\..*)|(?:6\.[0-5]\..*))"
rhel8_kernels = r"(?:(?:4|5)\.\d+\..*)"
rhel7_kernels = r"(?:3\.\d+\..*)"
rhel7_ebpf_kernels = r"(?:(?:3|4|5)\.\d+\..*)"

oracle = Builder("oracle", rf"^{oracle_kernels}", {})
fc39 = Builder("fc39", rf"^{fc39_kernels}", {})
fc36 = Builder("fc36", rf"^{fc36_kernels}", {})
rhel7_ebpf = EBPFBuilder("rhel7", rf"^{rhel7_ebpf_kernels}", {})
rhel8 = Builder("rhel8", rf"^{rhel8_kernels}", {})
Expand All @@ -122,6 +124,7 @@ def main(task_file):

builders = [
oracle,
fc39,
fc36,
rhel7_ebpf,
rhel8,
Expand Down Expand Up @@ -156,9 +159,11 @@ def main(task_file):
rhel7_ebpf_builders = rhel7_ebpf.split(driver_builders)
rhel7_builders = rhel7.split(driver_builders)
fc36_builders = fc36.split(driver_builders)
fc39_builders = fc39.split(driver_builders)

builders = [
*oracle_builders,
*fc39_builders,
*fc36_builders,
*rhel8_builders,
*rhel7_ebpf_builders,
Expand Down
Loading