From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43F3233F378 for ; Thu, 14 May 2026 16:34:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776464; cv=none; b=O2kEjg+DEWuOIWOlg7Et9MJGbNk43Lq2TrLlC/uISI2QLrBF9s+U8UDTOgyQkknDknGRTyxaZaeTln4IAI5i+A9abCnvOGpMF1mG43UtJTpss3/SA8/Bu/vWXfh7VVMR7O71S8RiJ4CSLxOidLw79tcZIPx0g4C1zC6QAnWNVNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776464; c=relaxed/simple; bh=wwRoZKbj654sz4VrwUcykwLsN4Mk4H6ny+P/lIWtoWI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B+dOFahL4eTd2KLCvJkMdCbIYxmvukxQ0P6aOdvnesuyjdi4wDUNzlTsDSGCxG0QbjYeT6Q+zofraABcvQQohY0rcRzQUF/31yj/zr/GmF5rmH/GvWwx7riwK2T8wIaTF7Ws2EcUVHLFbA5efVAVWho1l/IZe7HP5BwXV5LuwtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=tXFTiR9m; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tXFTiR9m" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dc1c0b7ccso13285c88.1 for ; Thu, 14 May 2026 09:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776461; x=1779381261; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5i6lHdemblE/gP7H567PkD83N+A+98X3bUfvUWyr9JU=; b=tXFTiR9m96uUxkBDTjW10KGSeIfFKznWj/LiSih1z7kd6r61pXWiI+U/8LrfeN85OO ZSrlH/YZ7nwpD0rHZx9BPOGBG4cIZOvtsRAE+lZzzFbIPMYaBnG35Sq+YflUdQJDsOIs gWlvI2XnVLLprxt/KEjiDyVG9duzOvhpgto9oA7X/smCReO/X2bUwUyheWndLRXcpUfY S2HLoPc+UDJdSggaCH0rlRy53cGlLUBU+NRDV2qNvlGNhTwiftJAs+hSK06kbmvG51+d fBZQECDT8/M6UuwiXeMI0Ba7nILiycFUbIbk6td6EYcb86Dl86sRT1ciJHCXGHIM6UCM /oFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776461; x=1779381261; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5i6lHdemblE/gP7H567PkD83N+A+98X3bUfvUWyr9JU=; b=SvNGDfUEj6HlzQu6Wp3lX+D3HEgz5InN4RJ8wxxJ6ZPsNloGC0u1JEi4jzFyygHRCa u7RFXrGYuPCfnghmPXYU03BPaM2LdjRzzXF+u0GuEfnOyHqfsnou+qpHnwYs6Wf9yXLY iV8tpQ9un2ypzWNZ5KWx1rFW6rag/b0cEoelqvo9D2AxsHv9b+9vUtVsEKJ1umxPcL5w ppvdxk8X44Tgd/C40E+w5Re8Ddm/fhIpvFMcqZUtGzZH7e5qteA+61ejtxkNF1kkgn5T seMC7Xx5A+009ZNJVhOGOijAaP+PqNHg8AXVVgrxfMgLhCnGn16YvQ3r0cYgG7Te6tH1 x+6Q== X-Forwarded-Encrypted: i=1; AFNElJ8V8N6v2UiUQY8oxa18zYXQRk6jl17TGzSk4TDb+DFCLEyxpHr3ZVTC7ldB1ugQmiL45pbkcgZxeC0QBao=@vger.kernel.org X-Gm-Message-State: AOJu0Yzta3youtloYKyp2Bj0UZspR1C+RR/JEb7nNnMosu7kjFFgY6UN 1pJtkU5ap/Kc96SRdzoQg5fLZpc8mgl69sHTWoCwgQkwWhYYWW8fGwoBEQkicaeZ44ZJZhLH7E5 kQDx3PDa5/A== X-Received: from dlbvg5.prod.google.com ([2002:a05:7022:7f05:b0:134:74a7:dae]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:439b:b0:12d:de3e:86b1 with SMTP id a92af1059eb24-135000aa985mr153729c88.20.1778776461049; Thu, 14 May 2026 09:34:21 -0700 (PDT) Date: Thu, 14 May 2026 09:33:53 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-2-irogers@google.com> Subject: [PATCH v3 01/17] bpftool build: Restrict feature tests during bootstrap compilation From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When bpf_skel.mak executes 'make -C ../bpf/bpftool bootstrap', bpftool's Makefile unconditionally evaluated feature checks for llvm, libcap, libbfd, and disassembler libraries because the bootstrap target was not exempted. Since the bootstrap bpftool strictly compiles minimal AST parsing and C code generation logic without linking LLVM or disassembler libraries, these feature check sub-makes are completely redundant. Exempt the bootstrap target from non-essential feature tests to eliminate unneeded sub-make fork overhead during Kbuild startup. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/bpf/bpftool/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 0febf60e1b64..8f50bc163bb2 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -106,6 +106,10 @@ ifneq ($(SKIP_CRYPTO),1) CRYPTO_LIBS :=3D -lcrypto endif =20 +ifeq ($(MAKECMDGOALS),bootstrap) +FEATURE_TESTS :=3D libelf-zstd +FEATURE_DISPLAY :=3D +else FEATURE_TESTS :=3D clang-bpf-co-re FEATURE_TESTS +=3D llvm FEATURE_TESTS +=3D libcap @@ -122,6 +126,7 @@ FEATURE_DISPLAY +=3D libcap FEATURE_DISPLAY +=3D libbfd FEATURE_DISPLAY +=3D libbfd-liberty FEATURE_DISPLAY +=3D libbfd-liberty-z +endif =20 check_feat :=3D 1 NON_CHECK_FEAT_TARGETS :=3D clean uninstall doc doc-clean doc-install doc-= uninstall --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41D93344D9B for ; Thu, 14 May 2026 16:34:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776469; cv=none; b=tbLnAK1kOEmlZ7u/Uy25kNkpfQGhAkFwyQqOOCQDh5gAmIqlycqFI6VSvmGRl9JUVoFu2l0RxPu2kbt/YxG5dt7H+uYlzRUHnWes+iU7RPC2Pb3vNllFG5FizO5PM9VyhXyLEj23lbLQJkr4NwN87nd/g/oFcJqbO5jPRna9g/w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776469; c=relaxed/simple; bh=uqUEFNQ57AFlcZMBFJffGyxRIJA2Tz6olGf/kXvYcAU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QvOdKixnR32wkAxD8RlCuJQ8kwHX/KRbaxSPyEaoaF0y2veiYgJCns+xvalvrlYGzZldtIw9TJSN5WBidGouTws2AR0YiuCeynyUnhI8+MEoSVj2bmQ6ElqDQKEEC6FU2LCMOtqYT5xfahQZZlK6BST85KK+59iB27uzkq/gHaE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=o8E8BK4c; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="o8E8BK4c" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-132d631edaaso4165585c88.0 for ; Thu, 14 May 2026 09:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776466; x=1779381266; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=4CsWFZTIpHT1rxN0oH0dIIw0Lzzf2ZZoZH+mSq/1ZRM=; b=o8E8BK4cW9IIj/eskZh/8MDrYN/4K7f9nn4DbOKs4gvZ78bVGTrhl6uBSqLobo/kL4 AV9Q6jZowyLZWf1ya3WLqBegCx8pbf+eyqXobrpQ0tOBc0vWlNT0Zd7+rIhbjlvMBahF JVOQof4PC9pD/SQkWFUYzd9JBgogwcxliJFBwUP3P3ApQruqXfT2VUgORko0KALmbT+V 7QanfGXHrl7u5+W5yC64y3rHrZXahzmm1GEX2tN8Y3Va59jsSp48V7b+xRF5Uhfhp+xO /9KZCkuA/48scwRSE2ipG5Xho51fZE6dn80gnfUFxWbVaL+tKndDjE6HInq6PhWVvPzW lmQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776466; x=1779381266; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=4CsWFZTIpHT1rxN0oH0dIIw0Lzzf2ZZoZH+mSq/1ZRM=; b=XE99CWycSBOvPBLsliTWTaKKar3O7PGDBLVeadHEZgBtNfoXB7R3HP558I9Raz7i2q rne7Dh6olfYmy+AEXwLarq4N79UunqpqkrORMeeK0JZYQHOBnrlAq90DS7Is8Uc+DaBK 9Jdb/fFDe8d148yjhNGk6vTA/xkHbh/kkqXIC56s4mdmcHD3vazzBUeF+T2xfd4/NJ4w N48unPax1lKUIkuhvrfazKcsToWxWCFglKDdAtkLvt+s7QW44CvWusxw+AOdvolHxx4J Q5FfX4J+sXlLRZjzUnBOQKO5CLhSyH/TtU3TWX7W22Abd2KY4VGaO0PBJMQm7QaW5YOQ Xe2A== X-Forwarded-Encrypted: i=1; AFNElJ+iEQgTv7I9qigDlJH2qzmaAfBzggOWmG/VXZl+qWklcUoRn/MshdFdL4Atf5/cxTUayGGPbZc9PJ3MbcQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyQY9PACOrGF3xWhRHwGdlU1VNUrgslTig8PXT+ug3jf4QmDT2b Z7zubbMJ2l8/hTumaz1h1lYWYyIH8mI5vtJuHv8PN/15rFnAcNjCUe4m0PBKL1lOB6hcM/u3IiP McWA9VCo99Q== X-Received: from dlbem2.prod.google.com ([2002:a05:7022:1002:b0:132:8d92:4d6e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:1b08:b0:128:cf5c:5362 with SMTP id a92af1059eb24-1342ef43500mr5598839c88.12.1778776465893; Thu, 14 May 2026 09:34:25 -0700 (PDT) Date: Thu, 14 May 2026 09:33:54 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-3-irogers@google.com> Subject: [PATCH v3 02/17] tools build: Integrate libdebuginfod into test-all fast path From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bundling libdebuginfod into test-all.c allows Make to avoid an individual feature check sub-make fork during AST parsing. Short-circuit feature_check in Makefile.feature to instantly skip sub-make evaluations when a feature was already pre-detected by test-all. Trade-offs: On some Linux distributions (e.g., Debian/Ubuntu), libdebuginfod-dev is packaged separately from libelf-dev and libdw-dev. If a user installs libdw-dev but omits libdebuginfod-dev, adding -ldebuginfod to BUILD_ALL causes test-all to fail, falling back to individual feature tests. However, on fully configured developer workstations, this successfully reclaims sequential startup latency. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 2 +- tools/build/feature/test-all.c | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 2f192d3bf61b..064c75dd9914 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -8,7 +8,9 @@ endif =20 feature_check =3D $(eval $(feature_check_code)) define feature_check_code - feature-$(1) :=3D $(shell $(MAKE) OUTPUT=3D$(OUTPUT_FEATURES) CC=3D"$(CC= )" CXX=3D"$(CXX)" CFLAGS=3D"$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" C= XXFLAGS=3D"$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS=3D"$(L= DFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)= test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + ifeq ($(feature-$(1)),) + feature-$(1) :=3D $$(shell $(MAKE) OUTPUT=3D$(OUTPUT_FEATURES) CC=3D"$= (CC)" CXX=3D"$(CXX)" CFLAGS=3D"$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))= " CXXFLAGS=3D"$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS=3D"= $(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATUR= ES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0) + endif endef =20 feature_set =3D $(eval $(feature_set_code)) @@ -100,6 +102,7 @@ FEATURE_TESTS_BASIC :=3D \ disassembler-four-args \ disassembler-init-styled \ file-handle \ + libdebuginfod \ libopenssl =20 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list @@ -125,7 +128,6 @@ FEATURE_TESTS_EXTRA :=3D \ clang \ libbpf \ libpfm4 \ - libdebuginfod \ clang-bpf-co-re \ bpftool-skeletons =20 diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 704c687ed3ad..dc828523b50a 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -115,7 +115,7 @@ __BUILD =3D $(CC) $(CFLAGS) -MD -Wall -Werror -o $@ $(p= atsubst %.bin,%.c,$(@F)) $( BUILD_BFD =3D $(BUILD) -DPACKAGE=3D'"perf"' -lbfd -ldl BUILD_ALL =3D $(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=3D2 -= ldw -lelf -lnuma -lelf -lslang \ $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -ldl -lz -llzma -lzstd \ - $(shell $(PKG_CONFIG) --libs --cflags openssl 2>/dev/null) + $(shell $(PKG_CONFIG) --libs --cflags openssl 2>/dev/null) -ldebugi= nfod =20 __BUILDXX =3D $(CXX) $(CXXFLAGS) -MD -Wall -Werror -o $@ $(patsubst %.bin,= %.cpp,$(@F)) $(LDFLAGS) BUILDXX =3D $(__BUILDXX) > $(@:.bin=3D.make.output) 2>&1 diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index 1488bf6e6078..b6984236859f 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -146,6 +146,10 @@ # include "test-libopenssl.c" #undef main =20 +#define main main_test_libdebuginfod +# include "test-libdebuginfod.c" +#undef main + int main(int argc, char *argv[]) { main_test_libpython(); @@ -178,6 +182,7 @@ int main(int argc, char *argv[]) main_test_libzstd(); main_test_libtraceevent(); main_test_libopenssl(); + main_test_libdebuginfod(); =20 return 0; } --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 485C5341AB6 for ; Thu, 14 May 2026 16:34:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776470; cv=none; b=gvaL5oqLKtOgygjvDeRXyMV0YR99QGBIHigWJ1hXzVzoyw5MB7431kDXIEX4aF3PhiaKAgudlNszCloVG++d87ocxzge5qaUCfUqxqDwCO7USdA2wWPhaiQ7IjFAHvQi51JZEBsROoiYI1wYBXYregqDyUT1lSmRXBnmst3Q3Uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776470; c=relaxed/simple; bh=NmwC00d0QWQWGqBtMbAJfgXctOaRXmTkUV/Rmk73Ex4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LE6AOzqq9gPVfNqKGvRIpUhGFtZXBgj7pl8Sq9p06jyHudiah2cBwjqTr7Yd5kCK10iNPFNhViKn7xRyClLHosPcoRFuzWMCv75RBk+iWq2qi3xbKqonDDCLYjYEHoSRkdmrcpmfON3D7Jnkq4WsBd0wLZ+5hu59gEkZgBnPwWk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cwSpbnf+; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cwSpbnf+" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2fded513994so4614559eec.1 for ; Thu, 14 May 2026 09:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776468; x=1779381268; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8aNoI7BbnJFryPpWBQvv00Uhu0X5ziO6QpZKLc8J78U=; b=cwSpbnf+GfHHNPFmPozjTBeQH8igQBSm1o77iWPF95NW8qxVax5QkRgto4VdE0dvJU ADatYnATYFlfc5AxEzSzL6O6SagoHlbYQ9H+2MmzqAsUINrYYciUeq6fLOTDQW0blzT/ hQoCZZXQAdP9WQ3KdBIZem4gNhYq107sLei/KaoudO9yh5Bg8zBuqCpMOSpk6iP0B1ds lFxl4SzoPRhJGOqs4haCSrrNuECI1Sh35CxlSAhCclR5NGlgrxm2y/kpi4jXeiui6noq cSCz+aa3bBulnmKH199/scLz8l0zChtb4chy3eAfIz+7e77VAQp/UVQy0ArCWsdcIXnC 4FNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776468; x=1779381268; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8aNoI7BbnJFryPpWBQvv00Uhu0X5ziO6QpZKLc8J78U=; b=IO+VFD57mUpaxiDNEUfz8PGiQFhvc1ebLF+KUP+oNT0vyAcZe0nMt12PY6VwsYReX0 c1jppQS0s6bZZ3rZhgcUvVS65ka10FWJ2fmuq7STqAnpwjd4ji2BDtPoHAxkVp0GRq4s fGMYkDuJwg7y1xoZnvPfZqpdl9Kz7kLWFtOLBOj1IbNGHrfDM7fuj6JPv5yThA/p1vCn rQyiJ1rQfVT92AppEb6DHtMBbkM5Nzp7aX2p00k1YVyOpgBZ+nYdvUdHZdD29EYxVUWt S2/va6CHEUuG6TJfStSVYJ42gttR9voL42ZSCppcQfRWg1Bl8Cz0rWPQjtV8q9YTvZyl c+QQ== X-Forwarded-Encrypted: i=1; AFNElJ8CAzCrs0BjG1Jkxi731BsESDN/X71+02JvnnzDDb6JrvXXBCd/nXhwpoc6mSizFV60+HOtORdxIGMUONc=@vger.kernel.org X-Gm-Message-State: AOJu0YykWPSsn5Wd+z8oN0sDzhu1vaLgyzmfUDAcQDY7i9kv7qCvPDNL jBbtbfPfXnUpgAxo7H6KkEYgD2ySDnr9no8VEnICsEFp4HmyVDq/y9A7oX3DpDQr1WI4+YIT+V7 hw221x05vMQ== X-Received: from dlaf13.prod.google.com ([2002:a05:701b:240d:b0:132:f6b7:e3c6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:128e:b0:133:3bb1:8d41 with SMTP id a92af1059eb24-1349ab4b325mr4887099c88.28.1778776467779; Thu, 14 May 2026 09:34:27 -0700 (PDT) Date: Thu, 14 May 2026 09:33:55 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-4-irogers@google.com> Subject: [PATCH v3 03/17] tools build: Fix test-clang-bpf-co-re.bin to generate target file From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In tools/build/feature/Makefile, the test-clang-bpf-co-re.bin feature check compiled test-clang-bpf-co-re.c assembly on stdout and piped it to grep, but never redirected the matched output to create the target binary () on disk. Because the target file was never created, Kbuild could never cache the result of the check. Consequently, Make treated the prerequisite as missing and continuously re-executed the Clang BPF backend compilation check on every single sub-make evaluation during build startup. Redirect grep output to to guarantee the file is created on disk upon success, allowing Kbuild to perfectly cache the detection result and avoid redundant sub-make forks. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/build/feature/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index dc828523b50a..c34faccdf28b 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -385,7 +385,7 @@ $(OUTPUT)test-libzstd.bin: =20 $(OUTPUT)test-clang-bpf-co-re.bin: $(CLANG) -S -g --target=3Dbpf -o - $(patsubst %.bin,%.c,$(@F)) | \ - grep BTF_KIND_VAR + grep BTF_KIND_VAR > $@.tmp && mv $@.tmp $@ =20 $(OUTPUT)test-file-handle.bin: $(BUILD) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1111A34403D for ; Thu, 14 May 2026 16:34:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776475; cv=none; b=eWGK3QnjJXnyRieuzJ49Rg4px7+Lh8FkJxuv/uQN/GubABACHTYrFOYDT9a7ohAi/3xZhRlV7wtw/nIbEyWhNPxe8hfMF46DAiOo9d4oV0K6/erKX7juMN0wvo29PdgDyOSsK8uEX8q74iPqC+OEVhdUnpYX+589h6A6wlZ8t70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776475; c=relaxed/simple; bh=RYmWHBqv1X7gzpQ5z9chKCDeOOZF1zXT0awheGA/+lY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TgZ84mL489Mr42Y+smfn/9zub8o6UCwtjB7fOAMGABBTMIUFFBsQCeVxjIsDiog7Ec0C6xGI8B/1DQQnM2xEPFlCVy+nVT+WFU/dmQkbsa+5ocqqjuAICf4Qxa8W95UTFOvok2QtJ5nRPQrmY5UTsQbZ3dBb/h6+uxYbDg2LVQs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TDlRO8kO; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TDlRO8kO" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-12dc3d81736so7451786c88.1 for ; Thu, 14 May 2026 09:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776470; x=1779381270; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UiN/vQcqn06zrk2n5Mmf8vlMNzati6v5+uMmnfxZgvM=; b=TDlRO8kO/mm0VRR509VVNsNnd+yTEfEw7VazK5YfMJH1OPVilsavvFY5JZcBy1Ju3G gwtwON47B+4jFFLSf687R2WUJJXZbJYvotdarcqzRtPBu+RWq0rnc9BV/WQzUBNmC7qA tV2pOgom1ojd4OEmx7TBLWrz6+ZDt17pqfenkUE9c4PbtNyfRqP9HrKWo/XzSGImohgc ZVAzz5GrJknE7kpAdsRshG7qjQOH0R8jXg5mBC7u/stFjLdEkLtV0MNK0MrtbcNqGjGy moAWbQtKLj4dTziBfPLhvlTt1mTzulRSTheV9cuG0f6wKt24JwKcAj+Gah4gvv2yZOHC glaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776470; x=1779381270; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UiN/vQcqn06zrk2n5Mmf8vlMNzati6v5+uMmnfxZgvM=; b=gRwif7fV5QVYqiNPGmwpa8BoXRiB3vu11jrsq/xDqL5Ri7V6OtbXFXXFHHdpWDFqGK LAi/QW5uJCgercHuIeQDl/D1dwfhmMVS25ucwl2I8AUP7U8aOYypkGx9ahTl/5y0MqTw +UNrWu2YCySHf0FdFIG1o1E8Npjx9n7CTShxn+UR3inbcym/zAHRaSO0PyktDY9mD/8v CLlx3DQP1vdRYg2w/jnvsGrfnWOP4FZ55UX36GBQteX3OowUujwbkILooup6fo0F+TgL NVGxXAvF5NOPDx46RleMmTDpMV8WNNc+xniQXLJvFcPelrJemI9y0U3+dU4em+Ojmjim o8Og== X-Forwarded-Encrypted: i=1; AFNElJ8BzVCjLgnuVo34j9sP1zuGRjM7WiiVg7YQ1nOZ61iiX0gASREv+2AB5lGxiUCu51zjhyyJ5C5EJOe/Fbw=@vger.kernel.org X-Gm-Message-State: AOJu0YxSIMtKEhQMVjOlZNL+7pqAJ0Dcr3FS/6BwgD/AjQVAaYBIQ+pU cYZCsV/y/CvGFhmGwWTxS18uCv87ea1fNCPQjpLuxrz/1JP5gtnQMRnJO61pGeGdZTUz0V0U5o8 0Bfh/9lufoA== X-Received: from dlbtx10.prod.google.com ([2002:a05:7022:fc0a:b0:132:8d92:4d73]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:907:b0:122:3a5:fc42 with SMTP id a92af1059eb24-1349ab4d166mr5031692c88.20.1778776469927; Thu, 14 May 2026 09:34:29 -0700 (PDT) Date: Thu, 14 May 2026 09:33:56 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-5-irogers@google.com> Subject: [PATCH v3 04/17] perf trace beauty: Make beauty generated C code standalone .o files From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previously, builtin-trace.c directly included 15 embedded C files (e.g. trace/beauty/mmap.c and fsconfig_arrays.c), which in turn depend on dozens of generated beauty script arrays. To satisfy these embedded inclusions, the global Makefile.perf would define all the generator variables/rules and include them in the massive sequential prepare umbrella target, choking parallel build startup. Furthermore, tools/perf/util/syscalltbl.c included its own generated mapper, and util/env.c conditionally included arch_errno_names.c inline, splitting consumers across directories and preventing clean Make encapsulation. Refactor the framework to achieve better encapsulation: 1. Move util/syscalltbl.[ch] into trace/beauty/ to co-locate with all generated code consumers. 2. Create fsconfig.c and flatten embedded beauty .c files to compile as independent standalone objects via trace/beauty/Build, exporting their formatting functions via beauty.h and env.h. Switch arch_errno_names.o and syscalltbl.o assignments directly to perf-util-y and add an unconditional top-level recursive kbuild hook (perf-util-y +=3D trace/be= auty/) to compile them into libperf-util.a, resolving remote linkage for util/e= nv.c, util/bpf-trace-summary.c, and standalone python extensions. 3. Bridge private opaque references (struct trace) securely via accessors trace__show_zeros() and trace__host(), avoiding header entanglements. 4. Consolidate all generator variables, script paths, and array generation rules entirely out of Makefile.perf and place them directly inside the exact local Build files where their output objects are compiled (trace/beauty/Build and trace/beauty/tracepoints/Build), binding prerequisites locally. Use directly inside generator recipes to guarantee dynamic directory creation before script redirection, and append across all rules to print clean, standardized GEN ... file.c output during compilation. 5. Clean up clean target to recursively remove the generated directory instead of relying on dozens of individual variables. This unchokes the "prepare" target parallel barrier, allows make to evaluate generation scripts purely locally where consumed, and flattens the tracepoi= nt formatting architecture. Testing a parallel build (make -j28 all from scratch) shows improvements: Before: real 0m28.689s user 2m38.490s sys 0m30.148s After: real 0m27.642s user 2m32.356s sys 0m26.683s So reclaiming ~9.6 seconds of raw CPU time and over 1 full second off overall real-world build latency, by overlapping sub-make startup and avoiding top-level double-parsing overhead. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Build | 2 + tools/perf/Makefile.perf | 282 +----------------- tools/perf/builtin-trace.c | 30 +- tools/perf/trace/beauty/Build | 280 +++++++++++++++++ tools/perf/trace/beauty/arch_errno_names.c | 2 + tools/perf/trace/beauty/arch_errno_names.sh | 2 +- tools/perf/trace/beauty/beauty.h | 60 ++++ tools/perf/trace/beauty/eventfd.c | 6 +- tools/perf/trace/beauty/fsconfig.c | 5 + tools/perf/trace/beauty/futex_op.c | 6 +- tools/perf/trace/beauty/futex_val3.c | 6 +- tools/perf/trace/beauty/mmap.c | 24 +- tools/perf/trace/beauty/mode_t.c | 6 +- tools/perf/trace/beauty/msg_flags.c | 8 +- tools/perf/trace/beauty/open_flags.c | 1 + tools/perf/trace/beauty/perf_event_open.c | 22 +- tools/perf/trace/beauty/pid.c | 5 +- tools/perf/trace/beauty/sched_policy.c | 8 +- tools/perf/trace/beauty/seccomp.c | 12 +- tools/perf/trace/beauty/signum.c | 6 +- tools/perf/trace/beauty/socket_type.c | 6 +- .../perf/{util =3D> trace/beauty}/syscalltbl.c | 0 .../perf/{util =3D> trace/beauty}/syscalltbl.h | 0 tools/perf/trace/beauty/tracepoints/Build | 22 ++ tools/perf/trace/beauty/waitid_options.c | 8 +- tools/perf/util/Build | 4 +- tools/perf/util/bpf-trace-summary.c | 2 +- tools/perf/util/env.c | 4 +- tools/perf/util/env.h | 1 + 29 files changed, 468 insertions(+), 352 deletions(-) create mode 100644 tools/perf/trace/beauty/fsconfig.c rename tools/perf/{util =3D> trace/beauty}/syscalltbl.c (100%) rename tools/perf/{util =3D> trace/beauty}/syscalltbl.h (100%) diff --git a/tools/perf/Build b/tools/perf/Build index b03cc59dabf8..e18c80a5c1bc 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -34,6 +34,8 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) perf-$(CONFIG_TRACE) +=3D trace/beauty/ endif =20 +perf-util-y +=3D trace/beauty/ + perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 perf-bench-y +=3D bench/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 0aba14f22a06..c81797ceec42 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -509,225 +509,6 @@ arm64-sysreg-defs-clean: $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=3D$(arm64_gen_sysreg_outdir) \ prefix=3D subdir=3D clean > /dev/null =20 -beauty_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/linux/ -beauty_uapi_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /linux/ -beauty_uapi_sound_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /sound/ -beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ -beauty_x86_arch_asm_uapi_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/= x86/include/uapi/asm/ - -linux_uapi_dir :=3D $(srctree)/tools/include/uapi/linux -asm_generic_uapi_dir :=3D $(srctree)/tools/include/uapi/asm-generic -arch_asm_uapi_dir :=3D $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/ -x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ - -beauty_outdir :=3D $(OUTPUT)trace/beauty/generated -beauty_ioctl_outdir :=3D $(beauty_outdir)/ioctl - -# Create output directory if not already present -$(shell [ -d '$(beauty_ioctl_outdir)' ] || mkdir -p '$(beauty_ioctl_outdir= )') - -syscall_array :=3D $(beauty_outdir)/syscalltbl.c -syscall_tbl :=3D $(srctree)/tools/perf/trace/beauty/syscalltbl.sh -syscall_tbl_data :=3D $(srctree)/tools/scripts/syscall.tbl \ - $(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl) - -$(syscall_array): $(syscall_tbl) $(syscall_tbl_data) - $(Q)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@ - -fs_at_flags_array :=3D $(beauty_outdir)/fs_at_flags_array.c -fs_at_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh - -$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl) - $(Q)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -clone_flags_array :=3D $(beauty_outdir)/clone_flags_array.c -clone_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/clone.sh - -$(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) - $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -drm_ioctl_array :=3D $(beauty_ioctl_outdir)/drm_ioctl_array.c -drm_hdr_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi/drm -drm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh - -$(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_i= octl_tbl) - $(Q)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@ - -fadvise_advice_array :=3D $(beauty_outdir)/fadvise_advice_array.c -fadvise_advice_tbl :=3D $(srctree)/tools/perf/trace/beauty/fadvise.sh - -$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advi= ce_tbl) - $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@ - -fsmount_arrays :=3D $(beauty_outdir)/fsmount_arrays.c -fsmount_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsmount.sh - -$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls) - $(Q)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@ - -fspick_arrays :=3D $(beauty_outdir)/fspick_arrays.c -fspick_tbls :=3D $(srctree)/tools/perf/trace/beauty/fspick.sh - -$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls) - $(Q)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir) > $@ - -fsconfig_arrays :=3D $(beauty_outdir)/fsconfig_arrays.c -fsconfig_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsconfig.sh - -$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls) - $(Q)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_dir) > $@ - -pkey_alloc_access_rights_array :=3D $(beauty_outdir)/pkey_alloc_access_rig= hts_array.c -asm_generic_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ -pkey_alloc_access_rights_tbl :=3D $(srctree)/tools/perf/trace/beauty/pkey_= alloc_access_rights.sh - -$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(= pkey_alloc_access_rights_tbl) - $(Q)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_generic_hdr_dir) > $@ - -sndrv_ctl_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c -sndrv_ctl_hdr_dir :=3D $(srctree)/tools/include/uapi/sound -sndrv_ctl_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioct= l.sh - -$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_io= ctl_tbl) - $(Q)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@ - -sndrv_pcm_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c -sndrv_pcm_hdr_dir :=3D $(srctree)/tools/include/uapi/sound -sndrv_pcm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioct= l.sh - -$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_io= ctl_tbl) - $(Q)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@ - -kcmp_type_array :=3D $(beauty_outdir)/kcmp_type_array.c -kcmp_hdr_dir :=3D $(srctree)/tools/include/uapi/linux/ -kcmp_type_tbl :=3D $(srctree)/tools/perf/trace/beauty/kcmp_type.sh - -$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl) - $(Q)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@ - -kvm_ioctl_array :=3D $(beauty_ioctl_outdir)/kvm_ioctl_array.c -kvm_hdr_dir :=3D $(srctree)/tools/include/uapi/linux -kvm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh - -$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl) - $(Q)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@ - -socket_arrays :=3D $(beauty_outdir)/socket.c -socket_tbl :=3D $(srctree)/tools/perf/trace/beauty/socket.sh - -$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(so= cket_tbl) - $(Q)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beauty_linux_dir) > $@ - -sockaddr_arrays :=3D $(beauty_outdir)/sockaddr.c -sockaddr_tbl :=3D $(srctree)/tools/perf/trace/beauty/sockaddr.sh - -$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl) - $(Q)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@ - -vhost_virtio_ioctl_array :=3D $(beauty_ioctl_outdir)/vhost_virtio_ioctl_ar= ray.c -vhost_virtio_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/vhost_virti= o_ioctl.sh - -$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virt= io_ioctl_tbl) - $(Q)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@ - -perf_ioctl_array :=3D $(beauty_ioctl_outdir)/perf_ioctl_array.c -perf_hdr_dir :=3D $(srctree)/tools/include/uapi/linux -perf_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh - -$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl) - $(Q)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@ - -madvise_behavior_array :=3D $(beauty_outdir)/madvise_behavior_array.c -madvise_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ -madvise_behavior_tbl :=3D $(srctree)/tools/perf/trace/beauty/madvise_behav= ior.sh - -$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_beha= vior_tbl) - $(Q)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_dir) > $@ - -mmap_flags_array :=3D $(beauty_outdir)/mmap_flags_array.c -mmap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_flags.sh - -$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman= .h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl) - $(Q)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(asm_generic_uapi_dir= ) $(arch_asm_uapi_dir) > $@ - -mremap_flags_array :=3D $(beauty_outdir)/mremap_flags_array.c -mremap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mremap_flags.sh - -$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl) - $(Q)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) > $@ - -mount_flags_array :=3D $(beauty_outdir)/mount_flags_array.c -mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mount_flags.sh - -$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl) - $(Q)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -move_mount_flags_array :=3D $(beauty_outdir)/move_mount_flags_array.c -move_mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/move_mount_fl= ags.sh - -$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_f= lags_tbl) - $(Q)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -mmap_prot_array :=3D $(beauty_outdir)/mmap_prot_array.c -mmap_prot_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_prot.sh - -$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)= /mman-common.h $(mmap_prot_tbl) - $(Q)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_dir) $(arch_asm_uapi_d= ir) > $@ - -prctl_option_array :=3D $(beauty_outdir)/prctl_option_array.c -prctl_option_tbl :=3D $(srctree)/tools/perf/trace/beauty/prctl_option.sh - -$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl) - $(Q)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linux_dir) > $@ - -usbdevfs_ioctl_array :=3D $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c -usbdevfs_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.= sh - -$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevf= s_ioctl_tbl) - $(Q)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@ - -x86_arch_prctl_code_array :=3D $(beauty_outdir)/x86_arch_prctl_code_array.c -x86_arch_prctl_code_tbl :=3D $(srctree)/tools/perf/trace/beauty/x86_arch_p= rctl.sh - -$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x8= 6_arch_prctl_code_tbl) - $(Q)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x86_arch_asm_uapi_dir)= > $@ - -x86_arch_irq_vectors_array :=3D $(beauty_outdir)/x86_arch_irq_vectors_arra= y.c -x86_arch_irq_vectors_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoin= ts/x86_irq_vectors.sh - -$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_= arch_irq_vectors_tbl) - $(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@ - -x86_arch_MSRs_array :=3D $(beauty_outdir)/x86_arch_MSRs_array.c -x86_arch_MSRs_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoints/x86_= msr.sh - -$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tb= l) - $(Q)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_dir) > $@ - -rename_flags_array :=3D $(beauty_outdir)/rename_flags_array.c -rename_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/rename_flags.sh - -$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl) - $(Q)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -arch_errno_name_array :=3D $(beauty_outdir)/arch_errno_name_array.c -arch_errno_hdr_dir :=3D $(srctree)/tools -arch_errno_tbl :=3D $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh - -$(arch_errno_name_array): $(arch_errno_tbl) - $(Q)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr= _dir) > $@ - -statx_mask_array :=3D $(beauty_outdir)/statx_mask_array.c -statx_mask_tbl :=3D $(srctree)/tools/perf/trace/beauty/statx_mask.sh - -$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl) - $(Q)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_dir) > $@ - -sync_file_range_arrays :=3D $(beauty_outdir)/sync_file_range_arrays.c -sync_file_range_tbls :=3D $(srctree)/tools/perf/trace/beauty/sync_file_ran= ge.sh - -$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range= _tbls) - $(Q)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_linux_dir) > $@ =20 TESTS_CORESIGHT_DIR :=3D $(srctree)/tools/perf/tests/shell/coresight =20 @@ -848,38 +629,6 @@ build-dir =3D $(or $(__build-dir),.) =20 prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \ arm64-sysreg-defs \ - $(syscall_array) \ - $(fs_at_flags_array) \ - $(clone_flags_array) \ - $(drm_ioctl_array) \ - $(fadvise_advice_array) \ - $(fsconfig_arrays) \ - $(fsmount_arrays) \ - $(fspick_arrays) \ - $(pkey_alloc_access_rights_array) \ - $(sndrv_pcm_ioctl_array) \ - $(sndrv_ctl_ioctl_array) \ - $(kcmp_type_array) \ - $(kvm_ioctl_array) \ - $(socket_arrays) \ - $(sockaddr_arrays) \ - $(vhost_virtio_ioctl_array) \ - $(madvise_behavior_array) \ - $(mmap_flags_array) \ - $(mmap_prot_array) \ - $(mremap_flags_array) \ - $(mount_flags_array) \ - $(move_mount_flags_array) \ - $(perf_ioctl_array) \ - $(prctl_option_array) \ - $(usbdevfs_ioctl_array) \ - $(x86_arch_irq_vectors_array) \ - $(x86_arch_MSRs_array) \ - $(x86_arch_prctl_code_array) \ - $(rename_flags_array) \ - $(arch_errno_name_array) \ - $(statx_mask_array) \ - $(sync_file_range_arrays) \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ @@ -1299,35 +1048,8 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)= -clean $(LIBSYMBOL)-clean $( TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE \ $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c \ - $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \ - $(OUTPUT)$(fadvise_advice_array) \ - $(OUTPUT)$(fsconfig_arrays) \ - $(OUTPUT)$(fsmount_arrays) \ - $(OUTPUT)$(fspick_arrays) \ - $(OUTPUT)$(madvise_behavior_array) \ - $(OUTPUT)$(mmap_flags_array) \ - $(OUTPUT)$(mmap_prot_array) \ - $(OUTPUT)$(mremap_flags_array) \ - $(OUTPUT)$(mount_flags_array) \ - $(OUTPUT)$(move_mount_flags_array) \ - $(OUTPUT)$(drm_ioctl_array) \ - $(OUTPUT)$(pkey_alloc_access_rights_array) \ - $(OUTPUT)$(sndrv_ctl_ioctl_array) \ - $(OUTPUT)$(sndrv_pcm_ioctl_array) \ - $(OUTPUT)$(kvm_ioctl_array) \ - $(OUTPUT)$(kcmp_type_array) \ - $(OUTPUT)$(socket_arrays) \ - $(OUTPUT)$(sockaddr_arrays) \ - $(OUTPUT)$(vhost_virtio_ioctl_array) \ - $(OUTPUT)$(perf_ioctl_array) \ - $(OUTPUT)$(prctl_option_array) \ - $(OUTPUT)$(usbdevfs_ioctl_array) \ - $(OUTPUT)$(x86_arch_irq_vectors_array) \ - $(OUTPUT)$(x86_arch_MSRs_array) \ - $(OUTPUT)$(x86_arch_prctl_code_array) \ - $(OUTPUT)$(rename_flags_array) \ - $(OUTPUT)$(arch_errno_name_array) \ - $(OUTPUT)$(sync_file_range_arrays) + $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c + $(Q)$(RM) -r $(OUTPUT)trace/beauty/generated $(call QUIET_CLEAN, Documentation) \ $(MAKE) -C $(DOC_DIR) O=3D$(OUTPUT) clean >/dev/null =20 diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e58c49d047a2..e6fe8e13f4e7 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -60,12 +60,13 @@ #include "callchain.h" #include "print_binary.h" #include "string2.h" -#include "syscalltbl.h" +#include "trace/beauty/syscalltbl.h" #include "../perf.h" #include "trace_augment.h" #include "dwarf-regs.h" =20 #include +#include #include #include #include @@ -234,6 +235,16 @@ struct trace { const char *uid_str; }; =20 +bool trace__show_zeros(const struct trace *trace) +{ + return trace->show_zeros; +} + +struct machine *trace__host(const struct trace *trace) +{ + return trace->host; +} + static void trace__load_vmlinux_btf(struct trace *trace __maybe_unused) { #ifdef HAVE_LIBBPF_SUPPORT @@ -776,9 +787,7 @@ static const char *fsmount_flags[] =3D { }; static DEFINE_STRARRAY(fsmount_flags, "FSMOUNT_"); =20 -#include "trace/beauty/generated/fsconfig_arrays.c" =20 -static DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_"); =20 static const char *epoll_ctl_ops[] =3D { "ADD", "DEL", "MOD", }; static DEFINE_STRARRAY_OFFSET(epoll_ctl_ops, "EPOLL_CTL_", 1); @@ -1128,20 +1137,7 @@ static bool syscall_arg__strtoul_btf_type(char *bf _= _maybe_unused, size_t size _ .parm =3D &strarray__##array, \ .show_zero =3D true, } =20 -#include "trace/beauty/eventfd.c" -#include "trace/beauty/futex_op.c" -#include "trace/beauty/futex_val3.c" -#include "trace/beauty/mmap.c" -#include "trace/beauty/mode_t.c" -#include "trace/beauty/msg_flags.c" -#include "trace/beauty/open_flags.c" -#include "trace/beauty/perf_event_open.c" -#include "trace/beauty/pid.c" -#include "trace/beauty/sched_policy.c" -#include "trace/beauty/seccomp.c" -#include "trace/beauty/signum.c" -#include "trace/beauty/socket_type.c" -#include "trace/beauty/waitid_options.c" + =20 static const struct syscall_fmt syscall_fmts[] =3D { { .name =3D "access", diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build index 561590ee8cda..83c1919ecebd 100644 --- a/tools/perf/trace/beauty/Build +++ b/tools/perf/trace/beauty/Build @@ -19,6 +19,23 @@ perf-y +=3D socket.o perf-y +=3D statx.o perf-y +=3D sync_file_range.o perf-y +=3D timespec.o +perf-util-y +=3D syscalltbl.o +perf-y +=3D fsconfig.o +perf-y +=3D eventfd.o +perf-y +=3D futex_op.o +perf-y +=3D futex_val3.o +perf-y +=3D mmap.o +perf-y +=3D mode_t.o +perf-y +=3D msg_flags.o +perf-y +=3D open_flags.o +perf-y +=3D perf_event_open.o +perf-y +=3D pid.o +perf-y +=3D sched_policy.o +perf-y +=3D seccomp.o +perf-y +=3D signum.o +perf-y +=3D socket_type.o +perf-y +=3D waitid_options.o +perf-util-y +=3D arch_errno_names.o perf-y +=3D tracepoints/ =20 ifdef SHELLCHECK @@ -34,3 +51,266 @@ $(OUTPUT)%.shellcheck_log: % $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && f= alse) =20 perf-y +=3D $(SHELL_TEST_LOGS) + +# --- Encapsulated Beauty Generation Rules --- +beauty_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/linux/ +beauty_uapi_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /linux/ +beauty_uapi_sound_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /sound/ +beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ +beauty_x86_arch_asm_uapi_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/= x86/include/uapi/asm/ + +linux_uapi_dir :=3D $(srctree)/tools/include/uapi/linux +asm_generic_uapi_dir :=3D $(srctree)/tools/include/uapi/asm-generic +arch_asm_uapi_dir :=3D $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/ +x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ + +beauty_outdir :=3D $(OUTPUT)trace/beauty/generated +beauty_ioctl_outdir :=3D $(beauty_outdir)/ioctl + +# Output directories are dynamically created by $(call rule_mkdir) in reci= pes + +syscall_array :=3D $(beauty_outdir)/syscalltbl.c +syscall_tbl :=3D $(srctree)/tools/perf/trace/beauty/syscalltbl.sh +syscall_tbl_data :=3D $(srctree)/tools/scripts/syscall.tbl \ + $(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl) + +$(syscall_array): $(syscall_tbl) $(syscall_tbl_data) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@ + +fs_at_flags_array :=3D $(beauty_outdir)/fs_at_flags_array.c +fs_at_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh + +$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +clone_flags_array :=3D $(beauty_outdir)/clone_flags_array.c +clone_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/clone.sh + +$(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +drm_ioctl_array :=3D $(beauty_ioctl_outdir)/drm_ioctl_array.c +drm_hdr_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi/drm +drm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh + +$(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_i= octl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@ + +fadvise_advice_array :=3D $(beauty_outdir)/fadvise_advice_array.c +fadvise_advice_tbl :=3D $(srctree)/tools/perf/trace/beauty/fadvise.sh + +$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advi= ce_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_li= nux_dir) > $@ + +fsmount_arrays :=3D $(beauty_outdir)/fsmount_arrays.c +fsmount_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsmount.sh + +$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_di= r) > $@ + +fspick_arrays :=3D $(beauty_outdir)/fspick_arrays.c +fspick_tbls :=3D $(srctree)/tools/perf/trace/beauty/fspick.sh + +$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir= ) > $@ + +fsconfig_arrays :=3D $(beauty_outdir)/fsconfig_arrays.c +fsconfig_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsconfig.sh + +$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_d= ir) > $@ + +pkey_alloc_access_rights_array :=3D $(beauty_outdir)/pkey_alloc_access_rig= hts_array.c +asm_generic_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ +pkey_alloc_access_rights_tbl :=3D $(srctree)/tools/perf/trace/beauty/pkey_= alloc_access_rights.sh + +$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(= pkey_alloc_access_rights_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_= generic_hdr_dir) > $@ + +sndrv_ctl_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c +sndrv_ctl_hdr_dir :=3D $(srctree)/tools/include/uapi/sound +sndrv_ctl_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioct= l.sh + +$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_io= ctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_s= ound_dir) > $@ + +sndrv_pcm_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c +sndrv_pcm_hdr_dir :=3D $(srctree)/tools/include/uapi/sound +sndrv_pcm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioct= l.sh + +$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_io= ctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_s= ound_dir) > $@ + +kcmp_type_array :=3D $(beauty_outdir)/kcmp_type_array.c +kcmp_hdr_dir :=3D $(srctree)/tools/include/uapi/linux/ +kcmp_type_tbl :=3D $(srctree)/tools/perf/trace/beauty/kcmp_type.sh + +$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@ + +kvm_ioctl_array :=3D $(beauty_ioctl_outdir)/kvm_ioctl_array.c +kvm_hdr_dir :=3D $(srctree)/tools/include/uapi/linux +kvm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh + +$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@ + +socket_arrays :=3D $(beauty_outdir)/socket.c +socket_tbl :=3D $(srctree)/tools/perf/trace/beauty/socket.sh + +$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(so= cket_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beau= ty_linux_dir) > $@ + +sockaddr_arrays :=3D $(beauty_outdir)/sockaddr.c +sockaddr_tbl :=3D $(srctree)/tools/perf/trace/beauty/sockaddr.sh + +$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > = $@ + +vhost_virtio_ioctl_array :=3D $(beauty_ioctl_outdir)/vhost_virtio_ioctl_ar= ray.c +vhost_virtio_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/vhost_virti= o_ioctl.sh + +$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virt= io_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uap= i_linux_dir) > $@ + +perf_ioctl_array :=3D $(beauty_ioctl_outdir)/perf_ioctl_array.c +perf_hdr_dir :=3D $(srctree)/tools/include/uapi/linux +perf_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh + +$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@ + +madvise_behavior_array :=3D $(beauty_outdir)/madvise_behavior_array.c +madvise_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ +madvise_behavior_tbl :=3D $(srctree)/tools/perf/trace/beauty/madvise_behav= ior.sh + +$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_beha= vior_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_= dir) > $@ + +mmap_flags_array :=3D $(beauty_outdir)/mmap_flags_array.c +mmap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_flags.sh + +$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman= .h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(= asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@ + +mremap_flags_array :=3D $(beauty_outdir)/mremap_flags_array.c +mremap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mremap_flags.sh + +$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) = > $@ + +mount_flags_array :=3D $(beauty_outdir)/mount_flags_array.c +mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mount_flags.sh + +$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +move_mount_flags_array :=3D $(beauty_outdir)/move_mount_flags_array.c +move_mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/move_mount_fl= ags.sh + +$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_f= lags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_= linux_dir) > $@ + +mmap_prot_array :=3D $(beauty_outdir)/mmap_prot_array.c +mmap_prot_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_prot.sh + +$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)= /mman-common.h $(mmap_prot_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_di= r) $(arch_asm_uapi_dir) > $@ + +prctl_option_array :=3D $(beauty_outdir)/prctl_option_array.c +prctl_option_tbl :=3D $(srctree)/tools/perf/trace/beauty/prctl_option.sh + +$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linu= x_dir) > $@ + +usbdevfs_ioctl_array :=3D $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c +usbdevfs_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.= sh + +$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevf= s_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_li= nux_dir) > $@ + +x86_arch_prctl_code_array :=3D $(beauty_outdir)/x86_arch_prctl_code_array.c +x86_arch_prctl_code_tbl :=3D $(srctree)/tools/perf/trace/beauty/x86_arch_p= rctl.sh + +$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x8= 6_arch_prctl_code_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x8= 6_arch_asm_uapi_dir) > $@ + + +rename_flags_array :=3D $(beauty_outdir)/rename_flags_array.c +rename_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/rename_flags.sh + +$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linu= x_dir) > $@ + + +statx_mask_array :=3D $(beauty_outdir)/statx_mask_array.c +statx_mask_tbl :=3D $(srctree)/tools/perf/trace/beauty/statx_mask.sh + +$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_= dir) > $@ + +sync_file_range_arrays :=3D $(beauty_outdir)/sync_file_range_arrays.c +sync_file_range_tbls :=3D $(srctree)/tools/perf/trace/beauty/sync_file_ran= ge.sh + +$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range= _tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_= linux_dir) > $@ + +# --- Precise Local Prerequisites Binding --- +$(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array) +$(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays) +$(OUTPUT)trace/beauty/clone.o: $(clone_flags_array) +$(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array) +$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays) +$(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays) +$(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array)= $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(= perf_ioctl_array) $(usbdevfs_ioctl_array) +$(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array) +$(OUTPUT)trace/beauty/mmap.o: $(mmap_prot_array) $(mmap_flags_array) $(mre= map_flags_array) $(madvise_behavior_array) +$(OUTPUT)trace/beauty/mount_flags.o: $(mount_flags_array) +$(OUTPUT)trace/beauty/move_mount.o: $(move_mount_flags_array) +$(OUTPUT)trace/beauty/pkey_alloc.o: $(pkey_alloc_access_rights_array) +$(OUTPUT)trace/beauty/prctl.o: $(prctl_option_array) +$(OUTPUT)trace/beauty/renameat.o: $(rename_flags_array) +$(OUTPUT)trace/beauty/sockaddr.o: $(sockaddr_arrays) +$(OUTPUT)trace/beauty/socket.o: $(socket_arrays) +$(OUTPUT)trace/beauty/statx.o: $(statx_mask_array) +$(OUTPUT)trace/beauty/sync_file_range.o: $(sync_file_range_arrays) +$(OUTPUT)trace/beauty/arch_prctl.o: $(x86_arch_prctl_code_array) + +arch_errno_name_array :=3D $(beauty_outdir)/arch_errno_name_array.c +arch_errno_hdr_dir :=3D $(srctree)/tools +arch_errno_tbl :=3D $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh + +$(arch_errno_name_array): $(arch_errno_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC= ))' $(arch_errno_hdr_dir) > $@ + +$(OUTPUT)trace/beauty/arch_errno_names.o: $(arch_errno_name_array) diff --git a/tools/perf/trace/beauty/arch_errno_names.c b/tools/perf/trace/= beauty/arch_errno_names.c index ede031c3a9e0..156c6537e747 100644 --- a/tools/perf/trace/beauty/arch_errno_names.c +++ b/tools/perf/trace/beauty/arch_errno_names.c @@ -1 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "util/env.h" #include "trace/beauty/generated/arch_errno_name_array.c" diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace= /beauty/arch_errno_names.sh index b22890b8d272..d48d8561a7bb 100755 --- a/tools/perf/trace/beauty/arch_errno_names.sh +++ b/tools/perf/trace/beauty/arch_errno_names.sh @@ -57,7 +57,7 @@ create_arch_errno_table_func() archlist=3D"$1" default=3D"$2" =20 - printf 'static arch_syscalls__strerrno_t *\n' + printf 'arch_syscalls__strerrno_t *\n' printf 'arch_syscalls__strerrno_function(const char *arch)\n' printf '{\n' for arch in $archlist; do diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/bea= uty.h index 0a07ad158f87..931c4a80fea9 100644 --- a/tools/perf/trace/beauty/beauty.h +++ b/tools/perf/trace/beauty/beauty.h @@ -35,6 +35,8 @@ bool strarray__strtoul(struct strarray *sa, char *bf, siz= e_t size, u64 *ret); bool strarray__strtoul_flags(struct strarray *sa, char *bf, size_t size, u= 64 *ret); =20 struct trace; +bool trace__show_zeros(const struct trace *trace); +struct machine *trace__host(const struct trace *trace); struct thread; =20 struct file { @@ -265,4 +267,62 @@ size_t open__scnprintf_flags(unsigned long flags, char= *bf, size_t size, bool sh void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg = *arg)); =20 +extern struct strarray strarray__fsconfig_cmds; + +size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct = syscall_arg *arg); +#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags + +size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct sysca= ll_arg *arg); +#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op + +size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3 + +size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct sysc= all_arg *arg); +#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot + +extern struct strarray strarray__mmap_flags; + +size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags + +size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct s= yscall_arg *arg); +#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags + +size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, stru= ct syscall_arg *arg); +#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior + +size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall= _arg *arg); +#define SCA_MODE_T syscall_arg__scnprintf_mode_t + +size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, struct sysc= all_arg *arg); +#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags + +size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags + +size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struc= t syscall_arg *arg); +#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr +#define SCA_PERF_ATTR_FROM_USER(argname) \ + { .scnprintf =3D SCA_PERF_ATTR, \ + .from_user =3D true, } + +size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, struct s= yscall_arg *arg); +#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy + +size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op + +size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, struct = syscall_arg *arg); +#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags + +size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall= _arg *arg); +#define SCA_SIGNUM syscall_arg__scnprintf_signum + +size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct sy= scall_arg *arg); +#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type + +size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, struct= syscall_arg *arg); +#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options + #endif /* _PERF_TRACE_BEAUTY_H */ diff --git a/tools/perf/trace/beauty/eventfd.c b/tools/perf/trace/beauty/ev= entfd.c index 4bab106213c6..3fc552c9c360 100644 --- a/tools/perf/trace/beauty/eventfd.c +++ b/tools/perf/trace/beauty/eventfd.c @@ -11,7 +11,9 @@ #define EFD_CLOEXEC 02000000 #endif =20 -static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, = struct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct = syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "EFD_"; @@ -36,4 +38,4 @@ static size_t syscall_arg__scnprintf_eventfd_flags(char *= bf, size_t size, struct return printed; } =20 -#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags + diff --git a/tools/perf/trace/beauty/fsconfig.c b/tools/perf/trace/beauty/f= sconfig.c new file mode 100644 index 000000000000..98aa05315673 --- /dev/null +++ b/tools/perf/trace/beauty/fsconfig.c @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "trace/beauty/generated/fsconfig_arrays.c" + +DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_"); diff --git a/tools/perf/trace/beauty/futex_op.c b/tools/perf/trace/beauty/f= utex_op.c index 00365156782b..fb627780d381 100644 --- a/tools/perf/trace/beauty/futex_op.c +++ b/tools/perf/trace/beauty/futex_op.c @@ -17,7 +17,9 @@ #define FUTEX_CLOCK_REALTIME 256 #endif =20 -static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struc= t syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct sysca= ll_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "FUTEX_"; @@ -60,4 +62,4 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, s= ize_t size, struct sysc return printed; } =20 -#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op + diff --git a/tools/perf/trace/beauty/futex_val3.c b/tools/perf/trace/beauty= /futex_val3.c index 9114f7620571..d4d2fb117d39 100644 --- a/tools/perf/trace/beauty/futex_val3.c +++ b/tools/perf/trace/beauty/futex_val3.c @@ -5,7 +5,9 @@ #define FUTEX_BITSET_MATCH_ANY 0xffffffff #endif =20 -static size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, str= uct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct sys= call_arg *arg) { const char *prefix =3D "FUTEX_BITSET_"; unsigned int bitset =3D arg->val; @@ -16,4 +18,4 @@ static size_t syscall_arg__scnprintf_futex_val3(char *bf,= size_t size, struct sy return scnprintf(bf, size, "%#xd", bitset); } =20 -#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3 + diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 3c5e97b93dd5..f1a1012fd2a0 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 #include +#include "trace/beauty/beauty.h" =20 #include "trace/beauty/generated/mmap_prot_array.c" static DEFINE_STRARRAY(mmap_prot, "PROT_"); @@ -8,8 +9,7 @@ static size_t mmap__scnprintf_prot(unsigned long prot, char= *bf, size_t size, bo { return strarray__scnprintf_flags(&strarray__mmap_prot, bf, size, sh= ow_prefix, prot); } - -static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, stru= ct syscall_arg *arg) +size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct sysc= all_arg *arg) { unsigned long prot =3D arg->val; =20 @@ -19,18 +19,18 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf= , size_t size, struct sys return mmap__scnprintf_prot(prot, bf, size, arg->show_string_prefix); } =20 -#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot + =20 #include "trace/beauty/generated/mmap_flags_array.c" -static DEFINE_STRARRAY(mmap_flags, "MAP_"); +DEFINE_STRARRAY(mmap_flags, "MAP_"); =20 static size_t mmap__scnprintf_flags(unsigned long flags, char *bf, size_t = size, bool show_prefix) { return strarray__scnprintf_flags(&strarray__mmap_flags, bf, size, s= how_prefix, flags); } =20 -static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, + struct syscall_arg *arg) { unsigned long flags =3D arg->val; =20 @@ -40,7 +40,7 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf,= size_t size, return mmap__scnprintf_flags(flags, bf, size, arg->show_string_prefix); } =20 -#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags + =20 #include "trace/beauty/generated/mremap_flags_array.c" static DEFINE_STRARRAY(mremap_flags, "MREMAP_"); @@ -50,7 +50,7 @@ static size_t mremap__scnprintf_flags(unsigned long flags= , char *bf, size_t size return strarray__scnprintf_flags(&strarray__mremap_flags, bf, size,= show_prefix, flags); } =20 -static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, s= truct syscall_arg *arg) +size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct s= yscall_arg *arg) { unsigned long flags =3D arg->val; =20 @@ -60,7 +60,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *b= f, size_t size, struct return mremap__scnprintf_flags(flags, bf, size, arg->show_string_prefix); } =20 -#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags + =20 static size_t madvise__scnprintf_behavior(int behavior, char *bf, size_t s= ize) { @@ -73,10 +73,10 @@ static size_t madvise__scnprintf_behavior(int behavior,= char *bf, size_t size) return scnprintf(bf, size, "%#", behavior); } =20 -static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t siz= e, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, + struct syscall_arg *arg) { return madvise__scnprintf_behavior(arg->val, bf, size); } =20 -#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior + diff --git a/tools/perf/trace/beauty/mode_t.c b/tools/perf/trace/beauty/mod= e_t.c index 29a8fadfb7f9..7d7f89229513 100644 --- a/tools/perf/trace/beauty/mode_t.c +++ b/tools/perf/trace/beauty/mode_t.c @@ -20,7 +20,9 @@ #define S_IXUGO (S_IXUSR|S_IXGRP|S_IXOTH) #endif =20 -static size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct = syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall= _arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "S_"; @@ -68,4 +70,4 @@ static size_t syscall_arg__scnprintf_mode_t(char *bf, siz= e_t size, struct syscal return printed; } =20 -#define SCA_MODE_T syscall_arg__scnprintf_mode_t + diff --git a/tools/perf/trace/beauty/msg_flags.c b/tools/perf/trace/beauty/= msg_flags.c index 2da581ff0c80..5721b2bee99f 100644 --- a/tools/perf/trace/beauty/msg_flags.c +++ b/tools/perf/trace/beauty/msg_flags.c @@ -27,8 +27,10 @@ # define MSG_CMSG_CLOEXEC 0x40000000 #endif =20 -static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, - struct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "MSG_"; @@ -73,4 +75,4 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, = size_t size, return printed; } =20 -#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags + diff --git a/tools/perf/trace/beauty/open_flags.c b/tools/perf/trace/beauty= /open_flags.c index 78f6566ef110..a0396f9732ad 100644 --- a/tools/perf/trace/beauty/open_flags.c +++ b/tools/perf/trace/beauty/open_flags.c @@ -2,6 +2,7 @@ #include #include #include +#include "trace/beauty/beauty.h" =20 #ifndef O_DIRECT #define O_DIRECT 00040000 diff --git a/tools/perf/trace/beauty/perf_event_open.c b/tools/perf/trace/b= eauty/perf_event_open.c index 9f1ed989c775..d4e0f7816423 100644 --- a/tools/perf/trace/beauty/perf_event_open.c +++ b/tools/perf/trace/beauty/perf_event_open.c @@ -1,4 +1,7 @@ // SPDX-License-Identifier: LGPL-2.1 +#include +#include "util/evsel_fprintf.h" + #ifndef PERF_FLAG_FD_NO_GROUP # define PERF_FLAG_FD_NO_GROUP (1UL << 0) #endif @@ -15,8 +18,10 @@ # define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */ #endif =20 -static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, - struct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "PERF_"; @@ -43,7 +48,7 @@ static size_t syscall_arg__scnprintf_perf_flags(char *bf,= size_t size, return printed; } =20 -#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags + =20 struct attr_fprintf_args { size_t size, printed; @@ -76,10 +81,11 @@ static size_t perf_event_attr___scnprintf(struct perf_e= vent_attr *attr, char *bf =20 static size_t syscall_arg__scnprintf_augmented_perf_event_attr(struct sysc= all_arg *arg, char *bf, size_t size) { - return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf= , size, arg->trace->show_zeros); + return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf= , size, + trace__show_zeros(arg->trace)); } =20 -static size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size= , struct syscall_arg *arg) +size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struc= t syscall_arg *arg) { if (arg->augmented.args) return syscall_arg__scnprintf_augmented_perf_event_attr(arg, bf, size); @@ -87,8 +93,4 @@ static size_t syscall_arg__scnprintf_perf_event_attr(char= *bf, size_t size, stru return scnprintf(bf, size, "%#lx", arg->val); } =20 -#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr -// 'argname' is just documentational at this point, to remove the previous= comment with that info -#define SCA_PERF_ATTR_FROM_USER(argname) \ - { .scnprintf =3D SCA_PERF_ATTR, \ - .from_user =3D true, } + diff --git a/tools/perf/trace/beauty/pid.c b/tools/perf/trace/beauty/pid.c index 8f9c9950f8ba..cca4a3a5d9bd 100644 --- a/tools/perf/trace/beauty/pid.c +++ b/tools/perf/trace/beauty/pid.c @@ -1,11 +1,14 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "util/machine.h" +#include "util/thread.h" =20 size_t syscall_arg__scnprintf_pid(char *bf, size_t size, struct syscall_ar= g *arg) { int pid =3D arg->val; struct trace *trace =3D arg->trace; size_t printed =3D scnprintf(bf, size, "%d", pid); - struct thread *thread =3D machine__findnew_thread(trace->host, pid, pid); + struct thread *thread =3D machine__findnew_thread(trace__host(trace), pid= , pid); =20 if (thread !=3D NULL) { if (!thread__comm_set(thread)) diff --git a/tools/perf/trace/beauty/sched_policy.c b/tools/perf/trace/beau= ty/sched_policy.c index 68aa59eeed8d..7f7928d396be 100644 --- a/tools/perf/trace/beauty/sched_policy.c +++ b/tools/perf/trace/beauty/sched_policy.c @@ -14,8 +14,10 @@ #define SCHED_RESET_ON_FORK 0x40000000 #endif =20 -static size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, - struct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SCHED_"; @@ -47,4 +49,4 @@ static size_t syscall_arg__scnprintf_sched_policy(char *b= f, size_t size, return printed; } =20 -#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy + diff --git a/tools/perf/trace/beauty/seccomp.c b/tools/perf/trace/beauty/se= ccomp.c index 637722e2796b..b04555a364e2 100644 --- a/tools/perf/trace/beauty/seccomp.c +++ b/tools/perf/trace/beauty/seccomp.c @@ -6,7 +6,9 @@ #define SECCOMP_SET_MODE_FILTER 1 #endif =20 -static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, str= uct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct sys= call_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_SET_MODE_"; @@ -24,14 +26,14 @@ static size_t syscall_arg__scnprintf_seccomp_op(char *b= f, size_t size, struct sy return printed; } =20 -#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op + =20 #ifndef SECCOMP_FILTER_FLAG_TSYNC #define SECCOMP_FILTER_FLAG_TSYNC 1 #endif =20 -static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_FILTER_FLAG_"; @@ -52,4 +54,4 @@ static size_t syscall_arg__scnprintf_seccomp_flags(char *= bf, size_t size, return printed; } =20 -#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags + diff --git a/tools/perf/trace/beauty/signum.c b/tools/perf/trace/beauty/sig= num.c index 21220c56500a..0303a6e298c8 100644 --- a/tools/perf/trace/beauty/signum.c +++ b/tools/perf/trace/beauty/signum.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 #include =20 -static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct = syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall= _arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SIG"; @@ -54,4 +56,4 @@ static size_t syscall_arg__scnprintf_signum(char *bf, siz= e_t size, struct syscal return scnprintf(bf, size, "%#x", sig); } =20 -#define SCA_SIGNUM syscall_arg__scnprintf_signum + diff --git a/tools/perf/trace/beauty/socket_type.c b/tools/perf/trace/beaut= y/socket_type.c index bed8d5761ca8..c116b61a6ea9 100644 --- a/tools/perf/trace/beauty/socket_type.c +++ b/tools/perf/trace/beauty/socket_type.c @@ -18,7 +18,9 @@ #define SOCK_TYPE_MASK 0xf #endif =20 -static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, st= ruct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct sy= scall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SOCK_"; @@ -60,4 +62,4 @@ static size_t syscall_arg__scnprintf_socket_type(char *bf= , size_t size, struct s return printed; } =20 -#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type + diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/trace/beauty/syscall= tbl.c similarity index 100% rename from tools/perf/util/syscalltbl.c rename to tools/perf/trace/beauty/syscalltbl.c diff --git a/tools/perf/util/syscalltbl.h b/tools/perf/trace/beauty/syscall= tbl.h similarity index 100% rename from tools/perf/util/syscalltbl.h rename to tools/perf/trace/beauty/syscalltbl.h diff --git a/tools/perf/trace/beauty/tracepoints/Build b/tools/perf/trace/b= eauty/tracepoints/Build index e35087fdd108..392677319c6a 100644 --- a/tools/perf/trace/beauty/tracepoints/Build +++ b/tools/perf/trace/beauty/tracepoints/Build @@ -1,2 +1,24 @@ perf-y +=3D x86_irq_vectors.o perf-y +=3D x86_msr.o + +# --- Local Encapsulated Tracepoint Rules --- +beauty_outdir :=3D $(OUTPUT)trace/beauty/generated +beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ +x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ + +x86_arch_irq_vectors_array :=3D $(beauty_outdir)/x86_arch_irq_vectors_arra= y.c +x86_arch_irq_vectors_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoin= ts/x86_irq_vectors.sh + +$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_= arch_irq_vectors_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_a= rch_asm_dir) > $@ + +x86_arch_MSRs_array :=3D $(beauty_outdir)/x86_arch_MSRs_array.c +x86_arch_MSRs_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoints/x86_= msr.sh + +$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tb= l) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_di= r) > $@ + +$(OUTPUT)trace/beauty/tracepoints/x86_irq_vectors.o: $(x86_arch_irq_vector= s_array) +$(OUTPUT)trace/beauty/tracepoints/x86_msr.o: $(x86_arch_MSRs_array) diff --git a/tools/perf/trace/beauty/waitid_options.c b/tools/perf/trace/be= auty/waitid_options.c index d4d10b33ba0e..b3bd21162d6b 100644 --- a/tools/perf/trace/beauty/waitid_options.c +++ b/tools/perf/trace/beauty/waitid_options.c @@ -2,8 +2,10 @@ #include #include =20 -static size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, - struct syscall_arg *arg) +#include "trace/beauty/beauty.h" + +size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "W"; @@ -26,4 +28,4 @@ static size_t syscall_arg__scnprintf_waitid_options(char = *bf, size_t size, return printed; } =20 -#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options + diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 70cc91d00804..abc9a2926e85 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -75,7 +75,7 @@ perf-util-y +=3D sample.o perf-util-y +=3D sample-raw.o perf-util-y +=3D s390-sample-raw.o perf-util-y +=3D amd-sample-raw.o -perf-util-$(CONFIG_TRACE) +=3D syscalltbl.o + perf-util-y +=3D ordered-events.o perf-util-y +=3D namespaces.o perf-util-y +=3D comm.o @@ -441,3 +441,5 @@ $(OUTPUT)%.pylint_log: % $(Q)$(call echo-cmd,test)pylint "$<" > $@ || (cat $@ && rm $@ && false) =20 perf-util-y +=3D $(PYLINT_TEST_LOGS) + + diff --git a/tools/perf/util/bpf-trace-summary.c b/tools/perf/util/bpf-trac= e-summary.c index cf6e1e4402d5..9a31dbf06cbb 100644 --- a/tools/perf/util/bpf-trace-summary.c +++ b/tools/perf/util/bpf-trace-summary.c @@ -6,7 +6,7 @@ #include =20 #include "dwarf-regs.h" /* for EM_HOST */ -#include "syscalltbl.h" +#include "trace/beauty/syscalltbl.h" #include "util/cgroup.h" #include "util/hashmap.h" #include "util/trace.h" diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 1e54e2c86360..e694ae14686a 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -635,9 +635,7 @@ const char *perf_env__arch(struct perf_env *env) return normalize_arch(arch_name); } =20 -#if defined(HAVE_LIBTRACEEVENT) -#include "trace/beauty/arch_errno_names.c" -#endif + =20 const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, i= nt err __maybe_unused) { diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index c7052ac1f856..739d884fc236 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -189,6 +189,7 @@ void cpu_cache_level__free(struct cpu_cache_level *cach= e); =20 const char *perf_env__arch(struct perf_env *env); const char *perf_env__arch_strerrno(struct perf_env *env, int err); +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch); const char *perf_env__cpuid(struct perf_env *env); const char *perf_env__raw_arch(struct perf_env *env); int perf_env__nr_cpus_avail(struct perf_env *env); --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5EDF347BA5 for ; Thu, 14 May 2026 16:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776474; cv=none; b=m2BMfsD452hR9ypIBkvt2t4Vuz/DCJ11KIg9QyphRrGv2MwdnZo/ScvTzF3crrTl1QuepfULAFyNbX838BaBiIProvsZ/2u/GrHf2HxeczdmSaQppUqjcld3KAcNkE5aNDmrYJ52X+AVa1+UYXGZ6kK/ZGqa4EmcnqqHkFgpg9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776474; c=relaxed/simple; bh=/7TyOYbdEe9k68HYyv7dCCFzh+d6Q52A6z+ebAC5RwQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LCO3LrrTWNcnsxIgI5sdwzS07kwEZCSLzRHbfbRjwIycO94GPpLdUx5rrSqyX3UXopGVukYs8of1LTZeN05VFhOfUV3qSx+7XvONdC+V9GxPTY6uFeBavDq2aDvvjDBU6/A/vR6/I+ExHEHmo1IdSQFBi3/QS3ettd7YmvYRa4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=H4eHCZqE; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="H4eHCZqE" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ba9a744f7dso8576774eec.0 for ; Thu, 14 May 2026 09:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776472; x=1779381272; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5GIfuekLiG6d1t2FIig7OwOH7cYz1r1KvcU67M955lU=; b=H4eHCZqEHwLg9qmfJFurOiHENcCAjLtVIrRFHLmDlGTI1QsucXVKbU0L/WUCOuwUvo fXtEacMPMFF4wUIHHV7jGGaMob/RT/+PpNm48qrQAK/TFzEj8SMdURy8D4CLNIKFcWk8 k8TdN0w5Rj8vHbDIAIiCzzw2EXlbtQTdHhP/sJ7YbX/MbyIA77ji1MnChE9QykN68FFD psIxAcR2YqrNYK+mP3uryiW7pT+Gz72hVb71CwgTDsB/gWyYMp8ldMD4X7e95osCWIuj VGjkTKroayYwUeFQ2sSPYJL2sQkUNV8PepEZn51e5TazyfCjDBFXtXWqYuUt+h7aUvTr rqdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776472; x=1779381272; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5GIfuekLiG6d1t2FIig7OwOH7cYz1r1KvcU67M955lU=; b=Sq4xKfdCSKdjxW7myaGvz0eK+GRFYGaoHq8CpxY3yi/ZbEmMDpex1/XE5V3Flz7irk 3b/YcArdHlT43a9u1Bm6sH8MwyWoxAEzZoW46ObYWsvt2dZnU8XCOIUDfpp+e0rlbBl6 JgT4rU7PEg+ZC3V7wsNksF5HO0QZpwUxvoUWsbgqofblFiRcA5kh4mDCFGMXMEGkC3Qp MPJpNepHBGG1Emx7iuATHinikVJgoyLPzVhTcU8QqVHNggtegVXbM810hW6WySGWwBbS l83HPKrT/QlBbhafFQg2vRLnkMyJudxmrSg6InGTgxaLETpvtAAlrw615e9TR6VgeE4j cnPQ== X-Forwarded-Encrypted: i=1; AFNElJ8+5700UWBEclRzX1ZdiU9EHi1Bcaxi1R1RYmDzGs44VyXfsTCSeiqaoI+4YdwtSsD6CDBrAKIZ13xtfSo=@vger.kernel.org X-Gm-Message-State: AOJu0YxNLDwfi4xHDdcoG3BAFaf1JNowS6f3VWHQe7JGwVrlPRifOEq+ g14LzpT02fig+lbqWJMPVSrUfI2nibTr3irblI7QBEbVx2SzW2ncm4RlQDZPAKReFNgspe+5nHi JACXDh43N2A== X-Received: from dybgn2.prod.google.com ([2002:a05:7301:2502:b0:2f9:af7:5043]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:290f:b0:2ed:23cd:babf with SMTP id 5a478bee46e88-303981873d8mr110905eec.12.1778776471796; Thu, 14 May 2026 09:34:31 -0700 (PDT) Date: Thu, 14 May 2026 09:33:57 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-6-irogers@google.com> Subject: [PATCH v3 05/17] perf build: Decouple pmu-events from prepare umbrella target From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the $(LIBPMU_EVENTS_IN) sub-make depends on the massive "prepare" umbrella target. Because "prepare" depends on external libraries (libapi, libperf, etc.) as well as dozens of generated headers, make completely serializes the launch of the pmu-events sub-make behind some of those unrelated prerequisites. Since pmu-events is a large compilation unit, unblock its startup by binding it directly to only $(LIBPERF) instead of prepare. This allows background python generation scripts to overlap simultaneously with the rest of the build. Testing a parallel build (make -j28 clean all) shows improvements: Before: real 0m27.642s user 2m32.356s sys 0m26.683s After: real 0m22.254s user 2m32.810s sys 0m24.646s This reclaims over 5 full seconds of build latency (~19.5% overall reduction) by elevating average CPU concurrency from ~5.5 active cores up to ~8 active cores. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c81797ceec42..c66af4c825fd 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -550,7 +550,7 @@ build :=3D -f $(srctree)/tools/build/Makefile.build dir= =3D. obj $(PERF_IN): prepare FORCE $(Q)$(MAKE) $(build)=3Dperf =20 -$(LIBPMU_EVENTS_IN): FORCE prepare +$(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BC8D34403A for ; Thu, 14 May 2026 16:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776476; cv=none; b=pdIHwXnQ3grtReMm6AtpLV/MORAaNe6LiM87c9JAdpDz+MZddOAVweSUtB6SWkTDQi9MGqONazIEtR2v336G7qSjfWXL2FzAQ5UVxvVLaP7ycKdCnRECUaEt4MVYG/DWha6naBDntpejMZyFWiqfwUpNpukVAUQVomKSLB3IUTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776476; c=relaxed/simple; bh=xokYndru7r5U27QA5IiJ9grDU4CmNf+aSc8fRA9ncZg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Um6icgfIDHCEgiX2LkJqWuHkHnY1qea+XqNxwCYAVj0lwp/V+lar1KHShZrPKblx8RO6kj0qXrsTZY+EWUwEIsIynskyMWDURlhpp8Q4QdKZ1B7fbkpH/CbFngFq+pq84WgLTnJgGSoRlS/xr9SiEEq55tN5Ia7PHi7FiC6UhCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qtxBa4TN; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qtxBa4TN" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-132d5ad9c32so7974585c88.0 for ; Thu, 14 May 2026 09:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776474; x=1779381274; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=r68S8jxOjdQsq88pAcfrL0Nqp+mR1s52o0SNFT5DPPA=; b=qtxBa4TNUD9OyR2rF246snAMNlGr05/E3aBo3BcFNvyl/Ui5IUv8MdP+kUXGvBs0Af CjThkou0ANwhChcu4SkD+Ea5ZYgYx/rjneiRjIs1jm0+ZtXj8bU1iWMXlVlyHod7FpW7 fQW/rLLxkRpXHBbOSStRBJ9k0f9Tr7qkj9bN3q8t02zQ7e39CrpSUibNe3pZp0sHchy8 h5BQubEJqjnDzZywe2rVBaudW7Mcgx2oUZAN+ueHy9BvlsvlXIsWT++Mu3Q0lqBBXO28 Dfq+AxPgfP1ww8xeTX6PEsRJSgV+XsYRPHjugGWrWwx/XohlaFzRAIWnwUZIfBWfjsKz rkyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776474; x=1779381274; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r68S8jxOjdQsq88pAcfrL0Nqp+mR1s52o0SNFT5DPPA=; b=aSv577YTyC5Q07B0+TkhOph8nGuyg4CP+ETJP0sdq2DcKob8PYJENuLkMzblF0XJgX zalsU8vsbSyb3+oCEofcJEYiNoTiYtrUAPaVoL7GpR9y3BLqQGL4DZT8p4z7J2rCtGbR 1R57L/oFYtMh1+5fBlqvrCNM4ctHjRBlI/kt4D4xZJVDns4sg01pENsrwrSAALpf5nae C/WnUx6KxCs6c9Nb/3FOI1UUYvAt3BdtlJqjeWfQ/opj5G2K+V/obwy6uhwZAyGE4yxJ saFrqu1lm/oI1bv1ciPrDvL1xaYijQQu0MMq3fXEmHeq4fnKJRXisOpuNpFEs1/1MiX2 ytmg== X-Forwarded-Encrypted: i=1; AFNElJ/STiW2IOW9SHdbfJ1pY8LDIws5oP4ahaxXGgAnSp7ms+xC9mC1igRlrCTotfJTbdoRFKSbxH3UP+Nm8Sc=@vger.kernel.org X-Gm-Message-State: AOJu0YwBxYoUXkXbWahxHEeXaXKwlcjFrEjBEco8ellKv2xuNUtMeiDm xy7c2RIEczkt1Q4g8qv01CUPoRT0LKWXrJTwXyS4cySYD3MX85mMiSMhwbQehMh5fpgkPn+asbo cYkgPBkI27Q== X-Received: from dlbdz8.prod.google.com ([2002:a05:7022:ec8:b0:12c:8bfc:84e3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ea2b:b0:133:1cfe:5120 with SMTP id a92af1059eb24-1342ee3a1f0mr5673761c88.7.1778776473729; Thu, 14 May 2026 09:34:33 -0700 (PDT) Date: Thu, 14 May 2026 09:33:58 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-7-irogers@google.com> Subject: [PATCH v3 06/17] perf build: Remove empty archheaders target From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove empty target that doesn't do anything. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c66af4c825fd..24581941e912 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -627,7 +627,7 @@ endif __build-dir =3D $(subst $(OUTPUT),,$(dir $@)) build-dir =3D $(or $(__build-dir),.) =20 -prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \ +prepare: $(OUTPUT)PERF-VERSION-FILE \ arm64-sysreg-defs \ $(LIBAPI) \ $(LIBPERF) \ @@ -1070,7 +1070,7 @@ FORCE: .PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_sh= ell .PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare -.PHONY: archheaders python_perf_target +.PHONY: python_perf_target =20 endif # force_fixdep =20 --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD97533F5A5 for ; Thu, 14 May 2026 16:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776478; cv=none; b=A0/eWphjfjjLlisaldJ3VjPRCGVFlBTfHJWDqjNBftOrB/h1HeN0gLjiglE9cAtZr3mM8t8Q+2dzGy0qoZJ3O2e0sz7jiKZdaO5Jc3NjNYzjKu/J9g3emNu3bjRstZsBdpTLPqopxvgP12cHLywCj3fguyNGJwm6lAed3bgxDEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776478; c=relaxed/simple; bh=E8WgP2OPYV84m7NlyA7UDb/+f9ZTgE9HuPA2z3Pd1uA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dnKdb1YuaEWlz7UeEXVdefKYDH246hF59ZRhjjU94axCMrlNFVjxPHgBl4lC7m1oXZXF955LZNcMZ90dwfeiXyMeJDtTMvJkk7G1NpDL6CrzKixLSQw1awJvWjUAelIz0UC98M2MONulwKKOlOvnpqO8lgtVV8hOSfj+RV6f4Qw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=V6b29Q1C; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="V6b29Q1C" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82fa366fb79so8860862b3a.2 for ; Thu, 14 May 2026 09:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776476; x=1779381276; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ySSlk3AGnoYm7eQWOUje//dSZFFdDolZN9BqzUX7+o4=; b=V6b29Q1CNI9O7au5bJFCB2vMb5bbFLpSRISA3/fapEQvX0C7DGnGfr6uxxxCpfZCIW pgp1eMDYGhSYKGfO+ghwGKJbofSmlM6hFHcM6hh1RxYzHKDnm9OYA2sBtl5Iut6vgWw9 f2Txu8mOiciXv3wJePbqtkm5hZUbcnWGSlUpe1t0d2ciI9n8+8lB5lx79kCW9VaIlL/u 8nk7PYyijRoqOpUomSKbNfPWYdVxYvH943dNIjbv/TptqmyDTzuO7i7T8z0/tcQnLnec mtisad4Nc2dTPgVDKRk7mFL3aEjepMSAoyCD+Jycugz1URWVqkvshmQBlGvW46LbVRgh ozJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776476; x=1779381276; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ySSlk3AGnoYm7eQWOUje//dSZFFdDolZN9BqzUX7+o4=; b=sdfw/s3IsD/p8AD9hi/E19gEb3Z6CLUaedE9NcIHsXujTw7T/xnNBKwULckR3i4ktR BCgX1YyRkqIk5BNldL7F/zm7AEVkdWbqSKfRUjlp7TsOzUCFQN3MvN+sc7Mr+lVHhfct xAoHcUUO6HnhdDhvyhAM1tecSzffl01AUfVgU4u4KEzEnMtflGIlyTFdGia7DXLOdlvI 7JCP2AJv1EXxTYHDWPxtLE9O3E8bCOU4e9TYu8XjUWiTLTKpRIGowRgOx13cdu/Ji/9q TZteF/JzhuxQQA2O2ca6bnVrd41BzIf2KXdpOe9HRf7m5u/yi7+uIVi2XIBsqA97vVuV c7+A== X-Forwarded-Encrypted: i=1; AFNElJ+6tEY1/WThPDzD3WFjI8UvWLQTV31JsXvQAg2zeGAD4mRRTK0L1/WOM7HvntBaxFf2JW/urrOuRhNa9Ic=@vger.kernel.org X-Gm-Message-State: AOJu0YyYFpfObB+3CRefXwfFrUumw3qbWv0QEaFflu6Tj/KFC6ftBu4W 1uWjIPDk7QSeLukAg3J0eJSp7IH/klyhEYNZA4C9CblG67EO3HUGlMpRhgt2FNbhPaKnxX4XN8U dxTHewq3tfw== X-Received: from pfbgo19.prod.google.com ([2002:a05:6a00:3b13:b0:82f:8a3b:87f0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a904:b0:83d:a434:f099 with SMTP id d2e1a72fcca58-83f33c34aaamr342703b3a.5.1778776475834; Thu, 14 May 2026 09:34:35 -0700 (PDT) Date: Thu, 14 May 2026 09:33:59 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-8-irogers@google.com> Subject: [PATCH v3 07/17] perf build: Move BPF skeleton generation out of Makefile.perf From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the top-level Makefile.perf defines a massive global bpf-skel umbrella target that pre-compiles all 12+ BPF skeletons (%.skel.h) upfront before launching sub-makes. This forces unrelated sub-makes to serialize behind bpftool and clang BPF target evaluations, causing parallel build bottlenecks. Furthermore, bench_uprobe.bpf.c lived inside util/bpf_skel/, breaking conceptual directory encapsulation since it is consumed purely by bench/uprobe.c. Refactor the BPF skeletons to better achieve directory isolation: 1. Move tools/perf/util/bpf_skel/bench_uprobe.bpf.c directly into tools/perf/bench/bpf_skel/. 2. Extract the skeleton generation infrastructure out of Makefile.perf into a shared inclusion file tools/perf/bpf_skel.mak. 3. Include bpf_skel.mak locally inside tools/perf/util/Build and tools/perf/bench/Build and bind precise local prerequisites. 4. Safely synchronize the shared bpftool bootstrap and vmlinux.h targets via the conditional prepare: umbrella to avoid parallel sub-make races, while evaluating the actual skeletons completely locally on demand. A later patch will move these targets into bpf_skel.mak. 5. Export CLANG from the global Makefile to ensure accurate tool propagation. 6. Clean up Makefile.perf by stripping the global bpf-skel umbrella target and its SKELETONS list. While removing code from Makefile.perf generally helps build performance, the impact here is minimal. The main motivation for the change is to better encapsulate things in the build and simplify Makefile.perf that has around 50 lines removed. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 59 ++----------------- tools/perf/bench/Build | 6 ++ .../bpf_skel/bench_uprobe.bpf.c | 0 tools/perf/bench/uprobe.c | 2 +- tools/perf/bpf_skel.mak | 54 +++++++++++++++++ tools/perf/util/Build | 15 ++++- 6 files changed, 79 insertions(+), 57 deletions(-) rename tools/perf/{util =3D> bench}/bpf_skel/bench_uprobe.bpf.c (100%) create mode 100644 tools/perf/bpf_skel.mak diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 24581941e912..373eae7fb72a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC LD AR CFLAGS CXXFLAGS RUST_FLAGS V B= ISON FLEX AWK +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -632,8 +632,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ - $(LIBSYMBOL) \ - bpf-skel + $(LIBSYMBOL) =20 ifdef LIBBPF_STATIC prepare: $(LIBBPF) @@ -914,44 +913,13 @@ python-clean: =20 SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) -SKELETONS :=3D $(SKEL_OUT)/bpf_prog_profiler.skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.= skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_cgroup.skel.h $(SKEL_OUT)/func_latency.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/off_cpu.skel.h $(SKEL_OUT)/lock_contention.skel= .h -SKELETONS +=3D $(SKEL_OUT)/kwork_trace.skel.h $(SKEL_OUT)/sample_filter.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/kwork_top.skel.h $(SKEL_OUT)/syscall_summary.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/bench_uprobe.skel.h -SKELETONS +=3D $(SKEL_OUT)/augmented_raw_syscalls.skel.h =20 $(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 ifeq ($(CONFIG_PERF_BPF_SKEL),y) +prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool -# Get Clang's default includes on this system, as opposed to those seen by -# '--target=3Dbpf'. This fixes "missing" files on some architectures/distr= os, -# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. -# -# Use '-idirafter': Don't interfere with include mechanics except where the -# build would have failed anyways. -define get_sys_includes -$(shell $(1) $(2) -v -E - &1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ -$(shell $(1) $(2) -dM -E - $@ - -bpf-skel: $(SKELETONS) - -.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o - -else # CONFIG_PERF_BPF_SKEL - -bpf-skel: - endif # CONFIG_PERF_BPF_SKEL =20 bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKE= L_OUT)/vmlinux.h + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index b558ab98719f..67b76fe20ba6 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -24,3 +24,9 @@ perf-bench-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o perf-bench-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o =20 perf-bench-$(CONFIG_NUMA) +=3D numa.o + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +include $(srctree)/tools/perf/bpf_skel.mak + +$(OUTPUT)bench/uprobe.o: $(SKEL_OUT)/bench_uprobe.skel.h +endif diff --git a/tools/perf/util/bpf_skel/bench_uprobe.bpf.c b/tools/perf/bench= /bpf_skel/bench_uprobe.bpf.c similarity index 100% rename from tools/perf/util/bpf_skel/bench_uprobe.bpf.c rename to tools/perf/bench/bpf_skel/bench_uprobe.bpf.c diff --git a/tools/perf/bench/uprobe.c b/tools/perf/bench/uprobe.c index 89697ff788ef..616873bca243 100644 --- a/tools/perf/bench/uprobe.c +++ b/tools/perf/bench/uprobe.c @@ -44,7 +44,7 @@ static const char * const bench_uprobe_usage[] =3D { }; =20 #ifdef HAVE_BPF_SKEL -#include "bpf_skel/bench_uprobe.skel.h" +#include "bench/bpf_skel/bench_uprobe.skel.h" =20 #define bench_uprobe__attach_uprobe(prog) \ skel->links.prog =3D bpf_program__attach_uprobe_opts(/*prog=3D*/skel->pro= gs.prog, \ diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak new file mode 100644 index 000000000000..aa04d8b3ee07 --- /dev/null +++ b/tools/perf/bpf_skel.mak @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0 +# Shared BPF Skeleton Generator Rules + +include $(srctree)/tools/scripts/Makefile.include + +# Shared foundational tooling always lives in util/bpf_skel +SKEL_TOOL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) +SKEL_TOOL_TMP_OUT :=3D $(abspath $(SKEL_TOOL_OUT)/.tmp) + +# Component specific output lives in $(dir)/bpf_skel +SKEL_OUT :=3D $(abspath $(OUTPUT)$(dir)/bpf_skel) +SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool +VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h + +define get_sys_includes +$(shell $(1) $(2) -v -E - &1 \ + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ +$(shell $(1) $(2) -dM -E - $@ + +.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o +endif # CONFIG_PERF_BPF_SKEL diff --git a/tools/perf/util/Build b/tools/perf/util/Build index abc9a2926e85..40c258ac99b9 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -442,4 +442,17 @@ $(OUTPUT)%.pylint_log: % =20 perf-util-y +=3D $(PYLINT_TEST_LOGS) =20 - +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +include $(srctree)/tools/perf/bpf_skel.mak + +$(OUTPUT)util/bpf_ftrace.o: $(SKEL_OUT)/func_latency.skel.h +$(OUTPUT)util/bpf-filter.o: $(SKEL_OUT)/sample_filter.skel.h +$(OUTPUT)util/bpf_kwork_top.o: $(SKEL_OUT)/kwork_top.skel.h +$(OUTPUT)util/bpf_off_cpu.o: $(SKEL_OUT)/off_cpu.skel.h +$(OUTPUT)util/bpf-trace-summary.o: $(SKEL_OUT)/syscall_summary.skel.h +$(OUTPUT)util/bpf_counter_cgroup.o: $(SKEL_OUT)/bperf_cgroup.skel.h +$(OUTPUT)util/bpf_trace_augment.o: $(SKEL_OUT)/augmented_raw_syscalls.skel= .h +$(OUTPUT)util/bpf_counter.o: $(SKEL_OUT)/bpf_prog_profiler.skel.h $(SKEL_O= UT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.skel.h +$(OUTPUT)util/bpf_lock_contention.o: $(SKEL_OUT)/lock_contention.skel.h +$(OUTPUT)util/bpf_kwork.o: $(SKEL_OUT)/kwork_trace.skel.h +endif --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF33D357CF6 for ; Thu, 14 May 2026 16:34:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776481; cv=none; b=YwBLP7wxKhLKVswclGLe+NnJ4WdTwB9xaOj/fC1+zWMwAdCRINm4eqfE6QE5ha5GD77tzQMBKe0TgSTD9MBgbidfM1PgPV85KOkJGEhfD7F1xBIW4JfBMTfR1gz9TPwO6ZsLhpcKdPSANoT4/nYu94yAJa1yJCmzwRe1/aplHFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776481; c=relaxed/simple; bh=iX/pomdbV09fUUx5qN/QkCwv4mZZgoReI8KSf6RgqUs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mkkbZWdxMocR266RBDU7wwX3PbfGWdyQKCceOuIk0VPgP6rK29pcgP9gSz56rCEsuy73WRpi+3jTvua0tUrb9U4SzODg7O+aX+KHE7GfJJ3PyfR/bWK3WOibXyCn9zT2wz0rndFX6ow2fmVjS+HxU77ERkdzJ5775AMETdDdXMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=awP5D8hI; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="awP5D8hI" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-13312af37fdso16900405c88.0 for ; Thu, 14 May 2026 09:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776478; x=1779381278; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jfCl4yhDEQPzWh5om3NIawhO9j1SZgFCQ0pogc9oRc0=; b=awP5D8hIqYmqffAYb817KyivzlS2bH0L55n/GT1YwB+Yd4Q2mIaUQorU6fHuKT/eDQ cEgyu8WJZ7heDmhpGaVhgHwGCQc3yXwYQ187b3HUngEcuqmj698CmqT8gddSsv/OGaqA OqVvLCsx+x09umpMQsDrbE4nHKv8+zxyOqFxVQako7vd+OYPqsRUd6SS54eTWLGMoV93 fYQ93Ujjz1oJzSEQ9M/dP4IBLWgNj4lLYszjJFMdcl6TFa+RWosbgp56oa+6A2GJGJ/v 9tWF+LtvrGpyV0jkNHxrSJ+4nF+zsTK2nFvdnzTD2gwPz5ONnglHiihAaeNih03cj5uD 7Mug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776478; x=1779381278; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jfCl4yhDEQPzWh5om3NIawhO9j1SZgFCQ0pogc9oRc0=; b=R1xBHKKc0eRicuNgwN1bJT2ty9C8KFVNBSNBGIUo3/3bUVnbs9yC6jKeYjN4r8CNQJ 8JuQ7lARQWxoRCXSLLo/mFCoATbYCro+hZ8fAf0X4Zs9L/8A/rwzQZpsoPbYKK92netV L2p99Nf18sDupUPBAE1OyKZ6wVZAG54P30XxV6/dv10k4eEREDokjt3oW9mXlZZQqb7/ S9AKlKEbnLc2k/56l3tIDQ/kcjJkJClUyXbMCh69fYMIFIbwAWmEBX2ASJbbncodPp/v 4cC3bE7nfVE5VbYsn/+6XWyme9oSEdAvdt8Iem+Izw5Rk35PU6xMh23Er8pZ7F37G3YR GuwQ== X-Forwarded-Encrypted: i=1; AFNElJ+aCoHkZovtqOfvmumrAIXQVxGdx997xMpSlQ/5K15f/mNDtTYKFQ3dLoP9jC/50eAUeE5QByK4feBXJsA=@vger.kernel.org X-Gm-Message-State: AOJu0YzKt2v6nJhkIVb2om4kcSwrv7MhbbdAgOdhd0UliMSHuBJ18qXo 1YgRJG5DVlwuuLYEntO0qaXmFr9tI2SSjrh1Rlgu1A42wogSclRPXBSD2ZD35EA+IoJamMtPs5b Tgksge1yAHQ== X-Received: from dlbsv1.prod.google.com ([2002:a05:7022:3a01:b0:134:e1fb:d06e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:322:b0:130:ca3d:fa74 with SMTP id a92af1059eb24-13436bb789amr5072284c88.42.1778776477644; Thu, 14 May 2026 09:34:37 -0700 (PDT) Date: Thu, 14 May 2026 09:34:00 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-9-irogers@google.com> Subject: [PATCH v3 08/17] perf build: Encapsulate vmlinux.h and bpftool in bpf_skel.mak From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, bpftool and vmlinux.h are prerequisites of the top-level prepare target in Makefile.perf. This unnecessarily blocks the massive parallel C compilation of libraries (perf-util, perf-ui, pmu-events) during the initial startup phase. Move all bpftool and vmlinux.h generation rules down into tools/perf/bpf_skel.mak to encapsulate BPF tooling completely within the skeleton framework. Remove them entirely from prepare to unblock immediate parallel build execution. To prevent parallel sub-makes (perf-util and perf-bench) from racing to build shared prerequisites concurrently, while maintaining strict directory encapsulation without top-level inclusions, serialize bench after the util static archive finishes using an order-only prerequisite: $(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 2 +- tools/perf/Makefile.perf | 61 +++++--------------------------------- tools/perf/bpf_skel.mak | 47 +++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 06d7a3f9990c..bc1111c88226 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -736,7 +736,7 @@ ifeq ($(BUILD_BPF_SKEL),1) endif =20 ifndef GEN_VMLINUX_H - VMLINUX_H=3D$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h + VMLINUX_H_FILE=3D$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h endif =20 dwarf-post-unwind :=3D 1 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 373eae7fb72a..ec0e91bedce1 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF READELF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -324,7 +324,7 @@ else FEATURE_DUMP_EXPORT :=3D $(realpath $(FEATURES_DUMP)) endif =20 -export prefix bindir sharedir sysconfdir DESTDIR +export prefix bindir sharedir sysconfdir DESTDIR VMLINUX_H_FILE =20 # sparse is architecture-neutral, which means that we need to tell it # explicitly what architecture to check for. Fix this up for yours.. @@ -556,7 +556,9 @@ $(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_BENCH_IN): FORCE prepare +# The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h +# aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c +$(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) @@ -911,60 +913,11 @@ $(INSTALL_DOC_TARGETS): python-clean: $(python-clean) =20 -SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) -SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) - -$(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): +$(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBSUBCMD_OUTPUT) $(= LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 -ifeq ($(CONFIG_PERF_BPF_SKEL),y) -prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h -BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool - -$(BPFTOOL): | $(SKEL_TMP_OUT) - $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool \ - OUTPUT=3D$(SKEL_TMP_OUT)/ bootstrap - -# Paths to search for a kernel to generate vmlinux.h from. -VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ - $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ - ../../vmlinux \ - /boot/vmlinux-$(shell uname -r) - -# Paths to BTF information. -VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux - -# Filter out kernels that don't exist or without a BTF section. -VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) -VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ - do \ - if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ - then \ - echo "$$file"; \ - fi; \ - done) \ - $(wildcard $(VMLINUX_BTF_BTF_PATHS)) - -# Select the first as the source of vmlinux.h. -VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) - -ifeq ($(VMLINUX_H),) - ifeq ($(VMLINUX_BTF),) - $(error Missing bpftool input for generating vmlinux.h) - endif -endif - -$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H) -ifeq ($(VMLINUX_H),) - $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ -else - $(Q)cp "$(VMLINUX_H)" $@ -endif - -endif # CONFIG_PERF_BPF_SKEL - bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp + $(Q)$(MAKE) -f bpf_skel.mak clean =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index aa04d8b3ee07..30924ad140c4 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -35,6 +35,47 @@ ifneq ($(WERROR),0) CLANG_OPTIONS +=3D -Werror endif =20 +$(BPFTOOL): + $(Q)mkdir -p $(SKEL_TOOL_TMP_OUT) + $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool OUTPUT=3D$(SKEL_TOOL_TMP_OUT)/ bo= otstrap + +# Paths to search for a kernel to generate vmlinux.h from. +VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../vmlinux \ + /boot/vmlinux-$(shell uname -r) + +# Paths to BTF information. +VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux + +# Filter out kernels that don't exist or without a BTF section. +VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) +VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ + do \ + if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ + then \ + echo "$$file"; \ + fi; \ + done) \ + $(wildcard $(VMLINUX_BTF_BTF_PATHS)) + +# Select the first as the source of vmlinux.h. +VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) + +ifeq ($(VMLINUX_H_FILE),) + ifeq ($(VMLINUX_BTF),) + $(error Missing bpftool input for generating vmlinux.h) + endif +endif + +$(VMLINUX_H): $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H_FILE) + $(call rule_mkdir) +ifeq ($(VMLINUX_H_FILE),) + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ +else + $(Q)cp "$(VMLINUX_H_FILE)" $@ +endif + # Consolidated Pattern rule for $(dir)/bpf_skel/ $(SKEL_TMP_OUT)/%.bpf.o: $(srctree)/tools/perf/$(dir)/bpf_skel/%.bpf.c $(L= IBBPF) $(VMLINUX_H) $(OUTPUT)PERF-VERSION-FILE util/bpf_skel/perf_version.h $(call rule_mkdir) @@ -51,4 +92,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) $(Q)$(BPFTOOL) gen skeleton $< > $@ =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o + endif # CONFIG_PERF_BPF_SKEL + +clean: + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TOOL_TMP_OUT) $(OUTPUT)benc= h/bpf_skel/.tmp $(SKEL_TOOL_OUT)/*.skel.h $(OUTPUT)bench/bpf_skel/*.skel.h = $(SKEL_TOOL_OUT)/vmlinux.h + +.PHONY: clean --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 743CD3451A7 for ; Thu, 14 May 2026 16:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776482; cv=none; b=ui8lrM6L1hhucaYt0AYhqHsIcSvYSKeUKDuOWjK+IDk4/JAaXY839xJNIJFp80OxxSEjWGZ6PMYzUVMxjtM1EwzI3g6MQAV875O2VNA9znOKOqEvDYx/lrPbmvbmHa4yxP9jqS5b0oo4AVVlMTbUDRF4nTqkvLZd4rFEVz7NrS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776482; c=relaxed/simple; bh=wARZevzPzisMNLxa1znHw/JxGcHQ48J6wxMvyUlBbjc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AsGwBVFAD6hvvq2h3S6jnM42yvKNlU/imuCbAq7fpo/Ij5U8w/dbT5fdwNJobqvI5f9wpNSyFQYZTiJbZYLNeM6RjJ8dJFWQLVyDGRVCbzffZuktWktD5QBfe0lJa16fcJMKMSZDvTBbh0ZktKt1p5tmDx4PSKx2Jj4Zo6g4UfE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=N3xWGXYT; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="N3xWGXYT" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-1270dcd11c1so16201028c88.0 for ; Thu, 14 May 2026 09:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776480; x=1779381280; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Ahktu1Xboi/pnplugnzBCt7t42G9BqvuSLwtnSOz/As=; b=N3xWGXYT5IVth4U2hC6og5KfocgyPkOvY0OWjxiHQj5W+g0H483yl7hTpioGzpeRWD Ma6JPCXxDMePQjC1eIXFx3lVmaElZODiP+iEpbOi4Md3PgmjnoT7DTN1uTyhuoJbwHBp 0O5C93Bsnbhqt1p4fKWgdPOao4tWakevCyfN+jj42DunXgs/xx18hJcYSypgCuSsEhaf qfw4EUacRSGN3j31yoxE2WIEP/kMDsrJKBmENwprvUxnC7PAvjiGbTbiHngL/aMUYOOi PB9silA/IEBhXIipGHCPA/fE0jqI/qEv+pfx10sunZqWpXBz1G0SbNTBkFNBQSLOYzfr pKwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776480; x=1779381280; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ahktu1Xboi/pnplugnzBCt7t42G9BqvuSLwtnSOz/As=; b=HWanAft62dN6Am0liFLkiBoaoLMSZxgenKK8psa2uQeAoIZUD+IOZws3EnJnfQ1Mca 20GvaLCg0JrzRFWz3YXpgDA1kytunz+5NvL2ZIeeyWLxmyB1BacxLu/O2TmwMGbzRVB5 OtZm7i81IcntQvixs1AwPUu1rT6NsBy6sglmyw6PbWXwZm/DE9V7VECSNGq9FgEuHLdE 3b8PMROHQbzOBeb9xlsNdpfo3ZRaByxW/q6vpBDdr/DfVmIqtDCDRz/2iw73yblwCnWz TCWLGmBjlC6XSpH2lcvGVMpfbHA1Z2Pi2483L84cTADu1Gbum5X7Rslfzek2a6gGtTgw jY7A== X-Forwarded-Encrypted: i=1; AFNElJ8V8R+jbsfAKebSRD1Tq7RvmRX+T9XCtdVhE3QqDESahM3nGG3vVqM4udQdP/jLUcUY/U2EgBT/5reihAQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6HVq4ls3mEGEGWx0SRldCwFlJ3fcBWOGCv4jJIc7PDSTdbk+L xX0mVvM44vSvQAFOHS+1v+gr8q+Y/+lRodDGkSdEUjgHcZ13VMn1kud/zX/CqWxKPDi3sUcWvm8 q3Kqk37+4JA== X-Received: from dlaj12.prod.google.com ([2002:a05:701b:280c:b0:134:a6ef:d90f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2595:b0:133:3bb1:8d40 with SMTP id a92af1059eb24-1349a80df3cmr4884740c88.15.1778776479313; Thu, 14 May 2026 09:34:39 -0700 (PDT) Date: Thu, 14 May 2026 09:34:01 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-10-irogers@google.com> Subject: [PATCH v3 09/17] perf build: Move static libbpf dependency out of prepare step From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The prepare step is a large serialization point before parallel sub-makes build the perf tool. The libbpf headers are used in the bench and util libraries, as well as individual perf builtin commands. Move the libbpf dependency out of the prepare step and into the dependencies for those targets to avoid it being a source of serialization in the prepare step. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ec0e91bedce1..30114a31ca76 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -547,7 +547,7 @@ export NO_JEVENTS =20 build :=3D -f $(srctree)/tools/build/Makefile.build dir=3D. obj =20 -$(PERF_IN): prepare FORCE +$(PERF_IN): prepare $(LIBBPF) FORCE $(Q)$(MAKE) $(build)=3Dperf =20 $(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) @@ -558,13 +558,13 @@ $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) =20 # The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h # aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c -$(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) +$(LIBPERF_BENCH_IN): FORCE prepare $(LIBBPF) | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_TEST_IN): FORCE prepare +$(LIBPERF_TEST_IN): FORCE prepare $(LIBBPF) $(Q)$(MAKE) $(build)=3Dperf-test =20 $(LIBPERF_TEST): $(LIBPERF_TEST_IN) @@ -576,7 +576,7 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_UTIL_IN): FORCE prepare +$(LIBPERF_UTIL_IN): FORCE prepare $(LIBBPF) $(Q)$(MAKE) $(build)=3Dperf-util =20 $(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) @@ -636,10 +636,6 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ $(LIBSUBCMD) \ $(LIBSYMBOL) =20 -ifdef LIBBPF_STATIC -prepare: $(LIBBPF) -endif - $(OUTPUT)%.o: %.c prepare FORCE $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3D$(build-dir) $@ =20 --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05C9E362120 for ; Thu, 14 May 2026 16:34:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776487; cv=none; b=JveAMevE+21wHX1F5rRhPjE0scWJT9NbhZXjaTexoEvheJSgKH20ONBn5vMSr8rnYDkLkCkPpxyawhdfnxN8EcBkRBtZnSXWoNum5XnHa9Td8Xje6dPdDtpQJsV2yU3kiFrQ3L8cfVRp/cOAclLfJ/xNO+d61J5QwL/E16xthKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776487; c=relaxed/simple; bh=AJwnR+lAKW1np28RhLpF3ZsQLx/y1KNA7lXTPkvhHgQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hgK+8aEWrKKI+1ap/7DcjPMN+GtlTL7bO4oFXqLrb4I8pDrFK8w+CIjjFPsSvnl2kyGab5VyihIbK1pEq8HD8pHLBTlF2u4zhKw3TfIB7R0YOYOWWMBiUvJdELv3Ejpw3yADP9gkAMZqUA47CuP+IOPKxdlIGovrkOP2ip97e4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pi26ZQNV; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pi26ZQNV" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-132d5ad9c32so7976445c88.0 for ; Thu, 14 May 2026 09:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776485; x=1779381285; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=N38Q9ydqZGeVcFYSzFov0y5a5aAtSUelDrIknLwNZe4=; b=pi26ZQNVhND17qzfWYKp/c7iediSrX2KQrufnZ1jdARUni3+WC7X8BKZA5g8NMRxNR rgjmELQi1o7IKJhMn7pQagby58cdfCQp1EeoJFCHV5etPuXwDotjBNw80WFuGAqUtjf8 VCe9IglL9csmwPgQvBDAey5ivsR32umxSYepIPFcp39KfQzMa11gUpDecweWNtfLAIp1 c10kubNXKk0Wy1yXAsjyLuaj7Q+y6xcMd6HgjmRiJjp8MQLqPvXdtTc9aUWXGsKMVIYB Vrv2jpM4jKtIFnNBFhWW3tmdlBzcjFzHmjw5JnflVEbSqgEBqSA6MaYyIrmq+ifsbroj ymsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776485; x=1779381285; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=N38Q9ydqZGeVcFYSzFov0y5a5aAtSUelDrIknLwNZe4=; b=DMJYnra1bEPB/ZRfAyqeQIQQ/uocWxXaU19D9tzKGRn1G0Y2aWMab4tYwXfM0EHJW5 BjNmHUaGk87IwqlUCrcFj+0eKQmuw8iaFZRAkIvX8DrB0SuAQn+pD0SRxRZZbN0p3Mvb v4Mhfdf1ctsyFTMZ0DBVcHej9/4GHglS/Kc6w/75LaU5v0GMp6KU65d56I7GxCdZIf+t XLzDauvb79uHRCY4bclwbt2Q6BSldHTcdBNNbDZYT90DMrUtwR3aMb/p803BM7WirbBR l2tUMP+S6PO8BG+rRyo+D0S9TOfNAOam00rl4d4RT/WhQBPqvfCqWcaIcU9v2aLwV850 uv+A== X-Forwarded-Encrypted: i=1; AFNElJ89a4Z8iqm2TezS08jjLTlrAG20aqMSMvn7rMQqtkk9B5Nzmx+QRrgeMS8d4nADml6aoA6KNzNZgIzjBz8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6DIDH+zMS5yLynJ9FGLPp/dVc/JpfVK6vfPMNdAcB51a/xThY 0kpbU8we9N9dlB3Nf8faDqnUEQmKyjJD2pHOdXU7zHVu1cr/u/SGJExM2R5yorFgnFViGLFlN1E Qg1xy3J1tbQ== X-Received: from dlbuy7.prod.google.com ([2002:a05:7022:1e07:b0:12d:b319:ccc4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:322:b0:12d:de3e:86a8 with SMTP id a92af1059eb24-13436bb194dmr4732714c88.38.1778776484933; Thu, 14 May 2026 09:34:44 -0700 (PDT) Date: Thu, 14 May 2026 09:34:02 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-11-irogers@google.com> Subject: [PATCH v3 10/17] perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, BPF skeleton generation rules (bpf_skel.mak) are evaluated as part of util/Build. However, because LIBPERF_UTIL_IN explicitly depends on the top-level static libbpf archive, Make completely blocked the execution of bpftool bootstrap and skeleton generation until libbpf finished compiling midway through the build. Since bpftool bootstrap compiles its own independent copy of libbpf.a, it does not depend on the top-level libbpf target. Decouple early skeleton tooling generation by attaching bpf-skel-prepare to the umbrella prepare target, exporting CONFIG_PERF_BPF_SKEL to ensure accurate feature propagation. This allows Make to compile bpftool and dump vmlinux.h in the background at build startup, eliminating the initial sub-make startup bottleneck before BPF object compilation while keeping 100% of tooling rules perfectly encapsulated in bpf_skel.mak. Provide an empty fallback target to ensure builds succeed when BPF skeletons are disabled. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 8 ++++++-- tools/perf/bpf_skel.mak | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 30114a31ca76..a0426e914253 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -275,7 +275,7 @@ ifeq ($(PYLINT),1) endif =20 export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF READELF -export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT +export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT CONFIG_PERF_= BPF_SKEL =20 include $(srctree)/tools/build/Makefile.include =20 @@ -629,8 +629,12 @@ endif __build-dir =3D $(subst $(OUTPUT),,$(dir $@)) build-dir =3D $(or $(__build-dir),.) =20 +bpf-skel-prepare: + $(Q)$(MAKE) -f bpf_skel.mak bpf-skel-prepare + prepare: $(OUTPUT)PERF-VERSION-FILE \ arm64-sysreg-defs \ + bpf-skel-prepare \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ @@ -967,7 +971,7 @@ FORCE: =20 .PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_sh= ell -.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare +.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare bpf-skel-p= repare .PHONY: python_perf_target =20 endif # force_fixdep diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index 30924ad140c4..1fbd8dfefa5e 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -15,6 +15,10 @@ ifeq ($(CONFIG_PERF_BPF_SKEL),y) BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h =20 +.PHONY: bpf-skel-prepare +bpf-skel-prepare: $(bpf_skel_deps) + @: + define get_sys_includes $(shell $(1) $(2) -v -E - &1 \ | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ @@ -93,6 +97,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o =20 +else # CONFIG_PERF_BPF_SKEL +.PHONY: bpf-skel-prepare +bpf-skel-prepare: + @: endif # CONFIG_PERF_BPF_SKEL =20 clean: --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24F2334402B for ; Thu, 14 May 2026 16:34:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776494; cv=none; b=druR3JVXSybYJPhiLHNjlyEu3EVnNJaVgkxncJrkkm+1iYVP9Uop/hlpw9VlMFtdUPvORlN1/YLfYrXg/qr0mHyS6cb8J9uNuWFVCIsyRGw6N9mUsnHXvgIMzuY/Cb1iJTTFUFePWEeeIp42+JAjuJbcjSXUDvlAAX57U/HN63c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776494; c=relaxed/simple; bh=uB2iXn2WBt+EDR4kH5FxSuAwCprzLAHTXeIvfLbkm4I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VZy1sMAnH06pYH/ZLdDHr0moV1FUGiQSmNk31RCXL4EF0u+KQQcAuvnnx08wbNWS2b+hkG0KU5URqKeI4U7rP6jDtY7r1AqzhdhhER23k3gagOHcYk7RWIgfRsTr4EJrrIaacsOpuqxdx9JtCfxD5tGMXh+3zKZ/XnlBAzOMRjs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PP8LD1Zu; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PP8LD1Zu" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1334825de51so654816c88.0 for ; Thu, 14 May 2026 09:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776491; x=1779381291; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oPQGmeusY/cDiD2dEpt2Ws4BRT1lotcepITOMhHVtDs=; b=PP8LD1ZuFevVMqhbUJjsuz0mJ9bX3zVd1tvhLh/RZFpO4cOtB/Px5iv12H1hY9YM7G ufg7HT4ZmreUSrEBStUgwgB9Ed38vlvHf957Dy8Khatjhf2L4wPX0yNYioVfbi7crQN3 Q6DM8rascLGll280FJ9S/tE2Ca6Qs5602demGX8Txfklh3LDGYII6k7Kq3EKR8JQGe3u sPwoQ+pUrIePW8nFI3m/DIdC1ftGlBRmsFHxHgHzuLqFplOyc/afmrjp5ygDt46cJAbN l25cx72cVbSkagHwge60AX2uJefWk+Tpbp0YOn4ObWXmBSitJe9Ih/MVp51b09yPhze8 sbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776491; x=1779381291; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oPQGmeusY/cDiD2dEpt2Ws4BRT1lotcepITOMhHVtDs=; b=Axtq5gDcbQOOZpHhAsna7iH6fiWe60ISNv3IHYKpc8jMCuvT03a+YPNZBy/t3fJ+QX y9Xq/INnArr1rfFpBQi3FDMX/XFQrCmAFlV4Rp1kmID6xukR8U/t69F4Nx7v4FFkuHvL 6ligvy19UuYLW39rgZiwgOVwc3Mslp1fmgsy1AuM3Z9cSXOWnUwegWemVaPxsY25UJuH QSOdWh1ApQpCJfQRKkUNA27Kvv0JBPUZ77Ib42Za7bkjNrah1/fm2LCoGyh3pfEOCqye QIYqSBnQc2VfjTUBLUiMTt5omEjut9TOf0iHMvRWKJuZPBjCTsvff+M/2lsYGkqqgoK+ vpHg== X-Forwarded-Encrypted: i=1; AFNElJ+MumTZ34Nzsti+vC7SqfPWYe96DPWWirCCNYr16/KFfCaYVN9jBzYYwOKjb3oDmBDlH3rndYtuSVEo1nk=@vger.kernel.org X-Gm-Message-State: AOJu0YxX/JVmnqhmOGt61nP4Wcc2J/MVgJUlI4XqEcav6Ly1evfp1L89 nGwfEZe5LJVv0isV+r+v9Kfg0WCF3GEZhWFaFF6natHXs7bYBn88P31DfZf9qRTOaW/akkaKudL lzGxOvQrASA== X-Received: from dlboy10.prod.google.com ([2002:a05:7022:128a:b0:134:feba:1ec8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:1e04:b0:11b:9b98:aa4b with SMTP id a92af1059eb24-1342ef3d106mr5357167c88.6.1778776490869; Thu, 14 May 2026 09:34:50 -0700 (PDT) Date: Thu, 14 May 2026 09:34:03 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-12-irogers@google.com> Subject: [PATCH v3 11/17] perf build: Move libsymbol dependency out of prepare step From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The prepare step is a large serialization point before parallel sub-makes build the perf tool. The libsymbol headers are used in the bench and util libraries. Move the libsymbol dependency out of the prepare step and into the dependencies for those targets to avoid it being a source of serialization in the prepare step. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a0426e914253..01da32cd8988 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -558,7 +558,7 @@ $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) =20 # The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h # aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c -$(LIBPERF_BENCH_IN): FORCE prepare $(LIBBPF) | $(LIBPERF_UTIL) +$(LIBPERF_BENCH_IN): FORCE prepare $(LIBBPF) $(LIBSYMBOL) | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) @@ -576,7 +576,7 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_UTIL_IN): FORCE prepare $(LIBBPF) +$(LIBPERF_UTIL_IN): FORCE prepare $(LIBBPF) $(LIBSYMBOL) $(Q)$(MAKE) $(build)=3Dperf-util =20 $(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) @@ -637,8 +637,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ bpf-skel-prepare \ $(LIBAPI) \ $(LIBPERF) \ - $(LIBSUBCMD) \ - $(LIBSYMBOL) + $(LIBSUBCMD) =20 $(OUTPUT)%.o: %.c prepare FORCE $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3D$(build-dir) $@ --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDBF8331A61 for ; Thu, 14 May 2026 16:34:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776495; cv=none; b=i6lDpxZOfhGFVZyPSJMUQCWMq7So96NACnCv3v0NfmqF4lo2gQIY39mP3qNZuks4pZ/WmLeBlxrpmTnDsLpt9PGWQ7RcyfDg3CoB92HnQP3rl5f91YE3XfiOnYrm/E5Cvqt12fjryIL0ob5Rmp4GIanW0BP0aoQHt1Po43UHp5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776495; c=relaxed/simple; bh=o/K4kgugTGSk6IivctS3woOeRJortswYl5L/8mR0x6I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=orsPbsbcZ6ZY+t7QuDefsAWGLPk8pWTE3lMCSDxm/0xPHur3q14raWjaI48BuZyxKzpki4BfrG7jjz6HEBwgsxRX/TRrNl/9VKH2mTb8is4Kf6gwjvcBte00IcOamM0rZz09dyp0bX2NfS2HZqGjPEaL+aeAx9y2Z7stgzWfRX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=nDTycAW3; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nDTycAW3" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-132a99125f8so18346788c88.1 for ; Thu, 14 May 2026 09:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776493; x=1779381293; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mgPMCywWzI9T8eglAxB7fkblHJQb+JFJwFxoaBxPkU8=; b=nDTycAW3r5YLIMa6TOlxClRkS+6CPBoIQL1+mnl5/bjoxw1aq/hOxiIXWX8ovqJqra 5CNYphKXGvsmx4c+4LGaqgLyWb7VRU1ajBLeftdF0nWXvsmQG9idLZ+b70ru9d0SvwR5 kKkTGseLBzmCSzHWdNTbGPwn89Sd++EvBuy/gm+XFO6ILQ884Gwpdq9JlQf0ZEvv7OM2 wz0XfeoGUt2FTE5UPwF92hdeipGS3+Nq9b82mDDDPnQZvKm+ZTvRmh9bvkTqmcuvhPY5 2Bz7z+8eBxXhuNtaDu/lW659VwGcTN6fOj6ODbJRbwsJrxTpVF+d7OncL0MZiWx/hUvh nTIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776493; x=1779381293; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mgPMCywWzI9T8eglAxB7fkblHJQb+JFJwFxoaBxPkU8=; b=cxrISkZMuh6RPhd3Vfo4BYx9rfZaoN9OAebIrblKkBW3OZgjQDWkzzZ8ljW/BAEoSX LjvLEukcYC4DrmuIJOh46wFrOvePAuRLQ5bfuz1PhdBGwA0B+HZ3yG+icN4YV7aUTzuZ 1dTEjydLMltABi85H5e6kHQH1oLRJ50uh5jkodKHqtaQwflVabppGKQcWfIBpNUoHJHE vqGx7jZJo/8znGjY8Y+5PYWdFxB1sH5ggpLUal7a+oB2bXIkixdZDPJ+QPouTPabb3Xx gJzqDlddkYvzSCm0ZcPb1IMNEOgyJW5cO3Ick/t4MMJg7fWZ5IvLKChuo+iCpImCQhf+ l68g== X-Forwarded-Encrypted: i=1; AFNElJ8Kbr3yN/RmjCtAk3CJHVzqM2cAZ8qW/5SH56iNogoQcQyLlsroOHBglDBn7BsB8/SnuH8N0UKyoMJr7Zk=@vger.kernel.org X-Gm-Message-State: AOJu0YwNDmDGoOQhNLbilpJrHyrCECaRYhtJofWWIHVHvk5rQHNaKjxk K5H7pSyh2sSAmGliGX4CmzSGssb4FAWQwQJx4ynq1FrBcOLLSSCTX+LZPCjeBR9cJLOOqc7suIJ 98ym19BDgwA== X-Received: from dlbem1.prod.google.com ([2002:a05:7022:1001:b0:132:8d92:4d63]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f68e:b0:12a:94ab:e20 with SMTP id a92af1059eb24-134369910acmr5950565c88.20.1778776492912; Thu, 14 May 2026 09:34:52 -0700 (PDT) Date: Thu, 14 May 2026 09:34:04 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-13-irogers@google.com> Subject: [PATCH v3 12/17] perf build: Remove redundant libbpf feature check for static builds From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" By default, the perf tool compiles and statically links against its own internal copy of libbpf (tools/lib/bpf/libbpf.a), setting LIBBPF_STATIC=3D1. Despite this static linkage, Makefile.config unconditionally executed $(call feature_check,libbpf), which forced a synchronous sub-make fork during AST parsing to detect dynamic system libbpf libraries. As noted in the internal Makefile comments, this check was executed purely so that running `make VF=3D1` would display the detection status of system libbpf. During standard builds without LIBBPF_DYNAMIC=3D1, the detection result was entirely ignored. Wrap the libbpf feature check inside LIBBPF_DYNAMIC=3D1 so Make avoids the redundant sub-make fork overhead during standard static builds. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index bc1111c88226..fbe7fa83b0bb 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -587,10 +587,8 @@ ifndef NO_LIBELF =20 ifndef NO_LIBBPF ifeq ($(feature-bpf), 1) - # detecting libbpf without LIBBPF_DYNAMIC, so make VF=3D1 shows libb= pf detection status - $(call feature_check,libbpf) - ifdef LIBBPF_DYNAMIC + $(call feature_check,libbpf) ifeq ($(feature-libbpf), 1) EXTLIBS +=3D -lbpf CFLAGS +=3D -DHAVE_LIBBPF_SUPPORT --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBDD83644D4 for ; Thu, 14 May 2026 16:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776499; cv=none; b=RqUUrbA0XXAseNrwpVXjGoAxz/NGPIyehnxmiDNItTjrle27kUbaIGj1qzvFsXAe6Lq727On4cZHY/UBKj6FY3kGgbAp1L0uMV77A+y1D3Y0zJduqrBfi1NXD9lCOL4JeRHkh/WrdRL4eMFpJxCeeI2BbRimlxHe2wt3NiEOmfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776499; c=relaxed/simple; bh=OlJMLHxTvdwWkQUQIlnjX9l+g8QHwmLvUu+ZPddFRfQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=q1A2JHyiF85A40nek9ebgnKwbN+F5DxnJuwGSxYzskFY6gaQrAnIkWVkJRGkcdSQVBnYDpX5V4UGdop87jzZbCL9CM2WL+dZDhkZ7x9lzBYvKjJ6CcW4zjWisQt2i7t+uQPE8HMuuDCaVi4Y1Iu3YEhDQcXtdcGnnLh+0MI5Vco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZGQ+niPp; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZGQ+niPp" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ee34588671so10946112eec.0 for ; Thu, 14 May 2026 09:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776496; x=1779381296; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vfDc1bcKEUhtiGECvbeIiNM7pgIl+LxxIRj7Nb+DgBU=; b=ZGQ+niPpz17TzlcZa/l0fkpKZWcrNrxVoZzUhSsobVWLBRL7zK/5ZsA6GAxtlyi5Zd T6Jo485rbsv6pmGIqmtC4vX7ejgzdV7mYLRFKMVtoflUgsNdgEGQqALv9tE+eZSTNEky QNZ5F7Yi8u9vLW2tfcNIYyupo1F88/G8mmUAXuEYmRsxWvkp61jKdkvXUnmI9Q9/uvTJ 4/D+EdNFwOW1K1bTrCT4ouMiu3UOlGPaNFJKuHgJqxlEyeVmC08gjgsnqjpWbtbbfIV7 dPCgVHRGxFnbd5/anM8CCE41GlsnJqNLE8KTXycGOe0E4a/Ik7DpVJeJh8dO+LxMfMND bS6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776496; x=1779381296; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vfDc1bcKEUhtiGECvbeIiNM7pgIl+LxxIRj7Nb+DgBU=; b=OqehapSD16AzBPjPSP7E1q7bGvDXdoVvCyhLQJg+ebMT53Mxfmfq4cAgjIqdicWDkN x3Xs4ph8T9cJvGh6KLkju4s4EjZyOOQXUS2uBjszgvRHA3eZWQv4sVxXI7S4Pn5eeVzF hKYflgnq0Brv8HILIQWhNDLuZJQCqfLjqUN+fjAxKUMmBsgTV5IKowVrOFxCJloBpZH+ j6r2IshvvO8WAZDMYdIbFjgyK9MWXz1G7B8/+N+P1GHcu/2f2sAI2yfBd+xqwlh6jdNH Q0p4Sqj+FlaZgcxK1Yeo25l9Mc6WUIcgBMp0LI/RBR6/bZgvLSp2q6nE5O1SYJjE9vsc ax2Q== X-Forwarded-Encrypted: i=1; AFNElJ9pEtbVmINfeG5LORUQCteZWoAxY9TQP6WB4iaqibV+nkOSc/T+3XOVO1yA8MwQ2x88LZ5MWSwIVLQPJuw=@vger.kernel.org X-Gm-Message-State: AOJu0YxfaGBND8ZLZT3uRsphVXd8c76URqqaq2gP4dArF2OcJhi+d2Wv /W/6YN7x/zxShwy7QBiY3RziovF0Hec8DuV/eKUGrAERohrtSSXN235HCyqKT4uQhHu9sT5bT71 L9Df6ClTe4g== X-Received: from dyz15.prod.google.com ([2002:a05:693c:408f:b0:2f9:af7:5040]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:6884:b0:2ea:5057:a2f9 with SMTP id 5a478bee46e88-3039867f58bmr92041eec.16.1778776495689; Thu, 14 May 2026 09:34:55 -0700 (PDT) Date: Thu, 14 May 2026 09:34:05 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-14-irogers@google.com> Subject: [PATCH v3 13/17] perf pmu-events: Split big_c_string storage into standalone compilation unit From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py emits both the massive 2.8 MB big_c_string literal and tens of thousands of compact_pmu_event struct arrays into a single pmu-events.c compilation unit. Compiling this giant file takes ~2.2 seconds on a single CPU core during Kbuild startup. Refactor jevents.py to emit big_c_string into a dedicated pmu-events-string.c compilation unit. This allows Kbuild to compile pmu-events.o and pmu-events-string.o simultaneously in parallel across two separate CPU cores, preserving 100% string deduplication and zero dynamic ELF relocations while cutting C compilation latency in half. Add pmu-events-string.c to tools/perf/.gitignore to ensure in-tree Kbuild runs do not leave untracked generated files in the working directory. To guarantee 100% backward compatibility with GNU Make 4.0+ (avoiding the Make 4.3+ grouped target &: syntax which causes older Make versions like 4.2.1 to spawn multiple concurrent jevents.py processes during parallel builds), implement a robust dependency chaining pattern: $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) @: This ensures jevents.py is invoked exactly once. If jevents.py aborts early, Make's .DELETE_ON_ERROR: purges pmu-events.c, guaranteeing that subsequent Make invocations correctly re-execute the script and overwrite pmu-events-string.c, keeping the build fully self-correcting. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/.gitignore | 1 + tools/perf/Makefile.perf | 4 ++-- tools/perf/pmu-events/Build | 16 +++++++++++++++- tools/perf/pmu-events/jevents.py | 20 ++++++++++++++++---- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index 0f9451a6e39c..3b968c5158b8 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore @@ -38,6 +38,7 @@ arch/*/include/generated/ trace/beauty/generated/ pmu-events/arch/common/common/legacy-cache.json pmu-events/pmu-events.c +pmu-events/pmu-events-string.c pmu-events/jevents pmu-events/metric_test.log pmu-events/empty-pmu-events.log diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 01da32cd8988..3be0be5eb43b 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -921,7 +921,7 @@ bpf-skel-clean: pmu-events-clean: ifeq ($(OUTPUT),) $(call QUIET_CLEAN, pmu-events) $(RM) \ - pmu-events/pmu-events.c \ + pmu-events/pmu-events*.c \ pmu-events/metric_test.log \ pmu-events/test-empty-pmu-events.c \ pmu-events/empty-pmu-events.log @@ -929,7 +929,7 @@ ifeq ($(OUTPUT),) -name 'extra-metricgroups.json' -delete else # When an OUTPUT directory is present, clean up the copied pmu-events= /arch directory. $(call QUIET_CLEAN, pmu-events) $(RM) -r $(OUTPUT)pmu-events/arch \ - $(OUTPUT)pmu-events/pmu-events.c \ + $(OUTPUT)pmu-events/pmu-events*.c \ $(OUTPUT)pmu-events/metric_test.log \ $(OUTPUT)pmu-events/test-empty-pmu-events.c \ $(OUTPUT)pmu-events/empty-pmu-events.log diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index dc1df2d57ddc..95172a2a851f 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -1,7 +1,12 @@ EMPTY_PMU_EVENTS_C =3D pmu-events/empty-pmu-events.c # pmu-events.c will be generated by jevents.py or copied from EMPTY_PMU_EV= ENTS_C PMU_EVENTS_C =3D $(OUTPUT)pmu-events/pmu-events.c +PMU_EVENTS_STRING_C =3D $(OUTPUT)pmu-events/pmu-events-string.c + pmu-events-y +=3D pmu-events.o +ifneq ($(NO_JEVENTS),1) +pmu-events-y +=3D pmu-events-string.o +endif =20 # pmu-events.c file is generated in the OUTPUT directory so it needs a # separate rule to depend on it properly @@ -9,6 +14,10 @@ $(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) $(call rule_mkdir) $(call if_changed_dep,cc_o_c) =20 +$(OUTPUT)pmu-events/pmu-events-string.o: $(PMU_EVENTS_STRING_C) + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + # Message for $(call echo-cmd,cp), possibly remove the src file from # the destination to save space in the build log. quiet_cmd_cp =3D COPY $(patsubst %$<,%,$@) <- $< @@ -118,6 +127,7 @@ CUR_OUT_JSON :=3D $(shell [ -d $(OUT_DIR) ] && find $(O= UT_DIR) -type f) =20 # Things in the OUTPUT directory but shouldn't be there as computed by # OUT_JSON and GEN_JSON. + ORPHAN_FILES :=3D $(filter-out $(OUT_JSON) $(GEN_JSON),$(CUR_OUT_JSON)) =20 # Message for $(call echo-cmd,mkd). There is already a mkdir message @@ -224,6 +234,10 @@ endif # and inputs are dependencies. $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) $(OUT_DIR) $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) \ + $(OUT_DIR) $(PMU_EVENTS_C) $(PMU_EVENTS_STRING_C) + +$(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) + @: =20 endif # ifeq ($(NO_JEVENTS),1) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 3a1bcdcdc685..70a45e62f5d1 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1422,6 +1422,8 @@ such as "arm/cortex-a34".''', ) ap.add_argument( 'output_file', type=3Dargparse.FileType('w', encoding=3D'utf-8'), na= rgs=3D'?', default=3Dsys.stdout) + ap.add_argument( + 'output_string_file', type=3Dargparse.FileType('w', encoding=3D'utf-= 8'), nargs=3D'?', default=3DNone) _args =3D ap.parse_args() =20 _args.output_file.write(f""" @@ -1463,10 +1465,20 @@ struct pmu_table_entry { ftw(arch_path, [], preprocess_one_file) =20 _bcs.compute() - _args.output_file.write('static const char *const big_c_string =3D\n') - for s in _bcs.big_string: - _args.output_file.write(s) - _args.output_file.write(';\n\n') + if not _args.output_string_file: + _args.output_file.write('static const char *const big_c_string =3D\n') + for s in _bcs.big_string: + _args.output_file.write(s) + _args.output_file.write(';\n\n') + else: + _args.output_string_file.write('/* SPDX-License-Identifier: GPL-2.0 */= \n') + _args.output_string_file.write('/* Autogenerated by jevents.py */\n') + _args.output_string_file.write('const char big_c_string[] =3D\n') + for s in _bcs.big_string: + _args.output_string_file.write(s) + _args.output_string_file.write(';\n') + _args.output_string_file.close() + _args.output_file.write('extern const char big_c_string[];\n\n') for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], process_one_file) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEE7034C155 for ; Thu, 14 May 2026 16:35:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776503; cv=none; b=ApHjecngCeRwpPMuRGyQdTuBK/EU8rCyFZA73E88T6d7e0P/S8ClsquqdshGwQDdIbgwDZye/yofBEDdpi9xDnQJUMBB/8ZoXuM/v4MAdmcQ0ODznFQts7ZYwPh4p3DSllojeBbtyI4oBpIk4y4TxsfQPdD3aJ/wnWSedxdqvws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776503; c=relaxed/simple; bh=4zVkDbMoBuNB6T+QEmeQbHjKDWqgEgEqBPkRSy/rcSs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OdkeakX3WP3LFYNjUTnGtrB9MQ3jC1LK8I40SKIQkaxGQYsySxHDEh3Y1p9IEuuQqigJc7jujBZNEnLKZEHzCgNNiAiaN4d9rdTZEc4HoNgSWxVIX/PrgNijbn3QvkFnjK1gHtwplBWH3J1nf510ADzaCCL9zBjXb2cTcdabbbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=BR2Wtlwp; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BR2Wtlwp" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-132d5ad9c32so7979179c88.0 for ; Thu, 14 May 2026 09:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776501; x=1779381301; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=D3y8sU0zSqky90c33VE2UOxl6GE2wLZT9h/bbK/MxHA=; b=BR2WtlwpOxAFK6koHa7NYulYjc6NIGsfxhib8ry2z2pgJvOVA0zPHEP+PCYEoo2fAp VLNOPluc3KC4RJWRMNY7SBIDu9Lqz/2voykQ1DB8er2tDZnvbhIpauUCTu0E1EuVfPD4 F8H1qS/a3B/AO0edgtJNS7ImeP2Rl3fVxg2fqZf4e0Iogo0OiKQerl3vGyRPgoSCQuLZ lORuxVI548ahVWJ4eYsP7U5PqeDBAPCJJxIs6Hq03H0u6oxFepSPDonvUcaifC+LUjzk PNOybGm+JDtJD8YBuCLPBPZkce+BAGLgDsTunmcAnvNz3ZOpzTSJixVhoGipdGp5lYU5 YJ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776501; x=1779381301; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D3y8sU0zSqky90c33VE2UOxl6GE2wLZT9h/bbK/MxHA=; b=W/wlO4la6BA2uS3Rz2OdL1cq8FSFBcdCbRKxcPFyqUIOR/EHU548MqcHhQop8ABIDj 6+i7cYY998+E9mXYx+u0bFnA2d02STIM3a/hPoG1H/eSH/MrocsJ9uns1eI3QapKWBaC Mzuy+HYPebCHXMOvOpCsTRTHWi4MWFF/VlxQmWWjrIaBtlEf0SD3tLeMHDskvqd0sjMZ BedVbbEuRS7hrihHJNdAb3uB3H8DzKZt0biWVyYEzifXTLNvFSgDgZo++L2Y+4OUe8Rq 6jmfkIfpE1V5zEJJNIxvgmMIXuZpRb+L2l6RJN0yJ3b/kyZsb8SfOY2mCQ/7Gdf3WIWF RF6A== X-Forwarded-Encrypted: i=1; AFNElJ9GcKz1sHzi1H23TVmWEd+8qWtZB4G8Fr4soFIZUG8ELC83wQdQYPFZw0u1GIE41g+qOl1IInk6RXXZ+yk=@vger.kernel.org X-Gm-Message-State: AOJu0YxyTXJK6koEhCtyHHJw/HtNW5FVBC3XAl9mahn1r0i6HCux9W7N MhQJZoVauTl6IDoXS3IOc1Thws1hLaM84RWNTAnfRipy5RQublf6evHFryFo/gqgX1K5xlL+v7w LmW2cxrdT2A== X-Received: from dlber14.prod.google.com ([2002:a05:7022:264e:b0:12d:b65b:1fb3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6997:b0:12d:de3e:86a7 with SMTP id a92af1059eb24-13436bb1815mr5054005c88.37.1778776500969; Thu, 14 May 2026 09:35:00 -0700 (PDT) Date: Thu, 14 May 2026 09:34:06 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-15-irogers@google.com> Subject: [PATCH v3 14/17] perf pmu-events: Parallelize JSON and metric pre-computation in jevents.py From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py parses hundreds of JSON event and metric files sequentially across all CPU architectures during Kbuild startup, taking ~3.3 seconds of pure single-core execution time. Refactor jevents.py to pre-populate its internal JSON AST cache in parallel across all available CPU cores using ProcessPoolExecutor. Define the worker process initializer _init_worker at the top-level module scope to guarantee flawless pickling and standard event mapping inheritance under spawn multiprocessing semantics (avoiding AttributeError crashes when spawn is used instead of fork). This accelerates jevents.py execution by over 11x (from 3.3s down to ~290ms), fully reclaiming multi-core concurrency during the build generation phase. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 36 ++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 70a45e62f5d1..316708e32d74 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -457,8 +457,8 @@ class JsonEvent: return f'{{ { _bcs.offsets[s] } }}, /* {fix_comment(s)} */\n' =20 =20 -@lru_cache(maxsize=3DNone) -def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: +_json_cache =3D {} +def _read_json_events_impl(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" try: events =3D json.load(open(path), object_hook=3DJsonEvent) @@ -474,12 +474,16 @@ def read_json_events(path: str, topic: str) -> Sequen= ce[JsonEvent]: if updates: for event in events: if event.metric_name in updates: - # print(f'Updated {event.metric_name} from\n"{event.metric_expr}"\= n' - # f'to\n"{updates[event.metric_name]}"') event.metric_expr =3D updates[event.metric_name] =20 return events =20 +def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: + key =3D (path, topic) + if key not in _json_cache: + _json_cache[key] =3D _read_json_events_impl(path, topic) + return _json_cache[key] + def preprocess_arch_std_files(archpath: str) -> None: """Read in all architecture standard events.""" global _arch_std_events @@ -1381,6 +1385,14 @@ const char *describe_metricgroup(const char *group) } """) =20 +def _parallel_read_json_events(task: Tuple[str, str]) -> Tuple[str, str, S= equence[JsonEvent]]: + path, topic =3D task + return path, topic, _read_json_events_impl(path, topic) + +def _init_worker(std_events: dict) -> None: + global _arch_std_events + _arch_std_events =3D std_events + def main() -> None: global _args =20 @@ -1459,9 +1471,25 @@ struct pmu_table_entry { raise IOError(f'Missing architecture directory \'{_args.arch}\'') =20 archs.sort() + import concurrent.futures + tasks =3D [] + def collect_json(parents: Sequence[str], item: os.DirEntry) -> None: + if len(parents) =3D=3D 0: + return + if item.is_file() and item.name.endswith('.json') and not item.name.en= dswith('metricgroups.json'): + tasks.append((item.path, get_topic(item.name))) + for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' preprocess_arch_std_files(arch_path) + ftw(arch_path, [], collect_json) + + with concurrent.futures.ProcessPoolExecutor(initializer=3D_init_worker, = initargs=3D(_arch_std_events,)) as executor: + for path, topic, events in executor.map(_parallel_read_json_events, ta= sks): + _json_cache[(path, topic)] =3D events + + for arch in archs: + arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], preprocess_one_file) =20 _bcs.compute() --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5E403446C6 for ; Thu, 14 May 2026 16:35:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776506; cv=none; b=cXV+QRrJxe1gBu4mKVsL2+ngMQBcxNF4xzkc9T+oCUff3DphdHMMHYdeZENIcYmMjznZSCAE55oALnVrayuOabCt5NG9xgWJveN9BlMPimrri6fKaoXAv9sOkXkOAADwODzPFhPC+rugJ4h+Mh2ob9sBdhVE4KblqRUegBHLYeE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776506; c=relaxed/simple; bh=oY8ot2ZW4/Uix4iWQvLYcy2TP5wWoGw+BgLtKo4g2Nw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HfMww2gk7y52JyJVNUvRn/h/OJ861dKFr+Ke93MaoOyFU8ZKfOoG4UZZDh064AC+3ck9t2FzULyqxhZaGIf+3UkX2to5HHIkpt23SuKH2hLQx0rTQzQJIe400hbFxfctcLdv1wsOA9FEI6HW/qYpMlH9Y0rdItRBIgMnTzxrPKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wKjZKiQS; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wKjZKiQS" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dc3d81736so7452530c88.1 for ; Thu, 14 May 2026 09:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776503; x=1779381303; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fcNB+RxRa1Sr7NhNICyZ5jAIefEmQ21qHYxrPQiAS0s=; b=wKjZKiQSAZYvfcjPli2eB9MolyGE70LZiwKJo0Zdkcxd0glK1AnzqLmAYcUtYdVECx ZXFj2rHIqRfX8ygT4h0xqevKmmPT+wMTofOw2KUq74OxNzxI+3SY+GJ33mo42OUe+v3j 7JxFYLs8jLIc0mloOaxiTt4layYEkcrmnLFL4GMArRWP771CVVd/Imauksb3Nk0J+QXa 9mOXhLt7qckl61/gQaas3OiIngo5yYkqU+8wFIJ9YMalV5EBxOWE5JKcLD5CCEDwicH3 zZWgSNS05jUzWmbkEB/P5uVwb+MX1hrJtxtFfEmOVcvMhvpvXAUbjwDZ1kHchFb+iFWm SRoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776503; x=1779381303; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fcNB+RxRa1Sr7NhNICyZ5jAIefEmQ21qHYxrPQiAS0s=; b=kd/AbcqhCfuD7oIHK7cgNTFO2nHyPeyJJZtvEhFEc/BacssVc2Lj5adbL1QowDHo6h 43BQRWZK8IxcomUn+sOVBN9cyrt9Hzw7uhOjGmbkxuhPoQtb7FNOtXPYW+bP5Q23XBFK yvxUhSiFeIjRAgyhbf6qD7egKShoXB0mo27i3CjlMu62m6sMSFfwGYhvvg6CZ5amVkpV viQpQ3by735dp5ejlA0O/Kp76KSNVpVxhiU+c1p8a7Ophr7tFujTwnTt5n8m6KOAtE4K AVrkCywvYMP0smTeeiR4MCXrI26SdzpleQitF9a6IYjklTxzt4FyyFlr4kX+95weND/z v0pw== X-Forwarded-Encrypted: i=1; AFNElJ8svoDyaEskWLZI4dhnTMHtbr2VexUX24TcKbXd+fWPe9dCHBmE117o1mILYvLadDFNW8rw2279Ks5VFwk=@vger.kernel.org X-Gm-Message-State: AOJu0YzftGyX0NTYEDuYwwR2pLDqJdjkx/KnxKZZzetVk4ICZX480XzW WxcUDXfhpQfbgx47nqWXW+mKfDCRI0uAJoXxwVQISl7CvjU0MSJv0HM8Zsnlfq/QHjy+4JDtVnQ mRa+BuM9Qiw== X-Received: from dlbem1.prod.google.com ([2002:a05:7022:1001:b0:132:8d92:4d63]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:101:b0:133:3c47:92de with SMTP id a92af1059eb24-1349a80f03amr5239132c88.17.1778776502833; Thu, 14 May 2026 09:35:02 -0700 (PDT) Date: Thu, 14 May 2026 09:34:07 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-16-irogers@google.com> Subject: [PATCH v3 15/17] perf build: Prefix SCRIPTS with output directory to fix continuous rebuilds From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In Makefile.perf, ALL_PROGRAMS includes SCRIPTS (perf-archive, perf-iostat). However, unlike PROGRAMS and DLFILTERS, SCRIPTS was not prefixed with $(OUTPUT). During out-of-tree builds (or when O=3D is specified), Make checked for the unprefixed target 'tools/perf/perf-archive'. Since the actual script was installed into $(OUTPUT)perf-archive, Make concluded the target was missing and continuously re-executed the script installation rule on every single incremental build. Prefix SCRIPTS with $(OUTPUT) and update the static pattern rule to ensure Kbuild correctly tracks generated script prerequisites during incremental builds. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 3be0be5eb43b..dccfce2efb93 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -405,7 +405,7 @@ python-clean :=3D $(call QUIET_CLEAN, python) $(RM) -r = $(PYTHON_EXTBUILD) $(OUTPUT # Use the detected configuration -include $(OUTPUT).config-detected =20 -SCRIPTS =3D $(patsubst %.sh,%,$(SCRIPT_SH)) +SCRIPTS =3D $(addprefix $(OUTPUT),$(patsubst %.sh,%,$(SCRIPT_SH))) =20 PROGRAMS +=3D $(OUTPUT)perf =20 @@ -592,8 +592,8 @@ $(GTK_IN): FORCE prepare $(OUTPUT)libperf-gtk.so: $(GTK_IN) $(PERFLIBS) $(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) =20 -$(SCRIPTS) : % : %.sh - $(QUIET_GEN)$(INSTALL) '$@.sh' '$(OUTPUT)$@' +$(SCRIPTS) : $(OUTPUT)% : %.sh + $(QUIET_GEN)$(INSTALL) '$<' '$@' =20 $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE $(Q)$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B45C36728A for ; Thu, 14 May 2026 16:35:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776507; cv=none; b=jYLKx2M8Yx6eff4hliDOB82rqDMWwWnmBKL3NVv/uZhlRlfoGmL9Ao3spsVkfMd15bQ3vNFf3vXSLbupyx2QZ2JXjQQMjT9g/bgsTwvH1LXY1w0/dksJu8aHMWpIDd11X7dxNrTAgzjVWMJ0WvPPm1ngKO63swQPAzpwWmQgGdI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776507; c=relaxed/simple; bh=NGfYl6kDEytKUmpKfL2C4Og3ft1hP0ENd8qszCmyGZM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=d/ygJtkNWZ+RoN7csMOzjn243NS7levdkHZB7U1ojTlsL0MXEhZi3RpcHnY8ExcuDCv/s5s7DrGvZ1jVqbeChMux8YJ2kZG9Kc/QYf96s852ttOv9zBUNEEHwzoDW1wmVf+D1A/ZnXqurJoovLaCqP9cBg5oXqvw/bpb7DEhuSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=k8HjMx8g; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="k8HjMx8g" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2f485961555so25121086eec.1 for ; Thu, 14 May 2026 09:35:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776505; x=1779381305; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ugOFCk7HwEprnixRixPWaow/W0W91ZlZhg4SUCGAxfk=; b=k8HjMx8gJXPEFICSPrlfWdLaTjZpRZ4i96t6qhDdQZhNQQW1rLL1T+nkuudUhDItgw O4kPVD2eC9BC3PN052cwEZlqH7tIy5yW15Xz+lODbLfcO1NElJXN6/GquuZbk/IQhp/1 c/2xpEUbGfAP6L0tpAvrBz0BNM0X+qonEJxPU9RSlG7E7ZnYxMxrnCpd8MB8BpmYA9+e xRZXSURLlG0ons+18eeX7ox96j36kEfGH/4ODx8/t1kTVNje3fKCJMDtHa10iRkhPOIX QNO07rlKWT5uleB7x69HNCpvJ3Hci1vdrws2xXDVGrJd0lH9foEL8jnI9Z0RiuVArW7n ww+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776505; x=1779381305; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ugOFCk7HwEprnixRixPWaow/W0W91ZlZhg4SUCGAxfk=; b=BTI/I+H+2suxQz2ujXWXTJh6kBqu+VmlRXjvUMRxjXTWBb+ODOm3G2h0t/SvqK3jje THRoe8PrVDpmJdLdxrzOLOHhmPlFy1xRzlGD6+KZUkfFXPyezPI+8WDMyMEeUy651/5N +s6zPgUxxGZUkxpopIg+zaowbGyefYFfOYc9IHpf3krjRTbPR08nm2mfEembDoC2CqBh DCOEP5cdGUjCMokKjKnUd7e14isGx2t07vVbqGZACqVnujTMRfzOkjqkY6QJpo/r78/p z6JHkpIWCsrJrm200GIq69t8W39FVKM8T+rpindhK7lLuXlLYuegnoOof64fESte3cNR eXDA== X-Forwarded-Encrypted: i=1; AFNElJ8eiTsti2vYFTzwOZoEZOlyenfQ/clHW64AwgUnCqoR6YIzdi1K8vI+/HLkJY3+JCF9bhh206/n0Jz7ONA=@vger.kernel.org X-Gm-Message-State: AOJu0YzUEO/s4xkHXnbDY59CRZXM1CYNd7y2w5jryGkEjmGy9A/hGH7z MXzS2IRSCUHScUZzhO96F2B+mg88qKcC03L1AP8PITvBoMjy50lRdq6Mg57u4hOJlPb2ntqjaOS Qnqfl+Ms/RQ== X-Received: from dyt2.prod.google.com ([2002:a05:693c:8082:b0:2f9:af7:503a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1293:b0:2ee:ade0:e0bf with SMTP id 5a478bee46e88-30398687b27mr111865eec.30.1778776504464; Thu, 14 May 2026 09:35:04 -0700 (PDT) Date: Thu, 14 May 2026 09:34:08 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-17-irogers@google.com> Subject: [PATCH v3 16/17] perf pmu-events: Convert recursive shell assignments and macros to Make built-ins From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In pmu-events/Build, ZENS, ARMS, and INTELS were assigned using recursive assignment (=3D), and model_name/vendor_name were evaluated using shell macros (echo ... | sed ...). Because these variables were expanded inside the COPY_RULE dependency evaluation loop across hundreds of PMU JSON files and inside every metric generation recipe, Kbuild continuously re-executed 'ls', 'grep', and 'sed' shell forks thousands of times during AST parsing and execution. Convert ZENS, ARMS, and INTELS to simply expanded variables (:=3D) and replace model_name/vendor_name with pure GNU Make string functions. This guarantees Make executes directory probing shell forks exactly once when the Build file is parsed and evaluates path macros purely in memory, completely eliminating over 7,800 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/pmu-events/Build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 95172a2a851f..372773b998e4 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -56,12 +56,12 @@ $(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY) # Python to generate architectural metrics GEN_METRIC_DEPS :=3D pmu-events/metric.py pmu-events/common_metrics.py # Functions to extract the model from an extra-metrics.json or extra-metri= cgroups.json path. -model_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/extra-metric.*\.json= @\1@') -vendor_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/[^/]*/extra-metric.= *\.json@\1@') +model_name =3D $(notdir $(patsubst %/,%,$(dir $(1)))) +vendor_name =3D $(notdir $(patsubst %/,%,$(dir $(patsubst %/,%,$(dir $(1))= )))) =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate AMD Json -ZENS =3D $(shell ls -d pmu-events/arch/x86/amdzen*) +ZENS :=3D $(shell ls -d pmu-events/arch/x86/amdzen*) ZEN_METRICS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metrics.json) ZEN_METRICGROUPS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ZEN_METRICS) $(ZEN_METRICGROUPS) @@ -78,7 +78,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),arm64 all)) # Generate ARM Json -ARMS =3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) +ARMS :=3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) ARM_METRICS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metrics.json) ARM_METRICGROUPS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ARM_METRICS) $(ARM_METRICGROUPS) @@ -95,7 +95,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate Intel Json -INTELS =3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v mapf= ile.csv) +INTELS :=3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v map= file.csv) INTEL_METRICS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metrics.json) INTEL_METRICGROUPS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metricgro= ups.json) GEN_JSON +=3D $(INTEL_METRICS) $(INTEL_METRICGROUPS) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 13:56:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70BF734251D for ; Thu, 14 May 2026 16:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776511; cv=none; b=IOHNTQlucfEa6Gl/Ki66GQ+JBNn6QRLUgcMPIQxCzendozWhMBIbG/zLNu9MiQLWsnq2FyB40pVw4UhyZ9SjVgN/5v3WWRoadvVXj8COyrb6hmAwbhiSgBrf33dsdPjsx8Mrse3gftc1OyKq2bhqa+QNf48+mLiafnt+aFGZEc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776511; c=relaxed/simple; bh=KgYhLbj+7JbYPwwwjNkDDjdOGe6Kx8xfZHNose5DOpk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=s/F2Li1cC5mgWdU2iECvpjXVlmVfpd/osCQ0bdvHmk9lyBZlIEIokxoli5bFc9YFC+FfeXhYfeMLaEgjwIdtfUERGwZOaNj5cJhgpg1YuEwy4FFzuNW7wRtVjJ6yY8RyiN2cAXICIVMwHgbV2wav1nYrzRJIis3lfSAm+1RHYIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=amwxDYXs; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="amwxDYXs" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-132d5ad9c32so7980691c88.0 for ; Thu, 14 May 2026 09:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778776510; x=1779381310; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=a7UhuB240zbvecKzTnCZgue1l2Usf38vhdVC8tHlI64=; b=amwxDYXsg2Jcp+Q1eUmF24k7ji2/fD9keeXQ7Cw7McYbp94CSRpM7UXZiIiUBZ0b5d aPkcXim9FrJZJB882DHqVaxYA+rT9GI0m1TQbp4oa1GVY20pRbT3o+spu502CyUuCPyc 0iGBUno1ZZM1qqn+Zm7qEGny/u0MQJqLZtMpgZRxZSrPvzZCZjnGCn+COdTxZE9f9qKP rJX+/QjXafxOm17yOitISXidYFqChoO3Huv7nWeJsWh6bEDTjzDylenUt/Ny11R6JMZx 9Mz23QlgDUyrModPX/NVUgWlWBWiZsRf+LdDQ678CnIHJ26VvFRYkTw/11MfG/L6JsR2 YcuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778776510; x=1779381310; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a7UhuB240zbvecKzTnCZgue1l2Usf38vhdVC8tHlI64=; b=eKtAv200QJUgoeC7r9DcpTV15In932H/rMyTxU41m+i5tGY64azu+hzwJiS70BzcvB X8pFdTb6GoNeBimeeYOo2wBWQ9qM3SlXpgq1NkLrh121VQsjnWH5Bi1LtdAUGDTN124N kqQr7qm31LAPDQ7e/4P/j6nd9YKnmUIbqZgZrIvcDsupnrI5zgqXYxAGhTBX1YK1jk8m 3nMJn4omHuRUwKezPUFXRK1rtXU1ls6AMQ8exf6NOne2DgOodZyWYsvEwmS1PQbrE59V sbAUlrmNUKLqEy4wiU7lovh+eso36qS623PyrV6YPKOWH3iss7CCahQJZ+ula8qFi7tK h5tA== X-Forwarded-Encrypted: i=1; AFNElJ9CxYHibRET5zInYz64ukE0RJwZiEjhHBQ43Q7fgFUGPFjBvxoCjs9ay2DBmu3Bf6jiG/5o1xTOUiaDUSA=@vger.kernel.org X-Gm-Message-State: AOJu0YzEYRVs1/BfcGQ2qWhRtgcyl499rXaEm+teSS0DgM9M/ytR8S39 xkoso0MyTYHBrfj5qdbqJt3yJkLd+K3iCpt+mQBg3TnuZiNgvY6y8cGZbTY3LiJ3R03eRflDJtG 9xWI8y+Hp9Q== X-Received: from dlea2-n1.prod.google.com ([2002:a05:701b:4202:10b0:12a:77b3:9893]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:910:b0:12d:b6cb:bdc9 with SMTP id a92af1059eb24-1342ee3a35cmr5414185c88.9.1778776509284; Thu, 14 May 2026 09:35:09 -0700 (PDT) Date: Thu, 14 May 2026 09:34:09 -0700 In-Reply-To: <20260514163409.927816-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260512174638.120445-1-irogers@google.com> <20260514163409.927816-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260514163409.927816-18-irogers@google.com> Subject: [PATCH v3 17/17] perf build: Convert llvm-config shell queries to simply expanded variables From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In Makefile.config, CFLAGS, CXXFLAGS, LIBLLVM, and EXTLIBS were assigned using recursive expansion or appended with raw $(shell $(LLVM_CONFIG) ...) calls. Because these variables were expanded during dependency evaluation across every single object file compilation rule, Kbuild continuously re-executed llvm-config forks nearly 200 times during incremental builds. Convert llvm-config shell queries to simply expanded variables (:=3D) to ensure Make evaluates LLVM compiler flags and library paths exactly once when Makefile.config is parsed, eliminating ~185 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index fbe7fa83b0bb..7a61da082c0b 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -951,11 +951,14 @@ ifndef NO_LIBLLVM $(call feature_check,llvm-perf) ifeq ($(feature-llvm-perf), 1) CFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT - CFLAGS +=3D $(shell $(LLVM_CONFIG) --cflags) - CXXFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT - CXXFLAGS +=3D $(shell $(LLVM_CONFIG) --cxxflags) - LIBLLVM =3D $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) = --system-libs) - EXTLIBS +=3D -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) + LLVM_CFLAGS :=3D $(shell $(LLVM_CONFIG) --cflags 2>/dev/null) + LLVM_CXXFLAGS :=3D $(shell $(LLVM_CONFIG) --cxxflags 2>/dev/null) + LLVM_LIBLLVM :=3D $(shell $(LLVM_CONFIG) --libs all 2>/dev/null) $(she= ll $(LLVM_CONFIG) --system-libs 2>/dev/null) + LLVM_LIBDIR :=3D $(shell $(LLVM_CONFIG) --libdir 2>/dev/null) + CFLAGS +=3D $(LLVM_CFLAGS) + CXXFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT $(LLVM_CXXFLAGS) + LIBLLVM :=3D $(LLVM_LIBLLVM) + EXTLIBS +=3D -L$(LLVM_LIBDIR) $(LIBLLVM) EXTLIBS +=3D -lstdc++ $(call detected,CONFIG_LIBLLVM) else --=20 2.54.0.563.g4f69b47b94-goog