From nobody Fri Jun 12 20:18:30 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 18D0F43D50D for ; Tue, 12 May 2026 17:46: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=1778608015; cv=none; b=AcT/9oUN2pAbEsXdkDYc7FaJIpV8sNbzuoO0lG2rZcoFn9FsTekyvMIIuJBXfWBjMplDSeIGkJLX/afpYzLqUOYqJ/5eiejka5+HUYUn8A0MYRiTYtw0Z9SB4Goj/4qWjDVcLm/fdqXo7KEfCP/7k8TxoZjVzcSuCAhVddt8l3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608015; c=relaxed/simple; bh=wwRoZKbj654sz4VrwUcykwLsN4Mk4H6ny+P/lIWtoWI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=p6RLaAHEOkNIjOIbQpUrSIsKllfPYoLmZ+0IC0zmDTJ+s23i2yGVQiampC0yqPsYV4h0JO89ea/djvt506458/SxO2H9YD4lpY13C9R4ldF2OsLMZX/qKl55azQ2He4JktHjBWhxt5a5o10ZJ5+ThGog9dXfhd4BYW02NPXlbJ8= 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=UWnz/L5C; 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="UWnz/L5C" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-132c3280e03so138890c88.1 for ; Tue, 12 May 2026 10:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608013; x=1779212813; 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=UWnz/L5CHs56nuL4flzdXORm60vsxhec3WMPdsoOkZdqGq/7sbXmmtH2T7USAsWYmM YdG25Mx97Nfyef2jTpuZVk9MGHTDppxtEl2OIkmxc6jxnkgexNyR07Y8YsIEqKr8fGVH y+ZwO1m5rZY35yMw8a++Xt28T94D+MQGqhwhhyIc2ChbBEkv3ZnyAU/5TulV72llDmP0 CEedv1UPNVnz0ylLySAYypRSSL200f7IWN2odcKG1hrEdz1Z8S3OP/qaWaZCG1eBZ2NU 60+CtxPYnfR600xur0udksYXqIKiBQu9r7TAjTw/+5NXX1/2ZfMhi/9K0sFc6e1qJmlO 5OcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608013; x=1779212813; 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=oP3TA4Ueqa80Z49dsv+8irHdVlvKxl58lt7b1PJGaLDPVMrDNqfr/KnyJTKzNhXCZ9 Z8KSXKb3sDZiYJIo+ytcaLWkZfnf7lTjWuzsZSo8NQDR7xT6VefPpEANhlmZLruuxYJB Cz+Jf6jzQKi6LuYRPPGzh9t4TqCq+vWJ8u6r1p6xh3usPRyvYziFdVc325hbhBRZXDW+ rv6S6LvqK+W0UqkGgMvL2hKeBd3D8RVy3mXkLdvPyCwrtEuakAvvN1kFWJwibAEtdCxD 36zStGSNMR54t3geXgQgGWzL9WP2aB0gFCMHOzqFE+OehkGSr3JFmUOjy5ZXbogM8pzl xZqw== X-Forwarded-Encrypted: i=1; AFNElJ+iJ1gIPQoR/lgMhhzTJtZjN+inOl0NCUvjtZfQPp5P0nRilOhmIz4Ue1ynOc5n3kTFJOf9PEnmFMnss98=@vger.kernel.org X-Gm-Message-State: AOJu0YyyoOsZs3t3qCwO1fHskvsU+ODRWZM1HQKox+xlHY4L89suXHY/ FqezaAWMXUoNv9YCt6GSdY6gicHz2LYsIwIg7xNY/xf7BFJEDWOByY2RG9raluSXh12/kah3JNN Si+NFiFWN3g== X-Received: from dlzz19.prod.google.com ([2002:a05:7022:493:b0:12d:b27b:7405]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:45a9:b0:12c:6e75:bb1 with SMTP id a92af1059eb24-132a7edc8a8mr7939294c88.4.1778608012963; Tue, 12 May 2026 10:46:52 -0700 (PDT) Date: Tue, 12 May 2026 10:46:21 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-2-irogers@google.com> Subject: [PATCH v2 01/18] 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 20:18:30 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 2DB0D4657CA for ; Tue, 12 May 2026 17:46:56 +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=1778608019; cv=none; b=Dyn84BmUD4N56xTjhl6p/fwP9Uv3NhHoDTI6rG+mwP55nuUEfCn/j1bbu5rXvqwp/ktX/d00WLSKXhzwBPL6qDvO+Ib3j3hPNzr69EA/nr+M02swHqqTfoUaWuOCWlQ9ptyc61LszmDBWJHBoqnWQSY1Wm+ZrMgETdyrQSygIKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608019; c=relaxed/simple; bh=+nYwJiA0bJhsQqP8J103mMLWgw1LSQxAQSclczxtcVI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=INFc0K7Y48m4qmGO1OVL0pv/v/8x05q+IZilYDA6Svzu8zHlg5d25gD7zfypbQWzKohCghXsANB+QVa1ymutlSKX7G/2zKD5o0KG3LK9ggy+1XL7ZqYyzhmz2WjTaoESp8ynZXIcqcHqi+4QXIWM9UY4cOrim5f7sj9T76iQopQ= 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=M/sq6PXA; 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="M/sq6PXA" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ba9a744f7dso4692667eec.0 for ; Tue, 12 May 2026 10:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608015; x=1779212815; 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=48Gda8O0cS2ktC9kVwU4XlytikI6HiStHpxBe0cBwCQ=; b=M/sq6PXAGAr388AEV3OXdYhA2MGXd1ddCqYmYeqrGHtwSvr4eq3mif/77BFpkv9j6q 1NF7on9CxHaKb/FjSPtmAqIyk7LdwLTZMZ6lc/qk07u/qRL9IbPhu3brSXVOwkQ36f/z 2oF1Bmu4BHoilWakMP85YJRB2B/dkXyIt67KtkaSX7a7c3R6Idd0TyGUqIH33sw86RnW kVXpydH+HHx4/hlgh2z8AZESzenFHkvA781SCuv8Cq4HpNpjajUxdppLJufmb1HBkZLo M9Nb0fHBNpq85VhZRGUit4PyK+xknHV5GUvc2bvJ7oHha1gBftjVvQBiFTlMB5F1P39L T32Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608015; x=1779212815; 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=48Gda8O0cS2ktC9kVwU4XlytikI6HiStHpxBe0cBwCQ=; b=Us9cK6rmNq71YS32gf9CUIGBj84tXHM7DT4WZ/69fPLphdeEtqfNYHx8ln8wRN1TWt 2QCLKphvDPrWEAXK7JeJXjKDEXFRVWtjuMc4fnoZWlAMerX0h4vsnYXklV2YGnmFk1bc m8TORFjcsNYG37NHc4UMxqHrakonHNOvNeuwCWJqIx4xV7WNeNxqkeEyM0SxAwz01mcH 108XrggiPPbIYksXEkYNexQx8qY6AFL/dWj0miuml0baxypce4UYJqfWXpgA+8i7snWp axTg4qjmber7IF0wuzOwIbok9Kr8KqAmjUEMO09IzKsDZyXCtgRnzbg9JahMoUnc+jz0 Ac8w== X-Forwarded-Encrypted: i=1; AFNElJ8NeQ8tHmKvXqLFJOtu8uWECHBkI63yYXC/rTMSkt5NmSR3NdQ9uxeKU32xBDjTEupvyiMZYs5c8BzWp1s=@vger.kernel.org X-Gm-Message-State: AOJu0Yw923h380xHJrQuyGWNCQOqxp2YOYHHABNlWe6bLPwpCT8yEIcV O46eDh/iyxMVyWRazMhUbK7GXTB21w7VNR4KNriLttf+vmeqG5WiiCb5hB4cFdBb3/XZjl87dYr 2D7I6rGdjjw== X-Received: from dyz23.prod.google.com ([2002:a05:693c:4097:b0:2d8:d251:f7ba]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e78d:b0:2fc:9aa8:83da with SMTP id 5a478bee46e88-3011a369aa2mr27082eec.29.1778608014915; Tue, 12 May 2026 10:46:54 -0700 (PDT) Date: Tue, 12 May 2026 10:46:22 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-3-irogers@google.com> Subject: [PATCH v2 02/18] 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..d8febe5d5800 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_FEATURE= S)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 20:18:30 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 E2A0D4D98F9 for ; Tue, 12 May 2026 17:46:57 +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=1778608019; cv=none; b=kEraL19rAEfcdSihwsYhRhkmIScvl1l2O9iPGlJCeYBWlANDgk8tYbvH8riwEm7YPPEEeXoiS241X/do/zGIQzKTEWsql8tYfu4hsE88AbJGoOQD0kfZW6swpe+qGIuLEkWYak25TX7VK6E71aCLI6jg6qf6XujwzYeeVLtka2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608019; c=relaxed/simple; bh=3q0g8O0ztwV+78aFp8RPw4sh9x5Uyk5RGK7knh3apw8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lsDzSIv0PRd7eFBIAJ4vCZ0vF3lRSq+mGSfhh4Ns39p9SdXhAwThQFLq1m6uvpTK9dNL6ZAY4Ki4YDhBkQ0MtO06xBkTI+pN3EKkIn4mUAUfwJvbnjgmIFcWn92IzW6YqLp9JiPOXzAkE0QwBfJThPaBIu9d5+IOGdqP0xCjI1U= 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=wb21vXsI; 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="wb21vXsI" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2f2d983d109so7940827eec.0 for ; Tue, 12 May 2026 10:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608017; x=1779212817; 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=nTNOVWRvce3lC7h3emxjjZvlJvb7j/kAaYdkg8DKpPI=; b=wb21vXsIja4rjwH3QC2n5QDhNuEyNTz4mESpAiOQx87m+H6XdrdX8zQZQz03jF852L zcqOviopaJ7e87dnycBkLlLZTsXEQuPSkK6sNcLdwD+Mh1csiD6lgyF95iZCfmBgE936 i4LDhQK9xto+yggWkkql9vuFbtje68krKniUDdaXkzlJNyDkliNoc5LQXaEZQJiAP2AC 1LqeeNHrjBZ/Gg1hWfAHt0BXbISB/tEv0d8sxElzVGrBL6l2JMJMOc/9fLWhvb6khCFi EA9MBAzV+MNVsMHul132jA087gk81PXzplz/GUm9U8NJ7qiFs73NXrK8A2+9LH5apkat ooJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608017; x=1779212817; 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=nTNOVWRvce3lC7h3emxjjZvlJvb7j/kAaYdkg8DKpPI=; b=mMARPb8V69CfzR5cWemLXFEwkgNoubRDacsiMzXGK5un8PocRHR1PWUfT7QIFkMuiH CgFf2pBBmT5ZCEwNEriAQT1QO4xWPekyAr6hprJgy9HZifvtX09Ky64BGXJWHgyka2XH UJVnuCklQcPUA2K3bT59aOF/FlqJzbWLnEz+2ajxN+JHAbj5EH5gCVHXu2ZDfjX0giVn U3L9TaMne/6JdrA0xn+zT8I3/VIuXzbgQCHKWI+TO9BfJLQSZsaELIM74KSJvGKamNxw B4Dm8b/a+ca6EqtesoSneIlxixOOHGQZ6DrBche0Rxz1BjiD4HigHrnF9qBwhJ8zeYJc SGgw== X-Forwarded-Encrypted: i=1; AFNElJ9xOn9sk7DVExFlkEvcvrppJ0lZ2BpF+w9Fh+4ZYLMxY3em3EdSnUDJtS85W9f9eW7yT63Yxk00UKhil1M=@vger.kernel.org X-Gm-Message-State: AOJu0YwRkRt+49YfxpyzArRL6xTqJFllrwUKfbHKzIrFHATiCNsF1W6o CB838uDMrxUovYZ8flKTQY1KsjmIHlTpYBTO/7piUQ6jOPFMaHzGO0iWjBz3OhuyktNI880szy4 SRS4vgtHMRg== X-Received: from dydr14.prod.google.com ([2002:a05:7300:50ee:b0:2ca:9b08:e7c9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e105:b0:2f2:6dde:df67 with SMTP id 5a478bee46e88-30118e9ff09mr51836eec.22.1778608016683; Tue, 12 May 2026 10:46:56 -0700 (PDT) Date: Tue, 12 May 2026 10:46:23 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-4-irogers@google.com> Subject: [PATCH v2 03/18] 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..f43f85738b5d 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 > $@ =20 $(OUTPUT)test-file-handle.bin: $(BUILD) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 20:18:30 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 E6A014DA543 for ; Tue, 12 May 2026 17:46:59 +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=1778608022; cv=none; b=qq8KA1yN+FOfckWw5okoEg9UbluOzEHRKHS5ihzgYFIBZFH5czkjh7q24kLnvCJDB3HpO6AH3YLeVwVJFnYznNa8qqjeo9rSEksO9KeliKdOP3pp5h2rz0C4/qn1R8NC/zmCtARfGCxyZTSkLBKftkb5o0k/C4Tqx15NcNvH6DA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608022; c=relaxed/simple; bh=AKSQH2siP4utMQ9xhh4jNh7yTLC8UkZ/sL2vSdtCUcw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CVOtaZlDiKZcyhGxtpgB0yMN1t13ctavi35ysQGoUzGo9ghw074xemCXURoRKHbRtEAMruVD+rAmrB9jcAKmpyQcQfgTSUygPM9SmDI/J1TVoIkRYXJPcsVSyB9iUDHIOitmSN7j24DVY9sSr4TohFH8Y7OnvHNjsTV6qXl/bwM= 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=AKS0up2I; 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="AKS0up2I" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dece274b1so8988281c88.1 for ; Tue, 12 May 2026 10:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608019; x=1779212819; 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=1yVcJX3ToKV+Wqq27E1R2W87lkjzMpr5Ak2bcYR9g3Q=; b=AKS0up2Iw1nRWbPfURNvXx46HojS8Vpbvnfz2nOZsoc451WEzeTcs5BZcHVVU5SZW3 BbhFzZDd+Ok7aFLIxiZyOaf6e5YVxPKCyZVeh93aIif3gCP6iS4WL0Q7p1bB5Vx0IylB cmLa5eAXEBUg/lYcMzNAiX5YdL3RN5mIyrAyQJ1oMcdqJHNawsiBlC5P84TCscyQtHpw vhNANhO7JMZvPA1KsYpWOXHXGcvrYuFQhy1tFG/WfF0jV7zaPRMQ2Rpd2mrr1qL7JQDO CqoCKT9RqV0oEy245ELkNePa7bN5tJkxqFh2LPMUTifA5g7g3ROrCGll8Pej6mANYNHN 4uHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608019; x=1779212819; 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=1yVcJX3ToKV+Wqq27E1R2W87lkjzMpr5Ak2bcYR9g3Q=; b=c9gIrSQ38XHyFmtyrfI2LyWZyKFAMu+aqhVBFLZI6QCeowV5npYwCHERXqfQ72P5AY 8xIPVVkH9Pl8DhMVZxVPuah9VRGgkVQJFAByVw4p1yQozs1ujGHx4nx8Ayq1kClUl5PA pMDu6ku/AnAS6n53mKGftRUjdt6xNISdaoH44YPzxyZzYzbPGWEhMbCw9oN65n8qCjyp EyvyVJIVUB8FDQ0HI38jzun4Uo81VP8pI3QTb6A1kmye7efzHm4CDyM72YAyM6JIUm5e EAo+nMR1sJIkxdqc8tzjhFGuqc9TTBROIP0/AoWxi+OniveEOx2XD9Y8iIuHhpA3ADe5 /rnw== X-Forwarded-Encrypted: i=1; AFNElJ/i310DaQzFIZdydFhtwkFPLlJwEI7Kt6KSum3Hv5U/Z0mWbos46o16R0w8QmfdkUyPZJQyfmZGsFbF6F8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy88zp0HtyT6KTjHFNwn6yXu+7RKib27edtg1YqA9nhStGfhLYE tueLVYXp2QqBb5E6Ui7sKd2I1cqf40PqfolnzlFam2UDwwhs7y2Va3pvb8vriB7ZRnnTMK2IuYQ WSRIVQxjkJQ== X-Received: from dlbvv13.prod.google.com ([2002:a05:7022:5f0d:b0:128:cfd6:a3c6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:e1f:b0:130:6978:c96 with SMTP id a92af1059eb24-13344d7dc23mr2588285c88.19.1778608018800; Tue, 12 May 2026 10:46:58 -0700 (PDT) Date: Tue, 12 May 2026 10:46:24 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-5-irogers@google.com> Subject: [PATCH v2 04/18] tools scripts: Short-circuit CC_NO_CLANG compiler probe in Makefile.include 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.include, CC_NO_CLANG unconditionally executed a GCC/Clang compiler inspection fork (gcc -dM -E ...) during Makefile parse time. Because Makefile.include is included across more than 40 sub-makes and component directories throughout the Kbuild tree, Make continuously re-executed this compiler probe dozens of times during incremental builds. Wrap CC_NO_CLANG with a conditional check and export the variable to sub-makes. This guarantees Kbuild evaluates the compiler backend exactly once during top-level Make invocation, eliminating 40+ redundant shell forks across the build tree. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/scripts/Makefile.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 41971a68972d..3c7803122ae2 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -74,7 +74,10 @@ $(call allow-override,CXX,$(CROSS_COMPILE)g++) $(call allow-override,STRIP,$(CROSS_COMPILE)strip) endif =20 +ifeq ($(CC_NO_CLANG),) CC_NO_CLANG :=3D $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__= "; echo $$?) +endif +export CC_NO_CLANG =20 ifneq ($(LLVM),) HOSTAR ?=3D $(LLVM_PREFIX)llvm-ar$(LLVM_SUFFIX) --=20 2.54.0.563.g4f69b47b94-goog From nobody Fri Jun 12 20:18:30 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 724074921BF for ; Tue, 12 May 2026 17:47:02 +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=1778608025; cv=none; b=hDk5i9LG1h8+Hi0mRstLCMAwuhQmqNDAfKEcSD20xJCqSk30n5eyjCVavJkbxE1gwr+voXuUKsiptglhzLoHvT9qCMzOqCofyB+GegzDjuWJc7ZwbWiBY91wzootXIkLAi4w1WBiSdUY6IJGRLzPHUIxoQkLEBAjZqmOKZj9+mE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608025; c=relaxed/simple; bh=Fy/02XDOGJwcAXfOYa54BGYi6QwnfjSlhAJtenJl5xI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PkdATLBO6Tiwrqj2IkYBLNRRBi8tnHRKwFHnmhJWUvMVs0zRoftP3S1jPIRgX6EkNa8U0nsNaBQx0sGKMQ+PxYXZ8p8izDYyCgLVYKs+3fJCTb1pk6iEo4tw+q0SkSx6lqSf8v/xF7fRY0QUvJmZ2/FIRkHvk3DKyLoR4SHNb8Q= 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=IfkeUIQL; 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="IfkeUIQL" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ef62078ee7so7599292eec.0 for ; Tue, 12 May 2026 10:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608021; x=1779212821; 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=Cfn5NYQH+lQKcQIvWr6oWklsK8S100k8GWaxg3P8v7I=; b=IfkeUIQLvLgi4yG97dRsw8GXH6KCEsZdT7A1dCVGhdtu7CmlCu1tjq6ccBFK2jI/Fa DDJCyxybfeB1/MP0A5Zf9kvHLnfo4bLEqS89reVAVjw0y9JiJAPzyOhgmGgfBch95EEg R6tu3IYj1mJHY9I+qNnK3ufNRoLrcYuL+BRKYP+Jc32w2Zx8hpFZoFDAiCQHrFoOFsKa ogPR0cD9wsPZr/ZtxINqmmrQomvLBHDO6+fdmfjWN4VlPlVgQMxKKiX+rnSgJREcE7aH dPZO/CNrZQWDJmCYXmy8mh+hunbrP3xROUaw0+Uah54HB7R00Yy4dNKnRrCmE6asVNX5 HEow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608021; x=1779212821; 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=Cfn5NYQH+lQKcQIvWr6oWklsK8S100k8GWaxg3P8v7I=; b=lBFL+oJW9WRzd3X6A3QSD1S6vWHbDkm1r0Rz642rgEPjexmpVSQFp6lNkD85GkY5Vy YwiinlwcK7PJTwEt11mhQgtGyDiKLzdRnFD/ilNqudRDFil8fB8ad258L2y4N4U+3cRF 0suJ8Uf5Ob6iBBv29q3+lkVskJC8KC9vkPXmEeAXobQmA9stG27dH3v4UKRqYycMipY7 uHtpiqMd7jXdX0SMza/0ZIeLsLw/rjNFBAebTZz8sCkmpTI5DzNxC6rl/ljDB7WHuxLS XJZR4N/Q8dJl6oqBR+VKlivB3uwkMVzBtCW4Gq2/rvB2EJRk50PWA1vLiE7cr5TAbWC5 CxNw== X-Forwarded-Encrypted: i=1; AFNElJ94eAgXJyrW4Qbs3vI85LNJsOY0AidLTNUYm+xjBRHvxT735NvHZabP8WWdMntp7RKoQ/wkDlWWwR3Snxg=@vger.kernel.org X-Gm-Message-State: AOJu0YwNDJamQ13xuq3OpyWfAVPVufmcFktOK1YukKm+TgDyfG5L0NeX cNhm0MhHPrqShAQGjlBzp8bRi5MsVrGNPnppv/fnECpAX1saFUJc/E04JwIe23Hor8uF3p2Hgqq o2XcwvrhGtw== X-Received: from dyek35.prod.google.com ([2002:a05:7300:6423:b0:2e2:26bc:21c2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1698:b0:2d9:5cd9:b8ff with SMTP id 5a478bee46e88-30117b7f066mr49481eec.6.1778608021068; Tue, 12 May 2026 10:47:01 -0700 (PDT) Date: Tue, 12 May 2026 10:46:25 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-6-irogers@google.com> Subject: [PATCH v2 05/18] 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 a top-level recursive kbuild hook (perf-util-$(CONFIG_TRACE) +=3D trace/beauty/) to compile them into libperf-util.a, resolving remote linkage for 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 $(call rule_mkdir) directly inside generator recipes to guarantee dynamic directory creation before script redirection, and append $(call echo-cmd,gen) 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 20:18:30 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 79A083955E7 for ; Tue, 12 May 2026 17:47:04 +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=1778608026; cv=none; b=VAiSL5Bs31yj66r+iCv+3s7nRhG4HzrZr3RFr77eqmFZb3m4xXJGSgG3vx46m6zGQrD+Y/UmZPJ3VqTnMefj4c6h8DMtyq4dSVFEYcFu+d6ZvLb4oo0ImbSWC8hW80z03IBkPx6ectscDMHs5DuY4oJA0fXbHWe7EwhN0t7P/4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608026; c=relaxed/simple; bh=/7TyOYbdEe9k68HYyv7dCCFzh+d6Q52A6z+ebAC5RwQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Xit5+T3oLh7r4o9dpa+vTtNPKcHz+OITg61+lZa7SIGQ/i8grs67IR5FMh/RlSsQouYzYuATwlX5Nem+yUefR3CgWpTiz8iCzI07Avvp2C49/XtfaDR0hJXTR7uHUVbJquOZxCnjT2dD8hFldtRW5dz2z/1BKM/LNEH2IMIMgYA= 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=wcBa1LXD; 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="wcBa1LXD" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1329791f18fso7698763c88.1 for ; Tue, 12 May 2026 10:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608023; x=1779212823; 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=wcBa1LXDhgVQogrQHnKAaUsIkGXSAHjefoQD/Te9sSIIhRgrSPoefsnSUAWTgr3Uvc bmo4ETMjOwEo5+DPfU4daZLOdxlNgCracl6uMBduZFxaeorBZvy+WSZC0BqZlhZD+KUQ FoI6zkcRvZeEV+yof3uXZR7rY6kOBJirPI0A9L4DFRpUaJw8HDOiGht1lMXAhipuKwgl D7fsLBNUH/HmoQkOc8IY6EnJ0AFOW33eZKX5ael4MoVrw0yFN/eHQj/rIJp6q2i6DnEI luizDsmqyHQJ36v/MNLtU5Kn7t3/NDA9S/QrJmLFYY4U7MoDSEI9KKl2BZkNRjakbbeB Sozw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608023; x=1779212823; 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=JndbW2Qa2IYB1NXw8GsvQxL0NDe/ClnuHm6aerOvy0CtnKuzbZvv37YbArE2txO1F7 Zx9QKcnyIFm2tWy+werdwV/NawXVqHLXJhAmLBx6idQBpsLYsos7ZY0KY7yX8bTHTAJc QJedh6lJCIbLsBasDMGt9fDPVXni31TRWEgkgHnAitjgYFW9e2iHvzd9DelP4Bg0g835 CEcHSMv3PVsu/CCXWhTWmuWP+fld21+HhEqOZrKRC5d3dibvbaUQKxu9G2d8xc5PqHlf qH6pghlLAJI0Ft0xI53vqOVCRFPCaZjen1Vh60DHuQZqsZKAnTflXH1L5JIYFdqHZmXT nx2g== X-Forwarded-Encrypted: i=1; AFNElJ8TVJl5fZbhbxDHZ9tZy/b1yajbmG4GIfOxlijCVZKCik2INbgJ2EQAJum6zo5Kc6o5HEC1QzJewAZGFcM=@vger.kernel.org X-Gm-Message-State: AOJu0YzMCQjTjJ07DXo3k+FbAP9/8pLUOU4TAQ9h/z/1BmNkhj6kcyg+ UpyQ4pIj7kLaugkfwHsFJyQ3H3M68KbFGpElJO1+3nLdIYqrHTo9zaQcQKCvWma46G+BPE3JIDQ IvN/oIj5rFQ== X-Received: from dldz1-n2.prod.google.com ([2002:a05:701b:4181:20b0:12d:bafb:54f6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:23aa:b0:12a:6c4b:9cf0 with SMTP id a92af1059eb24-131967d5026mr15473065c88.3.1778608023142; Tue, 12 May 2026 10:47:03 -0700 (PDT) Date: Tue, 12 May 2026 10:46:26 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-7-irogers@google.com> Subject: [PATCH v2 06/18] 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 20:18:30 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 7BBF23BB115 for ; Tue, 12 May 2026 17:47:06 +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=1778608027; cv=none; b=RYVnK2IJeY4sXoNDjhMZWz+i6S0tKFfPKhQzCEegNDQNH93SLEDDwLkVwqnDNX2bM15k/Mec1DizU6o376JY+NyMYnvtUcDazj4No61pGcSUr5R3s2tkals2i4+WWkYPqVyyib3kmz5vGX79Z1GSMstNAHJGLA6KCkjwXxsBL+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608027; c=relaxed/simple; bh=xokYndru7r5U27QA5IiJ9grDU4CmNf+aSc8fRA9ncZg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=b6+NQuEPjeVAIMvtByIL9EMvRVA7drFg/TNUtYzXyM8oPpoB+aKV0ZMi9OXgQaMKc+fGzowy5nRXMUjYzUHUPGMVn+/FOu+gVdbrNLLynPmu0bz5BMtzW+R4GKYY5/Y1d6RWjxLcr+hoyRYyLCWQJNYpfGPq1+fU0GJdoAoKmLU= 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=Z6LS6/mG; 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="Z6LS6/mG" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ef62078ee7so7599365eec.0 for ; Tue, 12 May 2026 10:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608025; x=1779212825; 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=Z6LS6/mG8oR/pgnzQxbW2+IpeRPnoQ9VNiPydEi+YDrjygS/Hx3ReaY+uC0pgQal8y cHDUi6KCe2Xz3BvpXOYy6WyUfjzldngPoXkkOWaqYW0Nb1hV18Y1v3UilMa942VAoNcL o0AHYcExCUShVZEMUCtzw6dQ5ZfInB9WaZ4eIsCtWlcKpeA8RdTi41t4eY+q99QwEayQ L8jRsWWhTzbrvwGllbptOxfUTPj4hHixOCDG3rEKBh5grLpVk48tuUPfFOzt208C5D2q O+kTUzCgWqtmGCO+Asx/4CZPJI/xHU2reE6oo3Fb31bCsWdIBQ5bR/D7B43IGH4eQ0j1 4/5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608025; x=1779212825; 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=iFOfs9XQSSZ6SirAFaD/o70PCJMTDLpqRAdPKIXuN4eb/cCrLwT8LCHcXZYYQUAhuJ UqJ46lbMfuOSNPG9RC/HZ9owVdixj7cqHQYfHfnIkxJ2vj4molPIEfXhYJyfuX1WXrdi WDezb6lx/OcjVM5uEuMRz16R1IixadCR285e5JDowqy/nkYjyk1cImzFSKfb0QbrVb21 Rt8zASfK0uB6rwHY0RzSvMeASqX+Ji/dhs7+ZQUEG/JD+yR8uQHoYDqKub0yFIvw5b5v nV2wjMZR38LLO4VWvp+43bZAW3OnV5zkUYkohu9I0mCuQ6yC31uNhTEyG+VCdYk8Y2e8 Td0A== X-Forwarded-Encrypted: i=1; AFNElJ9rMUFpETCZG8mnfxd48DQY7XiRMay6/j4phJ/6dmb1jsM+h6zJ0JIN3MB4lqy/R9nXQCYmIuOKF1/Okfs=@vger.kernel.org X-Gm-Message-State: AOJu0YxSJvHtCqN+qG2PMMPL6sY2dwiAt0BtVKwRCf2XHubIQyNZ0W5F N7E+AAV61+aNgUI6c+uoSu2TZTR2nwgQmgC8rhIIVlaedEkvXCQEhgwKlrlQfGmlGcYGB9yG3gV yMq5ZXFcMpQ== X-Received: from dlbbo27.prod.google.com ([2002:a05:7022:439b:b0:12d:e33d:70da]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:60a3:b0:128:d23d:81aa with SMTP id a92af1059eb24-133450a1de4mr2504765c88.27.1778608025074; Tue, 12 May 2026 10:47:05 -0700 (PDT) Date: Tue, 12 May 2026 10:46:27 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-8-irogers@google.com> Subject: [PATCH v2 07/18] 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 20:18:30 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 64CB43BB137 for ; Tue, 12 May 2026 17:47:08 +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=1778608030; cv=none; b=J81x0X8a9P2typEknjW0jXbAr54YJ198pXcOAuCIU9D3OxyIWX5lxDIyaUJcYKQZsaGkSlB6O69rycS333iQ+sPV1h5kleWKvtmIDQLjVZmRYd8WrN4bbNiskNFArGrYj10CHTNt09oDssCpC9WZ+7n/FugIyX+bjVbCCX7RCFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608030; c=relaxed/simple; bh=mXF2WIFzpwMFAj3O5yl3PnAqbqkroEJlx3Zbis93nOU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rFdiPkbe3zRogXSbUn3BKvgZSJcGkUXx/4A41aLVYFVUeSkaCDC/tCKtEZ5OjaMJzc5Y2CsO4WbEVqFzEGJgbi3C+YAq+BemOoW0IW4gvjJwlEvfaMR5j590b4PzZnmCDAYaemYSm/1lxet+hNVDWuFzMZVqfBLD6ChxgPHsf0U= 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=twJBiJaa; 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="twJBiJaa" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-132d631edaaso14430918c88.0 for ; Tue, 12 May 2026 10:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608027; x=1779212827; 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=1dZq0fZiOpKsR8LJBHYIA10eOHGje5SDa/V/7pkEZMU=; b=twJBiJaawKiqGbYlUN3QWcK7GGpiRlXPNnU94xHL2gIyYC4uL65eQ72otqY+GPqtfB zp9rcpAafgKbsFche52K+pCCc8LxWNUyVzMU9n/I5lNFMuC4GRxXD1yOsMHm7Tp1xCuS 7PokUL3CJ84D7Hk9EymexCNxk6WQMn0qtgRi4Dearc3gqqBVtpx9F9BqNyueLPVdA89D Y6UsqzFuwzds2mUOqmFk2Vy5Ksnn2u7AnyO3m02aY4qvJ4/PT4wTGAeQeey0nSyu0E51 B8y/bcbzvxZ92yl27lPMTt8tymjss7loF/pFMO1DPwqEWYAzzYxY1I58D0EQxPDKRHKv 7CbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608027; x=1779212827; 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=1dZq0fZiOpKsR8LJBHYIA10eOHGje5SDa/V/7pkEZMU=; b=nA5o6QugoVepk0C79Z+SHDBU1wv2VE7L2KFrjttqSxfjqCtAN/uPfj6m32lZTF1IsA 6qW+sgoPWQCQLU4WkQW3tKURKVhKsZYJAAAEjny5hsX1u2q3N8B3AaB6EF1ESii+Nc0k 6iyVXoawSNk/BIqIIq5BDxJHnPiPPjJthTCuwgGvrrzZqHL2SG0PBj+AV0evfg+61NOW QViIyVPPQRdWP3NduIZ7Q+2Cua1pOoACZyZ+ku16xVqLD52nSN+Cdo+rmtqD8pqnnwIg bg5XPC8SO8LHEaceOazo+9T1iCKoCIh32YMxZU3P/ymsFTZA2DSChvq+2frJEiniwyiz q2uw== X-Forwarded-Encrypted: i=1; AFNElJ9Rp8xHYTv3QrNMDF3XMQGMEeIw/HxRuTjM96Lkp5l1eMXa6qRN2csEUVRmQJz+tdD8R+l339OeNbLvd1k=@vger.kernel.org X-Gm-Message-State: AOJu0YxQXo93uiboTOrBHcAZ7TjDmk5U2OyFJJj34ez0ZoJNgZhtkt1a WhKxgF3DtC8H5jMUaNMM4n+MpygjSnXKufSGO7gdgHsFAIyarlgI4mHyk2D8qaZFtWHXQSWc+C1 naMwM00yj5w== X-Received: from dlyy37.prod.google.com ([2002:a05:7022:6a5:b0:12d:b86f:f7a6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:e21:b0:11a:3734:3db3 with SMTP id a92af1059eb24-132a82e05admr10064666c88.32.1778608027270; Tue, 12 May 2026 10:47:07 -0700 (PDT) Date: Tue, 12 May 2026 10:46:28 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-9-irogers@google.com> Subject: [PATCH v2 08/18] 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 propagatio= n. 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 | 55 +++++++++++++++++ tools/perf/util/Build | 15 ++++- 6 files changed, 80 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..d4fc10f36781 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 =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..bcb704d5af32 --- /dev/null +++ b/tools/perf/bpf_skel.mak @@ -0,0 +1,55 @@ +# 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 +bpf_skel_deps :=3D $(BPFTOOL) $(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 20:18:30 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 32D6D4BCAA6 for ; Tue, 12 May 2026 17:47:10 +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=1778608031; cv=none; b=YWQXK2UvGPtCCXUmb+MMrnfbtk1MEtSVkvsGKWBc6WuF/oFCA0c9Kc773aQz3XL3Oh8OaCp+QiRTn/lPQySgLKJHxBA97VzFPDziPJTb8eOH2JzBedWlQbG11C4Z+utkHrB761KzbNRwiruTG+YPcU8WCgIVbDJ+6g9dmPHFyKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608031; c=relaxed/simple; bh=cRUfYLXCoHYdcJf7petym2SaUqyYp1wK8ZawGIFjxks=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=D3G0yr5y+/1/zqFcFgJlL0WrdJqQCHcpuESg5GKdqyTenmIAwcPccfNwZefN39zRMAX4K8WvPMrh9gKHL85T+8zmtWnhdMj1AYSdRPLmrKIASzfLCbrT16zq3edMVh9Ex/FJiypUffSDkbk/VmMuM/w/64oSQFWvuAbWa7zUtCQ= 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=u/rWHH0/; 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="u/rWHH0/" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dc1c0b7ccso6268423c88.1 for ; Tue, 12 May 2026 10:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608029; x=1779212829; 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=iQz/WCb5j0166DK49KzL5MgWB2a5AIO3DA7/MM9BNeU=; b=u/rWHH0/F0m9Y8DmgN4h+6D9RDyCm1+gkAI6BimXZvBpEwcVjkcWqpgkh8pvQcoEl6 mKbMUF3QE5xWj54uyGB2Ztzglesc9neRvB4K25o57txLBDX3jPEXEFG+dIrfa6lkDRlt wJzQKYKDgHYdqahMF6g8vKmDtiGCn7ZYA6q+tQ9j8gOYugj4/wMA9gTXlrR9k3M/SYiG rmqBtY9KjD99z1irfPH6QV2aNyFzdFkrh61qI9vRoCnGKXZEAdYgRDFHgBWgmA4bVLhZ AQJUr1tJ/ynwkcS+kbNDLZRweLZHz6l2Xt1GXA5klCk4/YtXkzeESvJKdVLaew6WV3Of 0kqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608029; x=1779212829; 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=iQz/WCb5j0166DK49KzL5MgWB2a5AIO3DA7/MM9BNeU=; b=WKKbPEpgcP2d4H6dBF6ix13nVJ5mkSae0X1fhULvyvsnluedhiLRunum8v/OjuM1sa uO0z7i4Zyo1GfQC/S32bkxW4qmrQ6HPAP/YbDWzDPgfD5nJ1MhUMB+IAScG5lit34BqN 9k5OQ+QUP/flylDrAJXFD+0Ovlkh8mOIDJd7W7AYfH0YIsL3Pq5n+wwrY3fuxAceto+T OivTHWfSft/1W1MskO0FqWgWV06Ad3AYdbBTQm6wY724E+8WylE2Y4gQbU9wIxgOPXlF wJ1sIiXzjzaATWPh5o6r7eIyqTaV5gvjWqt/GnSlsA76OeKr/kE/vXCKOiwHOTCOKy9A Si3Q== X-Forwarded-Encrypted: i=1; AFNElJ/D8G8cX4TZIbEH363vtxriBuqzKkFazvaaWes8+Cv80XA/tmrSHFbThqnJZR5lclYl7pZEyHrhuYpiDXA=@vger.kernel.org X-Gm-Message-State: AOJu0YwMWBYumIGhCpPuFmazcNQ1/Su/dhb5FK+lNwisusYFANFsqik0 f6AwYjyZ+zbsjuH247Xg5o75yVjopVzBZg8jtDjh85KnZQh0yW8vWC328/an+2vMvO7mOjJ9o8T LDUPmHK1yLQ== X-Received: from dlbsj9.prod.google.com ([2002:a05:7022:f909:b0:132:8d92:4d68]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7023:b83:b0:12d:31cb:b806 with SMTP id a92af1059eb24-1333b4e94ddmr2899885c88.26.1778608029032; Tue, 12 May 2026 10:47:09 -0700 (PDT) Date: Tue, 12 May 2026 10:46:29 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-10-irogers@google.com> Subject: [PATCH v2 09/18] 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 d4fc10f36781..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 + $(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 bcb704d5af32..ded578b9570c 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -36,6 +36,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) @@ -52,4 +93,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 20:18:30 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 3D0613C09F7 for ; Tue, 12 May 2026 17:47:12 +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=1778608033; cv=none; b=VU9/AZ0zAADEluV8zNP4fXTU+hU28o0zeknwKIyXrw+admlDPpFrSlu09hkswnqLjFKBz6ydxrlFJMX0FTLkgZanjDfch64f0ccNUoAoioGhKTlLBrs1p6vFHdWDYmOWoU6px4Ob9UK7mBEaLbKNSpJfg2JyjnR9byKixXxQtUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608033; c=relaxed/simple; bh=V9uO+ebp1yArPXpVQzfrUgibD+lVsuNu/lXBqcKFX7E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NQyCoUiBPbaI+detNAQb9fJCj9VT8nNdq8jG4V9QXuTOeWTbYxOBULRaSR6LYMJsbMNgxUarPn0XUpkwH5O3gowp2wjeRlIPlhI6EIMoZLopTG5atRhGQLPDKVmd/8UAAN0T3regQ3715clUdxspijAm13jAFufZsvsP91ULn7I= 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=qU5mT/cp; 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="qU5mT/cp" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-132a8f93432so10968093c88.0 for ; Tue, 12 May 2026 10:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608031; x=1779212831; 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=ub1wi1XFkCEqGxrUuZJmOTaLUIJDT+EL7sF28fUopIQ=; b=qU5mT/cpTugojQ6nFLl3IFhbPR8VeL7bX0+FJqI5K++E5fYkz8Dq6by7fLcrv+PXxS olfqi2M1XooJGXggHriKD9CxOkA8JjVOr7QjX0wAxHOTHy+POOukn9M2I4y/AUpIqqlf crPlIse/q8Cv/OGXYCIX9Tm70FCc9StZf59l4kFWoW7r142Vo7jqNlyotPnPQfKYqrrg NMNjAOrd1PHKcm9qUtWrBl8OcmJiEmwJIAn8+5pi9/6pZatcXM2tfAvrxt1fn4sGYpMz kaWCOiPoM9FEaztC3dER43ToHgRPjB1zUv53V2jnR+QKgnmZoq3ZEFTFZHDFTgvT5SA2 aAUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608031; x=1779212831; 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=ub1wi1XFkCEqGxrUuZJmOTaLUIJDT+EL7sF28fUopIQ=; b=FaHU5ZVsjk/MWxq/F9Z+DVJIF9QH+5VBtSrLmSWtzxiS+7tFbhHG5D2E4OfiSyg3Uc dztJufih87+Fs0kIl3zN3aQPy+X/ZD736vX2I7BYTfGyOX8ZTPHNUxlY7B1YFKx3Df3v xbM6EA75VWxBluZTTcwB57RWgIaYOIVYTkwymtowsUEMkVxPNAHX5lMNdzV2LAsU3a00 P9n/axr/IsLOfX0DIrB0w8RIZBkd6sEwJaEgWHKZiqWNZjBTTD5pVztoy1VOBp0lz+vk Wr/qBX48iyxt/rqLqtgt7enpN4M8/V4pSa+Qtx3xCpCLx+lF2hFZw86tZu5gJb28AbpP qzag== X-Forwarded-Encrypted: i=1; AFNElJ9realFI0XIlpyff7MLQ6CexjCOElAFZo+HER7VI9rZxBFD5Q367Zi+DfblCTGCej3QWv5mPyXjfSa1ozE=@vger.kernel.org X-Gm-Message-State: AOJu0YyD+2UiWg/pTpmot917OZFUT9+lFCwRsSWQmoUHEzHZH/vQtBFH P0LzUGtg9xL8MpS0qUC4BWFv3iR7hnIiU/YzuURolNc13bXU1fAZ90OBFBXJpMR0XQ4fkY4Kt2K zo+OUx85l/A== X-Received: from dlbbq39.prod.google.com ([2002:a05:7022:6727:b0:12d:bbfe:96d3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:2412:b0:132:f27:533e with SMTP id a92af1059eb24-1320f275532mr10237119c88.19.1778608031266; Tue, 12 May 2026 10:47:11 -0700 (PDT) Date: Tue, 12 May 2026 10:46:30 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-11-irogers@google.com> Subject: [PATCH v2 10/18] 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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ec0e91bedce1..5af767415c11 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,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 | $(LIBPERF_UTIL) +$(LIBPERF_BENCH_IN): FORCE prepare $(LIBBPF) | $(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 +$(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 20:18:30 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 476EC3DC871 for ; Tue, 12 May 2026 17:47:14 +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=1778608035; cv=none; b=F8/r4x35TUiNxZTHlClS33CfUIzNb3SRugKsW/EOdK2rT2I/2qz/7ULdI2Di+rWcFRou2Mq7aSdMtvVhfqjH24+TPgaJrUlrcnYlAXpMwRUFWdOkM4jwil4MwcVA0npeeQVuyjizk0Xdo1vQwyUtoiIaWOVeMo71NFGoit+CvkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608035; c=relaxed/simple; bh=bhZ2hY6MSv532Che0Y8RNtMfS5lmLi1CAbUeT+WGv3I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I61fFzCC+BRfm36Z2kFVg9vLM3/+G53IAO8ItGOKJA4G2uEIKexYI8BVSOfvj3Dn9AXHaUFCbUVh0YicsgEUANskz/F+6mnu99SvL0T5sj6rELdejMecwzqqHdSzB4QkGjViOVGNvAAEaur8HoBkby3ktu37CLWpfwhXzTRaSF0= 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=UUyeVwlP; 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="UUyeVwlP" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dc3d81736so5362004c88.1 for ; Tue, 12 May 2026 10:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608033; x=1779212833; 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=hm7qoj0ZGArqNuRl8x36cXklyqsz/vJwzKuTWLKP+4A=; b=UUyeVwlPRv14a/u+t0LpJ8p9XUpPzZGkk97zqbdFQmtagmktQH1qfvIykE9Mq8l1VT NPbcZFQ5jleyHBLPeg7TM8mdU6lEM4y/PTxuk+Vv0n/3ib9Upm4ZTg/0f01gJfBL2rha jWllkdiD7dkVZBlqlRejH2Na2AMVJLcKTp+FHpY6tMZEtCg0hadIPwpdAtryXCDCFjvF voeuvCW3d4U3ApUa9C6JZkQ8GEHk25fvZUi1kGULTV/9lmvIAKlXe0fQEU3InTUQSNfW vvtULIxowJDMqVopyF3prmv2IiOJa8MNBqUIfeyoasq0x+s21fZZmT7rYUo/41eoHNGw ii5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608033; x=1779212833; 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=hm7qoj0ZGArqNuRl8x36cXklyqsz/vJwzKuTWLKP+4A=; b=ebELd1nobx9WRQ1m7e68UJO5yY7MuSAKSkH80HUQI3N4tYCxNCPo9B+ShODucMgoQw zSNm8bse6GgCifnxAhswms7zGCOUdu0l3AHidqsDKFsXLGNCd+fOxAZyG1gmBksTijH4 5ZUsXIpZO+UTVkOKfw4qLlsfYxgFpGqH+eRjTyFSR8S6hD2jo82MNWXo/d6YhrPDANu7 x4DDxRv3Vd0HU9S3GSpW02Uzx8ullUCBIfrL2ZRziJkNKwIgVkL/+ZhxFmpwdRZKTUoh iyHir6x0W6Texv7Lir1uJ4pvzMHVc+0sp8SW9BJ+zXUgKLHXBnfrbUpPCI2OmjMjHYwk CEaQ== X-Forwarded-Encrypted: i=1; AFNElJ/jih51VEKwy0+g2UPsyphbzv9QpLdubNCMjeHGfG8pYNBBQF1VdE44VSnqFb5mkJTzpXdhfganz+JN5tA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/OVWaB5I7ZJm+gV+qVboq/frpbaBugifgNPz8glHsib3ap8r4 dONbQb2RmcEx9fLh/2S5Rzf/vmPRIyg2rvR9DKLq55ssuInJrpeWfsOqmzvu4cfU0aMp9G6vvYg uArgJub+2fQ== X-Received: from dlah5.prod.google.com ([2002:a05:701b:2605:b0:132:e3a2:6717]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f102:b0:119:e56b:98a4 with SMTP id a92af1059eb24-1319763be96mr15409551c88.11.1778608033142; Tue, 12 May 2026 10:47:13 -0700 (PDT) Date: Tue, 12 May 2026 10:46:31 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-12-irogers@google.com> Subject: [PATCH v2 11/18] 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 | 6 +++++- tools/perf/bpf_skel.mak | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5af767415c11..df68d29ecab7 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) \ diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index ded578b9570c..c4340a218323 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -16,6 +16,10 @@ BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h bpf_skel_deps :=3D $(BPFTOOL) $(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 }') \ @@ -94,6 +98,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 20:18:30 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 A95093DD847 for ; Tue, 12 May 2026 17:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608037; cv=none; b=UttubMlZghabt8BsSRUrRqrDSUUectjWKXy9ScYAd9xF1IoDJ4hYuOwTuVMZQLSR2uueLbnqcXuFHSerysTgQs5rImBEaPZfxg5LFJ5eWf1cNu91kSdBoRLeY7U4S0ofIHaZj988PfqvoTz84jYnpSV9oo1g8s72sOywUZaS+t0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608037; c=relaxed/simple; bh=BWtcwch9wSpm+jcG4ZyiBYkU6wNGJJ6j24TCjJCtDxk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tfIkXPPWxGGHqHZTVTsMwb1iZFUKeAux7hfQ5mHWkzK91C0RnCb1k81+Sfny8mY7zjgHBVlYAdbshldld0eN9cyE6FPh6RdYtVSCgA4OxGGeRIZhb6IfzRcJnoWOqarzlqMkuutPwHWISltSYFl3dLRgWNigpRMdr6/zOKslFXE= 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=Wu6t0AA0; arc=none smtp.client-ip=209.85.215.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="Wu6t0AA0" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c82751074c8so4128655a12.0 for ; Tue, 12 May 2026 10:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608035; x=1779212835; 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=YigNKPWKB82lJT8UYMSKceUMHop1vuFK75H7FYEGV78=; b=Wu6t0AA0I2+ybNq86mWs3uItgEWGY3hJws5tDt802bGEOtWz9lnKQ8W5vbrauj1iGq bHnw9nNHStr0heJ2Edlo2yOVE/mprJU2sykngST/SPLfuCMa6E6l/m/q4BzRoJhsjqNq XfIbnFuHD4If+I157cBgBW3xcFSxNa9CJhYFo8JxpQORoPmJLlmN4tHEZIx6Q/r8IPts U65vtuwjFDAJELiqgzJVckMvjgl7PeQw0OVz7cHEj+D0qkXgnMzSDKY5vuQMRdVEBlIW o5kmbmtvlC4vWgN8l+uotq+kOrXrCDDuLKRBWdzyu4jpzac6zFul1gNfLh6ZzQOoWWn/ RmGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608035; x=1779212835; 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=YigNKPWKB82lJT8UYMSKceUMHop1vuFK75H7FYEGV78=; b=dXVEPqV5f3Uq7Laliek8sDRkNI3MiIVOYvZi8hJIbYjZ7E+iv8juWfH3l/LVknMLw8 5FtoAtna7VA3P4XwEs3WVcpcNT2Ao2SDuOqGWLrCFKno3ny2i+8F4Dk8C3EcalFhsuU7 ORDTZBRKp55Oyr7suldY8f2t/cI2YSHaLNveGzQvRzlmvVGwymnGfsPwbbpwgP4FswOX X+2rXs3H7YuMlqEqeHPUgHwVY+Zexj98ZrHPRJikuSlDus/QbSGb6pEkAsRPX7FYanDu R2etlM4sqdOXTgdwSqXyVw4z7RKlnTLytTCLKI6f4Jg9K9jrAcvc1NGQItuzmJ87VVcK sICQ== X-Forwarded-Encrypted: i=1; AFNElJ+htNOWuBQEdCnO6ZtPTu1Ln7XDUsSmdLfk4KYkz64oImRTSxsG9BqOQ79C622G5G7uIpEbCZ7bjLWoxVg=@vger.kernel.org X-Gm-Message-State: AOJu0YxzO7ldueP+JDg5bAj5y1Iv2OgqKIgdYF+cZGHP3qYY0US09tBs PuOz3WfC/msZpy6+n6URgyqSAOnoe7fMnGts5ziGt/nr1xIbmEYRBz24ZRuliskIsSnAWnxXkdk kil5TGzbk+g== X-Received: from pgww13-n1.prod.google.com ([2002:a05:6a02:2c8d:10b0:c7f:cbe1:2d84]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:2786:20b0:3aa:c93b:625b with SMTP id adf61e73a8af0-3aad425fecfmr11319658637.3.1778608034842; Tue, 12 May 2026 10:47:14 -0700 (PDT) Date: Tue, 12 May 2026 10:46:32 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-13-irogers@google.com> Subject: [PATCH v2 12/18] 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 df68d29ecab7..d2e673d5e5be 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 20:18:30 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 AED203C09F7 for ; Tue, 12 May 2026 17:47:17 +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=1778608039; cv=none; b=f9aNnwHW41n91Yn81Jtzann9230mqlkBDftNEedhS3IxIeSWfpiu19Pn9Mz35tFrqiOhxRmHC4+Oh84ymcyHqeP5I3AtTVO+RUTyMqD4I77k0wFqupcigpFysYkQZV4hqa28i6u3idTWSZ5rXjmQ3TTnfB9nsj5Y++rPGLvy7P4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608039; c=relaxed/simple; bh=o/K4kgugTGSk6IivctS3woOeRJortswYl5L/8mR0x6I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V00PayBtZFd+WmhDfGjKCiWNuKLoXCSwolctYSsBBoqE0/zURatQdrDjUqlpGIChhDzl76ChP4ArGRkJSiHKo+b5P8h3g44Ql9K3+O0CrJYmsUxcLPag+NNE6WWE1s3smxmYS6bJBzeeCX0acgylACpuuNjE0vmczhRa9jf+TNM= 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=CLWTZPoC; 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="CLWTZPoC" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2f1383b7439so4941342eec.1 for ; Tue, 12 May 2026 10:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608037; x=1779212837; 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=CLWTZPoCGnYEEE2di1Vp8iNXccTkZ5173mucOZM4M168dyHV2PsVWI6v/YPIwQ7bIC Lu5mawI61+p75J7g8DBgMFUO0COgirbte21Coqi+sueKt+q5HPA/V9wVpaSAw+Ywo/nw PnmakwWRdmNvl2S6AExVvF30gQUAnF2o0QcbNdoJAKPTCwC7BEuskEF5DpfOlaoK17If XT2tZQoEj875gwb2DMuxN/j/N+gObT8ESVDlhfEhhH29cvTRHQUfXeT+Ey3+fpRVZ1TI QUPr2WcGN6iGkmhXuC7raFyUVMtvkL9+T8ZdZvzNl86I5zvvSWiuDPCl2xl5JfQavl9C 658g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608037; x=1779212837; 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=fYXJJjtPQDNS/9rl/ZE8ICqv+SkndWhW4Ic/exu6LypVjuLWuLmQEgl8VReQSZbIPb TqnFQCYtkXzEEwKQPjaTuYIZK2AwOR2aoMVhZGW+jqOmHLPSah82ZTfqr3SEx5CXS3jq IQBZU9R7UWd9hhkJo17/JcZXPwRh20kCVRHU5Q8/zOPoobug3eu3nFBzr9qUw4z4O8nT 6PJiQWSxjJxub0K7URZTrg1ECaA25MfWbWG2XUFs0mvpX/oMnylgHM3QuNGm2IeJWe4g 1Tx5tG8cLKZio+TChN0dAINXQLv/DpKC8qCek8Z1zp2ZdwBrK9YUJhsZsKODpcxVesvn eZLQ== X-Forwarded-Encrypted: i=1; AFNElJ9x3Gunof53h7tHx9aa6pcpUJ2kzD9mPOZHjlVZFadQBDyej8WZtKeYJsbm6YaETpd7TeijlokOhVQGjEM=@vger.kernel.org X-Gm-Message-State: AOJu0YxoNfq48hxh+WYFIGMdA/uQ/Nnn+NdYMoYiADl05QiURuQsp1Q8 6lGfs/L8evrp6Lw8TMkZio/cxl9KOGtcNxWR+tqvkdKIungYndMtEpbLHCbaMtdKPDRufvdIKpR lBr6duQJBEA== X-Received: from dlai28.prod.google.com ([2002:a05:701b:271c:b0:132:8d92:4d7c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:10e:b0:130:5606:94d with SMTP id a92af1059eb24-1333a927d94mr2988973c88.0.1778608036478; Tue, 12 May 2026 10:47:16 -0700 (PDT) Date: Tue, 12 May 2026 10:46:33 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-14-irogers@google.com> Subject: [PATCH v2 13/18] 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 20:18:30 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 840CB3E5A0F for ; Tue, 12 May 2026 17:47:19 +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=1778608041; cv=none; b=YilAa/MBUV5b6HPPKMX5uvR5IAXnamfDM/ld7KzZW97uEdL7kdO8WlNXgNTowKIB2eE6g7TdiwZEE3yvl1YITVdJ8Kw0iL01AEWTLD3DpuGeyRjy4AV3qNq1973ZgM6dhEu073YC+Geny8DKQ17AoDhl/AIVLWqVZtW377WljNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608041; c=relaxed/simple; bh=aVeetu0i9pJvvdQlKW2orztydFPaYslh6O+fJ92QNxo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=l01pIjpZuoYZwLZDrOkSt/+KOR8eYi7ilU/mqUYsRgOhDxaXyA0mkTXv0YfBlhaImFK2dcGxCkArDo7WKz+TsKFsyvsPh0B6W++sMIObq53jX4TYjONdrbYqBiLIghi2Zt6wOH4Z/xhQSOPneekQvLJom5rJ+yPdsEM4dAnn814= 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=kbhhac6n; 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="kbhhac6n" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2fded513994so7816557eec.1 for ; Tue, 12 May 2026 10:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608039; x=1779212839; 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=+LcYsFf4HI19tCNBxoq7qOzkOfWxUuLxu2pXUmt71oU=; b=kbhhac6n6D3B4Q6Ni8rIbhnojgR8pyM24jLaVmz0cfAUw9T9dNHm2Xx84h034yn2ki +HQ0jH3m6GCqJJ5fdreFehtj5zqcmVZTilI3cpl5SWfhWoudWWp9NOMZIGNRi0jj7+/5 j4xhCX0cU8uaWqCeqjE7kmA/SyrzPNfCI8PvLVtsgdkF+GRo3VgO3gIy7RqoUP6aWllb yzSCmkx/YFQ6m1/6z2ZVk6qLSMvGO+3WIL9YDIoowHFcxdI3l5KzgiR1LmnsLKsHqpcZ M1xxHVX6MDOlbeXXzuONTX6Iv3NG+bGjmxTGhG1gq9s/mXIuAsbazli3M3hFMLHf9Hwr LXFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608039; x=1779212839; 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=+LcYsFf4HI19tCNBxoq7qOzkOfWxUuLxu2pXUmt71oU=; b=o6NWL8Q2iTMT5w/c+852fXW70jiF435SUhGKb6uUuYRSmHwxIo7yGx/3hbJ0tLQYoY 9PYNh3WFcPMT9tAYhGek2zY5Mz+by8+tgWPmkgCjHC+sebL4HPv4wzUMIn58IgOEV31o 9Z6s95eSZL3iwS//sUwnWzb3KzWedVujaUd2tGSHjHJ612rQoGeQ9ZhSWXGfrlATfGSs zdIoPQNVDsa9gSGvPrUiuoNCgPF0Jv8L6BLSfWqULVgpmbXmiCGUWoBKUCyVeXAUPFR8 wpcQTyuPOJ6+G2RJOsVIDeD5RGFpqiRLpRBKDHn9Ux8HaxmcaFrGiYN/Y2oKi1xLg6cr htxw== X-Forwarded-Encrypted: i=1; AFNElJ/527v2B7pPI3TiWFyHlWcs8zHFe6gQFBnOvZdKTh2l6dWWxNm2ylJRx58ywEBV1XEPeZy83nIwJhjs1RM=@vger.kernel.org X-Gm-Message-State: AOJu0YzL0nHck1YsfGjtJ8mROVtyn6Mavj/RSlzAqV+PdQZYyEkuSUNS yRoFlyLDZJB1daici1+WH/xOdBFVtbAS9lFPQkQQSoszZX7aNZ91nZgr02An3O3gi5JkXUP5Ix0 ReExXx5qhzg== X-Received: from dycnr8-n1.prod.google.com ([2002:a05:7300:e9c8:10b0:2f3:e5fe:f565]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:1486:b0:2da:4216:7ea3 with SMTP id 5a478bee46e88-30117a7b8camr59716eec.14.1778608038494; Tue, 12 May 2026 10:47:18 -0700 (PDT) Date: Tue, 12 May 2026 10:46:34 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-15-irogers@google.com> Subject: [PATCH v2 14/18] 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. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 4 ++-- tools/perf/pmu-events/Build | 15 +++++++++++++-- tools/perf/pmu-events/jevents.py | 20 ++++++++++++++++---- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index d2e673d5e5be..98b6f9fda8d1 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..e957aa2fcb48 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 @@ -222,8 +232,9 @@ endif =20 # Finally, the rule to build pmu-events.c using jevents.py. All test # and inputs are dependencies. -$(PMU_EVENTS_C): $(JEVENTS_DEPS) +$(PMU_EVENTS_STRING_C) $(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) =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 20:18:30 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 87EE13E5A3A for ; Tue, 12 May 2026 17:47:21 +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=1778608043; cv=none; b=kBOh+0lpNxKdnfO9Y9vhatZhDY/lVZEgkUvW0LXeW7QvOQFDMfkRJmyw4eJhFpIt6W0p1JqNXgpDnumxo2l6wUGLDBBbKxp0sb+M4tCuYIUgeD82tdqaMogs/i7/iR2w3vBbYUzRr8XKv/ja2ugB+QSbnQ0LCUGRl7BHxLUSL+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608043; c=relaxed/simple; bh=PFrOy//LHqOv9Vz8X99ZJKt7QA5vUi44zRLC/m7ulls=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I/pFgmRsXXmfk78RbLu3VGqSd7BdMQHk9pojJN2fwHftrkJHetaaRnnNTNulQnxmwahta5HxAc91utcJPi/L6kaPqHA64Ed0Ad6zbYqljrJTjswNaA+rXPPBHx/171Ex8jBzfcFqvHDRLrjCrSYT6r1nt10S4MRQmqAuHvprAIQ= 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=FN7uiou7; 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="FN7uiou7" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c16233ee11so7881364eec.1 for ; Tue, 12 May 2026 10:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608041; x=1779212841; 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=o5JKeEQpA3f9GP+7lvTdgn4CpHfMwPOs0RU2hawabLQ=; b=FN7uiou7zjrTbj3lkHFFGPtCJ/yvHtaEUZicJRQ4qdaezCX2pj/hzx08CGajqzWysH lyzzJEDpH4Jrunrxxf1rX1Wg6A7QvSBjcjfqmO2A0hADaF47G9tOGuAHUHw+jf+p/wkq 7lFBdNz7RtCOGz8ZnaljPSgc2aCqs/z8vfNyDu5AfPR0TF6bdBKB4mmySLo4UqLwCLX9 lboRGqLFtm1gJ3Q/7cbygjjVzuGKbo8tXfgaX1pc2whawuZQ5lgmfZBqClRtfhuigIz6 lyEspAZ1Et75DZ00ty4WlVJqQ1pWVlHCkWjfg/MZG1zGkflFhl97HXO07UL/IugvXZbX UXVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608041; x=1779212841; 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=o5JKeEQpA3f9GP+7lvTdgn4CpHfMwPOs0RU2hawabLQ=; b=SqZOBipM67pC3f83XzaauXWeLIKjxL57bG0lST7vto8gwzSDa+vmCaZ9EkRHIzJ8Ua 4zfzTBZltW9YRZ9LZT2wfjQVcNHz+Nt6+Szsf9jdoxqWriRbimA/SJbuvWbhs0YJoRCl scRzQ4GjRticqtLRg1l1oVIeObISHbOose2lA7hPQA4wiFp3TtIENXQ88hnyYwk0RD8b ew7LMqe27b99nR5yds/NVbApmsbCmG3/Gr5sLhg4hJ/562Su/LLBvb7HxAM6SwWONlPs m0MUIHdm1zAAArOhIC3kHMHgKCh/24Q7t5md2Amd6XkOFq+odT3VR0m53G7cYf1jds5o TXog== X-Forwarded-Encrypted: i=1; AFNElJ+EaPZUx8jRqAJONc/7pHQXf7FiFpMTi1Ek+eqfL4KYAe+HuqlF2fPa8ij6eIKDdhSZexY2a0yTD0etL1U=@vger.kernel.org X-Gm-Message-State: AOJu0YzXooHDvbXokma1Eu7I+N7BM2+76PCQs+NkWPLTCOmZYJLB1S6E 1PN2VFozCYfr7Z9rtQFn8OFHb3dqpBbiY8bnBTiP3+MH/XMSgBFAbxIX4yLAgZRowC88pXcG4N4 +3vEbKS4/7A== X-Received: from dlae11.prod.google.com ([2002:a05:701b:230b:b0:132:c001:cbab]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:48f:b0:128:d375:f1d4 with SMTP id a92af1059eb24-132a83fb2a8mr8635469c88.28.1778608040466; Tue, 12 May 2026 10:47:20 -0700 (PDT) Date: Tue, 12 May 2026 10:46:35 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-16-irogers@google.com> Subject: [PATCH v2 15/18] 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. Configure worker process initializers to guarantee standard event mapping inheritance under spawn multiprocessing semantics, and apply depth filtering to prevent redundant worker tasks. 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..eb72c154f946 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,10 @@ 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 main() -> None: global _args =20 @@ -1459,9 +1467,29 @@ 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) + + def _init_worker(std_events: dict) -> None: + global _arch_std_events + _arch_std_events =3D std_events + + 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 20:18:30 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 A4D943E9C14 for ; Tue, 12 May 2026 17:47:23 +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=1778608045; cv=none; b=f04HFUCLJucZvKMqWweV0+39L+bbptTmo6tQLkUBGuQQ9/gNF89UDx+SUSZejMp1r4b7MFOl/IJPUWqpxS9+uuCW8IF0OPKatVD2gjNFt5XU292L6tJfOUEMw6a/loM5HNFgv12bSMfDDhRsjkXkCYJzDCN/Suuts8zcuLBfGsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608045; c=relaxed/simple; bh=rjzjA5zRIkpICgO0qUIWtuptTam/FQFcuKRS9Xq1UvA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=W8FSWktx++zC/fYdrz6YMx6IQZ6XrhWA8yQtDcjAMuS6ZVg4BusdQARWsCJNh+FQDJuGq4n1qLC4CbCVlICwIBtlSlGFvunjFJcJvoiLto6T57t0my7pU/WaoOCcbyMhEM4YNH0nm974kSchOZTlaiWR/kxXNC1gsPOcahfamOk= 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=hISbOQme; 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="hISbOQme" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-130aab78a09so5675486c88.0 for ; Tue, 12 May 2026 10:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608043; x=1779212843; 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=lGrstGPcZrorDIbjfOFeE8ufwrIU7j/Y3K3p6Csfg9g=; b=hISbOQmeq6wIJtbpqFRlt6niyjmQ5fheLeZOlTslW0cMaYT/XuMby6ZnQECQCTnFCc o4yuVsAWui7rXE5LB8uPL1fpPOEYXBjbllNQ0QU334AhGGd29J8cJ7utup90Le/XvVYb oSB9EXyzeZUmB3AukQztxa+K9nsNLDyHHnYb9FiwuJIqJ9M/DJdyvay8rNpxNYEIcGft cBayo59RgFpo+xk6YwXvGrkQv2X9LsHmvbRrcu0gcd8CT1SiGMoWsK52lp7q0dOjCEhV WbMboaE26CKwYTN1BH0uX1KKaCus9WDLLoNIxpNxFWNhycH5s1KGVYNekBShDSfnaCo/ tEvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608043; x=1779212843; 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=lGrstGPcZrorDIbjfOFeE8ufwrIU7j/Y3K3p6Csfg9g=; b=Y3C2uiXN+9jAahTyNug6UKArtLeIVc0iR252rXIDmFu5YI0fBAjvl59K+skewS8NN/ RyIA3KNew/MFDlw3MdJZd3ULBh9zTCsDpHyVGgU1PkwSYqHs+huyvDKkGvXgCh7/HtTF xVAhIaCZfLUiN6Slz2id1+Hh1fUOKWXHMiY2U2AMVOUpAyb7282DFcC1vbJ4MrkBMf9t /UMqCDs+IrLRnbrXpS4ClQpAum7EIAOgETSMEgZQJTUpiet/kJce9fNjWXroiKk/zEyv n+xS+/kM7NH8RjHyQOuk6jk56W+MVk7iodqZjOEnVLS5myBabP9zQ52i9wqIhwSa6AT9 chUg== X-Forwarded-Encrypted: i=1; AFNElJ+qFbT7Ot8kCZS1YNTPt/Q8tdlicH5i/sTcpnta/ErbF0ibqP+/FgZTf8eoP7/L6vuJGVi5Q2AiXDdl85Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0PkRFAeHhz1HWM2WhnOq4WtB0ArX/nP0vcNo+Nbjh7FcxyXvE YNgQHaAMo+CsKwGKglqOKViglKkWu1rP7XvMe2DLS0oZRwyodCQXTk8iQO0OYGit4bCKeMLiJlq USrrfKJqyDQ== X-Received: from dlaf19.prod.google.com ([2002:a05:701b:2413:b0:132:8d92:4d78]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6896:b0:130:9c30:edfe with SMTP id a92af1059eb24-13344fa6201mr3149800c88.32.1778608042523; Tue, 12 May 2026 10:47:22 -0700 (PDT) Date: Tue, 12 May 2026 10:46:36 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-17-irogers@google.com> Subject: [PATCH v2 16/18] 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 98b6f9fda8d1..e700cc1ed028 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 20:18:30 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 6E35E3E9C39 for ; Tue, 12 May 2026 17:47:25 +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=1778608046; cv=none; b=lwG7ydPe227Ffq9mWU15SOpQ+1FvN7LV1nYDaXPhDI9hYj4fPcbmdeM61HQj4NQ0VQqiOwR2P+X3BCL18mM6m6WdTcq/2+9RRqIPNZ3nf4WAcCsny3H4iU1I3u8x0uhIZ4+Zc3Ppm+OSFaqj7Ii65BtKtj6BJ4w+n2Qft3ikBuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608046; c=relaxed/simple; bh=fbeGUoInrJ7IQS9XDD8dWdJoRhkp1aoUqMLyaq501UI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kNUV5oTnsX0yWTA0e7zek/peY9XeK+B2q9F07zmhm6LfrqcdZujR1SPEIAFXOawjJ0llFvG0kWSjqPn+LnIpQJkr/B+Q01+fjtZkOoREcJdCxOfjzGHMjanteVmkPWFmZv3Z6ytnyMFVSUKqyWpv6fb2pRTOh6eABCf9lurNVuU= 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=ZuzcC9qz; 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="ZuzcC9qz" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-1270dcd11c1so11668519c88.0 for ; Tue, 12 May 2026 10:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608045; x=1779212845; 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=zlwGLoBgL+mbcr2Ut7vVtoWK7MJrQO+SoHBMlgxr4mU=; b=ZuzcC9qz52599ULcaFrsRc/OHlDKTE784zzb2Ch+62hPnyiwiweD14PKKwPaPkW9v3 MBXepLtBxfiyV2i13jotC+uNpBh8WeazXB0UWrhwncSGCYbOKD0ZEFfmpklzNsTveAgb 9vibtcKfi7mRZoaP0KA2u8zELNMtTw+a/MjVharEmGAY9Czq/Y8+cK6kUye0S/5O2WZT GEId3dx4sh/CUK55J/xpY6rTGPgMJFEqZ16Okt12hl0yQPmJhPIiMYai8V9t+wlkZWL4 3vbcoYCylVYUYAh/yNgq1lhbtQzUzPa6xFByjd/RJlQAv+SDg/T5S1wKHwbQJVQ/WzbY FnQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608045; x=1779212845; 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=zlwGLoBgL+mbcr2Ut7vVtoWK7MJrQO+SoHBMlgxr4mU=; b=Bi9qa7MGaQ5tCvlebpJwptpUc7lzzxR6ft7uuHv8Uz6yyN/oleBx2rhWzd38xxRAh+ eXJe6P8FStYjJPavlNNCBYF3AvK9ibhOwg+ipjXsq/icJRwy7JxEaPN/cKqZQb0qjIZU YLOHQcUTydm6sD1SZNj9NKF67QMyoNNrMAgeQ/91WASl6GDEDtDS/WozOztDEXq5VfZD WQyL/vQ8wbdoG+eqtJHZdAJqjeD1zshsRKCBBwWq0zdWZCAI8sutTpW9+LADHV2h2gME gsGSmJsBMOpvVqV8Fkftm/VYetRrdeL5h5L+IEIg1xex/FD/a3TcuzFIKZglHnpZJB2x 2vZg== X-Forwarded-Encrypted: i=1; AFNElJ+vVRC++oo5XMx+4dsrRu/u19LvNiWugbm9rh6+Ffk9h+/jOJS7zRmcFvi/WooueVYqOH/R+HU3Id3QjPY=@vger.kernel.org X-Gm-Message-State: AOJu0YzqwjKVpnQYllRdWpUFJwCqoROhbaEr2qPV/GgLnkuRipqJrbSS 8/Cl81L91JeBbtTf7rZRQdoChePyAtqni/9rYy2/UwhEn0o+0ODjjlu9V2c9TRPxOsrs75K9aHl pHOvrxMBOmw== X-Received: from dlbpd1.prod.google.com ([2002:a05:7022:1401:b0:133:5da7:fa13]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:914:b0:122:2f4:b285 with SMTP id a92af1059eb24-1319cf59324mr16562582c88.25.1778608044293; Tue, 12 May 2026 10:47:24 -0700 (PDT) Date: Tue, 12 May 2026 10:46:37 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-18-irogers@google.com> Subject: [PATCH v2 17/18] 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 repl= ace 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 e957aa2fcb48..246b04f73ccf 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 20:18:30 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 A8ABC3EDE4F for ; Tue, 12 May 2026 17:47:27 +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=1778608048; cv=none; b=TzSb/TGgZ9Yw4+avoKIv6ymP8sAyV5HbdPj8TlCRqJtW0OIyXg3reBZR5xv/tselyTptSVmvKBzFVlPohEFtx/N6l0pGI2lXct0Rwx7Epy776Bbnw5Z9kytlxPlUwr5ROJqLvSSVkB1+lmcCG+LG7TwwCxVIAM2+acirtAQuiC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608048; c=relaxed/simple; bh=cXobzdS8IKelKwX3du7Jn4Xo/cwPgqr6uVkMRMJ3L+Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sXy45ZbwoiESVlODGSD7HIqB5/o6DpCL5sQ8Y1fQK/d+KmNHretwEnDgowK/BHAT7Qvg9JVyzt2jFtNBHze9KgPaz4WB5q5Cub+qzwe0aK4owjpt9V7HHFbcDlgwyPHO1pF+qpbhzaqWPUpZXUJEOUXF2xFE9hP/PFwiCwGyI+4= 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=syENb1OA; 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="syENb1OA" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2ee34588671so8235713eec.0 for ; Tue, 12 May 2026 10:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778608047; x=1779212847; 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=QUCs++vVYNhQEfRcxQUIPcuntgMnfvBVScnOJKZmjZo=; b=syENb1OA9L4L7+s+RKrD0jUL2wZx7kaHkkBJdd14s71g6nwd5jUpeNm2V2ZJCbgIjn Crbbny/DHn6i8hs7FPJD8ZulCcHymE6RKYAmM/HrBEkjCtpQToNTky5l/AjGaN4gR+9T BAngpqdRvINr7EZBLGCaaajX9WxL/zF5uqOoHTl5XiPq9P9aiQne0SobklUwsqsniQP+ 8Ge9/JOnAkwIRPtnOgXGQIwPXFkvjjNAMcF6Lh4mTMAcsEnxhBj0M70Jq9gxvvJMlpKq 0a4bgcxvNOckrh6QtejZdta9VLpQOZ5IFYRn8rW5bS04qRU9ZKYjXJAfTriA47jyK5aw Sdpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608047; x=1779212847; 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=QUCs++vVYNhQEfRcxQUIPcuntgMnfvBVScnOJKZmjZo=; b=kBtu1TXpryyvazM+39VoPCyVLl7pjInlj0eEtkm7esrfqffmALU/FFHRLseLdk9d12 jcUwtx86RGlgCghzlZo+pvfhiTeR17hl1NWMSSzBLJCcw6NbT6QhDNZxLZMjFCrqh8j2 i/xTvTzIM0AwEo/Eur7+sg5z8MNb8R6gtHxVLNbNg7qjOkCx1qSqdf3/vrJ/ZuI3uFor BICQApjS4Xz2hwtSBUqv1qY34YCKOgkjlozz5gTVS7oMFFI8BMs6L40Fmj7y+HaDPBEe WrT7qoc5jYjcuWQnewGJQ7s4s+onXOTebVhkmIS/k2QV8XKT15hHxre5jf54w1x8u5Xg vfDw== X-Forwarded-Encrypted: i=1; AFNElJ+7REY0hpr9fUNCP/uyHCalJ0JgwINJlhuraGxH/y7EJwKY4AUrH27G2p5KpZsqRZpqn4UmRWOuYnL0j+M=@vger.kernel.org X-Gm-Message-State: AOJu0Yyv8LQnMkUF9V+rvUwLt6pdFGhQVxCsPoAvx/62oaW7L8hKEZog B5UicwQ+PAtoqRDdSEHWwoKxo/UACSWu4bOLDMQaYKoNH3rrft9rd7VHxINt/8x7tL3bXd6J1+x gz3iwMB4XtA== X-Received: from dybia10.prod.google.com ([2002:a05:7301:30a:b0:2da:3d44:ddce]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:5793:b0:2f2:6dde:df54 with SMTP id 5a478bee46e88-3011977f73fmr47297eec.33.1778608046462; Tue, 12 May 2026 10:47:26 -0700 (PDT) Date: Tue, 12 May 2026 10:46:38 -0700 In-Reply-To: <20260512174638.120445-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: <20260512053539.3410189-15-irogers@google.com> <20260512174638.120445-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260512174638.120445-19-irogers@google.com> Subject: [PATCH v2 18/18] 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 us= ing 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 en= sure 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