From nobody Mon May 25 05:12:27 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 5C539481227 for ; Mon, 18 May 2026 15:46:50 +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=1779119215; cv=none; b=VykoGi1Thmma1EGwKXarx0Jn+1+UGw2GBRX3Y+sgUt4PVhW7c7Q8sFMYw35j2sdFPOgYthGhoUQUEKmD/uUZKcxquvCbBnekbTldRTCQSb/2joCS0XQXs2Cz76JlYFhLuM4G1hWVwhkzu5udlt1h6AfwefPwcgf8TNZEx4W/9H8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119215; c=relaxed/simple; bh=M4TALmiKZilb0u+lhPWRfGvMJCr+kBUrEvnnlqnUv2w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IW3d+qvXtmZnxV9tQCUGAv73BiIhr2WiwrncTiyAUeVU8mD930i4nnci2fPKj4PcHzE/PUtRe2hizVUMH3vFZIxyzU53jxg2Z6oQTaRipsLA9zu6b87iiWOqKywh2Q9ZqlQXSYvYIfZMyDyLjwjzCsukVqh9y+VWj30Vx2VrTGU= 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=spFwGHXq; 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="spFwGHXq" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-13509e2e47bso3401392c88.1 for ; Mon, 18 May 2026 08:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119208; x=1779724008; 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=Xy1UTgDV/XpXNGsXM34DAoH9zJ9hy0otqwfOVYZUB1U=; b=spFwGHXq5VZVZBzj6xcesY4HWaHX0HQIMo3Um0ETy3m+nW01M0X0R0Ytnkag1ViSjF sRMRwBQ3KmuHfxtzEp+0cOXwKlKPc/xwYyKJCIVW1TYkQTK6EplKHzotGuNVXO40IKCf 6CWHkAof0tYLaY7BQnLN+W6E488bvhTwqi+Y1u9cwrOyGU8IKyi4bpSNiuRxshsn2bWl 9Zbt2hYR13GiZ9Ox/tKgczzN6lDD4YZAXZjuBmbgx8izNjQT+Rvm+uh7/wKC8TDpHixD ytcMe2328yolnvDNkjuSgp+Zpx3hRLdXMf5paaPq7E8k3rb2qW4uug0l/TAX2PdXzgUf ZHYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119208; x=1779724008; 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=Xy1UTgDV/XpXNGsXM34DAoH9zJ9hy0otqwfOVYZUB1U=; b=pbX2KnJg5NjePHWHS9k4yS59I9EisAjqLu9NqipKkTF+0Iir3y4Lbe/iuqwFKDs2PB 9YRrhr45w8KZvwvCWfPi+BHPxkstf35r/g3K6V2UJ8juWl3KilErQw1HjhepEFb6YsOg CNspQCXC80uD3jLd8XwL4atpjHJsaZGMXk3iF22Qd8+DpV9Pri3xyHMoSisKSE3eUEl6 HJg68APfNLP0NO15YRueR8crr+0r9mIGrMuMc4mhLRtASqhd4THuZySLdMvRAnJtEnlw UKr5MPgddY/LAdSCoJeJz8DlL5pTa3i+1A1PKyBAvt2HParVaIj/e+JFxGwXj70Q0tuI 0kxg== X-Forwarded-Encrypted: i=1; AFNElJ9KT2MJJQX6BqxHgYvVuumijGtYIuuWW8s9ZLxIyuafp/+BLEcBeI7oF0NhntoRfZa2Iln4nVRhhYVuaWg=@vger.kernel.org X-Gm-Message-State: AOJu0Ywfspvh5vmNwPszqJYBIW3GpHzKVyFroenxmYkps1FIq9elUNxn R6SEzW4Um/2oty3F35JpzW7jxmlstjPSBjOVO9F/xuntPpUVmh4Rb2mzddN5M2+niVOqnUydQzV 7AXKy/z03eQ== X-Received: from dlea9-n1.prod.google.com ([2002:a05:701b:4209:10b0:135:637f:2609]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7023:b82:b0:134:c740:9dca with SMTP id a92af1059eb24-13505433cffmr6255801c88.26.1779119207736; Mon, 18 May 2026 08:46:47 -0700 (PDT) Date: Mon, 18 May 2026 08:46:25 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-2-irogers@google.com> Subject: [PATCH v7 01/14] tools build: Fix feature checks to touch target files on success From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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, test-clang-bpf-co-re.bin and test-bpftool-skeletons.bin redirected grep output but never touched or created the $@ target file upon success. Because the target file was never created on disk, Kbuild could never cache the result of the check. Consequently, Make treated the prerequisite as missing and continuously re-executed the Clang BPF backend and bpftool feature checks on every single sub-make evaluation during build startup. Refactor both feature check recipes to group the shell pipeline within curly braces and redirect both stdout and stderr to .make.output before touching $@ purely upon success (> $(@:.bin=3D.make.output) 2>&1 && touch $= @). Grouping the pipeline ({ cmd1 | cmd2; }) ensures that compiler stderr is successfully captured in .make.output rather than escaping to the parent shell. This perfectly matches standard Kbuild feature check conventions, allowing Make to cache positive detections and avoid redundant sub-make forks during incremental builds. Add test-bpftool-skeletons.bin to the FILES list so that make clean correctly purges the generated binary. For test-clang-bpf-co-re.bin, add explicit source file prerequisite test-clang-bpf-co-re.c and simplify the Clang recipe using $<. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- tools/build/feature/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 4e4a92ef5e1e..9da5a4fd956a 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -72,7 +72,8 @@ FILES=3D \ test-file-handle.bin \ test-libpfm4.bin \ test-rust.bin \ - test-libopenssl.bin + test-libopenssl.bin \ + test-bpftool-skeletons.bin =20 FILES :=3D $(addprefix $(OUTPUT),$(FILES)) =20 @@ -379,9 +380,9 @@ $(OUTPUT)test-libaio.bin: $(OUTPUT)test-libzstd.bin: $(BUILD) -lzstd =20 -$(OUTPUT)test-clang-bpf-co-re.bin: - $(CLANG) -S -g --target=3Dbpf -o - $(patsubst %.bin,%.c,$(@F)) | \ - grep BTF_KIND_VAR +$(OUTPUT)test-clang-bpf-co-re.bin: test-clang-bpf-co-re.c + { $(CLANG) -S -g --target=3Dbpf -o - $< | \ + grep BTF_KIND_VAR; } > $(@:.bin=3D.make.output) 2>&1 && touch $@ =20 $(OUTPUT)test-file-handle.bin: $(BUILD) @@ -393,8 +394,8 @@ $(OUTPUT)test-libopenssl.bin: $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags openssl 2>/dev/null) =20 $(OUTPUT)test-bpftool-skeletons.bin: - $(SYSTEM_BPFTOOL) version | grep '^features:.*skeletons' \ - > $(@:.bin=3D.make.output) 2>&1 + { $(SYSTEM_BPFTOOL) version | grep '^features:.*skeletons'; } \ + > $(@:.bin=3D.make.output) 2>&1 && touch $@ =20 # Testing Rust is special: we don't compile anything, it's enough to check= the # compiler presence. Compiling a test code for this purposes is problemati= c, --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 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 87EB729B200 for ; Mon, 18 May 2026 15:46:54 +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=1779119222; cv=none; b=DmAO/ac0lkFIyOIxRQCBVspUqTd5WjoVPG4H1//ndYxH09NZAVOhi++ZqvwtB3dAybkMfvmw/G9CvcBBTISFZ070WnapwTsg/C3RznH5LpqlD9l/7R9wtTxj7MgWeHG7ZNgQOllSoieipEnoQtXZQasvpybO6VYTUkMzvOxQLV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119222; c=relaxed/simple; bh=dZkuhV8RGawi2DuJQ8lwEVR/L/HhgBVeSSQOfsADrlw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nbCaeBXUJTl4fJ/PrKdnA/7cKDYLucR2hplwSxZ8UkphLy7iddcOxdqZj65B2vNhKSgF7fvRVIh4SJ168+u1j7zDD28po+67lnlpwWjysAXwoBXSPjob5vkv0dovRbZnkjGJk/sP+y+PZDgZyP9jnSVMBzNLQFCPtWd82DenMH0= 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=cbncYRWe; 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="cbncYRWe" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2fded513994so9884917eec.1 for ; Mon, 18 May 2026 08:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119210; x=1779724010; 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=t1UlEVipGBJaqABLgnwkx/BbBCItzXVB/vRUhC+xVso=; b=cbncYRWeHd6wq8kydHvDpa9WmWyUsuuYHPIaCc/kfikddj4h4U47WlOymhrb80DTBN a6IDHpiBYEyGFtfhq/MRjWfaRWfElkYwz7bRD1if956N7xefGFslbTEE6E+gu471/3Sh RW9LSsEVDZg0XCWson2pF33fgs5vokFI48huzobh3ICy2o3EyHky/Bg/hbTOdTbN8c5l wDaCn5yJgtkhRo+i9kPBtferogh1NzN2ZgyRtXiz+6IZtPPMrLTtypUBakD9tjCJFcOd suMxFSPAXoQw9CH9dHDdepafazsU65OujMRox9PpOpYeFtqTZWFbcD6vTct0xTViSQ9j y0fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119210; x=1779724010; 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=t1UlEVipGBJaqABLgnwkx/BbBCItzXVB/vRUhC+xVso=; b=V9HyBvqNCtfJ6nOMxY2ZxXDqL4EdtjdzLFNSNNFeOH3ZFgeaKsUJJ7Z2Edam9X09py gHCCKMcQG17CPbWaCImtmSP4YPnVQwblfjJ2vOqkj1cO6af28FwYr0j+Ljht2wg5xPQ9 lf5ASJnM4E/jemG5+AKffMO0fd/8HmUoxv4xcMITue6M80G+CTdcjhBEi+nyRigiOt6W gCM9WZPCOebESTVmJ/xNmXxVIkJLEQaEsFVuHjHgechY6nxD7WZUWVLqIbSSdNhfBh37 NEZCdgMJ7i8SDa+fguZC7UuYW9gzvCW/SOlNGIYLk+Fdaf6UfxYSQd9Xv7CVR4W4I9Fy FpMA== X-Forwarded-Encrypted: i=1; AFNElJ9AYO2kWE6/EPiNvnRi0EolEJxwkwE/xzDf6a0V+YCmugqlUu0ZixHp9T0KGjijkprN7NixwWE96++YxdE=@vger.kernel.org X-Gm-Message-State: AOJu0YxS0ZZCn/wavwy+2O1pejir07apCvPChnAaJ1MurubbxqV9I1o9 px068KtO4IFGsw5nf47wyN6dFca8rXt3mXdeiV3eFLLglOFDRxhDLs6lGXpK4TSf9S8Th2ofXXa S1Yz6GU//zA== X-Received: from dybtv21.prod.google.com ([2002:a05:7300:f495:b0:2ee:b6da:180]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:a90b:b0:2ed:e12:376e with SMTP id 5a478bee46e88-303986b13f9mr7523614eec.30.1779119209449; Mon, 18 May 2026 08:46:49 -0700 (PDT) Date: Mon, 18 May 2026 08:46:26 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-3-irogers@google.com> Subject: [PATCH v7 02/14] perf trace beauty: Make beauty generated C code standalone .o files From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 prepare umbrella target, choking parallel build startup. Furthermore, tools/perf/util/syscalltbl.c included its own generated mapper, and util/env.c conditionally included arch_errno_names.c inline, splitting consumers across directories and preventing clean Make encapsulation. Refactor the framework to achieve better encapsulation: 1. Move util/syscalltbl.[ch] into trace/beauty/ to co-locate with all generated code consumers. 2. Create fsconfig.c and flatten embedded beauty .c files to compile as independent standalone objects via trace/beauty/Build, exporting their formatting functions via beauty.h and env.h. Switch arch_errno_names.o and syscalltbl.o assignments directly to perf-util-y and add an unconditional top-level recursive kbuild hook (perf-util-y +=3D trace/be= auty/) to compile them into libperf-util.a, resolving remote linkage for util/e= nv.c, util/bpf-trace-summary.c, and standalone python extensions. 3. Bridge private opaque references (struct trace) securely via accessors trace__show_zeros() and trace__host(), avoiding header entanglements. 4. Consolidate all generator variables, script paths, and array generation rules entirely out of Makefile.perf and place them directly inside the exact local Build files where their output objects are compiled (trace/beauty/Build and trace/beauty/tracepoints/Build), binding prerequisites locally. Use directly inside generator recipes to guarantee dynamic directory creation before script redirection, and append across all rules to print clean, standardized GEN ... file.c output during compilation. 5. Clean up clean target to recursively remove the generated directory instead of relying on dozens of individual variables. This unchokes the "prepare" target parallel barrier, allows make to evaluate generation scripts purely locally where consumed, and flattens the tracepoi= nt formatting architecture. Testing a parallel build (make -j28 all from scratch) shows improvements: Before: real 0m28.689s user 2m38.490s sys 0m30.148s After: real 0m27.642s user 2m32.356s sys 0m26.683s So reclaiming ~9.6 seconds of raw CPU time and over 1 full second off overall real-world build latency, by overlapping sub-make startup and avoiding top-level double-parsing overhead. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- tools/perf/Build | 2 + tools/perf/Makefile.perf | 282 +----------------- tools/perf/builtin-trace.c | 32 +- tools/perf/trace/beauty/Build | 276 +++++++++++++++++ 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 | 5 +- tools/perf/trace/beauty/futex_val3.c | 5 +- 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 | 2 + tools/perf/trace/beauty/perf_event_open.c | 21 +- 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 | 21 ++ 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, 447 insertions(+), 368 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 e9cc870a5acd..dbbc9aaccf28 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 @@ -235,6 +236,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 @@ -777,10 +788,6 @@ static const char *fsmount_flags[] =3D { }; static DEFINE_STRARRAY(fsmount_flags, "FSMOUNT_"); =20 -#include "trace/beauty/generated/fsconfig_arrays.c" - -static DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_"); - static const char *epoll_ctl_ops[] =3D { "ADD", "DEL", "MOD", }; static DEFINE_STRARRAY_OFFSET(epoll_ctl_ops, "EPOLL_CTL_", 1); =20 @@ -1129,21 +1136,6 @@ 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" - static const struct syscall_fmt syscall_fmts[] =3D { { .name =3D "access", .arg =3D { [1] =3D { .scnprintf =3D SCA_ACCMODE, /* mode */ }, }, }, diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build index 561590ee8cda..93cde93461a3 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,262 @@ $(OUTPUT)%.shellcheck_log: % $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && f= alse) =20 perf-y +=3D $(SHELL_TEST_LOGS) + +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 + +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) > $@ + +$(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..18b661282834 100644 --- a/tools/perf/trace/beauty/eventfd.c +++ b/tools/perf/trace/beauty/eventfd.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #ifndef EFD_SEMAPHORE #define EFD_SEMAPHORE 1 #endif @@ -11,7 +13,7 @@ #define EFD_CLOEXEC 02000000 #endif =20 -static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, = struct syscall_arg *arg) +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_"; @@ -35,5 +37,3 @@ static size_t syscall_arg__scnprintf_eventfd_flags(char *= bf, size_t size, struct =20 return printed; } - -#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..05d2111e504b 100644 --- a/tools/perf/trace/beauty/futex_op.c +++ b/tools/perf/trace/beauty/futex_op.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" #include =20 #ifndef FUTEX_WAIT_BITSET @@ -17,7 +18,7 @@ #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) +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_"; @@ -59,5 +60,3 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, s= ize_t size, struct sysc =20 return printed; } - -#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..fe4e82741ffc 100644 --- a/tools/perf/trace/beauty/futex_val3.c +++ b/tools/perf/trace/beauty/futex_val3.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" #include =20 #ifndef FUTEX_BITSET_MATCH_ANY #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) +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; @@ -15,5 +16,3 @@ static size_t syscall_arg__scnprintf_futex_val3(char *bf,= size_t size, struct sy =20 return scnprintf(bf, size, "%#xd", bitset); } - -#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..c8a4cd49c845 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,8 @@ 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); } - -#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..9304b0bf3094 100644 --- a/tools/perf/trace/beauty/mode_t.c +++ b/tools/perf/trace/beauty/mode_t.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include #include @@ -20,7 +22,7 @@ #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) +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_"; @@ -67,5 +69,3 @@ static size_t syscall_arg__scnprintf_mode_t(char *bf, siz= e_t size, struct syscal =20 return printed; } - -#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..be7f82677cbf 100644 --- a/tools/perf/trace/beauty/msg_flags.c +++ b/tools/perf/trace/beauty/msg_flags.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 @@ -27,8 +29,8 @@ # define MSG_CMSG_CLOEXEC 0x40000000 #endif =20 -static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, - struct syscall_arg *arg) +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_"; @@ -72,5 +74,3 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, = size_t size, =20 return printed; } - -#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..c2c7769e6595 100644 --- a/tools/perf/trace/beauty/open_flags.c +++ b/tools/perf/trace/beauty/open_flags.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include #include diff --git a/tools/perf/trace/beauty/perf_event_open.c b/tools/perf/trace/b= eauty/perf_event_open.c index 9f1ed989c775..c1c7445dcff9 100644 --- a/tools/perf/trace/beauty/perf_event_open.c +++ b/tools/perf/trace/beauty/perf_event_open.c @@ -1,4 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "util/evsel_fprintf.h" +#include + #ifndef PERF_FLAG_FD_NO_GROUP # define PERF_FLAG_FD_NO_GROUP (1UL << 0) #endif @@ -15,8 +19,8 @@ # 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) +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 +47,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,19 +80,14 @@ 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); =20 return scnprintf(bf, size, "%#lx", arg->val); } - -#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..3fb6d9e0fae9 100644 --- a/tools/perf/trace/beauty/sched_policy.c +++ b/tools/perf/trace/beauty/sched_policy.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include =20 /* @@ -14,8 +16,8 @@ #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) +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_"; @@ -46,5 +48,3 @@ static size_t syscall_arg__scnprintf_sched_policy(char *b= f, size_t size, =20 return printed; } - -#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..f345c66c1bfa 100644 --- a/tools/perf/trace/beauty/seccomp.c +++ b/tools/perf/trace/beauty/seccomp.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #ifndef SECCOMP_SET_MODE_STRICT #define SECCOMP_SET_MODE_STRICT 0 #endif @@ -6,7 +8,7 @@ #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) +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_"; @@ -51,5 +53,3 @@ static size_t syscall_arg__scnprintf_seccomp_flags(char *= bf, size_t size, =20 return printed; } - -#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..6817e9febab9 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 "trace/beauty/beauty.h" + #include =20 -static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct = syscall_arg *arg) +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"; @@ -53,5 +55,3 @@ static size_t syscall_arg__scnprintf_signum(char *bf, siz= e_t size, struct syscal =20 return scnprintf(bf, size, "%#x", sig); } - -#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..059e3041d338 100644 --- a/tools/perf/trace/beauty/socket_type.c +++ b/tools/perf/trace/beauty/socket_type.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 @@ -18,7 +20,7 @@ #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) +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_"; @@ -59,5 +61,3 @@ static size_t syscall_arg__scnprintf_socket_type(char *bf= , size_t size, struct s =20 return printed; } - -#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..9924ad24a6f1 100644 --- a/tools/perf/trace/beauty/tracepoints/Build +++ b/tools/perf/trace/beauty/tracepoints/Build @@ -1,2 +1,23 @@ perf-y +=3D x86_irq_vectors.o perf-y +=3D x86_msr.o + +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..78ead5df985a 100644 --- a/tools/perf/trace/beauty/waitid_options.c +++ b/tools/perf/trace/beauty/waitid_options.c @@ -1,9 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 -static size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, - struct syscall_arg *arg) +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"; @@ -25,5 +27,3 @@ static size_t syscall_arg__scnprintf_waitid_options(char = *bf, size_t size, =20 return printed; } - -#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 2bb60f50f62d..797d7bc909be 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 @@ -440,3 +440,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..20953ef7b9d8 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -635,10 +635,6 @@ 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 - const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, i= nt err __maybe_unused) { #if defined(HAVE_LIBTRACEEVENT) 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 Mon May 25 05:12:27 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 35878481A85 for ; Mon, 18 May 2026 15:46:54 +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=1779119219; cv=none; b=VqESYv0KDDHDxNWWs4zV3jshREZ2S4amIFPTAjSM4zaTPx5C4DP/iSJVPxIodkKf2hObYH93liWdBiGn1ynd/uh11zCpXsG0CxnA6Bf2sXdfaaMDibRItvZUoitVHLqOHtDm0rxCxGCwJQXRP+OEJTyza4BdmXRTwQ2NCpWCdJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119219; c=relaxed/simple; bh=/7TyOYbdEe9k68HYyv7dCCFzh+d6Q52A6z+ebAC5RwQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gQKwriDAQomr/x/9Fg9TNd/j51d03ZNRsAIisR5gAxDEOUHBrTEXqmw9KJc8mFh74Odz0KhAtWgmcLZm7Q7JmRCDNu86BxJxIt3O4GBFBn+ce7Lnalsm7nFrCoz+hXdQNSTDyBaNScUhWMQkEqW4Zhd5W7WnT6pAWQfvaYYwcCE= 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=jSfBD0UC; 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="jSfBD0UC" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2f5943ca81aso8294658eec.0 for ; Mon, 18 May 2026 08:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119211; x=1779724011; 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=jSfBD0UCxTvVy838eBJRpMz5JBxwPTh3WYMOi80oLfrSm3UaMDk+xc9seB7HqCRtHE O59gIBADssMAUZSkGpQ31GUHAG+HKocKRK79B9pJtt8rdzdRCCHdUBF3Z9paONclV0Yn DK11Z4pNUJnBIp28AJN3hTKR3qcb0FL0Ae372ac9OOuC0RAFlsous7eTjYTlhXYPxGXV IGMNd96f6AqRyFSAmRxLYy6YM6iAS0kAdpUpdImEG7r70JaUTMRYkCQhtW3wzsPYnbFM /VUfjKrw8f3wZDJYWenX35gicOUjwZLKPnaq0p+/dUI8J3lf3VMYZ8oYfklBONuTQgNp wGzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119211; x=1779724011; 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=o9d7we2wiVU25rSHEmAcEeUXbOkQeEf7wuQUXXmnRIn9EEbbv1nFLhdWlFB+2/m0oz byPgQgBxspQVNNNQK/CASpexUdZYzyFXxjeQfvNQs+6kpN5b8RW8CabUnKNRU/cDA/J8 grg5T/Zh7gekm+8iJR4QrG6s97BWJIlNcVpo19rS8M9BKroN6lFYxknhnRkk+7ivVted zh+ZELR+hi4Ns+j8rF143GoewRTPh2y4ovU+6j8KcmO9ingmmJN1JUXCfdABL/VmqQQ6 y82ZT2/Ivr9RFxKOtx1HoqWVE9tSdT7d3Xlde2UPD0tFxwyMDnVxghiN2ETwXHNG9qwo Adeg== X-Forwarded-Encrypted: i=1; AFNElJ84LoSC6DAadlUkYgD+cPQSC0IX2mDKwp8JjjQIJfe3NtUdV3uBJR5Kh1fK4D7uRj8+YHqfPKBN8OMNHSk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9V+0CoWGWyPZGPxB1A55xSDUeKh1ZA5eV0mrIe2Kt6HBvXcep j56r3toOZqL5ajPU1iE1VpbecUaD8uKpQH3GHAENK4sF93Ljggfv2UINhQcNJWF/J/cWkHZ7d+5 xqYqFZgHN1A== X-Received: from dybsr9.prod.google.com ([2002:a05:7301:7189:b0:2f9:af7:504f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:6006:b0:2ed:7e1:975 with SMTP id 5a478bee46e88-3039812a638mr7231205eec.1.1779119211152; Mon, 18 May 2026 08:46:51 -0700 (PDT) Date: Mon, 18 May 2026 08:46:27 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-4-irogers@google.com> Subject: [PATCH v7 03/14] perf build: Decouple pmu-events from prepare umbrella target From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 Mon May 25 05:12:27 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 243B0481AA7 for ; Mon, 18 May 2026 15:46:55 +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=1779119220; cv=none; b=dBCjH7h9OC2RdNudjiAeojQDotgqIREzzvfMiCvTMeCBUQBNeGKz4YqMlx/7Jc/WAsQeCXrKGFiyOvEMMZdrF+S+EwlkTWIhCsJvkNg2JvLyewiccAHqYrFX1CjdVh22tYayRIf3gTM9E1HwNgYxNOZSpz2ChgKqIT+nCwNrpGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119220; c=relaxed/simple; bh=xokYndru7r5U27QA5IiJ9grDU4CmNf+aSc8fRA9ncZg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=r/VgILDfWzwKCruvw2RM8MvWb43l/sWzgUJyQ8kugI5uxdLBdGy329Wjc/exjE1aswqHHmrC+HsZ6tvFCtPhk3f/Aoj26vDbWYTMPiWY0tG98HUg9f3m7rkR2HnZGCm6wOGMmxOOLP/Xd1yIgQY8nwI+zKRVnkImgj50DqiEOOE= 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=nqa+Xpn+; 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="nqa+Xpn+" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2f5943ca81aso8294919eec.0 for ; Mon, 18 May 2026 08:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119214; x=1779724014; 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=nqa+Xpn+WYiNVYiFro/FdEuSqfdz+/Anp4DY6x02BJ7r+d6QiYgljg8qrG4eBVqoC3 YIk8l2U7vrOxH0W3K9un/C6PcUl6uMXshmVsYRp0nu9TlQB99JQy4xQoQSPKV+2vD7Nf thr8/7mHu4kYr7wC2UA13Vni/e8j45B29mb2YKFuTg9OU56wMzy2MNMaqgbaH6doqH80 VuPrBy95+G4257UW+K1ZDqZRncWJQe+jF978MR+ESgpzjE8EhQNPdg6k8GuQBHUG97Qw Gh4RivISJIDnETU2sBYFeF4PZ9SPpVitjQoBzpHM6tSIDoXMXn9SNkb8orZdHHjrIoTC 8ZQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119214; x=1779724014; 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=Ltfuc1ctSishIIIE+ch57oo/bVFGDFFYvGrSuGGqrHmzTJ2VQFqTtxf2QiVfdn7+d6 CjwqnhodDRV87SrBxBNUJ5vByM7ydnIAQgVcHYD3RsHkNWMVO0PaL3Pa3hW1mThC/OOJ 4B2ZOI2xCTFHeWg9xzlYTdK2G8AJ3QJj/nQVdyDifYeujHBNyoDmeQ4Rwa5vc7E6Gs0P uMJdX5wFaNpDJ/DQkH+yp1w+0BbvcZ1h8d+1WMKezS3BCPOlBsqDj8Sbm0UKzkYX4qyY IKmlmdqLv4nshOT1CETY6RLNHUMetdd25BANNWmClsSLaI9MkphkGQJVmkxR4EQNvWng hE+g== X-Forwarded-Encrypted: i=1; AFNElJ9VDHNHkocA5b39dgan2+M6shyayAMXWGiKDo7WwPBIDaJ4kpZMKzs/pPqpM+FDo/RVajlKUqveXbiRrHM=@vger.kernel.org X-Gm-Message-State: AOJu0YxkdUiBDm3Wgj27Nh2k2MYQu6lVaWcLJ/2UdG9ajV4D8H08yNIG RSPwOyEJ79DEWB8JRG2cSHU0irhhqyyUQf9L2UUqlggEZHiE3ECJ/nBWpYMEgom+ywcurv9JlfU GcB+GDpZgqg== X-Received: from dybme15.prod.google.com ([2002:a05:7301:188f:b0:2e5:fa99:f6e4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:400c:b0:302:e560:afb5 with SMTP id 5a478bee46e88-303986010f3mr7499182eec.18.1779119213238; Mon, 18 May 2026 08:46:53 -0700 (PDT) Date: Mon, 18 May 2026 08:46:28 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-5-irogers@google.com> Subject: [PATCH v7 04/14] perf build: Remove empty archheaders target From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 Mon May 25 05:12:27 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 88AFD371897 for ; Mon, 18 May 2026 15:46:59 +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=1779119227; cv=none; b=tco1GMqT+BqaPYuIU5RRRzsvLt+xOYOWE2G1yer5lf+6Ejs17i/iXGaA3d+5gLGxXhuPnV6Iw4zhDWZqfkbLhD7ptCKy2BOzYVZFBpdKvJ6mQb+KDM9Ziqt+FFMgZG+KvL7bkeV2IB400hrAh7tvOsVA+fKDgKWcwP81oBMAdq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119227; c=relaxed/simple; bh=AzKvzqCtJFillqWhRXVXuhHissrT45mVpRBEmYSkA6Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Qt9sQbl9M8tMIxgQG8hGktXT2m9fR8NdrFuIDobDJ0ei7zS5G3F4YJOrLV8i6QRGTq6g6o9QVhRGU67hXwd+OtnBxxVnWTyUVzn/ZJuVYlYQArHBaY+iuqTN6xDH/RRWTW4MBHipuf1cx3+sQvs5rRce+B5prvofck8GZBmdZA8= 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=E7ychK0k; 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="E7ychK0k" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ee34588671so2744688eec.0 for ; Mon, 18 May 2026 08:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119215; x=1779724015; 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=A0CBA7nLbTe7NFXyjW7XoJfjNIjaEhh3N9DeBi+LQ4w=; b=E7ychK0kRVEi/MBqraDhfcY0lFTafEXzmmP5ndRZIkqEI6FC5JEljdLxVswSXr1mQB 6wlfBIOG1HBJUMncUODtQ9lHf0c9vIvjPfHXXWyEzUKXco2dT11Ml2tUXGBvhOvblXds sFXBbi3xi4gr2EzN0FxjqbPy2dTs3Mlbsigg7rZjWNyIeKDa9t8naPnQcWa9/69QgWSK /6t0GpcJ6CRDYD4mtdtlxUPK5OhYoYCT7U+OlgY/1NPWOTDTlDzRV3xJdkr6zmS8LiRa uwubuNyfFJq7WTMma7NiBqt9GNBM/BKkE2gCBmpv3L2aeSNRQq3FkAlwWDVr+imeVj8B KDvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119215; x=1779724015; 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=A0CBA7nLbTe7NFXyjW7XoJfjNIjaEhh3N9DeBi+LQ4w=; b=sgdMlOHtiu45D6w6mHc3HDF2sFmWUFE2q8utMQpp1wFJxepe6dHXCH7h+LjUQP0KDL 9+frpLC8lAgVoRTOOHrxzkPRFOlTmEB0S5wt68gGfA1X6wx2JNqmziCfnjpObVdn79I+ NfLx//k3WtHvRpAOGjHgtPWsRvsCwV78fiC7xzUNu5NSSTpGIhPItCFukdcj/NmL4mhW e3HaNQ4RgJUHI8VnjCLL9lJy2W6kQHPZuEI/DAVi8Xhz98F5TaI2WVEJ41tg6usTCaiZ sRh1GsQiQytbZ78+HDNNtWACgE1eBL71IiXrnp87Ateoo1l8D6txy5H4Mh3gX6+u09Bb kBWQ== X-Forwarded-Encrypted: i=1; AFNElJ95Npy02haKjPnilUQOsTU4wY4E0PGL968dCPnVrACbynGwgyBGKXz1ngtIhuDbr2pc/FXCJP/7wv0yBFI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1ksGYFQ+z1eJcn+3tqj4J6xwGjJQ5a+D3SujWaJ1pPQ6XUr4E n/RuT7mK24Fxxb6aU46XLx4CpQSjiT7kqeHJL0FbQnMtwVRqPNtFFRtILnQIMiqANN6yYig1+Hc mz1lOG32dMw== X-Received: from dys5.prod.google.com ([2002:a05:693c:8005:b0:2d7:dc51:72ad]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:fd15:b0:2ed:935:aa33 with SMTP id 5a478bee46e88-3039818f163mr7137769eec.5.1779119215269; Mon, 18 May 2026 08:46:55 -0700 (PDT) Date: Mon, 18 May 2026 08:46:29 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-6-irogers@google.com> Subject: [PATCH v7 05/14] perf build: Move BPF skeleton generation out of Makefile.perf From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the top-level Makefile.perf defines a massive global bpf-skel umbrella target that pre-compiles all 12+ BPF skeletons (%.skel.h) upfront before launching sub-makes. This forces unrelated sub-makes to serialize behind bpftool and clang BPF target evaluations, causing parallel build bottlenecks. Furthermore, bench_uprobe.bpf.c lived inside util/bpf_skel/, breaking conceptual directory encapsulation since it is consumed purely by bench/uprobe.c. Refactor the BPF skeletons to better achieve directory isolation: 1. Move tools/perf/util/bpf_skel/bench_uprobe.bpf.c directly into tools/perf/bench/bpf_skel/. 2. Extract the skeleton generation infrastructure out of Makefile.perf into a shared inclusion file tools/perf/bpf_skel.mak. 3. Include bpf_skel.mak locally inside tools/perf/util/Build and tools/perf/bench/Build and bind precise local prerequisites. 4. Safely synchronize the shared bpftool bootstrap and vmlinux.h targets via the conditional prepare: umbrella to avoid parallel sub-make races, while evaluating the actual skeletons completely locally on demand. A later patch will move these targets into bpf_skel.mak. 5. Export CLANG from the global Makefile to ensure accurate tool propagation. 6. Clean up Makefile.perf by stripping the global bpf-skel umbrella target and its SKELETONS list. While removing code from Makefile.perf generally helps build performance, the impact here is minimal. The main motivation for the change is to better encapsulate things in the build and simplify Makefile.perf that has around 50 lines removed. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- tools/perf/Makefile.perf | 59 ++----------------- tools/perf/bench/Build | 6 ++ .../bpf_skel/bench_uprobe.bpf.c | 0 tools/perf/bench/uprobe.c | 2 +- tools/perf/bpf_skel.mak | 54 +++++++++++++++++ tools/perf/util/Build | 15 ++++- 6 files changed, 79 insertions(+), 57 deletions(-) rename tools/perf/{util =3D> bench}/bpf_skel/bench_uprobe.bpf.c (100%) create mode 100644 tools/perf/bpf_skel.mak diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 24581941e912..373eae7fb72a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC LD AR CFLAGS CXXFLAGS RUST_FLAGS V B= ISON FLEX AWK +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -632,8 +632,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ - $(LIBSYMBOL) \ - bpf-skel + $(LIBSYMBOL) =20 ifdef LIBBPF_STATIC prepare: $(LIBBPF) @@ -914,44 +913,13 @@ python-clean: =20 SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) -SKELETONS :=3D $(SKEL_OUT)/bpf_prog_profiler.skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.= skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_cgroup.skel.h $(SKEL_OUT)/func_latency.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/off_cpu.skel.h $(SKEL_OUT)/lock_contention.skel= .h -SKELETONS +=3D $(SKEL_OUT)/kwork_trace.skel.h $(SKEL_OUT)/sample_filter.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/kwork_top.skel.h $(SKEL_OUT)/syscall_summary.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/bench_uprobe.skel.h -SKELETONS +=3D $(SKEL_OUT)/augmented_raw_syscalls.skel.h =20 $(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 ifeq ($(CONFIG_PERF_BPF_SKEL),y) +prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool -# Get Clang's default includes on this system, as opposed to those seen by -# '--target=3Dbpf'. This fixes "missing" files on some architectures/distr= os, -# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. -# -# Use '-idirafter': Don't interfere with include mechanics except where the -# build would have failed anyways. -define get_sys_includes -$(shell $(1) $(2) -v -E - &1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ -$(shell $(1) $(2) -dM -E - $@ - -bpf-skel: $(SKELETONS) - -.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o - -else # CONFIG_PERF_BPF_SKEL - -bpf-skel: - endif # CONFIG_PERF_BPF_SKEL =20 bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKE= L_OUT)/vmlinux.h + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index b558ab98719f..67b76fe20ba6 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -24,3 +24,9 @@ perf-bench-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o perf-bench-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o =20 perf-bench-$(CONFIG_NUMA) +=3D numa.o + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +include $(srctree)/tools/perf/bpf_skel.mak + +$(OUTPUT)bench/uprobe.o: $(SKEL_OUT)/bench_uprobe.skel.h +endif diff --git a/tools/perf/util/bpf_skel/bench_uprobe.bpf.c b/tools/perf/bench= /bpf_skel/bench_uprobe.bpf.c similarity index 100% rename from tools/perf/util/bpf_skel/bench_uprobe.bpf.c rename to tools/perf/bench/bpf_skel/bench_uprobe.bpf.c diff --git a/tools/perf/bench/uprobe.c b/tools/perf/bench/uprobe.c index 89697ff788ef..616873bca243 100644 --- a/tools/perf/bench/uprobe.c +++ b/tools/perf/bench/uprobe.c @@ -44,7 +44,7 @@ static const char * const bench_uprobe_usage[] =3D { }; =20 #ifdef HAVE_BPF_SKEL -#include "bpf_skel/bench_uprobe.skel.h" +#include "bench/bpf_skel/bench_uprobe.skel.h" =20 #define bench_uprobe__attach_uprobe(prog) \ skel->links.prog =3D bpf_program__attach_uprobe_opts(/*prog=3D*/skel->pro= gs.prog, \ diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak new file mode 100644 index 000000000000..aa04d8b3ee07 --- /dev/null +++ b/tools/perf/bpf_skel.mak @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0 +# Shared BPF Skeleton Generator Rules + +include $(srctree)/tools/scripts/Makefile.include + +# Shared foundational tooling always lives in util/bpf_skel +SKEL_TOOL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) +SKEL_TOOL_TMP_OUT :=3D $(abspath $(SKEL_TOOL_OUT)/.tmp) + +# Component specific output lives in $(dir)/bpf_skel +SKEL_OUT :=3D $(abspath $(OUTPUT)$(dir)/bpf_skel) +SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool +VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h + +define get_sys_includes +$(shell $(1) $(2) -v -E - &1 \ + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ +$(shell $(1) $(2) -dM -E - $@ + +.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o +endif # CONFIG_PERF_BPF_SKEL diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 797d7bc909be..4bbc78b1f741 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -441,4 +441,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 Mon May 25 05:12:27 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 1EAAE48124A for ; Mon, 18 May 2026 15:47:00 +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=1779119229; cv=none; b=g/rMSdwb8/7zgaEKTaPSoLnTnS0ht5D/t51trFxi5Fxg8Kq7QIeFil+Sux9m/8dg91Nf1MZUu04TEpHqP7n0YACE2Z/1ns4lUp3HUg+gqn7h+utys0tgtYXtULI/NoofkwCLjNa1SMEAM5wAmPJVD58kGSlWWoE1yRna5qMlfJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119229; c=relaxed/simple; bh=qGIGcXBZNocRlR3JFELM4l1uEoG1XLzekHqz1ZDyUMo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Syk2/MfUB4sL4Qm9KFdASc83um6CIfxdhc8sxNdzfIdt2h2ExJfDNFjaWx2h5JhBEMBaXN09ANotJ66V8Xp1lu22M6nd8LwlD/Nq9hP2pp6fv7SLCg3OJomn2rleJ7j56OaPLXalLR9mw0HCQxWXeuJTEb2HSEZVZBHxk4NkTsQ= 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=RiWn1Q+p; 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="RiWn1Q+p" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12dc3d81736so1819868c88.1 for ; Mon, 18 May 2026 08:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119218; x=1779724018; 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=IYhcsGACL8LkG71M/mjaAqqSQSXVQ89TKnDLzXk5kps=; b=RiWn1Q+p16Wn0b/pj03+Xf/rIXSrCqUWqWDMSCGeeOgVWxbKnYnSOegKmxt33pLPiE MyBjihMY+unMXhS1zD8HuZybJ768jOgyBowBCH6Y9YjaD/OaLw4x1/Tl3jTyznxZuBPt AOusN6PHWoDnPjEMGJbJBiSV+Jn5PGSO0jjNN0rCZvikTdg4G3MV/zv+urEXDOvUmy47 qp6jveLtV2GZeRFcJSHuqMFN3bGLHC0M5gSeisHDiCtPh5iBQkslcX3avtNdXbKBuwHI OZl8cEdqqto4Hp5Ljo0RmUpr+0VeZQJi3fn6os6KYj8C2LoKvhp9tQF/Tv4ZWPJ8cWcI 5lkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119218; x=1779724018; 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=IYhcsGACL8LkG71M/mjaAqqSQSXVQ89TKnDLzXk5kps=; b=a43SdnzF8ihSdnkusaXkx3cvHc9vvZ5WaugbmcALNa6lhLbsI+zbDYkvT9Lr7KZwZE zHbqh4dTNo/JbBzBd+Odicb0e8GDS3l/vCRrDvgYNGDOIVLxHf2PiivVwhJ7AxzxLZoL IQiSB4A3F3omWGn5doR6O3CfeS9wFlBB9CHiv4sb5MVNnZRH7jKs4HECmX/dACKECN4k aVzGhTq/IpcInxUXQzstG6mYxr5BEVfC6hPk1fUYhTRxq6RINDcm9vUzctkCMF8dJWL3 BTX2dYnBon1cbOYXdeEw1mGdRTJ2xEKw0t6ZNnLJ1AjgDp6Yquch27OUXGHBzOouUQNn oyVA== X-Forwarded-Encrypted: i=1; AFNElJ8rG2OJBIXZPuq8Fi8oxGtb9nWqlfK+OBqxCtbHO3oodsUx7r51ArT8WARJ3s3fSPtsPT+XPofZbYrRVTk=@vger.kernel.org X-Gm-Message-State: AOJu0YwiX4FngwnSRf/nh3Uw4h1Q4n2Xby5UoZ1lB43xdenfyO5WgejL rXkHGN5wI5ZFVx9YNnHIgwiiqMdqE+euAGZbiCJYu1tVHHW9axVP4II3ZKRgCQH3pJo5KCf5c+x 3BSdQNJjv2w== X-Received: from dlbqi10.prod.google.com ([2002:a05:7022:ebca:b0:135:6e62:55b4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:41a7:b0:130:6904:8c17 with SMTP id a92af1059eb24-1350451e28dmr6652129c88.18.1779119217659; Mon, 18 May 2026 08:46:57 -0700 (PDT) Date: Mon, 18 May 2026 08:46:30 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-7-irogers@google.com> Subject: [PATCH v7 06/14] perf build: Encapsulate vmlinux.h and bpftool in bpf_skel.mak From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 7a0e372824c6..8437c3f72125 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -681,7 +681,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 ifndef NO_LIBUNWIND diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 373eae7fb72a..ec0e91bedce1 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF READELF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -324,7 +324,7 @@ else FEATURE_DUMP_EXPORT :=3D $(realpath $(FEATURES_DUMP)) endif =20 -export prefix bindir sharedir sysconfdir DESTDIR +export prefix bindir sharedir sysconfdir DESTDIR VMLINUX_H_FILE =20 # sparse is architecture-neutral, which means that we need to tell it # explicitly what architecture to check for. Fix this up for yours.. @@ -556,7 +556,9 @@ $(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_BENCH_IN): FORCE prepare +# The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h +# aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c +$(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) @@ -911,60 +913,11 @@ $(INSTALL_DOC_TARGETS): python-clean: $(python-clean) =20 -SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) -SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) - -$(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): +$(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBSUBCMD_OUTPUT) $(= LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 -ifeq ($(CONFIG_PERF_BPF_SKEL),y) -prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h -BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool - -$(BPFTOOL): | $(SKEL_TMP_OUT) - $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool \ - OUTPUT=3D$(SKEL_TMP_OUT)/ bootstrap - -# Paths to search for a kernel to generate vmlinux.h from. -VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ - $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ - ../../vmlinux \ - /boot/vmlinux-$(shell uname -r) - -# Paths to BTF information. -VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux - -# Filter out kernels that don't exist or without a BTF section. -VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) -VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ - do \ - if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ - then \ - echo "$$file"; \ - fi; \ - done) \ - $(wildcard $(VMLINUX_BTF_BTF_PATHS)) - -# Select the first as the source of vmlinux.h. -VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) - -ifeq ($(VMLINUX_H),) - ifeq ($(VMLINUX_BTF),) - $(error Missing bpftool input for generating vmlinux.h) - endif -endif - -$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H) -ifeq ($(VMLINUX_H),) - $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ -else - $(Q)cp "$(VMLINUX_H)" $@ -endif - -endif # CONFIG_PERF_BPF_SKEL - bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp + $(Q)$(MAKE) -f bpf_skel.mak clean =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index aa04d8b3ee07..30924ad140c4 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -35,6 +35,47 @@ ifneq ($(WERROR),0) CLANG_OPTIONS +=3D -Werror endif =20 +$(BPFTOOL): + $(Q)mkdir -p $(SKEL_TOOL_TMP_OUT) + $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool OUTPUT=3D$(SKEL_TOOL_TMP_OUT)/ bo= otstrap + +# Paths to search for a kernel to generate vmlinux.h from. +VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../vmlinux \ + /boot/vmlinux-$(shell uname -r) + +# Paths to BTF information. +VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux + +# Filter out kernels that don't exist or without a BTF section. +VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) +VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ + do \ + if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ + then \ + echo "$$file"; \ + fi; \ + done) \ + $(wildcard $(VMLINUX_BTF_BTF_PATHS)) + +# Select the first as the source of vmlinux.h. +VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) + +ifeq ($(VMLINUX_H_FILE),) + ifeq ($(VMLINUX_BTF),) + $(error Missing bpftool input for generating vmlinux.h) + endif +endif + +$(VMLINUX_H): $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H_FILE) + $(call rule_mkdir) +ifeq ($(VMLINUX_H_FILE),) + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ +else + $(Q)cp "$(VMLINUX_H_FILE)" $@ +endif + # Consolidated Pattern rule for $(dir)/bpf_skel/ $(SKEL_TMP_OUT)/%.bpf.o: $(srctree)/tools/perf/$(dir)/bpf_skel/%.bpf.c $(L= IBBPF) $(VMLINUX_H) $(OUTPUT)PERF-VERSION-FILE util/bpf_skel/perf_version.h $(call rule_mkdir) @@ -51,4 +92,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) $(Q)$(BPFTOOL) gen skeleton $< > $@ =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o + endif # CONFIG_PERF_BPF_SKEL + +clean: + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TOOL_TMP_OUT) $(OUTPUT)benc= h/bpf_skel/.tmp $(SKEL_TOOL_OUT)/*.skel.h $(OUTPUT)bench/bpf_skel/*.skel.h = $(SKEL_TOOL_OUT)/vmlinux.h + +.PHONY: clean --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 5055748124B for ; Mon, 18 May 2026 15:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119232; cv=none; b=YEdnhsLXaSj2k1/v+tK4HbM2HK9tQ6y1X6iCcQIqk4rOlJgEn2g7WTGweJn+PtiFIq13CpCqQnDRQy6Gj8cS2NuNCFBFUMKF+Sgu+SGvzjjtkkkhf3gLTjZCPTMSAEa5NiFzSvS2tQ9s4iK0ZfOj1X+RhXGB/74kkg9gKOUESwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119232; c=relaxed/simple; bh=+U/Ns4U0n1I6K6DVg25733xbH6/xIUj21YSyt3UqYhY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=c7MLWsF/Pd7WIxyTRs+2pvmkWZt5S9rOfjN3j7X4S2AVmc7xiHBGYqdfliAwM0JvFyh228BiS9w/Sf0zwJshuEwArSVykP69NafKXE+rFNydKIjyXdFy50AODTQLvKSyQb/kuMYFt0D3dN0jdyRVriL2h1gLVSl1VkNlvLvRpfg= 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=Dx/ZvRs8; arc=none smtp.client-ip=209.85.215.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="Dx/ZvRs8" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c828f0f5c23so998451a12.1 for ; Mon, 18 May 2026 08:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119220; x=1779724020; 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=MCHaIawCxnCGNrWb/mE/uud5GJuFlh4Rbz9NZTl4E9Y=; b=Dx/ZvRs8iPBwt85T9MdPPogNuStVk1R/jFXAVdee33pEcChHLAhatDJeblGBQPGfDi FH4WkyGOL192PGOe/L3Zfq1ZsLsTEH4IvoKcpfBBe4ey/nHYBQXTdsrO1tF3ZOjP8DJ4 HBqXKucc8/DL/U/Vd6lEn0Jnwd4iALpubvoYFJNvXQ6sVWQi++KOIv4tf1+/1c/tAp4t E77TnkQ/gFE6+n0uu+FzLFKMWucc+JWB/uEYw9pCq3AfuqoEXblfWhM8Pmicpk2Z0MCo gq1kanqSEjq0gAI/+/N97ywmq6vuMIOazOIGxNwANFzV4do2RJ7EXKVZiVc36da7PJAy YPgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119220; x=1779724020; 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=MCHaIawCxnCGNrWb/mE/uud5GJuFlh4Rbz9NZTl4E9Y=; b=HQjk3h8u5L6Ay/FArbEPzTVcND17R5NRa2EH8KdaEi8CHIUVTu/iQd+PqwB5BxsexA N7W6NRJAHad+GZajpbkor/ktRJsUYXSFrSikS/E5ZhTZpZRuAlcxrZ+kXmNI3exs3jcx 2zZT7JA6UGrmEoYgryyegDfI8ksJzGjW29K03bBSQW8MhtP5b0HjhGh3iqOqxu5QgGoD XQwrMpDlg6bxSP2T1kbpT2ODwVMXLnLJVYm/++vaflHalUuxReKdI33rUur4B4SjuCYk MW5HEmD1RGVtOsBcX9C491YgLay+Z/bzL8OtvivnVhh0yLWZLFBoBMqD+x3zIjM0U2vq S3fg== X-Forwarded-Encrypted: i=1; AFNElJ/Fp9U3k1nnLltrdrniQ4piMGZx3+A1AcxHd1N2R/8Z5vV4f2XYvAQeHK11J7gHCZSksN/7Ys2fwHDDOSo=@vger.kernel.org X-Gm-Message-State: AOJu0YzllDvfAUNjRi2R8hDfB6sjbYFXKTcCE5kG+r2ga4cnehp9icET 6z4mqUnftG2KizQodI+1HdA3Ou3ebT0N9jcFHVCoRwEIUAQ+sGJYAnAti4rnkZm1FQz1FIcaNtQ 2ew3fBYk9dQ== X-Received: from pgbda3.prod.google.com ([2002:a05:6a02:2383:b0:c73:bc95:cca8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:748b:b0:39c:787:f197 with SMTP id adf61e73a8af0-3b22ec70cacmr17175514637.36.1779119219461; Mon, 18 May 2026 08:46:59 -0700 (PDT) Date: Mon, 18 May 2026 08:46:31 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-8-irogers@google.com> Subject: [PATCH v7 07/14] perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- tools/perf/Makefile.perf | 8 ++++++-- tools/perf/bpf_skel.mak | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ec0e91bedce1..876065a02de6 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) \ @@ -971,7 +975,7 @@ FORCE: =20 .PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_sh= ell -.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare +.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare bpf-skel-p= repare .PHONY: python_perf_target =20 endif # force_fixdep diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index 30924ad140c4..7704e7e635d8 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -15,6 +15,10 @@ ifeq ($(CONFIG_PERF_BPF_SKEL),y) BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h =20 +.PHONY: bpf-skel-prepare +bpf-skel-prepare: $(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 }') \ @@ -93,6 +97,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o =20 +else # CONFIG_PERF_BPF_SKEL +.PHONY: bpf-skel-prepare +bpf-skel-prepare: + @: endif # CONFIG_PERF_BPF_SKEL =20 clean: --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E71D72FCC0E for ; Mon, 18 May 2026 15:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119232; cv=none; b=YQjVtmDNHEb3fY2RCzKIxyguNb1WpuIxfwBEjlaJzh2bMhzK75MwqoYds32sBeEBTyjeWSqGWA14DlTSxswMwtyxH3iiD7EnXoK1YDblbXzX/kBcqTEhxA+j0wRoHxZPoIiwhzDbdG7CnowFuZe/NF4F0cj0o1LfvFbSQHttatM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119232; c=relaxed/simple; bh=l5QKav5wmqSVNvurZfB75hgd7Q4yiRfMQ7JC8EnR+0M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HNdEe+M/g7wC+8UeMm7AzduJMIQ98JyhswiVndd4QCpnRvCS+auyl+b1Zpr2lrlvzHW6Yc8ZK5bHvxcxujMm2B5Xm4IaJXnr72zVXY0hQrPXA4mEzoWUv/JCXi5NRnvg0J06VdsPm47hDGyiRdzito2EXOJu0MXC/DgBsPb2GrM= 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=inN5A96y; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="inN5A96y" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82fa860e71eso1210857b3a.0 for ; Mon, 18 May 2026 08:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119222; x=1779724022; 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=5Ko4k/zOsIwJVmScnIi9Okmp0zWky5zOptE9t4gyo8w=; b=inN5A96ygbRa1owLWamZcHGtfneBMNJbayNQ6cUlCB+rHss4NEQStfV9DKj/2s0uCj USpnZzXOoBrqEkFFlRFGl7rMG2mqsFTJIy14NLt1s16HpO3ePJeUQCxy2Rftr0gmxsnt xykhbMgOj0bbPISIRXayzcIJOIgnMOx/qNzAKQZWCOMbCQWGRIr7lLm1D8/p8srK+dsw 8TTTG8YM8o5BaIXKWAFhSIgeLuc4adsTFz/fwCDM3ieYfbHMaForQIK2f67iwCgYE7wt IPEsaT7R5BSnd4X3UpU2ASuucTBMEw6Gx84ZZQIFhwU2YmW05qPlQifwQKNcK1zKbaPG dV/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119222; x=1779724022; 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=5Ko4k/zOsIwJVmScnIi9Okmp0zWky5zOptE9t4gyo8w=; b=IEKYrAE5yIoasv2JdqRiRw4vp6ZFOcBSVQfuIii2WItYCG5xwzkPcpBCFWV9V2zxIe 3OVw+k2JyjX/uoybF+TGqpRq3fFIpotRCQlxz0a77GRhTyB1VqFJJ5xA8laTB7Ctwfla L/DggAFyh9geM7fRmhMBjhOfY4yYa6FXPjG0WnCx54JIdCMLu36Vt/U0ydWjQ3dxqbR+ oMfdmzYv+lvO8NM8MEO2nOFhE2gKB1lAKR33D1daxaEFfHKSSRxRV1nDPlNJro72FStS ki0vBgoMf41alBT1Pv5eF9ts0N9xlwomYRFdJk2bXdZlqVrp8+YzTAf7/8rbVyWcHk6x o5tQ== X-Forwarded-Encrypted: i=1; AFNElJ/+2JNQsPuE69Hi2agP/82AyY4IzaTUUuBHLJrRnMe4c4HC9skp7Js4ZZnf4OPKq02hDO7LoH2HziMCFVs=@vger.kernel.org X-Gm-Message-State: AOJu0YwBlRQ/vw/OfbCbm1oiPS+04qK/LUxZYf7u4ABUGkp9e5YkALeD GdLGgbqPDGKcWj+Dx7laKk1mF6nswIJ+WubGPLsbaJ6xfYzuo8N1fwAey0BMg+uDiV6JjuFVFb7 nZJq6P3Id3g== X-Received: from pgar28.prod.google.com ([2002:a05:6a02:2e9c:b0:c76:b173:30d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d25:b0:3b1:a9ce:507f with SMTP id adf61e73a8af0-3b22ecaebfdmr17076556637.29.1779119221649; Mon, 18 May 2026 08:47:01 -0700 (PDT) Date: Mon, 18 May 2026 08:46:32 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-9-irogers@google.com> Subject: [PATCH v7 08/14] perf build: Move libsymbol dependency out of prepare step From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 876065a02de6..96a68723109f 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 | $(LIBPERF_UTIL) +$(LIBPERF_BENCH_IN): FORCE prepare $(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 +$(LIBPERF_UTIL_IN): FORCE prepare $(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 ifdef LIBBPF_STATIC prepare: $(LIBBPF) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 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 52AEA481FB7 for ; Mon, 18 May 2026 15:47:05 +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=1779119230; cv=none; b=qjacZR5LPGAQ0gcPxDvYVk50IBpgzCwvC55tkrEmZvGyl2dI4FTDbK9EHoavFiSPfo0/553umn7vs/wfFJvzdRKsfyWhP+votWbPiBjmvdc3w74Wwp/nucriKQMMiwuSvxksf41X6aZGJSCnANltVWhElNTrOlW/zVjfeaBuw2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119230; c=relaxed/simple; bh=lKi589raivhsbwyLaj9XtBtQSUnfs3hz++4WpPhAN6I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IXqIBj53rXdnlRzwQkBO1SOIf6r2fUVF+Ma0UhwsVpHFIoxCGwbKtCLMPCjzxC7tYJ9a2RUUJ0ewY9A61VBJr8fvVa+kb5qVcDTSgiKLGP/7TM4ySN4ACPkDk3XSmePzxBzjPjjDGQ/bPNzc8tg7bg7tiBEcZ/ATELOFQQGQBBo= 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=tQfDQYF6; 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="tQfDQYF6" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c16233ee11so3433610eec.1 for ; Mon, 18 May 2026 08:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119224; x=1779724024; 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=JU72sTCFhIbrBstza304DuXmMup6ne4nbZZzxxUn+Wk=; b=tQfDQYF6uVhSITmnFhm0k9b8w9og63+p3oU4GXvD3X+XtAh7GyRxJi8ru737j/Jfma iqvtRL3gskfQJhEJY74phE7TVjuKcZ+I20cSkguK42SL9fV9WUifi5Kbi7cGWVZPKWW9 CGXe1XQ9xGKdFaEhnhTYKIW2+NYFbzlhjTgo4ti3bcUsL8Rx3F4QR3r+poQDqs/ZtM6x Rt9UvsW///RptG5kfVu+MS/75fcD21DZPKTKLDOqql1JNoC+N0iie+4e/tuFNEXglF25 yB/PebwC1w1rslq10hvtXcKF3XH6ZDpBgU8/PLwKGRiT4YGqvToYTESGLie2T8M20r4O jfJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119224; x=1779724024; 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=JU72sTCFhIbrBstza304DuXmMup6ne4nbZZzxxUn+Wk=; b=flNB3TLN5BA/LjD8OfLlSBtnuAE7hsysZQpZsn4tJWg8QX/GIOse1BOTz0vsbm5HEC r7sSpJDS44tYDbo2y5F5IMfRo2JXvFWxJ4ddydshuXU9cvfSzFSBJZOfAjWL3PkFP1pM n7yqPXjJOXipFYB0UCz2Wqsvo96wcA+cutqvUcXEFpPxwV4GPoYxeSu8uOsfUxgAyViS uBCWxweRXrfTygHJHkl1o2K5l6RrHQYXG00ScaiHl4097eSYh0YKBSMQEYM/CI1SPPSE JNeZwz4ChioEzNV6AXq+lR9CFfyzBPvu2YQS2tQzzK0+LAKnXxxkKRezR8eZbSwg3Hjf omCg== X-Forwarded-Encrypted: i=1; AFNElJ8+BuxR3diOr+AW5z611aB46ewytGfFZQ00CQtMl9zlpOQNzlFJQwkSAZzrVLlJ9G4yBJdxjBOThi0EUeY=@vger.kernel.org X-Gm-Message-State: AOJu0YzYteK2zlOzRlbJrG7zIhEKqxSTKur2OzwKQ8k/NJYfMWRTzUEw vM3zLzHlwsEqDXd//Eq3w2+CiaR3faw6mIqAMbm0w0FP66hU1FBSNbIyy6ZjqxKhttiyG9IAmp7 rJaD9YMj1Og== X-Received: from dycju19.prod.google.com ([2002:a05:7301:fa13:b0:2fd:7d41:249d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:644c:b0:2ed:e12:376b with SMTP id 5a478bee46e88-303986b14d3mr7248330eec.33.1779119223501; Mon, 18 May 2026 08:47:03 -0700 (PDT) Date: Mon, 18 May 2026 08:46:33 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-10-irogers@google.com> Subject: [PATCH v7 09/14] perf build: Remove redundant libbpf feature check for static builds From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 8437c3f72125..26de7528d6ce 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -575,10 +575,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 Mon May 25 05:12:27 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 3D41E48A2DA for ; Mon, 18 May 2026 15: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=1779119239; cv=none; b=AcHZAAd72Mma0vKnL1quDDySh4EKl6Oi46iU46c6cXaT6exndNYR7c5qeYehuyrySl7qUUyqTKLy3JUGfeywTsSDpD85ENNanvVaweiAt8fVylk/wrJkL1/Kb2+3gP725pSMF4Uv+A9jR0/vyp/v1byVyqhSjsxVamIbtLRW0sA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119239; c=relaxed/simple; bh=W1AKf6HBmEZYwn59EoYtmY5+eNzGcl5c+gVy8e78TF0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Xlq8WXs597imxTD6l2cwBhcC85u1jC7D6OVEWvl1GFJTEaZ+EKUJ0B2DG12gGq1oWjUpsjulWnKPulQdRDe4ujoWSIcCGmvo4vbQoa7Cn7/OVf04T6/RaLB2jShZgkSnp/CpwIEm1UKcBj5LkTdS50VZRO0F6hjBlvwh52Ilxg0= 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=CDSWCAM9; 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="CDSWCAM9" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1353ac304f3so4419106c88.0 for ; Mon, 18 May 2026 08:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119226; x=1779724026; 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=J8Gn9u6Ay2gAeNSJD6VxHlLmg9jVbwsa1tUO88FBQSI=; b=CDSWCAM93WyW/HDu8uqlHfd4chVEi7mRKxeEQl8pVkQ1W7S3ntEOquUgNYHFmemc5u tJkpI90ikUkSz1cdn3Zk8eAYbq6RawEDyGczsE9cQAuQyxZNszYY+kAuzZ12BcZOZeKU oKdtj8a0oRm/Vfq1pdky+rXXQYDACBSVi3uzenUtnI+i3oYC3MzYNpmY2EIU1eOgVzBs 50YY7E1Esu83FNukA+WMusUSxs9FpZCgmZBVNrUkIMyLeUJX2bTH6k+2fjRHectuhIqz KHYklyfo3q77ksNVuFAjieaSZt1YSOc301U3JxUJhr+u+vX2A/uiFS47DwRARmGtQXhu pDhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119226; x=1779724026; 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=J8Gn9u6Ay2gAeNSJD6VxHlLmg9jVbwsa1tUO88FBQSI=; b=eExlC6JykM9998L2ytd40JHLvPzLXKCcW74/+D7kZOguE93tAW3DeMfu9qysiP6cPe 0QuuKAf1mm0FOs+vPM/HAhlZGiieg4BnvUeLGPp/fF0V93Vu1wY2NyvmpyKEmkETZAUn YuE4TowmVC63/yotE7+Z++0LcZazdgdXZJBaPKi2JyLOs1W3TG/WpGV7fGfyqQHOQOvy 7h/0r8keeGsMdbcHDAzNPfHh+bkUl/aV8Qs40YPOV5QJzPuLXwm7iP5nh0QjE1uRnq4h vn01Bv4I6BDZhOrVbVsqHl93/qw7f/LvyMlFZckotRrvNPqHdAX0/+EYYjcY4lZ5xY9f ZWOw== X-Forwarded-Encrypted: i=1; AFNElJ9yPAPSaSGF44qZPPMfxjQV8ZdKpg42mqEOoIL0qpAV/VfQNd6KtYPOkTHwb4mx48zp8M7koWaDl8VBFkg=@vger.kernel.org X-Gm-Message-State: AOJu0YyrhPnCTor7Nu3u4CPQxgVsDZWIJHDoIfV6pQHreuhWoB9FXBx0 AQQbBEfPz6FV/ajHfBWb+tqewU60AD9+nNhvr+aRLSItIYyRX/7ppIT8PCV7HoHU2BFJ44NjfpJ 8M/IxUsuPKg== 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:7022:41a7:b0:130:6904:8c17 with SMTP id a92af1059eb24-1350451e28dmr6652405c88.18.1779119225401; Mon, 18 May 2026 08:47:05 -0700 (PDT) Date: Mon, 18 May 2026 08:46:34 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-11-irogers@google.com> Subject: [PATCH v7 10/14] perf pmu-events: Split big_c_string storage into standalone compilation unit From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py emits both the massive 2.8 MB big_c_string literal and tens of thousands of compact_pmu_event struct arrays into a single pmu-events.c compilation unit. Compiling this giant file takes ~2.2 seconds on a single CPU core during Kbuild startup. Refactor jevents.py to emit big_c_string into a dedicated pmu-events-string.c compilation unit. This allows Kbuild to compile pmu-events.o and pmu-events-string.o simultaneously in parallel across two separate CPU cores, preserving 100% string deduplication and zero dynamic ELF relocations while cutting C compilation latency in half. Add pmu-events-string.c to tools/perf/.gitignore to ensure in-tree Kbuild runs do not leave untracked generated files in the working directory. To guarantee 100% backward compatibility with GNU Make 4.0+ (avoiding the Make 4.3+ grouped target &: syntax which causes older Make versions like 4.2.1 to spawn multiple concurrent jevents.py processes during parallel builds), implement a robust dependency chaining pattern: $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) @: This ensures jevents.py is invoked exactly once. If jevents.py aborts early, Make's .DELETE_ON_ERROR: purges pmu-events.c, guaranteeing that subsequent Make invocations correctly re-execute the script and overwrite pmu-events-string.c. In jevents.py, explicitly close output_file first and output_string_file second at the tail of main() to guarantee that pmu-events-string.c receives a filesystem timestamp greater than or equal to pmu-events.c, completely avoiding redundant incremental rebuilds. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- tools/perf/.gitignore | 1 + tools/perf/Makefile.perf | 4 ++-- tools/perf/pmu-events/Build | 16 +++++++++++++++- tools/perf/pmu-events/jevents.py | 23 +++++++++++++++++++---- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index 0f9451a6e39c..3b968c5158b8 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore @@ -38,6 +38,7 @@ arch/*/include/generated/ trace/beauty/generated/ pmu-events/arch/common/common/legacy-cache.json pmu-events/pmu-events.c +pmu-events/pmu-events-string.c pmu-events/jevents pmu-events/metric_test.log pmu-events/empty-pmu-events.log diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 96a68723109f..b8a81c9749a8 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -925,7 +925,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 @@ -933,7 +933,7 @@ ifeq ($(OUTPUT),) -name 'extra-metricgroups.json' -delete else # When an OUTPUT directory is present, clean up the copied pmu-events= /arch directory. $(call QUIET_CLEAN, pmu-events) $(RM) -r $(OUTPUT)pmu-events/arch \ - $(OUTPUT)pmu-events/pmu-events.c \ + $(OUTPUT)pmu-events/pmu-events*.c \ $(OUTPUT)pmu-events/metric_test.log \ $(OUTPUT)pmu-events/test-empty-pmu-events.c \ $(OUTPUT)pmu-events/empty-pmu-events.log diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index dc1df2d57ddc..95172a2a851f 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -1,7 +1,12 @@ EMPTY_PMU_EVENTS_C =3D pmu-events/empty-pmu-events.c # pmu-events.c will be generated by jevents.py or copied from EMPTY_PMU_EV= ENTS_C PMU_EVENTS_C =3D $(OUTPUT)pmu-events/pmu-events.c +PMU_EVENTS_STRING_C =3D $(OUTPUT)pmu-events/pmu-events-string.c + pmu-events-y +=3D pmu-events.o +ifneq ($(NO_JEVENTS),1) +pmu-events-y +=3D pmu-events-string.o +endif =20 # pmu-events.c file is generated in the OUTPUT directory so it needs a # separate rule to depend on it properly @@ -9,6 +14,10 @@ $(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) $(call rule_mkdir) $(call if_changed_dep,cc_o_c) =20 +$(OUTPUT)pmu-events/pmu-events-string.o: $(PMU_EVENTS_STRING_C) + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + # Message for $(call echo-cmd,cp), possibly remove the src file from # the destination to save space in the build log. quiet_cmd_cp =3D COPY $(patsubst %$<,%,$@) <- $< @@ -118,6 +127,7 @@ CUR_OUT_JSON :=3D $(shell [ -d $(OUT_DIR) ] && find $(O= UT_DIR) -type f) =20 # Things in the OUTPUT directory but shouldn't be there as computed by # OUT_JSON and GEN_JSON. + ORPHAN_FILES :=3D $(filter-out $(OUT_JSON) $(GEN_JSON),$(CUR_OUT_JSON)) =20 # Message for $(call echo-cmd,mkd). There is already a mkdir message @@ -224,6 +234,10 @@ endif # and inputs are dependencies. $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) $(OUT_DIR) $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) \ + $(OUT_DIR) $(PMU_EVENTS_C) $(PMU_EVENTS_STRING_C) + +$(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) + @: =20 endif # ifeq ($(NO_JEVENTS),1) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 3a1bcdcdc685..7344940e776a 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('extern const char big_c_string[];\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_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) @@ -1476,6 +1488,9 @@ struct pmu_table_entry { print_mapping_table(archs) print_system_mapping_table() print_metricgroups() + _args.output_file.close() + if _args.output_string_file: + _args.output_string_file.close() =20 if __name__ =3D=3D '__main__': main() --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 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 68DC03F5BC8 for ; Mon, 18 May 2026 15:47:11 +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=1779119239; cv=none; b=a26mnYJHhC/wPM6TYjYeyU3xwBLxFEh1k6DHj4CAxQ57kfNu8J64i12Vv12RZJCJuO+7GXxliJONH/OWxo9+8XUh3BjY0j0VlPoHdg3nugDlkgHTMtO7golcJPL0bzvmAQ924Oo+yjNDidDmnezL0/6+WqnV8m1L4uu5wVf470c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119239; c=relaxed/simple; bh=L14klLZVHgQZQ5seTQndooWBR1p+rofTHdL1BdJlPEE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=U1m3v38INPyOx8hd0o0jFnA+DDgf2O+Futg2MySBsBWBfqAp4Qk6Zu3DMQP1z0DBRUnyhJxd/9F7TKokKlmRjuiVnYRTUuwDZRhkPwjw4IUdl+zazR7oKDrgbjRDxv4RewjkddoAwMUw+F1tAOlwSSKESBgxjrHo50PkvbK2lyE= 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=H0k/gMd3; 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="H0k/gMd3" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-135405e4035so10554216c88.1 for ; Mon, 18 May 2026 08:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119228; x=1779724028; 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=/d6+paeaMcTTaPCQt35CLTxbLauWsR41NVkCLRNdE7I=; b=H0k/gMd30KAQYok4yNOI0BBiOPDSnBn0MLL82+2G0B9XMQEEwUDwefYukbmHfGPEnm RqOyGVwxdqVdQRFNOWUMqpIRYFZ4rTsOtrERCRu+aJ2WRF8lJ4OVGKgi7GqSrOwco5SR Ip8ZYwnWkIhapNn4Emd5njwb4ByzZ68TegQWp8f+pUcHAjnqpiRqpHSZqfwTgopJeIZi 7IzIDQ4m0rj+oxww1dCXhuLtNwQ8Qnw4+pyOuc/f3rcETHQSEX5TL2xqJMd0gyu1IaVN u0pjnmdJGRAQ4yBhC/XqWto5xQTWvwO5+tRZ+rLf8mBt+da9/93IEnJ/QV1CCUSq+t+o aT5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119228; x=1779724028; 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=/d6+paeaMcTTaPCQt35CLTxbLauWsR41NVkCLRNdE7I=; b=NkGy2uO8JgkiKrZVbr3hpdC4NMFd6k0c/8UtC5DH1dUgAy3uITQ9VPxpu81tUFJw0D Hf9QfbzQ7o7O9Joyt9XuUQy9aAVxabPYFJUqKlU8p26P5UhBVy14eDRhYXOckLhRe4Ax h/ReXL7Ui+AqtwMw9AbCBQedVYwuMZ4A8JUZVEzijukNMdWQ0Fr2NlufAQcRBicDXh1f o76V7GTfb8Sd3VZQgbVCBGwL9iyGaReYGRjrtT+U66gBD6IgKbedCv75+XKdeU2/J8T3 vGBhGP83bLO6NKTIfJGEAtPPTJthRFKJO5aFd7eLhkuullTVB7WyElW7B0eUPrmgoFy8 Moqw== X-Forwarded-Encrypted: i=1; AFNElJ/UYgmKjzscpbu64KdaJU7JrWpzkNCkSzExX3vvG+DrRAN7XYxGu+eJSbrgXezjdv5dpAzJCm6dKLzHBA8=@vger.kernel.org X-Gm-Message-State: AOJu0YxC5GTwHgXSrrgsJ0GLV3EdNVZsYB6iPQRGP+yHaK7JbIe3rHuu X0LAbzRXZKfOkr8Nc8/lHW5FBa6hoacXhWiNEz/gTIrDteRA1RojsyHOJdCeuiWpnyUeqUmu+Nn h/aVAM7czVA== X-Received: from dlbpt3.prod.google.com ([2002:a05:7022:e803:b0:135:3471:e411]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:689d:b0:12d:ca32:5a2 with SMTP id a92af1059eb24-135044192c9mr6931834c88.6.1779119227537; Mon, 18 May 2026 08:47:07 -0700 (PDT) Date: Mon, 18 May 2026 08:46:35 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-12-irogers@google.com> Subject: [PATCH v7 11/14] perf pmu-events: Parallelize JSON and metric pre-computation in jevents.py From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py parses hundreds of JSON event and metric files sequentially across all CPU architectures during Kbuild startup, taking ~3.3 seconds of pure single-core execution time. Refactor jevents.py to pre-populate its internal JSON AST cache in parallel across all available CPU cores using ProcessPoolExecutor. Define the worker process initializer _init_worker at the top-level module scope to guarantee flawless pickling and standard event mapping inheritance under spawn multiprocessing semantics (avoiding AttributeError crashes when spawn is used instead of fork). This accelerates jevents.py execution by over 11x (from 3.3s down to ~290ms), fully reclaiming multi-core concurrency during the build generation phase. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- 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 7344940e776a..807c42edcd33 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -457,8 +457,8 @@ class JsonEvent: return f'{{ { _bcs.offsets[s] } }}, /* {fix_comment(s)} */\n' =20 =20 -@lru_cache(maxsize=3DNone) -def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: +_json_cache =3D {} +def _read_json_events_impl(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" try: events =3D json.load(open(path), object_hook=3DJsonEvent) @@ -474,12 +474,16 @@ def read_json_events(path: str, topic: str) -> Sequen= ce[JsonEvent]: if updates: for event in events: if event.metric_name in updates: - # print(f'Updated {event.metric_name} from\n"{event.metric_expr}"\= n' - # f'to\n"{updates[event.metric_name]}"') event.metric_expr =3D updates[event.metric_name] =20 return events =20 +def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: + key =3D (path, topic) + if key not in _json_cache: + _json_cache[key] =3D _read_json_events_impl(path, topic) + return _json_cache[key] + def preprocess_arch_std_files(archpath: str) -> None: """Read in all architecture standard events.""" global _arch_std_events @@ -1381,6 +1385,14 @@ const char *describe_metricgroup(const char *group) } """) =20 +def _parallel_read_json_events(task: Tuple[str, str]) -> Tuple[str, str, S= equence[JsonEvent]]: + path, topic =3D task + return path, topic, _read_json_events_impl(path, topic) + +def _init_worker(std_events: dict) -> None: + global _arch_std_events + _arch_std_events =3D std_events + def main() -> None: global _args =20 @@ -1459,9 +1471,25 @@ struct pmu_table_entry { raise IOError(f'Missing architecture directory \'{_args.arch}\'') =20 archs.sort() + import concurrent.futures + tasks =3D [] + def collect_json(parents: Sequence[str], item: os.DirEntry) -> None: + if len(parents) =3D=3D 0: + return + if item.is_file() and item.name.endswith('.json') and not item.name.en= dswith('metricgroups.json'): + tasks.append((item.path, get_topic(item.name))) + for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' preprocess_arch_std_files(arch_path) + ftw(arch_path, [], collect_json) + + with concurrent.futures.ProcessPoolExecutor(initializer=3D_init_worker, = initargs=3D(_arch_std_events,)) as executor: + for path, topic, events in executor.map(_parallel_read_json_events, ta= sks): + _json_cache[(path, topic)] =3D events + + for arch in archs: + arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], preprocess_one_file) =20 _bcs.compute() --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 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 386BE2D592C for ; Mon, 18 May 2026 15:47:14 +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=1779119248; cv=none; b=OI65UCx88VVH5YdJKKJCOYxUtSk55vNcGrWbTTm1WjyzpLo8QpYreHsjGS0BJ6bTwYYxG0BH/zkCF1eCPHKLBNkyuOp/eH4fxhkDKYvgTqLfhBrakoN37SEPBhzPNHhKr1mDFeNoXfmW9hNp40kMC4PeldmV0/wBixEd3GBqL18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119248; c=relaxed/simple; bh=UO8COcfsaqz02sjdD6/7eGxdxivUik5cN2WpzQTquMs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RObjuzz31tBjf1bsYBTqW6Vr+rmJ6I7DLVQvdaR4qxKF3PKNTfjcPLlaVianuJLxV3iIINYppl+T0YQZ5gHa/G9y26PA5w6vnMUxUHnvn64Jk46jdLntUZjOUjVHGV5eJfOMFb5kh6NuWbnsWpP72TJyJIW1s6/DfOrIszk17vs= 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=YQinennJ; 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="YQinennJ" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2efc342ef15so3385310eec.1 for ; Mon, 18 May 2026 08:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119230; x=1779724030; 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=elI3dCv9to9+reTrmH7gWaOOH/Cw1KfhvnnriZ/0VzQ=; b=YQinennJ2/LJQgmXBz3gMZ7CyttkpVcwJXMrMeHx2mQLenLMTeUngykZbXIHlXouNR G4PZjzpyffIvlUrc/h4Lenazi+T3qQhEpRhkHa2GDZ9CVYBowDTJxboi01Lfov39OwTB 7ejTx/4uXOb//9n166LoA/O47fz52ijYatpFBySJTp2KH/lQLG7s7hVRRWnPg1WeZ/V0 p2j+QAJP/ZbafhDW8APl0/DJNz8p7CM0s1TWnzTk6fdzhaSXg36YjSNJTRdSwr3PFRUn WlSgtfS/ED59N4tfqxI301J5ET19GsprrzV1Zjh0pFyIhoIglZ7s6s5RbWap0SXdEa8Q ROPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119230; x=1779724030; 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=elI3dCv9to9+reTrmH7gWaOOH/Cw1KfhvnnriZ/0VzQ=; b=IbKQww0Eot7zcNHg925g3LLUErBiPQMjWbzzS486BIgp/n2NQ+a2kVWXrrlOXMywVD V0oGhY9pTLcjaXdTJ7v4GiP2YKa/ZW9eocdawF1pCHvDrqCd40ea4R1U4T9u85B51hoz CBkKQ7prgHNSbzxZcG3MOOO2o9etTDNE8syjIPe3FVQSByBYMIFc8qVas2uH9VEQBFhA 9aGEU2VaH2EHdX6VX+bDLcyvRn4Mgb60/+ojMhVos8qTK6qiGlLD//fqmBPcKUP51xMC B+RHKPT4WOiAaU8AJ9r/UfnPgp+GyZFRV7wrs7b2SLqftN9Xrxh4o1XEV+1vD96tEFLN gnLw== X-Forwarded-Encrypted: i=1; AFNElJ+0QkGmh6Auu8X65kkEmdwwnimQtybD41S4adDKktg33KE1jQMm9FDWmVVjimTTV9nVi+Sjo8KLCN7LolE=@vger.kernel.org X-Gm-Message-State: AOJu0YyYkRBNTqfR297MeVlnvU4E6TSxbN1uE3SDQip3SBFUVHFuGVz2 j90xRE984bAe8qzBYhxQNL8oNopUB9xqRM1hMI1RtE8Yygk4qiqOMuw4O7Q1ejtgPWFu2Egv5Uk Y7POjsvTFKQ== X-Received: from dycmx4.prod.google.com ([2002:a05:693c:2884:b0:2ee:de47:cde3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d706:b0:2d9:f0b3:1d98 with SMTP id 5a478bee46e88-303982860f0mr6417996eec.7.1779119229503; Mon, 18 May 2026 08:47:09 -0700 (PDT) Date: Mon, 18 May 2026 08:46:36 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-13-irogers@google.com> Subject: [PATCH v7 12/14] perf build: Prefix SCRIPTS with output directory to fix continuous rebuilds From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, 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 Reviewed-by: Namhyung Kim --- 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 b8a81c9749a8..fc92d6ceac5b 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 Mon May 25 05:12:27 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 DBBA43793BF for ; Mon, 18 May 2026 15:47:14 +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=1779119245; cv=none; b=XT0FnBw1m+Xjok9h2Vfv2Fv7ck9tPFS3gdApy5Hnx5DyyPB2T33nROQmeb6U5R+FC8PGXFzcDDkYxCQM1IgaBmzMbs/qicBmx9c8KmQUDH088uX0qVsL32BVMEuMKyyPp+eIBznbS1VGfzEc5g8cEVuSEDftiXPrD9XgN746z00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119245; c=relaxed/simple; bh=NGfYl6kDEytKUmpKfL2C4Og3ft1hP0ENd8qszCmyGZM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N0uiGK/7RYDssMaaYhOgrFp8KyiHT8DooNr1ez9XFZAkNChuSfPbwsR4PAy7HNjfKgwBIeiYiGeI2uE5GtrenPDvJjHisWymeXmyf5tE8LrVmpI0asF+/NzNYLMz3mDnueeC4+CsambvxteLWoY5ECDdsP1RaT3LEgQBrobgeXU= 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=GrwWJQk7; 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="GrwWJQk7" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-13312be8a31so6103523c88.1 for ; Mon, 18 May 2026 08:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119232; x=1779724032; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ugOFCk7HwEprnixRixPWaow/W0W91ZlZhg4SUCGAxfk=; b=GrwWJQk7vMPde+vKhBQzl/P429Q/lgUN6J/BG2/d07YliwnQwjS+zSNnm8IoSTQEQI kx+kZBoNEfCNwpBQT3W3r2m9VRuVQSIsPQv8k3DEoxqQhNoV/vTTXKpLBpnh+926Tld9 o+yASFtMTzo1QtmiOUqXRiDpKtC2eSgk0SQZ01mbj/2B9D2uDY9HOx8MGJyqMCQr3/iS glVPpPK6GvnMmAKeHqlMsz6gDHekDCloMl030IKnPM49RlWa1Uj7uHvURfWhf8PADf87 KEUj7+WEXoRLEuQp9Nwq0w10Ekgg+SM6MNE5w2y6iSptpAFLTu5cPkfEdCp3d2roG2HH IxfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119232; x=1779724032; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ugOFCk7HwEprnixRixPWaow/W0W91ZlZhg4SUCGAxfk=; b=S3OW6cHxwz5F06RjjWbU4Fq0l0Bou7fv1R/4LPMN0YV1Zf/iJ0Dth6h/wDHqu1UKKE ixQK3dF9dPE2g6v9F//aUF1MJaTulRtcgb7ZN/de9mA42wJ1Ie0O/FcvUwLwQVBVNkWB RM/P6Pgy8+iA57yEF/1sbAia1S1aDnYoVpiK5EGBRUHh38Y0FXTuzvGIE/KgZhYHoPX0 TE4ijYMmjfd4zkRFK2E/c/QnF/o0VxCypRzRHsFlCSHUQ11dF6iPHveSg3hCQ92vvhEm BldsaquDJUiJ8x6SBXsmzRM6g1eIoG8IphA2OWwlY8b3XT6fLDElLYZE29uZDoSnCtW0 S3XQ== X-Forwarded-Encrypted: i=1; AFNElJ/CgjdMmGugQWYDg1lufbiezlZPtW7Esm5Qwr/iq27Ss/y2OzERDlXi3HIVgRqxRnqSWTOkL/ktH3AhDzk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzq0TbDQu3sOU2BAH+c5NreLkeiCKQoiiZpFJZwFcMeFgJ5kAkI qerNcbqTImzJHlP9b8KL4GorKpqlExb68gKoIbhKgSXfxYmbpiiNiwfPqtw9PsLUqcu7QJAsbVc tGew8zlEJHw== X-Received: from dlbcj24.prod.google.com ([2002:a05:7022:6998:b0:12d:b2ba:b551]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2512:b0:135:3025:be5c with SMTP id a92af1059eb24-1353025bfefmr5841182c88.27.1779119231647; Mon, 18 May 2026 08:47:11 -0700 (PDT) Date: Mon, 18 May 2026 08:46:37 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-14-irogers@google.com> Subject: [PATCH v7 13/14] perf pmu-events: Convert recursive shell assignments and macros to Make built-ins From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In pmu-events/Build, ZENS, ARMS, and INTELS were assigned using recursive assignment (=3D), and model_name/vendor_name were evaluated using shell macros (echo ... | sed ...). Because these variables were expanded inside the COPY_RULE dependency evaluation loop across hundreds of PMU JSON files and inside every metric generation recipe, Kbuild continuously re-executed 'ls', 'grep', and 'sed' shell forks thousands of times during AST parsing and execution. Convert ZENS, ARMS, and INTELS to simply expanded variables (:=3D) and replace model_name/vendor_name with pure GNU Make string functions. This guarantees Make executes directory probing shell forks exactly once when the Build file is parsed and evaluates path macros purely in memory, completely eliminating over 7,800 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- tools/perf/pmu-events/Build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 95172a2a851f..372773b998e4 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -56,12 +56,12 @@ $(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY) # Python to generate architectural metrics GEN_METRIC_DEPS :=3D pmu-events/metric.py pmu-events/common_metrics.py # Functions to extract the model from an extra-metrics.json or extra-metri= cgroups.json path. -model_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/extra-metric.*\.json= @\1@') -vendor_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/[^/]*/extra-metric.= *\.json@\1@') +model_name =3D $(notdir $(patsubst %/,%,$(dir $(1)))) +vendor_name =3D $(notdir $(patsubst %/,%,$(dir $(patsubst %/,%,$(dir $(1))= )))) =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate AMD Json -ZENS =3D $(shell ls -d pmu-events/arch/x86/amdzen*) +ZENS :=3D $(shell ls -d pmu-events/arch/x86/amdzen*) ZEN_METRICS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metrics.json) ZEN_METRICGROUPS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ZEN_METRICS) $(ZEN_METRICGROUPS) @@ -78,7 +78,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),arm64 all)) # Generate ARM Json -ARMS =3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) +ARMS :=3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) ARM_METRICS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metrics.json) ARM_METRICGROUPS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ARM_METRICS) $(ARM_METRICGROUPS) @@ -95,7 +95,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate Intel Json -INTELS =3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v mapf= ile.csv) +INTELS :=3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v map= file.csv) INTEL_METRICS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metrics.json) INTEL_METRICGROUPS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metricgro= ups.json) GEN_JSON +=3D $(INTEL_METRICS) $(INTEL_METRICGROUPS) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 05:12:27 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 05927477E53 for ; Mon, 18 May 2026 15: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=1779119249; cv=none; b=Q4k9xbbjQXCeHpLdZSZy0Ur43mOI2BusD7bJbsl/yyDlQ18wpkyV1xLUrMB1JzwP+KPwKp0rcd336bSgl3BH2wP3nKYFtgGV6mEKaQ4c98RpiwsvapbhoJF/cGobB3fsSZFCzey/baimsIATEOZKCQJUAljhX3v2gwj56qtj7n8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779119249; c=relaxed/simple; bh=X/Y6Y0RSQ8C+MKLNRZgURcIaY/WnI4mafzsUsFyDboM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=cpsD4pvoSX1VCtAaXslzrF9dQ++LD7YmmRf4DOgNRb6YC0zCYUstmmp7EtHE8M8LvqsIA8EDiV812fcUZY2pvtRHb4jLynyEvUQdj0C3khcr90llT4NBZB49DZ/1cJO3OcC2zYj0c2iSy5yl75qxna+mgbypvj+WUAOuKYWRUtg= 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=H3WbO5xN; 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="H3WbO5xN" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2f1383b7439so2650335eec.1 for ; Mon, 18 May 2026 08:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779119234; x=1779724034; 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=TX+St+pVYkIq20j0v2ezoU/ohjaZ4xJX9nTu6/yN9F4=; b=H3WbO5xNS6Bmeu7nNWGPMsAcVEgU6/YV9eVWoy+g+luXVVs48rUi4obquBoXb2SyLp Tche+46vrriJCC6vuVwaqXftekc2S5JMBlK1p0KGPgI5ukrlU4gEQo+m6AJhEUQ3GPW2 lGN2q+c/pOXy0WMs/Tcj+DKtuJKhB/vr7ph1H/Qfh2VAlLqvmYBQ4JmQsry1A1ERVicE uQ9guDW60l5nTGLNF7sffSQUVLDWQ6pWN4N2ZFx+fwXPy5a4n1g54RjN/dqxCbXyMaHV oCHF0iYtW+FBGWvmnA5m0g7edOyy9ESTxMHIWWg3XTcwaOtSPlrCh2lr7mPJSjGBoyTy cLcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779119234; x=1779724034; 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=TX+St+pVYkIq20j0v2ezoU/ohjaZ4xJX9nTu6/yN9F4=; b=mp4q70gSurGTVqrbyqF7nw/2nLhGV1+pOzVHLW5v9jCP6yf7I/KMS/bmW6yW1pnwKZ /7Wy5vkXO952rVTl7jl1c9kvdBg3sVK5cyysQPy3YcqcZFy0C/vq5S8PoCaKzjWAsLCy QPs9fWKnf8fQwE0E10/QCmHhFRT0bPPqWBKgD5o3lXtByB0Kgts4zuJRvXvzCbUe8/zs ueN6GfVRo2IKqVBUQZj+HG0WBfBQI/MKvlD3UPr6Sr0DskOzAkOcfw8a37MQ1MhwyXRx ANYV0YKAvbMDLQXMlwtr0JtDXBT74cqZNraG/0+6ylCQyiU663BHH46+8tQLLi0lk+xP w7iQ== X-Forwarded-Encrypted: i=1; AFNElJ/VxaIm5khHAMIa6lTsksKp1L1b/mdzgKpfKDJhCyP0fTpI8VsM6yMl8ZER6skY3viwV8mKwrMMdJNF7+M=@vger.kernel.org X-Gm-Message-State: AOJu0YyCgywyl8J795HLpeHmyh4DyNPeqn4CRhndEr52oTK+WI41Bhel S/2EOEDosAVeKXfLALa+d2Cb6ZVSB80WxbZ1d5BlKfPm9YSw9cLDPzWwzfD5YcP/EDpOKj/jFGi tCedyQQt8Ug== X-Received: from dlad4.prod.google.com ([2002:a05:701b:2204:b0:12d:cbbc:2a7b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f8c:b0:12c:aae:7b43 with SMTP id a92af1059eb24-134c8d4f504mr8212918c88.24.1779119233477; Mon, 18 May 2026 08:47:13 -0700 (PDT) Date: Mon, 18 May 2026 08:46:38 -0700 In-Reply-To: <20260518154638.2798789-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: <20260518044740.2526802-1-irogers@google.com> <20260518154638.2798789-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260518154638.2798789-15-irogers@google.com> Subject: [PATCH v7 14/14] perf build: Convert llvm-config shell queries to simply expanded variables From: Ian Rogers To: irogers@google.com, acme@kernel.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, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In Makefile.config, CFLAGS, CXXFLAGS, LIBLLVM, and EXTLIBS were assigned using recursive expansion or appended with raw $(shell $(LLVM_CONFIG) ...) calls. Because these variables were expanded during dependency evaluation across every single object file compilation rule, Kbuild continuously re-executed llvm-config forks nearly 200 times during incremental builds. Convert llvm-config shell queries to simply expanded variables (:=3D) to ensure Make evaluates LLVM compiler flags and library paths exactly once when Makefile.config is parsed, eliminating ~185 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Reviewed-by: Namhyung Kim --- 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 26de7528d6ce..b56fa8419f7d 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -925,11 +925,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