From nobody Fri Dec 19 07:50:52 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.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 EFA81280330 for ; Thu, 5 Jun 2025 23:39:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749166796; cv=none; b=Lu3oFJwIET4UmoaLxaXR0OiE1OY7FSTzrDEc5mfZ1YAkVOZKaUOhP8yLma30G2+KTXLlQObC14IHedjb5jG74pLkUU3CAGBgRanNn1ugAyqK5vn9/4a75NzaV0ZQKeC5gGWuWDrMCjQzwFAPLOsvtUFCCvl80S+UkFnsvntXxLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749166796; c=relaxed/simple; bh=b5qIz6P3lrcv3sGS7KxAxKzdqooPdqfn8oztpbwmp10=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u9ZqoBAIsD2ZhqHAkoUVwI4BvtQcBxOSMkyQtnnh9fPQULaMRN4NL8GofnyvngctAOxxVSWHmi90mkykcg+6yNaW3yw3Qy39ssAvbaKrvV+EKWlkEd86++9/iJReTcIwtozw1dNHuBxivFWz1u5V/nAy0BgyJq2pFwFYtrVoh1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--blakejones.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KoYkv7G3; arc=none smtp.client-ip=209.85.216.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--blakejones.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KoYkv7G3" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-30a39fa0765so2440123a91.3 for ; Thu, 05 Jun 2025 16:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749166794; x=1749771594; 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=8iFfeaMcLuzx3qT6HoU1lCQOc9APQy0cingwV7epWcY=; b=KoYkv7G3t2JacguDnQHkoLBhbfUedimSiSODTtF/fmj+UCDxcVKrXJwSz/RO+LAxDD SXjhZRz80la3GK/70l1ddjc2UexGjM+kYdQzg1R9gTmX0ite7NDD08t8gygHpreMHnW2 ww92zqAxQK1Yj5DXxCo2mXzZ89SgOIFfgFrNVJvaeYb4DK3EA/bHxXaWTOb9+bhJFbhP skIRNYzTvXpqOmlQHtLuTr6ur1e8BGvvQCVZhrmmJKuY70/6EhdeayuN8If3Ts/waaTa BPF0NyCjURvxs7X7/EKAkUpGCXT+istdBqo7SijG+ThX/OC8HYN5LDyZWkWYvnNFqins NNMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749166794; x=1749771594; 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=8iFfeaMcLuzx3qT6HoU1lCQOc9APQy0cingwV7epWcY=; b=I78PoFBdaiwFOY6huKqSN9IDZx5tCk9DiXwZv9/ADoqY0J349UF3ZcIHs3fx8WPH7/ G/iFwyRqaZDAlwu0TTvbsmsH5gSGRP8Ps0UzbTXechkFhVFhg3xJET1OtCld1w5VDX3U kYPD7okcSBEfyZNsHLgQ8cgtA7tYUm9SWSKOGMj67pq9ckbNl3ZAptGCDyNRGtrjBygZ VT02+ereaisgMw1z16+S520ghzik4HKnt8GKCzGHhBosM/ANRBlLyJtVrELORQC0bpW7 8lWpu3lD5pecq9zy3gpirAVtuFPQFluIl/klXlrzxeChnLInbWp/lfxN03t2D6mENQE8 6NgA== X-Forwarded-Encrypted: i=1; AJvYcCWDldIUZu0P0RFvQE/r5SEmWU3I134moHWEGShZ41dB/aB8ZyyHlk3CaMscDjrlHYToqNlgU7kd9pvaXlw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2/psU5CtneTebBvycKZ3yxz3+YI8nOwmEeN398PJFnUtmvn8Y EjACtcmXukou9tjHN3/t4JYxOmYC9KRxvp0va9EJUuubF5/CF7oDqSVen3yxdw4iWqtCzdZFDG0 Xb2U0T70C54lzdfv92MZDCw== X-Google-Smtp-Source: AGHT+IFUcFav0NjAszjunYAxed+zQO9SwfdaT5YNefYYg0tyYpUQXQps02dUQweyT2eKvQCmOpCRVw1JAQd50fP3 X-Received: from pjh7.prod.google.com ([2002:a17:90b:3f87:b0:311:4aa8:2179]) (user=blakejones job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:38c3:b0:30e:ee4:3094 with SMTP id 98e67ed59e1d1-31346b04333mr1683541a91.1.1749166794276; Thu, 05 Jun 2025 16:39:54 -0700 (PDT) Date: Thu, 5 Jun 2025 16:39:34 -0700 In-Reply-To: <20250605233934.1881839-1-blakejones@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250605233934.1881839-1-blakejones@google.com> X-Mailer: git-send-email 2.50.0.rc0.604.gd4ff7b7c86-goog Message-ID: <20250605233934.1881839-5-blakejones@google.com> Subject: [PATCH v2 4/4] perf: add test for PERF_RECORD_BPF_METADATA collection From: Blake Jones To: Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Jiri Olsa , Peter Zijlstra , Ingo Molnar Cc: Mark Rutland , Alexander Shishkin , Adrian Hunter , Kan Liang , Steven Rostedt , Tomas Glozar , James Clark , Leo Yan , Guilherme Amadio , Yang Jihong , Charlie Jenkins , Chun-Tse Shao , Aditya Gupta , Athira Rajeev , Zhongqiu Han , Andi Kleen , Dmitry Vyukov , Yujie Liu , Graham Woodward , Yicong Yang , Ben Gainey , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, Blake Jones Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an end-to-end test for the PERF_RECORD_BPF_METADATA support. It adds a new "bpf_metadata_perf_version" variable to perf's BPF programs, so that when they are loaded, there will be at least one BPF program with some metadata to parse. The test invokes "perf record" in a way that loads one of those BPF programs, and then sifts through the output to find its BPF metadata. Signed-off-by: Blake Jones --- tools/perf/Makefile.perf | 3 +- tools/perf/tests/shell/test_bpf_metadata.sh | 76 +++++++++++++++++++++ tools/perf/util/bpf_skel/perf_version.h | 17 +++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100755 tools/perf/tests/shell/test_bpf_metadata.sh create mode 100644 tools/perf/util/bpf_skel/perf_version.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index d4c7031b01a7..4f292edeca5a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1250,8 +1250,9 @@ else $(Q)cp "$(VMLINUX_H)" $@ endif =20 -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlin= ux.h | $(SKEL_TMP_OUT) +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(OUTPUT)PERF-VERSION-FILE = util/bpf_skel/perf_version.h $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_O= UT) $(QUIET_CLANG)$(CLANG) -g -O2 --target=3Dbpf $(CLANG_OPTIONS) $(BPF_INCLU= DE) $(TOOLS_UAPI_INCLUDE) \ + -include $(OUTPUT)PERF-VERSION-FILE -include util/bpf_skel/perf_version= .h \ -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ =20 $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o | $(BPFTOOL) diff --git a/tools/perf/tests/shell/test_bpf_metadata.sh b/tools/perf/tests= /shell/test_bpf_metadata.sh new file mode 100755 index 000000000000..11df592fb661 --- /dev/null +++ b/tools/perf/tests/shell/test_bpf_metadata.sh @@ -0,0 +1,76 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# BPF metadata collection test. + +set -e + +err=3D0 +perfdata=3D$(mktemp /tmp/__perf_test.perf.data.XXXXX) + +cleanup() { + rm -f "${perfdata}" + rm -f "${perfdata}".old + trap - EXIT TERM INT +} + +trap_cleanup() { + cleanup + exit 1 +} +trap trap_cleanup EXIT TERM INT + +test_bpf_metadata() { + echo "Checking BPF metadata collection" + + if ! perf check -q feature libbpf-strings ; then + echo "Basic BPF metadata test [skipping - not supported]" + err=3D0 + return + fi + + # This is a basic invocation of perf record + # that invokes the perf_sample_filter BPF program. + if ! perf record -e task-clock --filter 'ip > 0' \ + -o "${perfdata}" sleep 1 2> /dev/null + then + echo "Basic BPF metadata test [Failed record]" + err=3D1 + return + fi + + # The BPF programs that ship with "perf" all have the following + # variable defined at compile time: + # + # const char bpf_metadata_perf_version[] SEC(".rodata") =3D <...>; + # + # This invocation looks for a PERF_RECORD_BPF_METADATA event, + # and checks that its content contains the string given by + # "perf version". + VERS=3D$(perf version | awk '{print $NF}') + if ! perf script --show-bpf-events -i "${perfdata}" | awk ' + /PERF_RECORD_BPF_METADATA.*perf_sample_filter/ { + header =3D 1; + } + /^ *entry/ { + if (header) { header =3D 0; entry =3D 1; } + } + $0 !~ /^ *entry/ { + entry =3D 0; + } + /perf_version/ { + if (entry) print $NF; + } + ' | egrep "$VERS" > /dev/null + then + echo "Basic BPF metadata test [Failed invalid output]" + err=3D1 + return + fi + echo "Basic BPF metadata test [Success]" +} + +test_bpf_metadata + +cleanup +exit $err diff --git a/tools/perf/util/bpf_skel/perf_version.h b/tools/perf/util/bpf_= skel/perf_version.h new file mode 100644 index 000000000000..1ed5b2e59bf5 --- /dev/null +++ b/tools/perf/util/bpf_skel/perf_version.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __PERF_VERSION_H__ +#define __PERF_VERSION_H__ + +#include "vmlinux.h" +#include + +/* + * This is used by tests/shell/record_bpf_metadata.sh + * to verify that BPF metadata generation works. + * + * PERF_VERSION is defined by a build rule at compile time. + */ +const char bpf_metadata_perf_version[] SEC(".rodata") =3D PERF_VERSION; + +#endif /* __PERF_VERSION_H__ */ --=20 2.50.0.rc0.604.gd4ff7b7c86-goog