diff --git a/testing/kernel_builder/.config b/testing/kernel_builder/.config deleted file mode 100644 index a07ccfe5..00000000 --- a/testing/kernel_builder/.config +++ /dev/null @@ -1,480 +0,0 @@ -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# Enable BPF and force the JIT compiler (default on most distros) -CONFIG_BPF_SYSCALL=y -CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y - -# Enable BTF -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_REDUCED=n -CONFIG_DEBUG_INFO_DWARF4=y - -# Enable securityfs -CONFIG_SECURITYFS=y - -# Virtio options required by virtme -CONFIG_VIRTIO_PCI=y -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_VIRTIO_NET=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_SCSI_VIRTIO=y - -# Overlayfs is needed for mount namespace tests -CONFIG_OVERLAY_FS=y - -# Enable cgroups and all subsystems -CONFIG_CGROUPS=y -CONFIG_BLK_CGROUP=y -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUP_PIDS=y -CONFIG_CGROUP_RDMA=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_BPF=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y - -# Enable ftrace (needed for fentry/fexit BPF programs) -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_KPROBES=y -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_FTRACE_SYSCALLS=y -CONFIG_FPROBE=y - -# Enable IPv6 (not on by default in aarch64 defconfig) -CONFIG_IPV6=y - -# Enable taskstats (not on by default in aarch64 pre-5.18). This -# will create a taskstats_exit function (which we hook) -CONFIG_TASKSTATS=y - - -# Modules support -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y diff --git a/testing/kernel_builder/Dockerfile.new b/testing/kernel_builder/Dockerfile similarity index 86% rename from testing/kernel_builder/Dockerfile.new rename to testing/kernel_builder/Dockerfile index 8002cfc6..7a165d79 100644 --- a/testing/kernel_builder/Dockerfile.new +++ b/testing/kernel_builder/Dockerfile @@ -2,10 +2,9 @@ from debian:bullseye RUN dpkg --add-architecture arm64 RUN apt-get -y update -RUN apt-get -y install xz-utils RUN apt-get -y install \ git gcc make libssl-dev bison flex bc libelf-dev python3 \ - gcc-aarch64-linux-gnu curl dwarves \ + gcc-aarch64-linux-gnu curl dwarves xz-utils \ cmake zlib1g libdw1 libdw-dev rsync RUN git clone https://git.kernel.org/pub/scm/devel/pahole/pahole.git /pahole diff --git a/testing/kernel_builder/Dockerfile.old b/testing/kernel_builder/Dockerfile.old deleted file mode 100644 index 9d25eba5..00000000 --- a/testing/kernel_builder/Dockerfile.old +++ /dev/null @@ -1,10 +0,0 @@ -from debian:bullseye - -RUN dpkg --add-architecture arm64 -RUN apt-get -y update -RUN apt-get -y install \ - git gcc make libssl-dev bison flex bc libelf-dev python3 \ - gcc-aarch64-linux-gnu curl xz-utils dwarves - -WORKDIR /work -CMD ./build.sh diff --git a/testing/kernel_builder/Makefile b/testing/kernel_builder/Makefile index 6efe4e56..4a146133 100644 --- a/testing/kernel_builder/Makefile +++ b/testing/kernel_builder/Makefile @@ -7,4 +7,4 @@ all: ${CONTAINER_ENGINE} run -v ${PWD}:/work ${IMAGE}-new:${TAG} image: - ${CONTAINER_ENGINE} build -f Dockerfile.new -t ${IMAGE}-new:${TAG} . + ${CONTAINER_ENGINE} build -f Dockerfile -t ${IMAGE}-new:${TAG} .