From nobody Fri Dec 19 07:49:25 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 362A3258CF9 for ; Sat, 7 Jun 2025 06:13:16 +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=1749276797; cv=none; b=NFyiXGYSTZonE7hhBFM8VP3XefouwRwn64oPcQOSpZ+tUXDjAryBJdL+0gKUNaQY4LgA4aZPOJ6esEexIr23FFpTykB3gbZddjkggCKUUxv74nEcTCc9BdnIf4T6mr9QIYC9nahhdoBnDKZ/pTxeN1neSLv7vJCNzfugXsJcTz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276797; c=relaxed/simple; bh=XHL9dgqHm8F7JFYr7Q6WVL17/G7a54iJiS+tQr2tKwo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=la7B6f4NfhVqpxoaD1OO2K9sRNimRNo2wqDZiiRzONbP9bDTsrFl6sd38v5tFLMaZPL+6/TII8ZWKhrk/Jbv1GSRySFoI00ffFytwqGTwqqXhnBjLf07tO7vHsZINsvQWDm17n4jAcZIXeCsuu/RI2mz+tTBPPUZxdIGFr/n8jc= 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=wKfSzfU8; 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--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="wKfSzfU8" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-311a6b43ed7so2450809a91.1 for ; Fri, 06 Jun 2025 23:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749276795; x=1749881595; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VLZXQWgZR2UOsdC23RnQr5r30UWzDolfedeJ9s30yTA=; b=wKfSzfU8oUh62KGuWwLmxJNGybghGg/inkYcOfr9vPp0YI/lYYEGpGV3CspngZpml4 1GtXI98Ug7xl5sZFpPSJEyipG5PrsX+UDSuJ21mTsgaVZhSryGC9nXBt60NQjMIF8+8X rihDUhok+swImZcZDRF8k5J2cJVjNL/RFQacOFjj1EyJibbFZ4bOTFwo1vjwypSLwSI2 i37C/2BuHxQaikTpGFmqVgNVguelJepiTrKfRa7pX4R7l6TaJuQ8M1YTHF2Rg4AS2rfg ThHIp8a6qD2LkkvUldtczoL8BzITTfoz6g8rTQX/lnmTWduaWLoAboEHeyIDv/VCfeBh FQVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749276795; x=1749881595; h=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=VLZXQWgZR2UOsdC23RnQr5r30UWzDolfedeJ9s30yTA=; b=mGh/b6wQNA+XIjuYmpFgNQUAREAIMTovRAOfNtkbD6khQxNa2k4EzLBTRCvtcnQdKv ud0clzgAPbR5yx/z3uLsA4jsVhbC7QBvD0HgbTlxUWHu8cDFe/xpj72so3ryJ4ZU44AT hKTW4/GKfX+S0C2WrSMXtpnIHUlE8thWBfxNTWG3wQEkJg5WRQTA+xoPD0N5csSbDtd1 3sgT4uPpAfi9oxNkQiwcn7UyKQvGfU+sTE8CbQ5bbKOSTfUCJGEK5ttlEK1tgMwtVncj DIm8QDjtmsWOrBhc3SRahVhkxCyax7LR3+ii7slyKKWLrKwzopFTfCJDW/mbcCHfj/cd qFvw== X-Forwarded-Encrypted: i=1; AJvYcCUEKHAixvDFoM6KBvtutFW+ek2gNp/UhwjCAjliKPKx3pKM+/X04qVr2CNTlx5W1hbOKNd9ELGBiOv1glI=@vger.kernel.org X-Gm-Message-State: AOJu0Yyvm3RFF8D7RAjJUHL4nAlo2/kOdAyQuuLE0Li75yJHQs+l7CaQ 3eZQmt17wZj9Ei5G+HVLLRmU6WR0y9FfLVrB416SyQgt4FZw+JG6dic3m7AjSJhV+Wx8MAJHIZB u8KythZ4gkQ== X-Google-Smtp-Source: AGHT+IGDfodlkWEYrf7QAcS8knOa1CAv0hwiL3yUtFdYjJ9TAySPqKK0flivIrLTcDyOCs4bEt55VDfiy7+b X-Received: from pjbso10.prod.google.com ([2002:a17:90b:1f8a:b0:311:d1a5:3818]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:28cc:b0:313:1e9d:404b with SMTP id 98e67ed59e1d1-313472d70c8mr9148867a91.2.1749276795640; Fri, 06 Jun 2025 23:13:15 -0700 (PDT) Date: Fri, 6 Jun 2025 23:12:35 -0700 In-Reply-To: <20250607061238.161756-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: <20250607061238.161756-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc0.604.gd4ff7b7c86-goog Message-ID: <20250607061238.161756-2-irogers@google.com> Subject: [PATCH v1 1/4] perf header: In pipe mode dump features without --header/-I From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Zhongqiu Han , Yicong Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In pipe mode the header features are contained within events. While other events dump details the header features only dump if --header or -I are passed, which doesn't make sense as in pipe mode there is no perf file header. Make the printing of the information conditional on dump_trace as with other events. Before: ``` $ perf record -o - -a sleep 1 | perf script -D -i - ... 0x2c8@pipe [0x54]: event: 80 =2E . ... raw event: size 84 bytes . 0000: 50 00 00 00 00 00 54 00 05 00 00 00 00 00 00 00 P.....T......... . 0010: 40 00 00 00 36 2e 31 35 2e 72 63 37 2e 67 61 64 @...6.15.rc7.gad . 0020: 32 61 36 39 31 63 39 39 66 62 00 00 00 00 00 00 2a691c99fb...... . 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0050: 00 00 00 00 .... 0 0 0x2c8 [0x54]: PERF_RECORD_FEATURE ``` After: ``` $ perf record -o - -a sleep 1 | perf script -D -i - ... 0x2c8@pipe [0x54]: event: 80 =2E . ... raw event: size 84 bytes . 0000: 50 00 00 00 00 00 54 00 05 00 00 00 00 00 00 00 P.....T......... . 0010: 40 00 00 00 36 2e 31 35 2e 72 63 37 2e 67 61 64 @...6.15.rc7.gad . 0020: 32 61 36 39 31 63 39 39 66 62 00 00 00 00 00 00 2a691c99fb...... . 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0050: 00 00 00 00 .... 0 0 0x2c8 [0x54]: PERF_RECORD_FEATURE, # perf version : 6.15.rc7.gad2a691c9= 9fb ``` Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index e3cdc3b7b4ab..84879d7fdffe 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -4341,7 +4341,6 @@ int perf_session__read_header(struct perf_session *se= ssion) int perf_event__process_feature(struct perf_session *session, union perf_event *event) { - const struct perf_tool *tool =3D session->tool; struct feat_fd ff =3D { .fd =3D 0 }; struct perf_record_header_feature *fe =3D (struct perf_record_header_feat= ure *)event; int type =3D fe->header.type; @@ -4357,28 +4356,23 @@ int perf_event__process_feature(struct perf_session= *session, return -1; } =20 - if (!feat_ops[feat].process) - return 0; - ff.buf =3D (void *)fe->data; ff.size =3D event->header.size - sizeof(*fe); ff.ph =3D &session->header; =20 - if (feat_ops[feat].process(&ff, NULL)) { + if (feat_ops[feat].process && feat_ops[feat].process(&ff, NULL)) { ret =3D -1; goto out; } =20 - if (!feat_ops[feat].print || !tool->show_feat_hdr) - goto out; - - if (!feat_ops[feat].full_only || - tool->show_feat_hdr >=3D SHOW_FEAT_HEADER_FULL_INFO) { - feat_ops[feat].print(&ff, stdout); - } else { - fprintf(stdout, "# %s info available, use -I to display\n", - feat_ops[feat].name); + if (dump_trace) { + printf(", "); + if (feat_ops[feat].print) + feat_ops[feat].print(&ff, stdout); + else + printf("# %s", feat_ops[feat].name); } + out: free_event_desc(ff.events); return ret; --=20 2.50.0.rc0.604.gd4ff7b7c86-goog From nobody Fri Dec 19 07:49:25 2025 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.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 C724F259CBD for ; Sat, 7 Jun 2025 06:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276800; cv=none; b=KNNC43VBHwOgn/3+QLNkgvM7FMDR4eNztoHnsC2YKZ7bJM5wCHMeMTLd6D0IYY6AQprkPXt/3SN6WE7/Vj1fUTUF5hxeUFeEF21lTka3YrI8ZWNCNfWprXG5xkGnFNF2xdyGC+4EFNaWbO5uV8m66l/4F54VlP5EOFFpTPlX9G0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276800; c=relaxed/simple; bh=4kJkBveRo8+jJBj/O5cyr7aCXtsfSX3e7ZSPO9xVk7M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=W5oPfSrhhE9+CzHi2SMog8RfjptjGLf61ID7R3ITwPJEO+RTIofR0IX+GTz+2ey72BlbINATiETD3m4Dw2ysxD9idrk7RmI5wdguxo0HAjxMk6P2UvHXSh/AuuSmxku6BdC3bvRFpeAxpw9F5Rd843J1YvHcdlEme/y2X5cFyuM= 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=Gv/ymN+m; arc=none smtp.client-ip=209.85.160.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="Gv/ymN+m" Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-2e954a1d239so2885558fac.1 for ; Fri, 06 Jun 2025 23:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749276798; x=1749881598; darn=vger.kernel.org; h=content-transfer-encoding:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=U0pn6/0s/p+lc/1tabk3JfmDY0UTcINJzaOZVvvQiEw=; b=Gv/ymN+ms///njd7lfEFxd6y3PMXyMxx1eUc+GjvwJBuXkjV00qpq4gJcsLBJjBOh2 ZtXcRwZaGStoj8yuMgx6iJSLqSgWLDViK4Zzxdh+INIlAbr9lkYV9aU55PLxmF4RMLVW Ot4vo6soaSscR6VfaBRW3Y3Gj8plmKZhOMEknsJohffzWycdGThgi+GU+Q4X8hbfAh6e QKU6tVweeF/ZWbufR/S3tHlagPmQih32gMerq7b4Fq/YO3YHp0G28I3ZveUF8xV3Tros rWUIfQFUSRt/onRQb1RY7oHoRBmc/8Wzd/e38C5MiMYdtpmszW4grmtpDFvurm/sBKyz wPvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749276798; x=1749881598; h=content-transfer-encoding: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=U0pn6/0s/p+lc/1tabk3JfmDY0UTcINJzaOZVvvQiEw=; b=UffIJMIc4C2D3NqTWiOVMTybSQ10LxlBKlCl4f1ahp5XxAcDsQLGDJ2FyqnhPtcn0u LisieTDXR2t0ESgco65pLIjZFbGYnndzs3O5UR+K4x7d+8QqS4+sRvHAP6SCR+JXwkgZ qJHe7HuQKy0Jk5EPf7aIxg7OMsU/DwZd27srQVY5aiaCzCYETlS64RRjgjTEA/qg3GxU kJqXSvLbPwxEZD1sOM0hLOem3imKbt2JM80aGcP8IkfIUjH/MVyycVZJyIt4OeVXLgMI IEaXgayY83WFhVd7a1WQEy2sCxhl091CRoH1NECZt1xC9zCpCYrWWNxaC3c3rdLfrvGx UlMQ== X-Forwarded-Encrypted: i=1; AJvYcCUAz+iCm0Fx8zv0cqFWmYxQuOYxylWBsxQ/TEObUHVaoO8iO6te+nUj1SYRRyBwYp4BCg/volEoGY0CT/0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy36mHlXIqimBxYyHXrPhg/PdYaMxiqyL9EulvBh+H7snaiCmGX bfLc5K2ZNjtA3wrBuJooOYoEQDSHcEc5sEcnEK4DFoFWxAGg4KfIrHk7wOvTU4tGFd5mcfdzbZK lytRJAqU4Lg== X-Google-Smtp-Source: AGHT+IEPNdqZpO1gLTs7JEkZH3S3RDHk1Uwt3ike1JWM5wGerMEXftFaA85V/RQLYGjlu5uopkscFTOMyk8p X-Received: from oabop2.prod.google.com ([2002:a05:6870:2dc2:b0:2c1:c983:48c1]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:1782:b0:2c8:361a:da77 with SMTP id 586e51a60fabf-2ea0118d3afmr3628225fac.26.1749276797716; Fri, 06 Jun 2025 23:13:17 -0700 (PDT) Date: Fri, 6 Jun 2025 23:12:36 -0700 In-Reply-To: <20250607061238.161756-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: <20250607061238.161756-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc0.604.gd4ff7b7c86-goog Message-ID: <20250607061238.161756-3-irogers@google.com> Subject: [PATCH v1 2/4] perf header: Allow tracing of attr events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Zhongqiu Han , Yicong Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In pipe mode attr events capture the perf_event_attr. Allow their dumping as they normally start the file. Before: ``` $ perf record -o - -a sleep 1 | perf script -D -i - . ... raw event: size 272 bytes . 0000: 40 00 00 00 00 00 10 01 00 00 00 00 88 00 00 00 @............... . 0010: 00 00 00 00 00 00 00 00 a0 0f 00 00 00 00 00 00 ................ . 0020: 87 01 01 00 00 00 00 00 14 00 00 00 00 00 00 00 ................ . 0030: 01 84 05 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0090: 91 08 00 00 00 00 00 00 92 08 00 00 00 00 00 00 ................ . 00a0: 93 08 00 00 00 00 00 00 94 08 00 00 00 00 00 00 ................ . 00b0: 95 08 00 00 00 00 00 00 96 08 00 00 00 00 00 00 ................ . 00c0: 97 08 00 00 00 00 00 00 98 08 00 00 00 00 00 00 ................ . 00d0: 99 08 00 00 00 00 00 00 9a 08 00 00 00 00 00 00 ................ . 00e0: 9b 08 00 00 00 00 00 00 9c 08 00 00 00 00 00 00 ................ . 00f0: 9d 08 00 00 00 00 00 00 9e 08 00 00 00 00 00 00 ................ . 0100: 9f 08 00 00 00 00 00 00 a0 08 00 00 00 00 00 00 ................ -1 -1 0 [0x110]: PERF_RECORD_ATTR 0x110@pipe [0x110]: event: 64 ... ``` After: ``` $ perf record -o - -a sleep 1 | perf script -D -i - 0@pipe [0x110]: event: 64 =2E . ... raw event: size 272 bytes . 0000: 40 00 00 00 00 00 10 01 00 00 00 00 88 00 00 00 @............... . 0010: 00 00 00 00 00 00 00 00 a0 0f 00 00 00 00 00 00 ................ . 0020: 87 01 01 00 00 00 00 00 14 00 00 00 00 00 00 00 ................ . 0030: 01 84 05 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ . 0090: 5c 08 00 00 00 00 00 00 5d 08 00 00 00 00 00 00 \.......]....... . 00a0: 5e 08 00 00 00 00 00 00 5f 08 00 00 00 00 00 00 ^......._....... . 00b0: 60 08 00 00 00 00 00 00 61 08 00 00 00 00 00 00 `.......a....... . 00c0: 62 08 00 00 00 00 00 00 63 08 00 00 00 00 00 00 b.......c....... . 00d0: 64 08 00 00 00 00 00 00 65 08 00 00 00 00 00 00 d.......e....... . 00e0: 66 08 00 00 00 00 00 00 67 08 00 00 00 00 00 00 f.......g....... . 00f0: 68 08 00 00 00 00 00 00 69 08 00 00 00 00 00 00 h.......i....... . 0100: 6a 08 00 00 00 00 00 00 6b 08 00 00 00 00 00 00 j.......k....... -1 -1 0 [0x110]: PERF_RECORD_ATTR, type =3D 0 (PERF_TYPE_HARDWARE), size = =3D 136, config =3D 0 (PERF_COUNT_HW_CPU_CYCLES), { sample_period, sample_f= req } =3D 4000, sample_type =3D IP|TID|TIME|CPU|PERIOD|IDENTIFIER, read_for= mat =3D ID|LOST, disabled =3D 1, freq =3D 1, precise_ip =3D 3, sample_id_al= l =3D 1 0x110@pipe [0x110]: event: 64 ... ``` Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 8 ++++++++ tools/perf/util/header.h | 1 + 2 files changed, 9 insertions(+) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 84879d7fdffe..7798435ab5d3 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -4414,6 +4414,11 @@ size_t perf_event__fprintf_event_update(union perf_e= vent *event, FILE *fp) return ret; } =20 +size_t perf_event__fprintf_attr(union perf_event *event, FILE *fp) +{ + return perf_event_attr__fprintf(fp, &event->attr.attr, __desc_attr__fprin= tf, NULL); +} + int perf_event__process_attr(const struct perf_tool *tool __maybe_unused, union perf_event *event, struct evlist **pevlist) @@ -4423,6 +4428,9 @@ int perf_event__process_attr(const struct perf_tool *= tool __maybe_unused, struct evsel *evsel; struct evlist *evlist =3D *pevlist; =20 + if (dump_trace) + perf_event__fprintf_attr(event, stdout); + if (evlist =3D=3D NULL) { *pevlist =3D evlist =3D evlist__new(); if (evlist =3D=3D NULL) diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 5201af6305f4..d16dfceccd74 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -175,6 +175,7 @@ int perf_event__process_attr(const struct perf_tool *to= ol, union perf_event *eve int perf_event__process_event_update(const struct perf_tool *tool, union perf_event *event, struct evlist **pevlist); +size_t perf_event__fprintf_attr(union perf_event *event, FILE *fp); size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp); #ifdef HAVE_LIBTRACEEVENT int perf_event__process_tracing_data(struct perf_session *session, --=20 2.50.0.rc0.604.gd4ff7b7c86-goog From nobody Fri Dec 19 07:49:25 2025 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 A2D5E25A327 for ; Sat, 7 Jun 2025 06:13:21 +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=1749276803; cv=none; b=UkJ1Wwt2UJD5h3sVT1Gbpo1dPe/KucJXFV5DiXZVCiKQ70odm6iI02VY4ccJZ4nTXb00GpZq1/EL90Dbdlp1MDMAJsOVb9RKSTbGm0webEnjfTs1DLa1gamyFjctIMzWYEOxzpYnWQ0zl41gnj7yHf2ZhRRMdCXEFm2uSxzZXwM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276803; c=relaxed/simple; bh=NxEw6+f6G5uFWkL+H2aWHdkGBgTgAD/5Iiu7vO2lJZE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=MlqXJshhh3mDisLMz6m0DdQS/j7W8TEfog6R8VE2pOsxSJ7RgN+mMdnC63cDEGMhJDwKfP0Mfdx/jnUyV+VBA1fwpjAhVib3nS/1Q5t0H2iy3uzjEbFQn8DsztdYjPN/QPSiyDhocd9t2zxeHFDGUcuud3K6ywUZN9Vm2lVqtf4= 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=Q5IEezbr; 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="Q5IEezbr" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-747ddba7c90so2188252b3a.0 for ; Fri, 06 Jun 2025 23:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749276801; x=1749881601; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=T0HIosMaj3PV5olqJjY+MHC2f5HBe0N917JAphCPE10=; b=Q5IEezbrAwORKEcHjDyd7V3CIrU9KCNMWOSaF0PRS6crsutjgUkWdcrlNXn9uvwwmq iELVI5xR21cpgn8wogWV63AVsQ+LbmlYJvhxzYAyHGZTRgJ+MN6OYbwm7xw/4I06p9er xunV6O+Wi2EIG3tk3fPwo45WPCvklIRzNx7KnrbJkX3tj82WW7Rt6ObfQDqjIMkLcUPD ugV7elz1x+lWQa6tZYXRWEs5zpKcfiNMq11UEPo24abmaRuj2jMj3c04CZnPWQlqUmo1 kZPcCtvBOBoghpUWIlSnxyEYcTvkwx9Ik9F2GSo6Z+DNLBdCcUaHYJxwjjQm57+nLJpa DR4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749276801; x=1749881601; h=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=T0HIosMaj3PV5olqJjY+MHC2f5HBe0N917JAphCPE10=; b=YrSMInu3TLxl75hEvC30aXdOnyFgX7qcXSNY4N5jRlP+Tyqz2dMecKZ9g/yEEHwMz+ 1gUJTWDnMP7niDeLker0vbGNCVadH4Y7hN20vRcvTnasYwa7+9mzOdasmzZtUiagA8cs BnwJ11z1pH+ZlKiarh5njCkn8a9/ACoLEC7+Htf6UGJQh0MOkDFJf1E52OZjyGyKpD/z WGk43u2eSOyfAsBsWk5/HNFlPZomuXVXzQ8BcBpZZqIHDME7dBL2ZzK2zsre1pKFAwKX xqlr/iozULlUSmvsStAblp4Fy4gzw+apzVL0iTqeV4Uni8s77QNFRaTlGsdfr7l/oKNP ZoMQ== X-Forwarded-Encrypted: i=1; AJvYcCUqwL2B6L/P9ZszXvuFwwoRQZ2AGGlJWiP3knGiSOOCTZyLgJC4xOzd5YD9A6KSm/KBE5Z1PYaNW3a9Ors=@vger.kernel.org X-Gm-Message-State: AOJu0Yx37U0YravX/v2Tece2kocVqhdcQARInTamxdmiMIqpjnsc6rKC uaOCwBvXbqnlG8lPxr7Y/uP9BrbYtUU8AAuEOmuK/xewmbxhVrtWzGYP7lpBXs0i2iKl4DvzKQY EeoXEzVpMuw== X-Google-Smtp-Source: AGHT+IHOS57SYtqmyar91S6b0MesD/UsSr8ImYsRFlvuYMV+h+3rM+zsbSohczJjZmyefODVD9k+Gk1Srxil X-Received: from pgct28.prod.google.com ([2002:a05:6a02:529c:b0:b2f:9d37:5753]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6d8b:b0:1f5:a3e8:64dd with SMTP id adf61e73a8af0-21ee13bd873mr8707034637.0.1749276800899; Fri, 06 Jun 2025 23:13:20 -0700 (PDT) Date: Fri, 6 Jun 2025 23:12:37 -0700 In-Reply-To: <20250607061238.161756-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: <20250607061238.161756-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc0.604.gd4ff7b7c86-goog Message-ID: <20250607061238.161756-4-irogers@google.com> Subject: [PATCH v1 3/4] perf header: Display message if BPF/BTF info is empty From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Zhongqiu Han , Yicong Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The perf.data file may contain a bpf_prog_info or bpf_btf feature. If the contents of these are empty then nothing is displayed. Rather than display nothing and not account for the file space, display an empty message. Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 7798435ab5d3..69e4f6aae293 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1814,6 +1814,9 @@ static void print_bpf_prog_info(struct feat_fd *ff, F= ILE *fp) root =3D &env->bpf_progs.infos; next =3D rb_first(root); =20 + if (!next) + printf("# bpf_prog_info empty\n"); + while (next) { struct bpf_prog_info_node *node; =20 @@ -1838,6 +1841,9 @@ static void print_bpf_btf(struct feat_fd *ff, FILE *f= p) root =3D &env->bpf_progs.btfs; next =3D rb_first(root); =20 + if (!next) + printf("# btf info empty\n"); + while (next) { struct btf_node *node; =20 --=20 2.50.0.rc0.604.gd4ff7b7c86-goog From nobody Fri Dec 19 07:49:25 2025 Received: from mail-oi1-f201.google.com (mail-oi1-f201.google.com [209.85.167.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 CBF7E25A35A for ; Sat, 7 Jun 2025 06:13:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276805; cv=none; b=JjHu1GdY328FstEgHwHcb54+AR6KIUMsBHHMmYfv3l6XQNmaNWUifXpiO9ZYx6cJT9jKmjnX/feOpmqbiefkjYJ7XeKFIyXmhpJor3wwAR+7OyMhK3bVbiV7sHYDhBhnxoVAnz78QFhHFbhi2dc0s/M/9wDyNCe8RamDMYUf6/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749276805; c=relaxed/simple; bh=bfHS/emfGlHnhoC/ZDSKlVMnpqM4aGBGfYvFX8Gj9tA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=rksRIz00nV6ZGTH4sZXcZMVSe5WDVfzg+GkpnB2x5/SuWp8SocDyhxCvX/XMcwtNeU4PHON4XV0H4lPzibp8XYCx5XjZvHZX7d7eJY1IZIR1rJWFQZ+6c5W4kzxCFkOcpuqndhoT1aWQV3IGiFN/dD37oeAUpJhaClkbhkD0WJ8= 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=0CUeoO+Z; arc=none smtp.client-ip=209.85.167.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="0CUeoO+Z" Received: by mail-oi1-f201.google.com with SMTP id 5614622812f47-408380b6329so976324b6e.0 for ; Fri, 06 Jun 2025 23:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749276803; x=1749881603; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=4/b3j+1gq1V00//t0ia9GN0R+cu1hGQ0HBZAPtJXD44=; b=0CUeoO+ZyLFZMnyh7mCshFxuBfZVZHP6cQlNyXdcLmzzOe/rizvarU8U++1ZWZRXr3 7qgGmL3ccgpYoCLCi4jqXgny/h1Kx8plTu/N3YxiTKF8qBObru8t+7YBWxV2MTRdI+nc MiwsadIO195z7SkX//SWamVtbc9DXxL8L78Ps1UBgoDpqp8G41Z9LhTNiQIw4+iMR0FJ rWWXHNaYX+d5f1FNbpNxtcMD7OiuCWnB00hynu7jrnKGqEI7nZk0x8hpIabBOqE1Kduy wLCMH9oUKsyuHqW2yet0USQMcQehCPpnyHE51JvEDG0mizdpKxPCQxGWjF11X58JIvw9 qqdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749276803; x=1749881603; h=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=4/b3j+1gq1V00//t0ia9GN0R+cu1hGQ0HBZAPtJXD44=; b=CsTTqbHrh5SvuyV6ZNJy/ZcHlOOpVWeGp8U+zpTMogsI8omZMeBH/ENIJZZfGeTjIM 8XIu3r0Mx1Uj3Aynnq8dI1aZcrF7Z38pG4P7u5s/EZ0dzZ94MLtEWZT/6Dn/Sim75Cca FkBXK/KbykftOZL41wigGQN7ypwOFjckTQRmqLo3WqX2nQ+uYqXwQGAfjjgcfyro1A2D a8cy4yR0wPt5SbZ7Lv4CSHZJ5yqlPruQNZf8bCV1XCpDAs2wkePALqjyyRmc4CYD4xqr DuVZ/7RAgCbfHeUGg3ljrMGcO5qwcEy8FesQ4qQw9sTqE9VB5UGzZSLy1hXJGHpOcRVd hHlA== X-Forwarded-Encrypted: i=1; AJvYcCWeNj4Pe+CQ8nSjj7tzTRelXknRXpHlXOWXkMvn+gy9NVFm5slAJdM3/3hIlZtkjkik5El3I1DrtmJ07lU=@vger.kernel.org X-Gm-Message-State: AOJu0YxwUF40z+Jty9FqiGYpJTJndXbzWgfJePDoN4KbPCWOJ0nWUjlf XSnMQ/3uvlgms01CTIDvWEAgbLbBLIIEeT5EFisoDr6UO9CdtYMqsQW+FJ9rJlY+261zyjypfPl z2lyQmLpiAg== X-Google-Smtp-Source: AGHT+IH772Rq2nXLQ5qLnBdp+yzi4nlFBMyEJIs4tK7/s8fbstOvndVR3+Izd3s0kfth2t5zaU7EubzrZgF9 X-Received: from oabwh6.prod.google.com ([2002:a05:6871:a686:b0:2da:6d76:b15c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:b6a6:b0:2d5:b2ae:2ebd with SMTP id 586e51a60fabf-2ea0153d81dmr3661056fac.34.1749276803057; Fri, 06 Jun 2025 23:13:23 -0700 (PDT) Date: Fri, 6 Jun 2025 23:12:38 -0700 In-Reply-To: <20250607061238.161756-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: <20250607061238.161756-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc0.604.gd4ff7b7c86-goog Message-ID: <20250607061238.161756-5-irogers@google.com> Subject: [PATCH v1 4/4] perf header: Don't write empty BPF/BTF info From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Zhongqiu Han , Yicong Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If there are no values in bpf_prog_info or bpf_btf feature don't write the data into the header. Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 69e4f6aae293..6657b02d4a81 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1016,10 +1016,13 @@ static int write_bpf_prog_info(struct feat_fd *ff, struct perf_env *env =3D &ff->ph->env; struct rb_root *root; struct rb_node *next; - int ret; + int ret =3D 0; =20 down_read(&env->bpf_progs.lock); =20 + if (env->bpf_progs.infos_cnt =3D=3D 0) + goto out; + ret =3D do_write(ff, &env->bpf_progs.infos_cnt, sizeof(env->bpf_progs.infos_cnt)); if (ret < 0) @@ -1058,10 +1061,13 @@ static int write_bpf_btf(struct feat_fd *ff, struct perf_env *env =3D &ff->ph->env; struct rb_root *root; struct rb_node *next; - int ret; + int ret =3D 0; =20 down_read(&env->bpf_progs.lock); =20 + if (env->bpf_progs.btfs_cnt =3D=3D 0) + goto out; + ret =3D do_write(ff, &env->bpf_progs.btfs_cnt, sizeof(env->bpf_progs.btfs_cnt)); =20 --=20 2.50.0.rc0.604.gd4ff7b7c86-goog