fix(pkg/driverbuilder): fixed bpf probe build for new libs.

Signed-off-by: Federico Di Pierro <[email protected]>
falcosecurity · Jul 7, 2023 · 51e8cc0 · 51e8cc0
1 parent f8b4e5b
commit 51e8cc0
Show file tree

Hide file tree

Showing 20 changed files with 214 additions and 52 deletions.
diff --git a/pkg/driverbuilder/builder/build.go b/pkg/driverbuilder/builder/build.go
@@ -69,3 +69,11 @@ func (b *Build) builderImageTag() string {
 	}
 	return defaultImageTag
 }
+
+func (b *Build) BuildModule() bool {
+	return len(b.ModuleFilePath) > 0
+}
+
+func (b *Build) BuildProbe() bool {
+	return len(b.ProbeFilePath) > 0
+}
diff --git a/pkg/driverbuilder/builder/builders.go b/pkg/driverbuilder/builder/builders.go
@@ -251,8 +251,8 @@ func (c Config) toTemplateData(b Builder, kr kernelrelease.KernelRelease) common
 		ModuleDownloadURL: fmt.Sprintf("%s/%s.tar.gz", c.DownloadBaseURL, c.DriverVersion),
 		ModuleDriverName:  c.DriverName,
 		ModuleFullPath:    ModuleFullPath,
-		BuildModule:       len(c.ModuleFilePath) > 0,
-		BuildProbe:        len(c.ProbeFilePath) > 0,
+		BuildModule:       c.BuildModule(),
+		BuildProbe:        c.BuildProbe(),
 		GCCVersion:        c.GCCVersion,
 	}
 }

diff --git a/pkg/driverbuilder/builder/templates/alinux.sh b/pkg/driverbuilder/builder/templates/alinux.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/almalinux.sh b/pkg/driverbuilder/builder/templates/almalinux.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/amazonlinux.sh b/pkg/driverbuilder/builder/templates/amazonlinux.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -26,8 +25,8 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the kernel module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
-
 make KERNELDIR=/tmp/kernel CC=/usr/bin/gcc-{{ .GCCVersion }} LD=/usr/bin/ld.bfd CROSS_COMPILE=""
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
 # Print results
@@ -36,7 +35,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/archlinux.sh b/pkg/driverbuilder/builder/templates/archlinux.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/lib/modules/*/build/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/centos.sh b/pkg/driverbuilder/builder/templates/centos.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/debian.sh b/pkg/driverbuilder/builder/templates/debian.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -31,6 +30,7 @@ sourcedir=$(find . -type d -name "{{ .KernelHeadersPattern }}" | head -n 1 | xar
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=$sourcedir
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -41,7 +41,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=$sourcedir
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/fedora.sh b/pkg/driverbuilder/builder/templates/fedora.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/flatcar.sh b/pkg/driverbuilder/builder/templates/flatcar.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -30,6 +29,7 @@ make KCONFIG_CONFIG=/tmp/kernel.config modules_prepare
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -40,7 +40,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/opensuse.sh b/pkg/driverbuilder/builder/templates/opensuse.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -26,6 +25,7 @@ sourcedir="$(find . -type d -name "linux-*-obj" | head -n 1 | xargs readlink -f)
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=$sourcedir
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -36,7 +36,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/oracle.sh b/pkg/driverbuilder/builder/templates/oracle.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/photonos.sh b/pkg/driverbuilder/builder/templates/photonos.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -22,20 +21,21 @@ mkdir -p /tmp/kernel
 mv usr/src/linux-headers-*/* /tmp/kernel
 
 {{ if .BuildModule }}
-
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
 strip -g {{ .ModuleFullPath }}
-
 # Print results
 modinfo {{ .ModuleFullPath }}
 {{ end }}
-{{ if .BuildProbe }}
 
+{{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/redhat.sh b/pkg/driverbuilder/builder/templates/redhat.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -25,6 +24,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -35,7 +35,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}
diff --git a/pkg/driverbuilder/builder/templates/rocky.sh b/pkg/driverbuilder/builder/templates/rocky.sh
@@ -9,7 +9,6 @@ mkdir -p /tmp/module-download
 curl --silent -SL {{ .ModuleDownloadURL }} | tar -xzf - -C /tmp/module-download
 mv /tmp/module-download/*/driver/* {{ .DriverBuildDir }}
 
-cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 bash /driverkit/fill-driver-config.sh {{ .DriverBuildDir }}
 
 # Fetch the kernel
@@ -23,6 +22,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 {{ if .BuildModule }}
 # Build the module
+cp /driverkit/module-Makefile {{ .DriverBuildDir }}/Makefile
 cd {{ .DriverBuildDir }}
 make CC=/usr/bin/gcc-{{ .GCCVersion }} KERNELDIR=/tmp/kernel
 mv {{ .ModuleDriverName }}.ko {{ .ModuleFullPath }}
@@ -33,7 +33,9 @@ modinfo {{ .ModuleFullPath }}
 
 {{ if .BuildProbe }}
 # Build the eBPF probe
+cp /driverkit/bpf-Makefile {{ .DriverBuildDir }}/bpf/Makefile
 cd {{ .DriverBuildDir }}/bpf
+ln -s ../*{.c,.h} .
 make KERNELDIR=/tmp/kernel
 ls -l probe.o
 {{ end }}