From 97bb0418c129c5e0fae8c4138e04693613c5ff4e Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 13:49:28 +0800 Subject: [PATCH 1/9] Add BUILD_BPF_SKEL=1 for perf make --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 2b38801f..5b6e4080 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -146,7 +146,7 @@ PERF_LINUX_VERSION := 6.1.52 perf: wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(PERF_LINUX_VERSION).tar.xz tar -xf linux-$(PERF_LINUX_VERSION).tar.xz && mv linux-$(PERF_LINUX_VERSION)/ linux_perf/ - cd linux_perf/tools/perf && make LDFLAGS="-static --static" + cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 spectre-meltdown-checker: ifeq ("$(wildcard spectre-meltdown-checker)","") From ec4e97002e039d9e18c1c36220c07f07bf979e96 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 14:13:02 +0800 Subject: [PATCH 2/9] Add clang which needed for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 8bb928e7..52707dea 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -16,7 +16,7 @@ RUN locale-gen en_US.UTF-8 && echo "LANG=en_US.UTF-8" > /etc/default/locale RUN add-apt-repository ppa:git-core/ppa -y RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \ gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \ - libreadline-dev default-jre default-jdk cmake flex bison libssl-dev + libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 From 2685b21020d969809eef5ed3a67f4029035b4a8f Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 14:28:58 +0800 Subject: [PATCH 3/9] Update to ubuntu 24.04 for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 52707dea..0920c937 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -6,7 +6,7 @@ # build output oss_source* will be in workdir # build image (from project root directory): # $ docker build -f tools/build.Dockerfile --tag perfspect-tools:$TAG ./tools -FROM ubuntu:18.04 AS builder +FROM ubuntu:24.04 AS builder ENV http_proxy=${http_proxy} ENV https_proxy=${https_proxy} ENV LANG=en_US.UTF-8 From dfa4be7a48c09a7f6a2fc81b350759ca125b6361 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 14:34:15 +0800 Subject: [PATCH 4/9] Update to ubuntu 24.04 for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 0920c937..ff542cee 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -6,7 +6,7 @@ # build output oss_source* will be in workdir # build image (from project root directory): # $ docker build -f tools/build.Dockerfile --tag perfspect-tools:$TAG ./tools -FROM ubuntu:24.04 AS builder +FROM ubuntu:22.04 AS builder ENV http_proxy=${http_proxy} ENV https_proxy=${https_proxy} ENV LANG=en_US.UTF-8 From 2d0a50537b5e91c1ab64d039d99bdf9381124798 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 14:45:20 +0800 Subject: [PATCH 5/9] Update to ubuntu 24.04 for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index ff542cee..476307a6 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -16,7 +16,7 @@ RUN locale-gen en_US.UTF-8 && echo "LANG=en_US.UTF-8" > /etc/default/locale RUN add-apt-repository ppa:git-core/ppa -y RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \ gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \ - libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang + libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 From 409f43639b5e190a370649483cfd33bb4931674b Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 15:34:42 +0800 Subject: [PATCH 6/9] Update to ubuntu 24.04 for perf build with BUILD_BPF_SKEL=1 --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 5b6e4080..8b878b14 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -146,7 +146,7 @@ PERF_LINUX_VERSION := 6.1.52 perf: wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(PERF_LINUX_VERSION).tar.xz tar -xf linux-$(PERF_LINUX_VERSION).tar.xz && mv linux-$(PERF_LINUX_VERSION)/ linux_perf/ - cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 + cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 NO_JVMTI=1 spectre-meltdown-checker: ifeq ("$(wildcard spectre-meltdown-checker)","") From fcbfdcc7233f01aa7cb470ae603a34ec38995e75 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 15:54:11 +0800 Subject: [PATCH 7/9] Update for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 476307a6..10c4a7b0 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -16,7 +16,9 @@ RUN locale-gen en_US.UTF-8 && echo "LANG=en_US.UTF-8" > /etc/default/locale RUN add-apt-repository ppa:git-core/ppa -y RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \ gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \ - libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev + libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev \ + libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python-dev binutils-dev \ + liblzma-dev libzstd-dev libnuma-dev libbabeltrace-dev llvm-13 ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 From 1efad61eba82720e39cda329920cfedf05d269c7 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 15:55:57 +0800 Subject: [PATCH 8/9] Update for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 10c4a7b0..8ab2e98b 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -17,7 +17,7 @@ RUN add-apt-repository ppa:git-core/ppa -y RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \ gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \ libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev \ - libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python-dev binutils-dev \ + libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python2-dev binutils-dev \ liblzma-dev libzstd-dev libnuma-dev libbabeltrace-dev llvm-13 ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 From ee74e0b43fbbe96fbdbbbf66ae7012cecf166628 Mon Sep 17 00:00:00 2001 From: Tianyou Li Date: Mon, 9 Dec 2024 16:15:33 +0800 Subject: [PATCH 9/9] Update for perf build with BUILD_BPF_SKEL=1 --- tools/build.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build.Dockerfile b/tools/build.Dockerfile index 8ab2e98b..34e5e003 100644 --- a/tools/build.Dockerfile +++ b/tools/build.Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y git build-essential autotools-dev autom libreadline-dev default-jre default-jdk cmake flex bison libssl-dev clang libbpf-dev \ libdw-dev systemtap-sdt-dev libunwind-dev libslang2-dev python2-dev binutils-dev \ liblzma-dev libzstd-dev libnuma-dev libbabeltrace-dev llvm-13 +RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64