From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 639B8428499 for ; Fri, 5 Jun 2026 19:15:12 +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=1780686920; cv=none; b=Dm9ORnHokh+f76BeMnz7nnis1HyhKNVvb6RPXgUvMNadtOH/IdV7Zr298wL+pjzlKnH+YBqrRmcU0VLB5FhnMYs6YoKzJvnLZjuFyp8i4oVMC5AQNuB7wbRpo8JpN34ryuPQ8GS/beIcIXsATPHHKLL2n5nEdToFymWVdSg7/7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686920; c=relaxed/simple; bh=RiYhss33D42QqLgZHZYYTehQt1u6H/vFc+MQ9nxfiLI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PRWrGK8rFJl0+SIVFr2MkmPCOatqjX0gnjWYzDsnyA2dBD6BbDzJFTurwM7ykhJwLfGGDK/1S/D/HEkG2sJEUu/d9zMDIP2dCYnrpF02qOie4DaTmfb71TM6ub2x9I5qliw/9gHO+wuKxK6tWkxApP/0OMyCiR++f6tYeyUV29A= 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=atZvwFAC; 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="atZvwFAC" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304d0d0b28eso6124362eec.0 for ; Fri, 05 Jun 2026 12:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686911; x=1781291711; 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=uG+WKiPE75BjcS+qT2G4l2IRWyCoLrq3SXW8vmt3ReE=; b=atZvwFACAyyPSz696HC1Zm1hohFT7MCPaqiqyfuOhcGjZtY7BbxCzX4OXbk2o3M3EM O2OPP6VYGx9k7IuTh2L8oJFl727d7vve6pQQ1ERMlGO7o7yPSmz5kip9BeY/YO0l/htc qjVBIePuH+DofGrc8VzAuF9v9Dcoy4LMin/94FtuWh3gr9dzrML70+djqmNpfAhXiYxT AU1vgl9xB0BhPDK8A+x0VWSxNvAhZpeJMm+IWcpmbWaFGXHBeTOn/RiGBg/dKzChF0FR lA4ZT71tAblhl06F7dHy1HIeRFa5B2U60m5iKmvrOdHPgHdA4rOUsqlUXtsDvoac7Nnm H5Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686911; x=1781291711; 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=uG+WKiPE75BjcS+qT2G4l2IRWyCoLrq3SXW8vmt3ReE=; b=rgdQbWD91acpooNrCBoj+/1t8wZuLr06TjwTjJ3RFehv50i1tC8493TPKH2wLW/9jP r4e3NaveZEfzOdEsMZBEoEgWOOp9ft6fzueCh0PLVRT9KrKci7kBR24jIXUZVKQh0g4i 3WXjOHXy2KT8Ge7jDDU2Bt7FQHsvElR121KYUSTe9m0sz1eLcJ1EvWWQF1+NIf72uMnN ly+lG/s+neuX06/yZU+TnDbSrPLNJhnMGag5Dsb5UyhdtcaJ+23RS2/xBudpllF4GB6V w/Dt3oAYgqJTwZf5EnEbF9vAYNEgQ/OhiPirbbeV5da5tgoeTApEY4IdNQIx7uxwtdPc 4eyQ== X-Forwarded-Encrypted: i=1; AFNElJ8wf7cVWUnKSsRLHobJTT5BfnBeb3PIZJo3mE/+FAgr5au/3YoNk7XoiN4Ie4Ex5dB9WFwoC7EYkHtw4s8=@vger.kernel.org X-Gm-Message-State: AOJu0YxIZKxcooc8pE6EwQr7Hh+Hk0rsm0mWeUxC8WTA0WqLqo57Pq8Z 08aSwxlk9d2sVV8UYk0jkchs/oVKaLafRNzLqI6ZVgasFsjZwGl283cyOG10nmTYIEmdi8RZYFM dQho7UouWdw== X-Received: from dycmz17.prod.google.com ([2002:a05:7300:ea11:b0:304:d169:68d5]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:7fa8:b0:304:e450:67e0 with SMTP id 5a478bee46e88-3077b3c30famr2970693eec.10.1780686910850; Fri, 05 Jun 2026 12:15:10 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:42 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-2-irogers@google.com> Subject: [PATCH v11 01/19] perf util: Sort includes and add missed explicit dependencies From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix missing includes found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code. Acked-by: Namhyung Kim Signed-off-by: Ian Rogers --- tools/perf/util/bpf_off_cpu.c | 30 +++++----- tools/perf/util/bpf_trace_augment.c | 8 +-- tools/perf/util/evlist.c | 91 +++++++++++++++-------------- tools/perf/util/map.h | 9 ++- tools/perf/util/perf_api_probe.c | 18 +++--- tools/perf/util/s390-sample-raw.c | 19 +++--- tools/perf/util/stat-shadow.c | 20 ++++--- tools/perf/util/stat.c | 16 +++-- 8 files changed, 113 insertions(+), 98 deletions(-) diff --git a/tools/perf/util/bpf_off_cpu.c b/tools/perf/util/bpf_off_cpu.c index a3b699a5322f..48cb930cdd2e 100644 --- a/tools/perf/util/bpf_off_cpu.c +++ b/tools/perf/util/bpf_off_cpu.c @@ -1,23 +1,25 @@ // SPDX-License-Identifier: GPL-2.0 -#include "util/bpf_counter.h" -#include "util/debug.h" -#include "util/evsel.h" -#include "util/evlist.h" -#include "util/off_cpu.h" -#include "util/perf-hooks.h" -#include "util/record.h" -#include "util/session.h" -#include "util/target.h" -#include "util/cpumap.h" -#include "util/thread_map.h" -#include "util/cgroup.h" -#include "util/strlist.h" +#include + #include #include #include -#include =20 +#include "bpf_counter.h" #include "bpf_skel/off_cpu.skel.h" +#include "cgroup.h" +#include "cpumap.h" +#include "debug.h" +#include "evlist.h" +#include "evsel.h" +#include "off_cpu.h" +#include "parse-events.h" +#include "perf-hooks.h" +#include "record.h" +#include "session.h" +#include "strlist.h" +#include "target.h" +#include "thread_map.h" =20 #define MAX_STACKS 32 #define MAX_PROC 4096 diff --git a/tools/perf/util/bpf_trace_augment.c b/tools/perf/util/bpf_trac= e_augment.c index 9e706f0fa53d..a9cf2a77ded1 100644 --- a/tools/perf/util/bpf_trace_augment.c +++ b/tools/perf/util/bpf_trace_augment.c @@ -1,11 +1,11 @@ #include #include =20 -#include "util/debug.h" -#include "util/evlist.h" -#include "util/trace_augment.h" - #include "bpf_skel/augmented_raw_syscalls.skel.h" +#include "debug.h" +#include "evlist.h" +#include "parse-events.h" +#include "trace_augment.h" =20 static struct augmented_raw_syscalls_bpf *skel; static struct evsel *bpf_output; diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 1a238b245b3a..ab6bf5e935f4 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -5,67 +5,68 @@ * Parts came from builtin-{top,stat,record}.c, see those files for further * copyright notes. */ -#include +#include "evlist.h" + #include #include -#include -#include "cpumap.h" -#include "util/mmap.h" -#include "thread_map.h" -#include "target.h" -#include "dwarf-regs.h" -#include "evlist.h" -#include "evsel.h" -#include "record.h" -#include "debug.h" -#include "units.h" -#include "bpf_counter.h" -#include // page_size -#include "affinity.h" -#include "../perf.h" -#include "asm/bug.h" -#include "bpf-event.h" -#include "util/event.h" -#include "util/string2.h" -#include "util/perf_api_probe.h" -#include "util/evsel_fprintf.h" -#include "util/pmu.h" -#include "util/sample.h" -#include "util/bpf-filter.h" -#include "util/stat.h" -#include "util/util.h" -#include "util/env.h" -#include "util/intel-tpebs.h" -#include "util/metricgroup.h" -#include "util/strbuf.h" #include -#include -#include #include =20 -#include "parse-events.h" -#include - #include -#include -#include -#include -#include -#include - #include +#include #include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include // page_size +#include +#include #include #include -#include #include +#include =20 -#include +#include "../perf.h" +#include "affinity.h" +#include "asm/bug.h" +#include "bpf-event.h" +#include "bpf-filter.h" +#include "bpf_counter.h" +#include "cpumap.h" +#include "debug.h" +#include "dwarf-regs.h" +#include "env.h" +#include "event.h" +#include "evsel.h" +#include "evsel_fprintf.h" +#include "intel-tpebs.h" +#include "metricgroup.h" +#include "mmap.h" +#include "parse-events.h" +#include "perf_api_probe.h" +#include "pmu.h" +#include "pmus.h" +#include "record.h" +#include "sample.h" +#include "stat.h" +#include "strbuf.h" +#include "string2.h" +#include "target.h" +#include "thread_map.h" +#include "units.h" +#include "util.h" =20 #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue(pid_t pid, int sig, const union sigval value); diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 979b3e11b9bc..fb0279810ae9 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -2,14 +2,13 @@ #ifndef __PERF_MAP_H #define __PERF_MAP_H =20 -#include -#include -#include -#include +#include #include #include -#include + +#include #include + #include =20 struct dso; diff --git a/tools/perf/util/perf_api_probe.c b/tools/perf/util/perf_api_pr= obe.c index 6ecf38314f01..e1904a330b28 100644 --- a/tools/perf/util/perf_api_probe.c +++ b/tools/perf/util/perf_api_probe.c @@ -1,14 +1,18 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include "perf_api_probe.h" =20 -#include "perf-sys.h" -#include "util/cloexec.h" -#include "util/evlist.h" -#include "util/evsel.h" -#include "util/parse-events.h" -#include "util/perf_api_probe.h" -#include #include =20 +#include + +#include "cloexec.h" +#include "evlist.h" +#include "evsel.h" +#include "parse-events.h" +#include "perf-sys.h" +#include "pmu.h" +#include "pmus.h" + typedef void (*setup_probe_fn_t)(struct evsel *evsel); =20 static int perf_do_probe_api(setup_probe_fn_t fn, struct perf_cpu cpu, con= st char *str) diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sampl= e-raw.c index 52bbca5c56c8..01111c4e3488 100644 --- a/tools/perf/util/s390-sample-raw.c +++ b/tools/perf/util/s390-sample-raw.c @@ -12,25 +12,26 @@ * sample was taken from. */ =20 -#include +#include #include #include -#include =20 -#include +#include #include #include -#include +#include +#include =20 +#include "color.h" #include "debug.h" -#include "session.h" #include "evlist.h" -#include "color.h" #include "hashmap.h" -#include "sample-raw.h" +#include "pmu.h" +#include "pmus.h" #include "s390-cpumcf-kernel.h" -#include "util/pmu.h" -#include "util/sample.h" +#include "sample-raw.h" +#include "sample.h" +#include "session.h" =20 static size_t ctrset_size(struct cf_ctrset_entry *set) { diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index c17373bb0e1e..35062f964618 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -2,20 +2,24 @@ #include #include #include -#include "evsel.h" -#include "stat.h" + +#include + +#include "cgroup.h" #include "color.h" #include "debug.h" -#include "pmu.h" -#include "rblist.h" #include "evlist.h" +#include "evsel.h" #include "expr.h" -#include "metricgroup.h" -#include "cgroup.h" -#include "units.h" +#include "hashmap.h" #include "iostat.h" -#include "util/hashmap.h" +#include "metricgroup.h" +#include "pmu.h" +#include "pmus.h" +#include "rblist.h" +#include "stat.h" #include "tool_pmu.h" +#include "units.h" =20 static bool tool_pmu__is_time_event(const struct perf_stat_config *config, const struct evsel *evsel, int *tool_aggr_idx) diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 14d169e22e8f..66eb9a66a4f7 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -1,21 +1,25 @@ // SPDX-License-Identifier: GPL-2.0 +#include "stat.h" + #include -#include #include #include #include + +#include +#include + #include "counts.h" #include "cpumap.h" #include "debug.h" +#include "evlist.h" +#include "evsel.h" +#include "hashmap.h" #include "header.h" -#include "stat.h" +#include "pmu.h" #include "session.h" #include "target.h" -#include "evlist.h" -#include "evsel.h" #include "thread_map.h" -#include "util/hashmap.h" -#include =20 void update_stats(struct stats *stats, u64 val) { --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2BC44279FD for ; Fri, 5 Jun 2026 19:15:14 +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=1780686922; cv=none; b=q8AVW3/tPjXc4HtHbLiMSValxUQxiAFUoQxLRrQ3lZdSqThMzkpWlD3OgueYsys8doGXo6wNLQ/cAp8icJ6Y/+cfnX2QKdNPmdDtXCf7x/ly/BfSu6TP5x++r4Kqn2iz/PPFrVEjL9nHm1SB0+mcxNC0pAlnDnT1QHIA4ruG1ec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686922; c=relaxed/simple; bh=tCSJcYB4NhRgV0EoN+2Mj7s7Z6/xFGuh/NFlr3KWR5w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bk0uph0g/ndsWyUd5JPVB+6f52v7T+Eg01NZKU3PHgROyNOkW46+HUTfCQqGnVUazgpk9B8/CmXF6RCGM06NCmAgOaTIhbZBtE1ULp9itcZmYSB2wfyYcStAosyI99LuVeTterzObfzy4MdLmU7fbGwyVm2GoTCxVH/AVXn7tIg= 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=N0yo9NpN; 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="N0yo9NpN" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304ea1eea05so4279875eec.0 for ; Fri, 05 Jun 2026 12:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686914; x=1781291714; 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=/3HTbZlk8r1o2shhD5prIkIUfpXfAm47iIMKJ9+pRt0=; b=N0yo9NpN6jtICPqQZefVhi+OWgzTEmpGIrozTR6frgz7fW6Hlj30QJAmN+DbP1qkXt vSLCjqZrpiSYbb6YHB4BLfJBP0KaM7DBXW2ZzarBmEApqnrPNGby2OQ15jLpoMwQQAr7 IADmkqR5zkoyVPERQWkwboo+MIt5ReSVOop45ArR9vZTfDP5oURmAk3iwAZzDv3Zut6H LPR0tslky5VV3e9eRcZ0ybPRKpLAJzqKziwlQIL+dZp7Nr89ziyN0UvHwb2eG+G0fRzA /+NKBTGhZgRtmILbI5pFfwviC0+AtISoC7MiGDtCm8D1St6xcpp+dFlCtlzjdX8XbQbg 70HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686914; x=1781291714; 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=/3HTbZlk8r1o2shhD5prIkIUfpXfAm47iIMKJ9+pRt0=; b=jI23o+TI+M/YffKt7pbb8nHLi1alQ6r5gbPIK0q0ZwAwngHNsK8p3c54ohCRwjDaQB 7CoSnunfwN8/LnI+YTGo0D+k4QmtseqM0Aw/kMaVdbQjqveGetOHl/NTB16RGQZG4LCO LfWA5j3axOa7s5plZRBO2JoWeeLVLJe3EGVt1EpXw8kjyc1Nuv2t6sx8AuiWj+gRvYR3 e/HO8u7KmjAK7O0kcyAoud8og7RVOsMNqcVLdiHZnhjCPXITHenFvxaJA0MA/G3/By+S jOTf4Uo5fq4BWytwfw8zuN2/COBOwL5zi95JenALdNFJ/JdspVerHh/AmlqdUn1IYicX jWpA== X-Forwarded-Encrypted: i=1; AFNElJ9wAxHXAflAX7cO73zRC4kSRDSWgjCvFtmwCc2w54ssqOdMcTOe6PHnwzM9yOpoY7/WkzI3rq0Bt8cpFIM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3Gv6THV7AeCkwu1TV7znf2AT/LWoHN4Q/l7SiZCnP7bh/NBFO 18kzXES4kaIxx4NQ/B8ubEibpYe18VMRJ09azeOT7JiATtIMCZd2XHUbUH3P81EkY1x4CTv+VKZ 3hfH39dXqIQ== X-Received: from dlaj10.prod.google.com ([2002:a05:701b:280a:b0:135:e6d6:d140]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ef18:b0:137:1ae1:bc19 with SMTP id a92af1059eb24-1380666a380mr2376008c88.5.1780686913509; Fri, 05 Jun 2026 12:15:13 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:43 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-3-irogers@google.com> Subject: [PATCH v11 02/19] perf python: Add missed explicit dependencies From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix missing #include of pmus.h found while cleaning the evsel/evlist header files. Also define PY_SSIZE_T_CLEAN before including Python.h to comply with modern Python 3 C-API requirements, and introduce CHECK_INITIALIZED and CHECK_INITIALIZED_INT safety macros to be used by subsequent patches. Signed-off-by: Ian Rogers --- tools/perf/util/python.c | 41 +++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index cc1019d29a5d..98a8dd9b673d 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1,30 +1,37 @@ // SPDX-License-Identifier: GPL-2.0 +#define PY_SSIZE_T_CLEAN #include -#include + #include -#include + #include +#include + +#include #include -#ifdef HAVE_LIBTRACEEVENT -#include -#endif #include +#include + #include "callchain.h" #include "counts.h" +#include "event.h" #include "evlist.h" #include "evsel.h" -#include "event.h" #include "expr.h" +#include "metricgroup.h" +#include "mmap.h" +#include "pmus.h" #include "print_binary.h" #include "record.h" #include "strbuf.h" #include "thread_map.h" #include "tp_pmu.h" #include "trace-event.h" -#include "metricgroup.h" -#include "mmap.h" #include "util/sample.h" -#include + +#ifdef HAVE_LIBTRACEEVENT +#include +#endif =20 PyMODINIT_FUNC PyInit_perf(void); =20 @@ -38,6 +45,22 @@ PyMODINIT_FUNC PyInit_perf(void); offsetof(struct pyrf_event, sample) + offsetof(struct perf_sample, memb= er), \ 0, help } =20 +#define CHECK_INITIALIZED(ptr, msg) \ + do { \ + if (!(ptr)) { \ + PyErr_SetString(PyExc_ValueError, msg " not initialized"); \ + return NULL; \ + } \ + } while (0) + +#define CHECK_INITIALIZED_INT(ptr, msg) \ + do { \ + if (!(ptr)) { \ + PyErr_SetString(PyExc_ValueError, msg " not initialized"); \ + return -1; \ + } \ + } while (0) + struct pyrf_event { PyObject_HEAD struct evsel *evsel; --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 348BA40DFB4 for ; Fri, 5 Jun 2026 19:15:17 +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=1780686923; cv=none; b=MQzvH3/qCZn4wG9vPa82Wuvwizh9MBh3Q7hL+v7RFjJ2ldh1TI0Qew1DS1znzr4HazZcs3bFcOvOs15l0P5kdc0ZzsVMQcp5ToJOGFBxbW8d8BiyNFWN29LeLmnkDdq/fHCcZ9Ov9jUFY3OTZJVasL5Ev0fXVFe76AnRryRtGgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686923; c=relaxed/simple; bh=ZD8nySNmfII//eX2G0gtlpqpA5fO9vJF8ULOOxAor5k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g1tVNU0uHsqMEAnS2lKYwYZlXelwc8G77nBpgrZZogw4icUqdtkiBDWX8QwpEO4dq9+AHcPzGcaxc8pQ/Lz7qE/RnRnhwGd41ezIA7sU4RDoSrnR0ZA8BbaSimLu5ay1rfuaYBBwdo8YmBgcOFX/Y5DNU6it/pIIk37juPnQGIU= 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=uVo4wREk; 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="uVo4wREk" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304f23c55b2so2172298eec.0 for ; Fri, 05 Jun 2026 12:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686916; x=1781291716; 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=aqXzvj0HL75GGH0vSM8SpyCIJBlgpw+ijia5w1nscwA=; b=uVo4wREkSRJcIg2n8mDwhDUKtY6EFgIFPiTHgKHJOESCg5x2vlyCY7f17KL25g2wRT dL9bZLCl6M0qTUf5XElykgSKEi3TdPCbt1UYRVa+WmNZsB+LBF0rVQcs4SWX7HUK0qS4 kTaeWePv2CCojjIbySoGQjoSPF6w6QCPU3TzMnFE8s3NZ8O3ElC64n/vMYRgQF9xldFi vzpg0vrahl3G/EMxw84g3Z0NrnkY7tS/kii/YQ6fxnmHiKq/fVy9PtAQSaGsUjAwLYkP +rcaMvc0/kuKTsGKkYx8AhFpbgfp4jipDj1eY40UW/MAuodMo5UDOvCSgFUrk2uQXPQG xNQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686916; x=1781291716; 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=aqXzvj0HL75GGH0vSM8SpyCIJBlgpw+ijia5w1nscwA=; b=dC3kEacyS9mTBSbL0LwNPMalVHxci3SFU6Ffaf2PdANu5gtohCZsgUfLj7JnLtdIDA yutvMbK0xhl2XTFV21/2kDni9yDv8TcD8x1apRFB5oXl31eiAesF3/EgjGAZupmIWw16 yhfXGCApGP8fx5D9/DBQkg8sPjxnL9+eF8uhWW8CDa+U4YFb0IEqDG9Oo6T1IGWleI6Z v8doIeyszwuY8FKaiS+HiBGslIo0uGpAcwHOHJ4NjZEj8ejhHzXfZhKyLLyId5/H9ABa nstyNmxbqdtz/O41RsgpqbkS3wb34LJfDoHtEeTQLtFm3bykotuLsrcHYFHZUNSl8+qZ wvoQ== X-Forwarded-Encrypted: i=1; AFNElJ9hMKCHVtIGe73iOkYXmxK/9N5hnNH3rbCEXkZIZOiSAYQtpYnj36wYUo3wEeUfRX/mKCjERaHSCRZr/b4=@vger.kernel.org X-Gm-Message-State: AOJu0YwMPVa4ldWWZoaR4ncwt/trVZMtv2hQl7xRkvBjhlyjAD5OV0+o zlrWZD/nOwMeosKp9SddOPojR5nHeuCTEFMBu+C7CBwYCWT1T5PLrB7lABeFteFuQsfUUrlqCcE HMrk5Dy6VIQ== X-Received: from dyaa27.prod.google.com ([2002:a05:693c:40db:b0:304:ee01:7777]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d517:b0:304:de94:1c2c with SMTP id 5a478bee46e88-3077b866467mr2881457eec.34.1780686915906; Fri, 05 Jun 2026 12:15:15 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:44 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-4-irogers@google.com> Subject: [PATCH v11 03/19] perf evsel/evlist: Avoid unnecessary #includes From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use forward declarations and remove unnecessary #includes in evsel.h. Sort the forward declarations in evsel.h and evlist.h. Move some PMU code into evsel.c. Signed-off-by: Ian Rogers Acked-by: Namhyung Kim --- tools/perf/util/evlist.h | 15 +++++++++------ tools/perf/util/evsel.c | 5 +++++ tools/perf/util/evsel.h | 25 ++++++++++++------------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index e507f5f20ef6..e54761c670b6 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -2,29 +2,32 @@ #ifndef __PERF_EVLIST_H #define __PERF_EVLIST_H 1 =20 +#include + #include #include -#include #include +#include +#include +#include + #include #include #include #include + #include "affinity.h" #include "events_stats.h" #include "evsel.h" #include "rblist.h" -#include -#include -#include =20 -struct pollfd; -struct thread_map; struct perf_cpu_map; struct perf_stat_config; +struct pollfd; struct record_opts; struct strbuf; struct target; +struct thread_map; =20 /* * State machine of bkw_mmap_state: diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 34c03f47a913..19e48b9260e9 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -370,6 +370,11 @@ void evsel__set_sample_id(struct evsel *evsel, evsel->core.attr.read_format |=3D PERF_FORMAT_ID; } =20 +bool evsel__is_non_perf_event_open_pmu(const struct evsel *evsel) +{ + return evsel->pmu && evsel->pmu->type > PERF_PMU_TYPE_PE_END; +} + /** * evsel__is_function_event - Return whether given evsel is a function * trace event diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 8178858d168a..6b28cd754a18 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -2,28 +2,30 @@ #ifndef __PERF_EVSEL_H #define __PERF_EVSEL_H 1 =20 -#include #include -#include + +#include #include #include +#include + #include #include + #include "symbol_conf.h" -#include "pmus.h" -#include "pmu.h" =20 +struct bperf_follower_bpf; +struct bperf_leader_bpf; +struct bpf_counter_ops; struct bpf_object; struct cgroup; +struct hashmap; struct perf_counts; +struct perf_pmu; struct perf_stat_config; struct perf_stat_evsel; -union perf_event; -struct bpf_counter_ops; struct target; -struct hashmap; -struct bperf_leader_bpf; -struct bperf_follower_bpf; +union perf_event; =20 typedef int (evsel__sb_cb_t)(union perf_event *event, void *data); =20 @@ -356,10 +358,6 @@ void arch_evsel__apply_ratio_to_prev(struct evsel *evs= el, struct perf_event_attr int evsel__set_filter(struct evsel *evsel, const char *filter); int evsel__append_tp_filter(struct evsel *evsel, const char *filter); int evsel__append_addr_filter(struct evsel *evsel, const char *filter); -static inline bool evsel__is_non_perf_event_open_pmu(const struct evsel *e= vsel) -{ - return evsel->pmu && evsel->pmu->type > PERF_PMU_TYPE_PE_END; -} =20 int evsel__enable_cpu(struct evsel *evsel, int cpu_map_idx); int evsel__enable(struct evsel *evsel); @@ -478,6 +476,7 @@ static inline bool evsel__is_group_event(struct evsel *= evsel) return evsel__is_group_leader(evsel) && evsel->core.nr_members > 1; } =20 +bool evsel__is_non_perf_event_open_pmu(const struct evsel *evsel); bool evsel__is_function_event(struct evsel *evsel); =20 static inline bool evsel__is_bpf_output(struct evsel *evsel) --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F15A741931D for ; Fri, 5 Jun 2026 19:15:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686926; cv=none; b=mLs+Sd4b2PKs4tf7sxEgawJymJ5c83pyHhdO8casz5EiC0oFMbjK9rwn+cy5Fa5vMrEc4lftorZwQelIPEBV35Zl9tJvL8Lz6zyVxGLKlDmnuUtOMVtMGDfiXR7Co14hdo3o5b8GT+kCb7dn/cQUQxVFNiKCMENMvFCj62zy/5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686926; c=relaxed/simple; bh=taSKB9BzdfFFc5okG7SIw+6aW6dC+xrRCx+VI9z577Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fBpQ+ubwzb0Tqvov1+zYJeOfRR0WGTgcrcyKJ6Yhnn9tsKKwRcNd46m7Nhuieg5lLAnofxm8kLfr6/L2sDZcS5k8gnYH9LDl7di7H8Z99Cx94ENPsSpRYyK9sI/LfvFl7O1L795Bagx0PbGmvRZb0Ki6mFovKqNxWGFe0acB6tc= 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=mAO+l4tj; 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="mAO+l4tj" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-30761ab3483so8331307eec.0 for ; Fri, 05 Jun 2026 12:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686919; x=1781291719; 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=b1KCxLzm5r/4/75FpnIjDCoJZ2/GF5PCnxsr/c+/xOQ=; b=mAO+l4tjFeMpWiEfjhIPK/al/q+XtFj8dXiTwQy7pB1Hl9R8EYGsfFaZ7i0JHcH17X HchyHMyPMz+VscNf2ElI0eoV9lKk6l6TlYDFeNfjfibnIMTiJtWPh55poachXAIfvvGW 4f9wvAUyRpEWmDgw7kIiPve6tc5dDosO07bzEjHeVFrbbB6qfy73r20piKCTugplvIud 31+DeN49YTaH75KDIbtolVG9EJr0c19m5mG6Rj/GlXYQBbLqrFrBLjftphB4g9IQzYZA 2hwe6MVP4xVjoqoXjLjMY3RMFw20L8+6JP8okNu0h41Dv4NeIxmdtCfsFn6IyAbxLeCK g86g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686919; x=1781291719; 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=b1KCxLzm5r/4/75FpnIjDCoJZ2/GF5PCnxsr/c+/xOQ=; b=qKv7c7nhWEtbzwqd5SLHtj8mK/mPZsK7sg2mxWNQ65sZphTDxZWj1Qi7QByKanYRxG p3RD2mzDE4mRYMG/K1Y+IyeDXB2ulA0rQ2WCMCRYtNYAqYjVOEcf1bbkkLEun+KiYzs/ e/El9yeecbJ6v4qPeWW7IwAbUjdE9438Bgluu7rTSY7XTQhxkMUuReJ8cciD4+6dd50C KAu8LY3W1UsU8fE617SLrWn5OmRVUYakf84sHfHD1XNEQIsJ3Tk9OairkS9ePk4fJBXF gjXAwoOGc15AbH3ioPVVQLZAvzkg1Y2pVgOXOnmReMqGnoEUeV5SgK03hcKhdCp9gvt/ 20nA== X-Forwarded-Encrypted: i=1; AFNElJ9HJgMo0a+3qX9VmlsZjh5RSjwCC1pxOSPZ8KsMK+gUpj5D/ZasI3a0bc3ZvCTr87wi053lZuZLwY8BbEI=@vger.kernel.org X-Gm-Message-State: AOJu0YxUk4BWijpexSOgPnKCV6QYp73bH3ezb10kvXoxyEPRYqxNroQZ KwwggXw49WLhoRVmIpSTpJ7yI2tAQbhpCbwvF/zP/jkJqRw3ROPFfxzxlIizt7W81rvWaFyWHik zw7LLcoSCGQ== X-Received: from dlcip7.prod.google.com ([2002:a05:7023:c087:b0:138:d5:834e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ef18:b0:135:6914:87e1 with SMTP id a92af1059eb24-13806668735mr2485588c88.6.1780686918592; Fri, 05 Jun 2026 12:15:18 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:45 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-5-irogers@google.com> Subject: [PATCH v11 04/19] perf data: Add open flag From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoid double opens and ensure only open files are closed. This addresses some issues with python integration where the data file wants to be opened before being given to a session. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Acked-by: Namhyung Kim --- Changes in v2: 1. Fixed File Rotation: In perf_data__switch() , I added data->open =3D false; after the file is closed. This ensures that the subsequent perf_data__open() call will not exit early and will successfully open the new file. 2. Fixed Memory Leak: In open_dir() , I added a call to zfree(&data->file.path) if mkdir() fails, preventing the leak of the path string. --- tools/perf/util/data.c | 27 ++++++++++++++++++++++----- tools/perf/util/data.h | 4 +++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index 94dc534a7386..33fd1b82019e 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -345,9 +345,10 @@ static int open_dir(struct perf_data *data) if (asprintf(&data->file.path, "%s/data", data->path) < 0) return -1; =20 - if (perf_data__is_write(data) && - mkdir(data->path, S_IRWXU) < 0) + if (perf_data__is_write(data) && mkdir(data->path, 0700) < 0) { + zfree(&data->file.path); return -1; + } =20 ret =3D open_file(data); =20 @@ -360,9 +361,16 @@ static int open_dir(struct perf_data *data) =20 int perf_data__open(struct perf_data *data) { - if (check_pipe(data)) + int ret; + + if (data->open) return 0; =20 + if (check_pipe(data)) { + data->open =3D true; + return 0; + } + /* currently it allows stdio for pipe only */ data->file.use_stdio =3D false; =20 @@ -375,16 +383,24 @@ int perf_data__open(struct perf_data *data) if (perf_data__is_read(data)) data->is_dir =3D is_dir(data); =20 - return perf_data__is_dir(data) ? - open_dir(data) : open_file_dup(data); + ret =3D perf_data__is_dir(data) ? open_dir(data) : open_file_dup(data); + + if (!ret) + data->open =3D true; + + return ret; } =20 void perf_data__close(struct perf_data *data) { + if (!data->open) + return; + if (perf_data__is_dir(data)) perf_data__close_dir(data); =20 perf_data_file__close(&data->file); + data->open =3D false; } =20 static ssize_t perf_data_file__read(struct perf_data_file *file, void *buf= , size_t size) @@ -457,6 +473,7 @@ int perf_data__switch(struct perf_data *data, =20 if (!at_exit) { perf_data_file__close(&data->file); + data->open =3D false; ret =3D perf_data__open(data); if (ret < 0) goto out; diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h index 8299fb5fa7da..76f57f60361f 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -50,6 +50,8 @@ struct perf_data { const char *path; /** @file: Underlying file to be used. */ struct perf_data_file file; + /** @open: Has the file or directory been opened. */ + bool open; /** @is_pipe: Underlying file is a pipe. */ bool is_pipe; /** @is_dir: Underlying file is a directory. */ @@ -59,7 +61,7 @@ struct perf_data { /** @in_place_update: A file opened for reading but will be written to. */ bool in_place_update; /** @mode: Read or write mode. */ - enum perf_data_mode mode; + enum perf_data_mode mode:8; =20 struct { /** @version: perf_dir_version. */ --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83BD3429814 for ; Fri, 5 Jun 2026 19:15:22 +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=1780686938; cv=none; b=MCaMGnax6b96BosuF8Wcp0C+O7XeoXG54PL0Q9yoQ4v4UTABIlbXQ3CUB/0bQZ4o0tDwqzVI1XItd7JDeWpSeNjAuXCbYt8F0wOyizvehOsATgiUFkNUUZnEWoLjFPhdj0qtrnTZzUD3lKq49XS+EjfRH0V7sFbuJf+Dr7P5ST8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686938; c=relaxed/simple; bh=9OC1WYKvRqGwvkzNUlSgJfRhl41XM7Mm5KTS5Ar2eiA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tEifmWh5Oky8wEljqyEso5GTrQtdcIOmRakaqb99k/CokqzCJbNcFK8/CbG7hdi6R9Dk5CE5zyB92vHwX79tXt3sV3gBspa8QdRp9mSHf41R9TfSdv/j5V4vrUvge0YF8E0c8A3MbN14TKfs3cPNk3uCxakWKP8NI+mt+OJ0sC4= 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=wbktuohV; 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="wbktuohV" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304dd917645so2208671eec.1 for ; Fri, 05 Jun 2026 12:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686922; x=1781291722; 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=sXi1dvR193RYUCe+AVOfvqNzIL53Q6YgXM4qzptM+M0=; b=wbktuohVn0k5u/JJReJQH2rqJt1aIJYUTZq2mq5ferj+9qB/vRfmHp/WdhB+/LZwL4 6760rKCdSxWi5uKST4VFcZIvhOLU+Ms021QhloV+L8PTOXjB9d5CqAAQmGg1EzCx4/GK QDrhPljDIOIvmKBNF0C9p1KQzMD/xvlnnVUCPor9KY6Og2/capasXP3uNaE+a+XubaNU sSH1nRjOM8W+qypB3mkcv/JU3duB6SYRaRttkK2+rOOBegVHhdISdRVrUoqxkk0x7/pj fqcoNkKe045Adv+a7KnOnqYUOtahZlVQpIlirkFVGD/HvHTOQtSDhkfLnPcXDQOKn3cB CyxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686922; x=1781291722; 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=sXi1dvR193RYUCe+AVOfvqNzIL53Q6YgXM4qzptM+M0=; b=Bt3PZZPN/tCR2Q+nlGVnyEF4HTUhjLiuuZVPJJCfWs2SD5mF96jCYY0WgbvypG/29t DKFvP/iHahY5LbB+mawTkdrMZU6QpjgmWyHiEiJb50KvlWbUIUQyDySHihAVlcx+y/uw uQReBfi1NAKVB6u2c0cJ6Q/CNlqMikpIjRcNvKiB7k2TCszoIn3BTNWTsLF909xDnnAY IR+khX13ZTw7E/azJ1ozrkX3x2TWgXI22ndAznskj9RDpfxQzGB/qXMlg9+tKo+ozc1O ha2yWF3cZUi7EMxeuoKNionan77+4lKK8cD4b9SCxDEyCtkMw3J1mYjmb8TFdZRmZukp 0UXQ== X-Forwarded-Encrypted: i=1; AFNElJ85CVzIpvrWVn+NihipNayEqr/t6se3/Fe4+Wx/CUevpb2hhfXVC6a+OAlAeVbcbiDaZmaWkiCUuKcWmmw=@vger.kernel.org X-Gm-Message-State: AOJu0YxgRP6/M9MIlKOcbngGOQ0e4Uger+ncyXU/2oRKvcyb45E+Ji8m /kv5LBZ+Bnu0ta1KFJtzARgo9e6wGCD2XdWfjOSQ06kik5rT6kCSaW2QlGwbfHYlTXN8G1+86aN 1x4qIHwnRNA== X-Received: from dycqa8.prod.google.com ([2002:a05:7300:fe48:b0:2f3:e5fe:f565]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:2b0c:b0:2ed:27a3:eae3 with SMTP id 5a478bee46e88-3077b22d30cmr2464378eec.26.1780686921050; Fri, 05 Jun 2026 12:15:21 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:46 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-6-irogers@google.com> Subject: [PATCH v11 05/19] perf evlist: Add reference count From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This a no-op for most of the perf tool. The reference count is set to 1 at allocation, the put will see the 1, decrement it and perform the delete. The purpose for adding the reference count is for the python code. Prior to this change the python code would clone evlists, but this has issues if events are opened, etc. This change adds a reference count for the evlists and a later change will add it to evsels. The combination is needed for the python code to operate correctly (not hit asserts in the evsel clone), but the changes are broken apart for the sake of smaller patches. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: Added evlist__put to pyrf_evlist__init in case init is called more than once. I double-checked trace__replay() and confirmed that trace->evlist is not assigned to session->evlist in that function. trace__replay creates a new session and uses its own evlist for processing file events, leaving trace->evlist pointing to the empty list created at startup. Therefore, the evlist__put(trace->evlist) call in trace__exit() is safe and correct to avoid leaking that empty list. v7: - Added pyrf_evlist__new to zero-initialize pevlist->evlist to fix crash on re-initialization. --- tools/perf/arch/x86/tests/hybrid.c | 2 +- tools/perf/arch/x86/tests/topdown.c | 4 +- tools/perf/arch/x86/util/iostat.c | 2 +- tools/perf/bench/evlist-open-close.c | 18 +- tools/perf/builtin-ftrace.c | 8 +- tools/perf/builtin-kvm.c | 4 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-sched.c | 6 +- tools/perf/builtin-script.c | 2 +- tools/perf/builtin-stat.c | 10 +- tools/perf/builtin-top.c | 52 ++--- tools/perf/builtin-trace.c | 26 +-- tools/perf/tests/backward-ring-buffer.c | 18 +- tools/perf/tests/code-reading.c | 4 +- tools/perf/tests/event-times.c | 4 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 8 +- tools/perf/tests/expand-cgroup.c | 8 +- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 2 +- tools/perf/tests/hists_link.c | 2 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/hwmon_pmu.c | 2 +- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 18 +- tools/perf/tests/openat-syscall-tp-fields.c | 18 +- tools/perf/tests/parse-events.c | 4 +- tools/perf/tests/parse-metric.c | 4 +- tools/perf/tests/parse-no-sample-id-all.c | 2 +- tools/perf/tests/perf-record.c | 18 +- tools/perf/tests/perf-time-to-tsc.c | 2 +- tools/perf/tests/pfm.c | 4 +- tools/perf/tests/pmu-events.c | 6 +- tools/perf/tests/pmu.c | 4 +- tools/perf/tests/sw-clock.c | 14 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 14 +- tools/perf/tests/tool_pmu.c | 2 +- tools/perf/tests/topology.c | 2 +- tools/perf/tests/uncore-event-sorting.c | 2 +- tools/perf/util/cgroup.c | 4 +- tools/perf/util/data-convert-bt.c | 2 +- tools/perf/util/evlist.c | 20 +- tools/perf/util/evlist.h | 7 +- tools/perf/util/expr.c | 2 +- tools/perf/util/header.c | 22 +- tools/perf/util/metricgroup.c | 6 +- tools/perf/util/parse-events.c | 4 +- tools/perf/util/perf_api_probe.c | 2 +- tools/perf/util/python.c | 242 +++++++++----------- tools/perf/util/record.c | 2 +- tools/perf/util/session.c | 2 +- tools/perf/util/sideband_evlist.c | 16 +- 54 files changed, 315 insertions(+), 328 deletions(-) diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests= /hybrid.c index e221ea104174..dfb0ffc0d030 100644 --- a/tools/perf/arch/x86/tests/hybrid.c +++ b/tools/perf/arch/x86/tests/hybrid.c @@ -268,7 +268,7 @@ static int test_event(const struct evlist_test *e) ret =3D e->check(evlist); } parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); =20 return ret; } diff --git a/tools/perf/arch/x86/tests/topdown.c b/tools/perf/arch/x86/test= s/topdown.c index 221f2c4bbb61..2b6f47ce4932 100644 --- a/tools/perf/arch/x86/tests/topdown.c +++ b/tools/perf/arch/x86/tests/topdown.c @@ -56,7 +56,7 @@ static int event_cb(void *state, struct pmu_event_info *i= nfo) *ret =3D TEST_FAIL; } } - evlist__delete(evlist); + evlist__put(evlist); return 0; } =20 @@ -174,7 +174,7 @@ static int test_sort(const char *str, int expected_slot= s_group_size, CHECK_COND(slots_seen, "slots seen"); ret =3D TEST_OK; out_err: - evlist__delete(evlist); + evlist__put(evlist); parse_events_error__exit(&err); return ret; } diff --git a/tools/perf/arch/x86/util/iostat.c b/tools/perf/arch/x86/util/i= ostat.c index 7442a2cd87ed..e0417552b0cb 100644 --- a/tools/perf/arch/x86/util/iostat.c +++ b/tools/perf/arch/x86/util/iostat.c @@ -337,7 +337,7 @@ int iostat_prepare(struct evlist *evlist, struct perf_s= tat_config *config) if (evlist->core.nr_entries > 0) { pr_warning("The -e and -M options are not supported." "All chosen events/metrics will be dropped\n"); - evlist__delete(evlist); + evlist__put(evlist); evlist =3D evlist__new(); if (!evlist) return -ENOMEM; diff --git a/tools/perf/bench/evlist-open-close.c b/tools/perf/bench/evlist= -open-close.c index faf9c34b4a5d..304929d1f67f 100644 --- a/tools/perf/bench/evlist-open-close.c +++ b/tools/perf/bench/evlist-open-close.c @@ -76,7 +76,7 @@ static struct evlist *bench__create_evlist(char *evstr, c= onst char *uid_str) parse_events_error__exit(&err); pr_err("Run 'perf list' for a list of valid events\n"); ret =3D 1; - goto out_delete_evlist; + goto out_put_evlist; } parse_events_error__exit(&err); if (uid_str) { @@ -85,24 +85,24 @@ static struct evlist *bench__create_evlist(char *evstr,= const char *uid_str) if (uid =3D=3D UINT_MAX) { pr_err("Invalid User: %s", uid_str); ret =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } ret =3D parse_uid_filter(evlist, uid); if (ret) - goto out_delete_evlist; + goto out_put_evlist; } ret =3D evlist__create_maps(evlist, &opts.target); if (ret < 0) { pr_err("Not enough memory to create thread/cpu maps\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__config(evlist, &opts, NULL); =20 return evlist; =20 -out_delete_evlist: - evlist__delete(evlist); +out_put_evlist: + evlist__put(evlist); return NULL; } =20 @@ -151,7 +151,7 @@ static int bench_evlist_open_close__run(char *evstr, co= nst char *uid_str) evlist->core.nr_entries, evlist__count_evsel_fds(evlist)); printf(" Number of iterations:\t%d\n", iterations); =20 - evlist__delete(evlist); + evlist__put(evlist); =20 for (i =3D 0; i < iterations; i++) { pr_debug("Started iteration %d\n", i); @@ -162,7 +162,7 @@ static int bench_evlist_open_close__run(char *evstr, co= nst char *uid_str) gettimeofday(&start, NULL); err =3D bench__do_evlist_open_close(evlist); if (err) { - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 @@ -171,7 +171,7 @@ static int bench_evlist_open_close__run(char *evstr, co= nst char *uid_str) runtime_us =3D timeval2usec(&diff); update_stats(&time_stats, runtime_us); =20 - evlist__delete(evlist); + evlist__put(evlist); pr_debug("Iteration %d took:\t%" PRIu64 "us\n", i, runtime_us); } =20 diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 8a7dbfb14535..676239148b87 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -1999,20 +1999,20 @@ int cmd_ftrace(int argc, const char **argv) =20 ret =3D evlist__create_maps(ftrace.evlist, &ftrace.target); if (ret < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 if (argc) { ret =3D evlist__prepare_workload(ftrace.evlist, &ftrace.target, argv, false, ftrace__workload_exec_failed_signal); if (ret < 0) - goto out_delete_evlist; + goto out_put_evlist; } =20 ret =3D cmd_func(&ftrace); =20 -out_delete_evlist: - evlist__delete(ftrace.evlist); +out_put_evlist: + evlist__put(ftrace.evlist); =20 out_delete_filters: delete_filter_func(&ftrace.filters); diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 394302ebdb16..993dabff2a72 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1810,7 +1810,7 @@ static struct evlist *kvm_live_event_list(void) =20 out: if (err) { - evlist__delete(evlist); + evlist__put(evlist); evlist =3D NULL; } =20 @@ -1941,7 +1941,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, out: perf_session__delete(kvm->session); kvm->session =3D NULL; - evlist__delete(kvm->evlist); + evlist__put(kvm->evlist); =20 return err; } diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 5841d43be971..d925543a68c0 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -2149,7 +2149,7 @@ static int __cmd_contention(int argc, const char **ar= gv) =20 out_delete: lock_filter_finish(); - evlist__delete(con.evlist); + evlist__put(con.evlist); lock_contention_finish(&con); perf_session__delete(session); perf_env__exit(&host_env); diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index a33c78f030d9..e76dc4e34ba1 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -4290,7 +4290,7 @@ int cmd_record(int argc, const char **argv) goto out; =20 evlist__splice_list_tail(rec->evlist, &def_evlist->core.entries); - evlist__delete(def_evlist); + evlist__put(def_evlist); } =20 if (rec->opts.target.tid && !rec->opts.no_inherit_set) @@ -4400,7 +4400,7 @@ int cmd_record(int argc, const char **argv) auxtrace_record__free(rec->itr); out_opts: evlist__close_control(rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.= ctl_fd_close); - evlist__delete(rec->evlist); + evlist__put(rec->evlist); return err; } =20 diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 4aa7833cae6e..a6a52c89ea9f 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3848,7 +3848,7 @@ static int perf_sched__schedstat_record(struct perf_s= ched *sched, session =3D perf_session__new(&data, &sched->tool); if (IS_ERR(session)) { pr_err("Perf session creation failed.\n"); - evlist__delete(evlist); + evlist__put(evlist); return PTR_ERR(session); } =20 @@ -3947,7 +3947,7 @@ static int perf_sched__schedstat_record(struct perf_s= ched *sched, else fprintf(stderr, "[ perf sched stats: Failed !! ]\n"); =20 - evlist__delete(evlist); + evlist__put(evlist); close(fd); return err; } @@ -4851,7 +4851,7 @@ static int perf_sched__schedstat_live(struct perf_sch= ed *sched, free_cpu_domain_info(cd_map, sv, nr); out: free_schedstat(&cpu_head); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index f4aa255fc329..f612a6d39ab9 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2274,7 +2274,7 @@ static int script_find_metrics(const struct pmu_metri= c *pm, } pr_debug("Found metric '%s' whose evsels match those of in the perf data\= n", pm->metric_name); - evlist__delete(metric_evlist); + evlist__put(metric_evlist); out: return 0; } diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 99d7db372b48..bfa3512e1686 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2113,7 +2113,7 @@ static int add_default_events(void) stat_config.user_requested_cpu_list, stat_config.system_wide, stat_config.hardware_aware_grouping) < 0) { - evlist__delete(metric_evlist); + evlist__put(metric_evlist); ret =3D -1; break; } @@ -2125,7 +2125,7 @@ static int add_default_events(void) metricgroup__copy_metric_events(evlist, /*cgrp=3D*/NULL, &evlist->metric_events, &metric_evlist->metric_events); - evlist__delete(metric_evlist); + evlist__put(metric_evlist); } list_sort(/*priv=3D*/NULL, &evlist->core.entries, default_evlist_evsel_c= mp); =20 @@ -2146,7 +2146,7 @@ static int add_default_events(void) metricgroup__copy_metric_events(evsel_list, /*cgrp=3D*/NULL, &evsel_list->metric_events, &evlist->metric_events); - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 @@ -2381,7 +2381,7 @@ static int __cmd_report(int argc, const char **argv) =20 perf_stat.session =3D session; stat_config.output =3D stderr; - evlist__delete(evsel_list); + evlist__put(evsel_list); evsel_list =3D session->evlist; =20 ret =3D perf_session__process_events(session); @@ -3060,7 +3060,7 @@ int cmd_stat(int argc, const char **argv) if (smi_cost && smi_reset) sysfs__write_int(FREEZE_ON_SMI_PATH, 0); =20 - evlist__delete(evsel_list); + evlist__put(evsel_list); =20 evlist__close_control(stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_c= onfig.ctl_fd_close); =20 diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 1211401616ee..ff24ae35c67f 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1652,14 +1652,14 @@ int cmd_top(int argc, const char **argv) perf_env__init(&host_env); status =3D perf_config(perf_top_config, &top); if (status) - goto out_delete_evlist; + goto out_put_evlist; /* * Since the per arch annotation init routine may need the cpuid, read * it here, since we are not getting this from the perf.data header. */ status =3D perf_env__set_cmdline(&host_env, argc, argv); if (status) - goto out_delete_evlist; + goto out_put_evlist; =20 status =3D perf_env__read_cpuid(&host_env); if (status) { @@ -1680,30 +1680,30 @@ int cmd_top(int argc, const char **argv) annotate_opts.disassembler_style =3D strdup(disassembler_style); if (!annotate_opts.disassembler_style) { status =3D -ENOMEM; - goto out_delete_evlist; + goto out_put_evlist; } } if (objdump_path) { annotate_opts.objdump_path =3D strdup(objdump_path); if (!annotate_opts.objdump_path) { status =3D -ENOMEM; - goto out_delete_evlist; + goto out_put_evlist; } } if (addr2line_path) { symbol_conf.addr2line_path =3D strdup(addr2line_path); if (!symbol_conf.addr2line_path) { status =3D -ENOMEM; - goto out_delete_evlist; + goto out_put_evlist; } } =20 status =3D symbol__validate_sym_arguments(); if (status) - goto out_delete_evlist; + goto out_put_evlist; =20 if (annotate_check_args() < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 status =3D target__validate(target); if (status) { @@ -1718,15 +1718,15 @@ int cmd_top(int argc, const char **argv) struct evlist *def_evlist =3D evlist__new_default(target, callchain_para= m.enabled); =20 if (!def_evlist) - goto out_delete_evlist; + goto out_put_evlist; =20 evlist__splice_list_tail(top.evlist, &def_evlist->core.entries); - evlist__delete(def_evlist); + evlist__put(def_evlist); } =20 status =3D evswitch__init(&top.evswitch, top.evlist, stderr); if (status) - goto out_delete_evlist; + goto out_put_evlist; =20 if (symbol_conf.report_hierarchy) { /* disable incompatible options */ @@ -1737,18 +1737,18 @@ int cmd_top(int argc, const char **argv) pr_err("Error: --hierarchy and --fields options cannot be used together= \n"); parse_options_usage(top_usage, options, "fields", 0); parse_options_usage(NULL, options, "hierarchy", 0); - goto out_delete_evlist; + goto out_put_evlist; } } =20 if (top.stitch_lbr && !(callchain_param.record_mode =3D=3D CALLCHAIN_LBR)= ) { pr_err("Error: --stitch-lbr must be used with --call-graph lbr\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (nr_cgroups > 0 && opts->record_cgroup) { pr_err("--cgroup and --all-cgroups cannot be used together\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (branch_call_mode) { @@ -1772,7 +1772,7 @@ int cmd_top(int argc, const char **argv) status =3D perf_env__read_core_pmu_caps(&host_env); if (status) { pr_err("PMU capability data is not available\n"); - goto out_delete_evlist; + goto out_put_evlist; } } =20 @@ -1795,7 +1795,7 @@ int cmd_top(int argc, const char **argv) if (IS_ERR(top.session)) { status =3D PTR_ERR(top.session); top.session =3D NULL; - goto out_delete_evlist; + goto out_put_evlist; } top.evlist->session =3D top.session; =20 @@ -1805,7 +1805,7 @@ int cmd_top(int argc, const char **argv) if (field_order) parse_options_usage(sort_order ? NULL : top_usage, options, "fields", 0); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (top.uid_str) { @@ -1814,18 +1814,18 @@ int cmd_top(int argc, const char **argv) if (uid =3D=3D UINT_MAX) { ui__error("Invalid User: %s", top.uid_str); status =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } status =3D parse_uid_filter(top.evlist, uid); if (status) - goto out_delete_evlist; + goto out_put_evlist; } =20 if (evlist__create_maps(top.evlist, target) < 0) { ui__error("Couldn't create thread/CPU maps: %s\n", errno =3D=3D ENOENT ? "No such process" : str_error_r(errno, errbuf, = sizeof(errbuf))); status =3D -errno; - goto out_delete_evlist; + goto out_put_evlist; } =20 if (top.delay_secs < 1) @@ -1833,7 +1833,7 @@ int cmd_top(int argc, const char **argv) =20 if (record_opts__config(opts)) { status =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } =20 top.sym_evsel =3D evlist__first(top.evlist); @@ -1848,14 +1848,14 @@ int cmd_top(int argc, const char **argv) =20 status =3D symbol__annotation_init(); if (status < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 annotation_config__init(); =20 symbol_conf.try_vmlinux_path =3D (symbol_conf.vmlinux_name =3D=3D NULL); status =3D symbol__init(NULL); if (status < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 sort__setup_elide(stdout); =20 @@ -1875,13 +1875,13 @@ int cmd_top(int argc, const char **argv) if (top.sb_evlist =3D=3D NULL) { pr_err("Couldn't create side band evlist.\n."); status =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } =20 if (evlist__add_bpf_sb_event(top.sb_evlist, &host_env)) { pr_err("Couldn't ask for PERF_RECORD_BPF_EVENT side band events.\n."); status =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } } #endif @@ -1896,8 +1896,8 @@ int cmd_top(int argc, const char **argv) if (!opts->no_bpf_event) evlist__stop_sb_thread(top.sb_evlist); =20 -out_delete_evlist: - evlist__delete(top.evlist); +out_put_evlist: + evlist__put(top.evlist); perf_session__delete(top.session); annotation_options__exit(); perf_env__exit(&host_env); diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 377f0a18b00e..ae1977082749 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -4418,7 +4418,7 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) =20 if (trace->summary_bpf) { if (trace_prepare_bpf_summary(trace->summary_mode) < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 if (trace->summary_only) goto create_maps; @@ -4486,19 +4486,19 @@ static int trace__run(struct trace *trace, int argc= , const char **argv) err =3D evlist__create_maps(evlist, &trace->opts.target); if (err < 0) { fprintf(trace->output, "Problems parsing the target to trace, check your= options!\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 err =3D trace__symbols_init(trace, argc, argv, evlist); if (err < 0) { fprintf(trace->output, "Problems initializing symbol libraries!\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (trace->summary_mode =3D=3D SUMMARY__BY_TOTAL && !trace->summary_bpf) { trace->syscall_stats =3D alloc_syscall_stats(); if (!trace->syscall_stats) - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__config(evlist, &trace->opts, &callchain_param); @@ -4507,7 +4507,7 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) err =3D evlist__prepare_workload(evlist, &trace->opts.target, argv, fals= e, NULL); if (err < 0) { fprintf(trace->output, "Couldn't run the workload!\n"); - goto out_delete_evlist; + goto out_put_evlist; } workload_pid =3D evlist->workload.pid; } @@ -4555,7 +4555,7 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) =20 err =3D trace__expand_filters(trace, &evsel); if (err) - goto out_delete_evlist; + goto out_put_evlist; err =3D evlist__apply_filters(evlist, &evsel, &trace->opts.target); if (err < 0) goto out_error_apply_filters; @@ -4672,12 +4672,12 @@ static int trace__run(struct trace *trace, int argc= , const char **argv) } } =20 -out_delete_evlist: +out_put_evlist: trace_cleanup_bpf_summary(); delete_syscall_stats(trace->syscall_stats); trace__symbols__exit(trace); evlist__free_syscall_tp_fields(evlist); - evlist__delete(evlist); + evlist__put(evlist); cgroup__put(trace->cgroup); trace->evlist =3D NULL; trace->live =3D false; @@ -4702,21 +4702,21 @@ static int trace__run(struct trace *trace, int argc= , const char **argv) =20 out_error: fprintf(trace->output, "%s\n", errbuf); - goto out_delete_evlist; + goto out_put_evlist; =20 out_error_apply_filters: fprintf(trace->output, "Failed to set filter \"%s\" on event %s: %m\n", evsel->filter, evsel__name(evsel)); - goto out_delete_evlist; + goto out_put_evlist; } out_error_mem: fprintf(trace->output, "Not enough memory to run!\n"); - goto out_delete_evlist; + goto out_put_evlist; =20 out_errno: fprintf(trace->output, "%m\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 static int trace__replay(struct trace *trace) @@ -5396,7 +5396,7 @@ static void trace__exit(struct trace *trace) zfree(&trace->syscalls.table); } zfree(&trace->perfconfig_events); - evlist__delete(trace->evlist); + evlist__put(trace->evlist); trace->evlist =3D NULL; ordered_events__free(&trace->oe.data); #ifdef HAVE_LIBBPF_SUPPORT diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/bac= kward-ring-buffer.c index c5e7999f2817..2b49b002d749 100644 --- a/tools/perf/tests/backward-ring-buffer.c +++ b/tools/perf/tests/backward-ring-buffer.c @@ -111,7 +111,7 @@ static int test__backward_ring_buffer(struct test_suite= *test __maybe_unused, in err =3D evlist__create_maps(evlist, &opts.target); if (err < 0) { pr_debug("Not enough memory to create thread/cpu maps\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 parse_events_error__init(&parse_error); @@ -124,7 +124,7 @@ static int test__backward_ring_buffer(struct test_suite= *test __maybe_unused, in if (err) { pr_debug("Failed to parse tracepoint event, try use root\n"); ret =3D TEST_SKIP; - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__config(evlist, &opts, NULL); @@ -133,19 +133,19 @@ static int test__backward_ring_buffer(struct test_sui= te *test __maybe_unused, in if (err < 0) { pr_debug("perf_evlist__open: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 ret =3D TEST_FAIL; err =3D do_test(evlist, opts.mmap_pages, &sample_count, &comm_count); if (err !=3D TEST_OK) - goto out_delete_evlist; + goto out_put_evlist; =20 if ((sample_count !=3D NR_ITERS) || (comm_count !=3D NR_ITERS)) { pr_err("Unexpected counter: sample_count=3D%d, comm_count=3D%d\n", sample_count, comm_count); - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__close(evlist); @@ -154,16 +154,16 @@ static int test__backward_ring_buffer(struct test_sui= te *test __maybe_unused, in if (err < 0) { pr_debug("perf_evlist__open: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 err =3D do_test(evlist, 1, &sample_count, &comm_count); if (err !=3D TEST_OK) - goto out_delete_evlist; + goto out_put_evlist; =20 ret =3D TEST_OK; -out_delete_evlist: - evlist__delete(evlist); +out_put_evlist: + evlist__put(evlist); return ret; } =20 diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-readin= g.c index 47043a3a2fb4..fc65a17f67f7 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -807,7 +807,7 @@ static int do_test_code_reading(bool try_kcore) } =20 perf_evlist__set_maps(&evlist->core, NULL, NULL); - evlist__delete(evlist); + evlist__put(evlist); evlist =3D NULL; continue; } @@ -844,7 +844,7 @@ static int do_test_code_reading(bool try_kcore) out_put: thread__put(thread); out_err: - evlist__delete(evlist); + evlist__put(evlist); perf_cpu_map__put(cpus); perf_thread_map__put(threads); machine__delete(machine); diff --git a/tools/perf/tests/event-times.c b/tools/perf/tests/event-times.c index ae3b98bb42cf..94ab54ecd3f9 100644 --- a/tools/perf/tests/event-times.c +++ b/tools/perf/tests/event-times.c @@ -186,7 +186,7 @@ static int test_times(int (attach)(struct evlist *), err =3D attach(evlist); if (err =3D=3D TEST_SKIP) { pr_debug(" SKIP : not enough rights\n"); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 @@ -205,7 +205,7 @@ static int test_times(int (attach)(struct evlist *), count.ena, count.run); =20 out_err: - evlist__delete(evlist); + evlist__put(evlist); return !err ? TEST_OK : TEST_FAIL; } =20 diff --git a/tools/perf/tests/event_update.c b/tools/perf/tests/event_updat= e.c index facc65e29f20..73141b122d2f 100644 --- a/tools/perf/tests/event_update.c +++ b/tools/perf/tests/event_update.c @@ -117,7 +117,7 @@ static int test__event_update(struct test_suite *test _= _maybe_unused, int subtes TEST_ASSERT_VAL("failed to synthesize attr update cpus", !perf_event__synthesize_event_update_cpus(&tmp.tool, evsel, process_eve= nt_cpus)); =20 - evlist__delete(evlist); + evlist__put(evlist); return 0; } =20 diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evs= el-roundtrip-name.c index 1922cac13a24..6a220634c52f 100644 --- a/tools/perf/tests/evsel-roundtrip-name.c +++ b/tools/perf/tests/evsel-roundtrip-name.c @@ -33,7 +33,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) if (err) { pr_debug("Failure to parse cache event '%s' possibly as PMUs don't su= pport it", name); - evlist__delete(evlist); + evlist__put(evlist); continue; } evlist__for_each_entry(evlist, evsel) { @@ -42,7 +42,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) ret =3D TEST_FAIL; } } - evlist__delete(evlist); + evlist__put(evlist); } } } @@ -66,7 +66,7 @@ static int perf_evsel__name_array_test(const char *const = names[], int nr_names) if (err) { pr_debug("failed to parse event '%s', err %d\n", names[i], err); - evlist__delete(evlist); + evlist__put(evlist); ret =3D TEST_FAIL; continue; } @@ -76,7 +76,7 @@ static int perf_evsel__name_array_test(const char *const = names[], int nr_names) ret =3D TEST_FAIL; } } - evlist__delete(evlist); + evlist__put(evlist); } return ret; } diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.c index dd547f2f77cc..a7a445f12693 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -106,7 +106,7 @@ static int expand_default_events(void) TEST_ASSERT_VAL("failed to get evlist", evlist); =20 ret =3D test_expand_events(evlist); - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 @@ -133,7 +133,7 @@ static int expand_group_events(void) ret =3D test_expand_events(evlist); out: parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 @@ -164,7 +164,7 @@ static int expand_libpfm_events(void) =20 ret =3D test_expand_events(evlist); out: - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 @@ -188,7 +188,7 @@ static int expand_metric_events(void) ret =3D test_expand_events(evlist); =20 out: - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cum= ulate.c index 267cbc24691a..3467d782d4bd 100644 --- a/tools/perf/tests/hists_cumulate.c +++ b/tools/perf/tests/hists_cumulate.c @@ -743,7 +743,7 @@ static int test__hists_cumulate(struct test_suite *test= __maybe_unused, int subt =20 out: /* tear down everything */ - evlist__delete(evlist); + evlist__put(evlist); machines__exit(&machines); put_fake_samples(); =20 diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filte= r.c index 002e3a4c1ca5..57513763da36 100644 --- a/tools/perf/tests/hists_filter.c +++ b/tools/perf/tests/hists_filter.c @@ -331,7 +331,7 @@ static int test__hists_filter(struct test_suite *test _= _maybe_unused, int subtes =20 out: /* tear down everything */ - evlist__delete(evlist); + evlist__put(evlist); reset_output_field(); machines__exit(&machines); put_fake_samples(); diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c index 996f5f0b3bd1..9646c3b7b4de 100644 --- a/tools/perf/tests/hists_link.c +++ b/tools/perf/tests/hists_link.c @@ -352,7 +352,7 @@ static int test__hists_link(struct test_suite *test __m= aybe_unused, int subtest =20 out: /* tear down everything */ - evlist__delete(evlist); + evlist__put(evlist); reset_output_field(); machines__exit(&machines); put_fake_samples(); diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_outpu= t.c index fa683fd7b1e5..2aa254ff10f4 100644 --- a/tools/perf/tests/hists_output.c +++ b/tools/perf/tests/hists_output.c @@ -630,7 +630,7 @@ static int test__hists_output(struct test_suite *test _= _maybe_unused, int subtes =20 out: /* tear down everything */ - evlist__delete(evlist); + evlist__put(evlist); machines__exit(&machines); put_fake_samples(); =20 diff --git a/tools/perf/tests/hwmon_pmu.c b/tools/perf/tests/hwmon_pmu.c index 62e0841a6c31..9e89051e7fdc 100644 --- a/tools/perf/tests/hwmon_pmu.c +++ b/tools/perf/tests/hwmon_pmu.c @@ -215,7 +215,7 @@ static int do_test(size_t i, bool with_pmu, bool with_a= lias) =20 out: parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-track= ing.c index 729cc9cc1cb7..51cfd6522867 100644 --- a/tools/perf/tests/keep-tracking.c +++ b/tools/perf/tests/keep-tracking.c @@ -153,7 +153,7 @@ static int test__keep_tracking(struct test_suite *test = __maybe_unused, int subte out_err: if (evlist) { evlist__disable(evlist); - evlist__delete(evlist); + evlist__put(evlist); } perf_cpu_map__put(cpus); perf_thread_map__put(threads); diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c index a69cd1046e9a..5ff58eb2af8d 100644 --- a/tools/perf/tests/mmap-basic.c +++ b/tools/perf/tests/mmap-basic.c @@ -94,7 +94,7 @@ static int test__basic_mmap(struct test_suite *test __may= be_unused, int subtest /* Permissions failure, flag the failure as a skip. */ err =3D TEST_SKIP; } - goto out_delete_evlist; + goto out_put_evlist; } =20 evsels[i]->core.attr.wakeup_events =3D 1; @@ -106,7 +106,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest pr_debug("failed to open counter: %s, " "tweak /proc/sys/kernel/perf_event_paranoid?\n", str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 nr_events[i] =3D 0; @@ -116,7 +116,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest if (evlist__mmap(evlist, 128) < 0) { pr_debug("failed to mmap events: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 for (i =3D 0; i < nsyscalls; ++i) @@ -134,7 +134,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest if (event->header.type !=3D PERF_RECORD_SAMPLE) { pr_debug("unexpected %s event\n", perf_event__name(event->header.type)); - goto out_delete_evlist; + goto out_put_evlist; } =20 perf_sample__init(&sample, /*all=3D*/false); @@ -142,7 +142,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest if (err) { pr_err("Can't parse sample, err =3D %d\n", err); perf_sample__exit(&sample); - goto out_delete_evlist; + goto out_put_evlist; } =20 err =3D -1; @@ -153,7 +153,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest if (evsel =3D=3D NULL) { pr_debug("event with id %" PRIu64 " doesn't map to an evsel\n", sample.id); - goto out_delete_evlist; + goto out_put_evlist; } nr_events[evsel->core.idx]++; perf_mmap__consume(&md->core); @@ -168,12 +168,12 @@ static int test__basic_mmap(struct test_suite *test _= _maybe_unused, int subtest expected_nr_events[evsel->core.idx], evsel__name(evsel), nr_events[evsel->core.idx]); err =3D -1; - goto out_delete_evlist; + goto out_put_evlist; } } =20 -out_delete_evlist: - evlist__delete(evlist); +out_put_evlist: + evlist__put(evlist); out_free_cpus: perf_cpu_map__put(cpus); out_free_threads: diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests= /openat-syscall-tp-fields.c index 9ff8caff98c3..b30f286fb421 100644 --- a/tools/perf/tests/openat-syscall-tp-fields.c +++ b/tools/perf/tests/openat-syscall-tp-fields.c @@ -51,7 +51,7 @@ static int test__syscall_openat_tp_fields(struct test_sui= te *test __maybe_unused if (IS_ERR(evsel)) { pr_debug("%s: evsel__newtp\n", __func__); ret =3D PTR_ERR(evsel) =3D=3D -EACCES ? TEST_SKIP : TEST_FAIL; - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__add(evlist, evsel); @@ -59,7 +59,7 @@ static int test__syscall_openat_tp_fields(struct test_sui= te *test __maybe_unused err =3D evlist__create_maps(evlist, &opts.target); if (err < 0) { pr_debug("%s: evlist__create_maps\n", __func__); - goto out_delete_evlist; + goto out_put_evlist; } =20 evsel__config(evsel, &opts, NULL); @@ -70,14 +70,14 @@ static int test__syscall_openat_tp_fields(struct test_s= uite *test __maybe_unused if (err < 0) { pr_debug("perf_evlist__open: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 err =3D evlist__mmap(evlist, UINT_MAX); if (err < 0) { pr_debug("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__enable(evlist); @@ -115,7 +115,7 @@ static int test__syscall_openat_tp_fields(struct test_s= uite *test __maybe_unused if (err) { pr_debug("Can't parse sample, err =3D %d\n", err); perf_sample__exit(&sample); - goto out_delete_evlist; + goto out_put_evlist; } =20 tp_flags =3D perf_sample__intval(&sample, "flags"); @@ -126,7 +126,7 @@ static int test__syscall_openat_tp_fields(struct test_s= uite *test __maybe_unused (tp_flags & flags) !=3D flags) { pr_debug("%s: Expected flags=3D%#x, got %#x\n", __func__, flags, tp_flags); - goto out_delete_evlist; + goto out_put_evlist; } =20 goto out_ok; @@ -139,13 +139,13 @@ static int test__syscall_openat_tp_fields(struct test= _suite *test __maybe_unused =20 if (++nr_polls > 5) { pr_debug("%s: no events!\n", __func__); - goto out_delete_evlist; + goto out_put_evlist; } } out_ok: ret =3D TEST_OK; -out_delete_evlist: - evlist__delete(evlist); +out_put_evlist: + evlist__put(evlist); out: return ret; } diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 05c3e899b425..19dc7b7475d2 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -2568,7 +2568,7 @@ static int test_event(const struct evlist_test *e) ret =3D e->check(evlist); } parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); =20 return ret; } @@ -2594,7 +2594,7 @@ static int test_event_fake_pmu(const char *str) } =20 parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); =20 return ret; } diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.c index 7c7f489a5eb0..3f0ec839c056 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -84,7 +84,7 @@ static int __compute_metric(const char *name, struct valu= e *vals, =20 cpus =3D perf_cpu_map__new("0"); if (!cpus) { - evlist__delete(evlist); + evlist__put(evlist); return -ENOMEM; } =20 @@ -113,7 +113,7 @@ static int __compute_metric(const char *name, struct va= lue *vals, /* ... cleanup. */ evlist__free_stats(evlist); perf_cpu_map__put(cpus); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/p= arse-no-sample-id-all.c index 8ac862c94879..78bb8db19240 100644 --- a/tools/perf/tests/parse-no-sample-id-all.c +++ b/tools/perf/tests/parse-no-sample-id-all.c @@ -49,7 +49,7 @@ static int process_events(union perf_event **events, size= _t count) for (i =3D 0; i < count && !err; i++) err =3D process_event(&evlist, events[i]); =20 - evlist__delete(evlist); + evlist__put(evlist); =20 return err; } diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c index ad44cc68820b..f95752b2ed1c 100644 --- a/tools/perf/tests/perf-record.c +++ b/tools/perf/tests/perf-record.c @@ -105,7 +105,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest err =3D evlist__create_maps(evlist, &opts.target); if (err < 0) { pr_debug("Not enough memory to create thread/cpu maps\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -117,7 +117,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest err =3D evlist__prepare_workload(evlist, &opts.target, argv, false, NULL); if (err < 0) { pr_debug("Couldn't run the workload!\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -134,7 +134,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest pr_debug("sched__get_first_possible_cpu: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__cancel_workload(evlist); - goto out_delete_evlist; + goto out_put_evlist; } =20 cpu =3D err; @@ -146,7 +146,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest pr_debug("sched_setaffinity: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__cancel_workload(evlist); - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -158,7 +158,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest pr_debug("perf_evlist__open: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__cancel_workload(evlist); - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -171,7 +171,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest pr_debug("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__cancel_workload(evlist); - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -209,7 +209,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest if (verbose > 0) perf_event__fprintf(event, NULL, stderr); pr_debug("Couldn't parse sample\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (verbose > 0) { @@ -350,9 +350,9 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest pr_debug("PERF_RECORD_MMAP for %s missing!\n", "[vdso]"); ++errs; } -out_delete_evlist: +out_put_evlist: CPU_FREE(cpu_mask); - evlist__delete(evlist); + evlist__put(evlist); out: perf_sample__exit(&sample); if (err =3D=3D -EACCES) diff --git a/tools/perf/tests/perf-time-to-tsc.c b/tools/perf/tests/perf-ti= me-to-tsc.c index cca41bd37ae3..d3538fa20af3 100644 --- a/tools/perf/tests/perf-time-to-tsc.c +++ b/tools/perf/tests/perf-time-to-tsc.c @@ -201,7 +201,7 @@ static int test__perf_time_to_tsc(struct test_suite *te= st __maybe_unused, int su err =3D TEST_OK; =20 out_err: - evlist__delete(evlist); + evlist__put(evlist); perf_cpu_map__put(cpus); perf_thread_map__put(threads); return err; diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c index fca4a86452df..8d19b1bfecbc 100644 --- a/tools/perf/tests/pfm.c +++ b/tools/perf/tests/pfm.c @@ -80,7 +80,7 @@ static int test__pfm_events(struct test_suite *test __may= be_unused, evlist__nr_groups(evlist), 0); =20 - evlist__delete(evlist); + evlist__put(evlist); } return 0; } @@ -165,7 +165,7 @@ static int test__pfm_group(struct test_suite *test __ma= ybe_unused, evlist__nr_groups(evlist), table[i].nr_groups); =20 - evlist__delete(evlist); + evlist__put(evlist); } return 0; } diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index fd5630f0a13c..4ea6d392085b 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -798,7 +798,7 @@ static int check_parse_id(const char *id, struct parse_= events_error *error) /*warn_if_reordered=3D*/true, /*fake_tp=3D*/false); free(dup); =20 - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 @@ -865,7 +865,7 @@ static int test__parsing_callback(const struct pmu_metr= ic *pm, =20 cpus =3D perf_cpu_map__new("0"); if (!cpus) { - evlist__delete(evlist); + evlist__put(evlist); return -ENOMEM; } =20 @@ -919,7 +919,7 @@ static int test__parsing_callback(const struct pmu_metr= ic *pm, /* ... cleanup. */ evlist__free_stats(evlist); perf_cpu_map__put(cpus); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index d7be9d1c6f52..13e8d7fa80af 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -294,7 +294,7 @@ static int test__pmu_config_helpers(struct test_suite *= test __maybe_unused, ret =3D TEST_OK; err_out: parse_events_terms__exit(&terms); - evlist__delete(evlist); + evlist__put(evlist); test_pmu_put(dir, pmu); return ret; } @@ -346,7 +346,7 @@ static int test__pmu_events(struct test_suite *test __m= aybe_unused, int subtest ret =3D TEST_OK; err_out: parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); test_pmu_put(dir, pmu); return ret; } diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c index b6e46975379c..bb6b62cf51d1 100644 --- a/tools/perf/tests/sw-clock.c +++ b/tools/perf/tests/sw-clock.c @@ -59,7 +59,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_i= d) evsel =3D evsel__new(&attr); if (evsel =3D=3D NULL) { pr_debug("evsel__new\n"); - goto out_delete_evlist; + goto out_put_evlist; } evlist__add(evlist, evsel); =20 @@ -68,7 +68,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_i= d) if (!cpus || !threads) { err =3D -ENOMEM; pr_debug("Not enough memory to create thread/cpu maps\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 perf_evlist__set_maps(&evlist->core, cpus, threads); @@ -80,14 +80,14 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock= _id) pr_debug("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64 " in= this test.\n", str_error_r(errno, sbuf, sizeof(sbuf)), knob, (u64)attr.sample_freq); - goto out_delete_evlist; + goto out_put_evlist; } =20 err =3D evlist__mmap(evlist, 128); if (err < 0) { pr_debug("failed to mmap event: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__enable(evlist); @@ -113,7 +113,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock= _id) if (err < 0) { pr_debug("Error during parse sample\n"); perf_sample__exit(&sample); - goto out_delete_evlist; + goto out_put_evlist; } =20 total_periods +=3D sample.period; @@ -131,10 +131,10 @@ static int __test__sw_clock_freq(enum perf_sw_ids clo= ck_id) err =3D -1; } =20 -out_delete_evlist: +out_put_evlist: perf_cpu_map__put(cpus); perf_thread_map__put(threads); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-t= racking.c index e32331fee277..abd08d60179c 100644 --- a/tools/perf/tests/switch-tracking.c +++ b/tools/perf/tests/switch-tracking.c @@ -582,7 +582,7 @@ static int test__switch_tracking(struct test_suite *tes= t __maybe_unused, int sub out: if (evlist) { evlist__disable(evlist); - evlist__delete(evlist); + evlist__put(evlist); } perf_cpu_map__put(cpus); perf_thread_map__put(threads); diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index 4053ff2813bb..a46650b10689 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c @@ -74,7 +74,7 @@ static int test__task_exit(struct test_suite *test __mayb= e_unused, int subtest _ if (!cpus || !threads) { err =3D -ENOMEM; pr_debug("Not enough memory to create thread/cpu maps\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 perf_evlist__set_maps(&evlist->core, cpus, threads); @@ -82,7 +82,7 @@ static int test__task_exit(struct test_suite *test __mayb= e_unused, int subtest _ err =3D evlist__prepare_workload(evlist, &target, argv, false, workload_e= xec_failed_signal); if (err < 0) { pr_debug("Couldn't run the workload!\n"); - goto out_delete_evlist; + goto out_put_evlist; } =20 evsel =3D evlist__first(evlist); @@ -101,14 +101,14 @@ static int test__task_exit(struct test_suite *test __= maybe_unused, int subtest _ if (err < 0) { pr_debug("Couldn't open the evlist: %s\n", str_error_r(-err, sbuf, sizeof(sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } =20 if (evlist__mmap(evlist, 128) < 0) { pr_debug("failed to mmap events: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); err =3D -1; - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist__start_workload(evlist); @@ -133,7 +133,7 @@ static int test__task_exit(struct test_suite *test __ma= ybe_unused, int subtest _ if (retry_count++ > 1000) { pr_debug("Failed after retrying 1000 times\n"); err =3D -1; - goto out_delete_evlist; + goto out_put_evlist; } =20 goto retry; @@ -144,10 +144,10 @@ static int test__task_exit(struct test_suite *test __= maybe_unused, int subtest _ err =3D -1; } =20 -out_delete_evlist: +out_put_evlist: perf_cpu_map__put(cpus); perf_thread_map__put(threads); - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/tests/tool_pmu.c b/tools/perf/tests/tool_pmu.c index 1e900ef92e37..e78ff9dcea97 100644 --- a/tools/perf/tests/tool_pmu.c +++ b/tools/perf/tests/tool_pmu.c @@ -67,7 +67,7 @@ static int do_test(enum tool_pmu_event ev, bool with_pmu) =20 out: parse_events_error__exit(&err); - evlist__delete(evlist); + evlist__put(evlist); return ret; } =20 diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index bd7b859dea66..15741abec8c6 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -58,7 +58,7 @@ static int session_write_header(char *path) !perf_session__write_header(session, session->evlist, perf_data__fd(&data), true)); =20 - evlist__delete(session->evlist); + evlist__put(session->evlist); perf_session__delete(session); =20 return 0; diff --git a/tools/perf/tests/uncore-event-sorting.c b/tools/perf/tests/unc= ore-event-sorting.c index 7d2fc304e21f..2e741aef4a59 100644 --- a/tools/perf/tests/uncore-event-sorting.c +++ b/tools/perf/tests/uncore-event-sorting.c @@ -165,7 +165,7 @@ static int test__uncore_event_sorting(struct test_suite= *test __maybe_unused, ret =3D TEST_OK; =20 out_err: - evlist__delete(evlist); + evlist__put(evlist); parse_events_error__exit(&err); zfree(&pmu_prefix); zfree(&m.event1); diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 1b5664d1481f..652a45aac828 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -520,8 +520,8 @@ int evlist__expand_cgroup(struct evlist *evlist, const = char *str, bool open_cgro cgrp_event_expanded =3D true; =20 out_err: - evlist__delete(orig_list); - evlist__delete(tmp_list); + evlist__put(orig_list); + evlist__put(tmp_list); metricgroup__rblist_exit(&orig_metric_events); release_cgroup_list(); =20 diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-conve= rt-bt.c index 5ff46bfcd0e1..e222371394c0 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -1362,7 +1362,7 @@ static void cleanup_events(struct perf_session *sessi= on) zfree(&evsel->priv); } =20 - evlist__delete(evlist); + evlist__put(evlist); session->evlist =3D NULL; } =20 diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index ab6bf5e935f4..82cc33259d81 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -75,7 +75,7 @@ int sigqueue(pid_t pid, int sig, const union sigval value= ); #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y)) #define SID(e, x, y) xyarray__entry(e->core.sample_id, x, y) =20 -void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, +static void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, struct perf_thread_map *threads) { perf_evlist__init(&evlist->core); @@ -88,6 +88,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_= map *cpus, evlist->nr_br_cntr =3D -1; metricgroup__rblist_init(&evlist->metric_events); INIT_LIST_HEAD(&evlist->deferred_samples); + refcount_set(&evlist->refcnt, 1); } =20 struct evlist *evlist__new(void) @@ -139,7 +140,7 @@ struct evlist *evlist__new_default(const struct target = *target, bool sample_call =20 return evlist; out_err: - evlist__delete(evlist); + evlist__put(evlist); return NULL; } =20 @@ -148,13 +149,19 @@ struct evlist *evlist__new_dummy(void) struct evlist *evlist =3D evlist__new(); =20 if (evlist && evlist__add_dummy(evlist)) { - evlist__delete(evlist); + evlist__put(evlist); evlist =3D NULL; } =20 return evlist; } =20 +struct evlist *evlist__get(struct evlist *evlist) +{ + refcount_inc(&evlist->refcnt); + return evlist; +} + /** * evlist__set_id_pos - set the positions of event ids. * @evlist: selected event list @@ -193,7 +200,7 @@ static void evlist__purge(struct evlist *evlist) evlist->core.nr_entries =3D 0; } =20 -void evlist__exit(struct evlist *evlist) +static void evlist__exit(struct evlist *evlist) { metricgroup__rblist_exit(&evlist->metric_events); event_enable_timer__exit(&evlist->eet); @@ -202,11 +209,14 @@ void evlist__exit(struct evlist *evlist) perf_evlist__exit(&evlist->core); } =20 -void evlist__delete(struct evlist *evlist) +void evlist__put(struct evlist *evlist) { if (evlist =3D=3D NULL) return; =20 + if (!refcount_dec_and_test(&evlist->refcnt)) + return; + evlist__free_stats(evlist); evlist__munmap(evlist); evlist__close(evlist); diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index e54761c670b6..a9820a6aad5b 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -61,6 +61,7 @@ struct event_enable_timer; =20 struct evlist { struct perf_evlist core; + refcount_t refcnt; bool enabled; bool no_affinity; int id_pos; @@ -109,10 +110,8 @@ struct evsel_str_handler { struct evlist *evlist__new(void); struct evlist *evlist__new_default(const struct target *target, bool sampl= e_callchains); struct evlist *evlist__new_dummy(void); -void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, - struct perf_thread_map *threads); -void evlist__exit(struct evlist *evlist); -void evlist__delete(struct evlist *evlist); +struct evlist *evlist__get(struct evlist *evlist); +void evlist__put(struct evlist *evlist); =20 void evlist__add(struct evlist *evlist, struct evsel *entry); void evlist__remove(struct evlist *evlist, struct evsel *evsel); diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 232998fef72b..8aef3c7418f7 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -468,7 +468,7 @@ double expr__has_event(const struct expr_parse_ctx *ctx= , bool compute_ids, const ret =3D parse_event(tmp, id) ? 0 : 1; } out: - evlist__delete(tmp); + evlist__put(tmp); return ret; } =20 diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index d7f41db7322c..e16362176986 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -5187,7 +5187,7 @@ int perf_session__read_header(struct perf_session *se= ssion) pr_err("Invalid ids section size %" PRIu64 " for attr %d, not aligned t= o u64\n", f_attr.ids.size, i); err =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -5200,7 +5200,7 @@ int perf_session__read_header(struct perf_session *se= ssion) pr_err("Invalid ids section size %" PRIu64 " for attr %d, too many IDs\= n", f_attr.ids.size, i); err =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } =20 /* @@ -5213,19 +5213,19 @@ int perf_session__read_header(struct perf_session *= session) pr_err("Invalid ids section for attr %d: offset=3D%" PRIu64 " size=3D%"= PRIu64 " exceeds file size %" PRIu64 "\n", i, f_attr.ids.offset, f_attr.ids.size, (u64)input_stat.st_size); err =3D -EINVAL; - goto out_delete_evlist; + goto out_put_evlist; } =20 tmp =3D lseek(fd, 0, SEEK_CUR); evsel =3D evsel__new(&f_attr.attr); =20 if (evsel =3D=3D NULL) - goto out_delete_evlist; + goto out_put_evlist; =20 evsel->needs_swap =3D header->needs_swap; /* * Do it before so that if perf_evsel__alloc_id fails, this - * entry gets purged too at evlist__delete(). + * entry gets purged too at evlist__put(). */ evlist__add(session->evlist, evsel); =20 @@ -5236,7 +5236,7 @@ int perf_session__read_header(struct perf_session *se= ssion) * hattr->ids threads. */ if (perf_evsel__alloc_id(&evsel->core, 1, nr_ids)) - goto out_delete_evlist; + goto out_put_evlist; =20 lseek(fd, f_attr.ids.offset, SEEK_SET); =20 @@ -5266,18 +5266,18 @@ int perf_session__read_header(struct perf_session *= session) err =3D perf_header__process_sections(header, fd, &session->tevent, perf_file_section__process); if (err < 0) - goto out_delete_evlist; + goto out_put_evlist; =20 if (evlist__prepare_tracepoint_events(session->evlist, session->tevent.pevent)) { err =3D -ENOMEM; - goto out_delete_evlist; + goto out_put_evlist; } #else err =3D perf_header__process_sections(header, fd, NULL, perf_file_section__process); if (err < 0) - goto out_delete_evlist; + goto out_put_evlist; #endif } =20 @@ -5303,8 +5303,8 @@ int perf_session__read_header(struct perf_session *se= ssion) out_errno: return -errno; =20 -out_delete_evlist: - evlist__delete(session->evlist); +out_put_evlist: + evlist__put(session->evlist); session->evlist =3D NULL; return err; } diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index c2ce3e53aaee..2c4e9fefb41f 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -214,7 +214,7 @@ static void metric__free(struct metric *m) zfree(&m->metric_refs); expr__ctx_free(m->pctx); zfree(&m->modifier); - evlist__delete(m->evlist); + evlist__put(m->evlist); free(m); } =20 @@ -1331,7 +1331,7 @@ static int parse_ids(bool metric_no_merge, bool fake_= pmu, parsed_evlist =3D NULL; err_out: parse_events_error__exit(&parse_error); - evlist__delete(parsed_evlist); + evlist__put(parsed_evlist); strbuf_release(&events); return ret; } @@ -1542,7 +1542,7 @@ static int parse_groups(struct evlist *perf_evlist, =20 if (combined_evlist) { evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries); - evlist__delete(combined_evlist); + evlist__put(combined_evlist); } =20 list_for_each_entry(m, &metric_list, nd) { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 943569e82b82..8fb5626d5d37 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2343,7 +2343,7 @@ int __parse_events(struct evlist *evlist, const char = *str, const char *pmu_filte =20 /* * There are 2 users - builtin-record and builtin-test objects. - * Both call evlist__delete in case of error, so we dont + * Both call evlist__put in case of error, so we dont * need to bother. */ return ret; @@ -2546,7 +2546,7 @@ int parse_events_option_new_evlist(const struct optio= n *opt, const char *str, in } ret =3D parse_events_option(opt, str, unset); if (ret) { - evlist__delete(*args->evlistp); + evlist__put(*args->evlistp); *args->evlistp =3D NULL; } =20 diff --git a/tools/perf/util/perf_api_probe.c b/tools/perf/util/perf_api_pr= obe.c index e1904a330b28..f61c4ec52827 100644 --- a/tools/perf/util/perf_api_probe.c +++ b/tools/perf/util/perf_api_probe.c @@ -57,7 +57,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, struct = perf_cpu cpu, const cha err =3D 0; =20 out_delete: - evlist__delete(evlist); + evlist__put(evlist); return err; } =20 diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 98a8dd9b673d..7483741c024a 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1292,7 +1292,7 @@ static int pyrf_evsel__setup_types(void) struct pyrf_evlist { PyObject_HEAD =20 - struct evlist evlist; + struct evlist *evlist; }; =20 static int pyrf_evlist__init(struct pyrf_evlist *pevlist, @@ -1302,18 +1302,27 @@ static int pyrf_evlist__init(struct pyrf_evlist *pe= vlist, struct perf_cpu_map *cpus; struct perf_thread_map *threads; =20 - if (!PyArg_ParseTuple(args, "OO", &pcpus, &pthreads)) + if (!PyArg_ParseTuple(args, "O!O!", + &pyrf_cpu_map__type, &pcpus, + &pyrf_thread_map__type, &pthreads)) return -1; =20 + evlist__put(pevlist->evlist); + pevlist->evlist =3D evlist__new(); + if (!pevlist->evlist) { + PyErr_NoMemory(); + return -1; + } threads =3D ((struct pyrf_thread_map *)pthreads)->threads; cpus =3D ((struct pyrf_cpu_map *)pcpus)->cpus; - evlist__init(&pevlist->evlist, cpus, threads); + perf_evlist__set_maps(&pevlist->evlist->core, cpus, threads); + return 0; } =20 static void pyrf_evlist__delete(struct pyrf_evlist *pevlist) { - evlist__exit(&pevlist->evlist); + evlist__put(pevlist->evlist); Py_TYPE(pevlist)->tp_free((PyObject*)pevlist); } =20 @@ -1322,7 +1331,7 @@ static PyObject *pyrf_evlist__all_cpus(struct pyrf_ev= list *pevlist) struct pyrf_cpu_map *pcpu_map =3D PyObject_New(struct pyrf_cpu_map, &pyrf= _cpu_map__type); =20 if (pcpu_map) - pcpu_map->cpus =3D perf_cpu_map__get(pevlist->evlist.core.all_cpus); + pcpu_map->cpus =3D perf_cpu_map__get(pevlist->evlist->core.all_cpus); =20 return (PyObject *)pcpu_map; } @@ -1335,7 +1344,7 @@ static PyObject *pyrf_evlist__metrics(struct pyrf_evl= ist *pevlist) if (!list) return NULL; =20 - for (node =3D rb_first_cached(&pevlist->evlist.metric_events.entries); no= de; + for (node =3D rb_first_cached(&pevlist->evlist->metric_events.entries); n= ode; node =3D rb_next(node)) { struct metric_event *me =3D container_of(node, struct metric_event, nd); struct list_head *pos; @@ -1441,7 +1450,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, if (!PyArg_ParseTuple(args, "sii", &metric, &cpu, &thread)) return NULL; =20 - for (node =3D rb_first_cached(&pevlist->evlist.metric_events.entries); + for (node =3D rb_first_cached(&pevlist->evlist->metric_events.entries); mexp =3D=3D NULL && node; node =3D rb_next(node)) { struct metric_event *me =3D container_of(node, struct metric_event, nd); @@ -1457,7 +1466,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, if (e->metric_events[0] =3D=3D NULL) continue; =20 - evlist__for_each_entry(&pevlist->evlist, pos2) { + evlist__for_each_entry(pevlist->evlist, pos2) { if (pos2->metric_leader !=3D e->metric_events[0]) continue; cpu_idx =3D perf_cpu_map__idx(pos2->core.cpus, @@ -1502,7 +1511,7 @@ static PyObject *pyrf_evlist__compute_metric(struct p= yrf_evlist *pevlist, static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; static char *kwlist[] =3D { "pages", "overwrite", NULL }; int pages =3D 128, overwrite =3D false; =20 @@ -1522,7 +1531,7 @@ static PyObject *pyrf_evlist__mmap(struct pyrf_evlist= *pevlist, static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; static char *kwlist[] =3D { "timeout", NULL }; int timeout =3D -1, n; =20 @@ -1542,7 +1551,7 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyrf_= evlist *pevlist, PyObject *args __maybe_unused, PyObject *kwargs __maybe_unused) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; PyObject *list =3D PyList_New(0); int i; =20 @@ -1571,7 +1580,7 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist = *pevlist, PyObject *args, PyObject *kwargs __maybe_unused) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; PyObject *pevsel; struct evsel *evsel; =20 @@ -1603,7 +1612,7 @@ static struct mmap *get_md(struct evlist *evlist, int= cpu) static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; union perf_event *event; int sample_id_all =3D 1, cpu; static char *kwlist[] =3D { "cpu", "sample_id_all", NULL }; @@ -1660,7 +1669,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf= _evlist *pevlist, static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; =20 if (evlist__open(evlist) < 0) { PyErr_SetFromErrno(PyExc_OSError); @@ -1673,7 +1682,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist= *pevlist, =20 static PyObject *pyrf_evlist__close(struct pyrf_evlist *pevlist) { - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; =20 evlist__close(evlist); =20 @@ -1699,7 +1708,7 @@ static PyObject *pyrf_evlist__config(struct pyrf_evli= st *pevlist) .no_buffering =3D true, .no_inherit =3D true, }; - struct evlist *evlist =3D &pevlist->evlist; + struct evlist *evlist =3D pevlist->evlist; =20 evlist__config(evlist, &opts, &callchain_param); Py_INCREF(Py_None); @@ -1708,14 +1717,14 @@ static PyObject *pyrf_evlist__config(struct pyrf_ev= list *pevlist) =20 static PyObject *pyrf_evlist__disable(struct pyrf_evlist *pevlist) { - evlist__disable(&pevlist->evlist); + evlist__disable(pevlist->evlist); Py_INCREF(Py_None); return Py_None; } =20 static PyObject *pyrf_evlist__enable(struct pyrf_evlist *pevlist) { - evlist__enable(&pevlist->evlist); + evlist__enable(pevlist->evlist); Py_INCREF(Py_None); return Py_None; } @@ -1806,7 +1815,26 @@ static Py_ssize_t pyrf_evlist__length(PyObject *obj) { struct pyrf_evlist *pevlist =3D (void *)obj; =20 - return pevlist->evlist.core.nr_entries; + if (!pevlist->evlist) + return 0; + + return pevlist->evlist->core.nr_entries; +} + +static PyObject *pyrf_evsel__from_evsel(struct evsel *evsel) +{ + struct pyrf_evsel *pevsel =3D PyObject_New(struct pyrf_evsel, &pyrf_evsel= __type); + + if (!pevsel) + return NULL; + + memset(&pevsel->evsel, 0, sizeof(pevsel->evsel)); + evsel__init(&pevsel->evsel, &evsel->core.attr, evsel->core.idx); + + evsel__clone(&pevsel->evsel, evsel); + if (evsel__is_group_leader(evsel)) + evsel__set_leader(&pevsel->evsel, &pevsel->evsel); + return (PyObject *)pevsel; } =20 static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i) @@ -1814,17 +1842,16 @@ static PyObject *pyrf_evlist__item(PyObject *obj, P= y_ssize_t i) struct pyrf_evlist *pevlist =3D (void *)obj; struct evsel *pos; =20 - if (i >=3D pevlist->evlist.core.nr_entries) { + if (!pevlist->evlist || i >=3D pevlist->evlist->core.nr_entries) { PyErr_SetString(PyExc_IndexError, "Index out of range"); return NULL; } =20 - evlist__for_each_entry(&pevlist->evlist, pos) { + evlist__for_each_entry(pevlist->evlist, pos) { if (i-- =3D=3D 0) break; } - - return Py_BuildValue("O", container_of(pos, struct pyrf_evsel, evsel)); + return pyrf_evsel__from_evsel(pos); } =20 static PyObject *pyrf_evlist__str(PyObject *self) @@ -1835,8 +1862,11 @@ static PyObject *pyrf_evlist__str(PyObject *self) bool first =3D true; PyObject *result; =20 + if (!pevlist->evlist) + return PyUnicode_FromString("evlist(uninitialized)"); + strbuf_addstr(&sb, "evlist(["); - evlist__for_each_entry(&pevlist->evlist, pos) { + evlist__for_each_entry(pevlist->evlist, pos) { if (!first) strbuf_addch(&sb, ','); if (!pos->pmu) @@ -1858,6 +1888,24 @@ static PySequenceMethods pyrf_evlist__sequence_metho= ds =3D { =20 static const char pyrf_evlist__doc[] =3D PyDoc_STR("perf event selector li= st object."); =20 +static PyObject *pyrf_evlist__getattro(struct pyrf_evlist *pevlist, PyObje= ct *attr_name) +{ + if (!pevlist->evlist) { + PyErr_SetString(PyExc_ValueError, "evlist not initialized"); + return NULL; + } + return PyObject_GenericGetAttr((PyObject *) pevlist, attr_name); +} + +static int pyrf_evlist__setattro(struct pyrf_evlist *pevlist, PyObject *at= tr_name, PyObject *value) +{ + if (!pevlist->evlist) { + PyErr_SetString(PyExc_ValueError, "evlist not initialized"); + return -1; + } + return PyObject_GenericSetAttr((PyObject *) pevlist, attr_name, value); +} + static PyTypeObject pyrf_evlist__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.evlist", @@ -1870,11 +1918,23 @@ static PyTypeObject pyrf_evlist__type =3D { .tp_init =3D (initproc)pyrf_evlist__init, .tp_repr =3D pyrf_evlist__str, .tp_str =3D pyrf_evlist__str, + .tp_getattro =3D (getattrofunc) pyrf_evlist__getattro, + .tp_setattro =3D (setattrofunc) pyrf_evlist__setattro, }; =20 +static PyObject *pyrf_evlist__new(PyTypeObject *type, PyObject *args, PyOb= ject *kwargs) +{ + struct pyrf_evlist *pevlist; + + pevlist =3D (struct pyrf_evlist *)PyType_GenericNew(type, args, kwargs); + if (pevlist) + pevlist->evlist =3D NULL; + return (PyObject *)pevlist; +} + static int pyrf_evlist__setup_types(void) { - pyrf_evlist__type.tp_new =3D PyType_GenericNew; + pyrf_evlist__type.tp_new =3D pyrf_evlist__new; return PyType_Ready(&pyrf_evlist__type); } =20 @@ -1977,157 +2037,74 @@ static PyObject *pyrf__tracepoint(struct pyrf_evse= l *pevsel, return PyLong_FromLong(tp_pmu__id(sys, name)); } =20 -static PyObject *pyrf_evsel__from_evsel(struct evsel *evsel) -{ - struct pyrf_evsel *pevsel =3D PyObject_New(struct pyrf_evsel, &pyrf_evsel= __type); - - if (!pevsel) - return NULL; - - memset(&pevsel->evsel, 0, sizeof(pevsel->evsel)); - evsel__init(&pevsel->evsel, &evsel->core.attr, evsel->core.idx); - - evsel__clone(&pevsel->evsel, evsel); - if (evsel__is_group_leader(evsel)) - evsel__set_leader(&pevsel->evsel, &pevsel->evsel); - return (PyObject *)pevsel; -} - -static int evlist__pos(struct evlist *evlist, struct evsel *evsel) -{ - struct evsel *pos; - int idx =3D 0; - - evlist__for_each_entry(evlist, pos) { - if (evsel =3D=3D pos) - return idx; - idx++; - } - return -1; -} - -static struct evsel *evlist__at(struct evlist *evlist, int idx) -{ - struct evsel *pos; - int idx2 =3D 0; - - evlist__for_each_entry(evlist, pos) { - if (idx =3D=3D idx2) - return pos; - idx2++; - } - return NULL; -} - static PyObject *pyrf_evlist__from_evlist(struct evlist *evlist) { struct pyrf_evlist *pevlist =3D PyObject_New(struct pyrf_evlist, &pyrf_ev= list__type); - struct evsel *pos; - struct rb_node *node; =20 if (!pevlist) return NULL; =20 - memset(&pevlist->evlist, 0, sizeof(pevlist->evlist)); - evlist__init(&pevlist->evlist, evlist->core.all_cpus, evlist->core.thread= s); - evlist__for_each_entry(evlist, pos) { - struct pyrf_evsel *pevsel =3D (void *)pyrf_evsel__from_evsel(pos); - - evlist__add(&pevlist->evlist, &pevsel->evsel); - } - evlist__for_each_entry(&pevlist->evlist, pos) { - struct evsel *leader =3D evsel__leader(pos); - - if (pos !=3D leader) { - int idx =3D evlist__pos(evlist, leader); - - if (idx >=3D 0) - evsel__set_leader(pos, evlist__at(&pevlist->evlist, idx)); - else if (leader =3D=3D NULL) - evsel__set_leader(pos, pos); - } - - leader =3D pos->metric_leader; - - if (pos !=3D leader) { - int idx =3D evlist__pos(evlist, leader); - - if (idx >=3D 0) - pos->metric_leader =3D evlist__at(&pevlist->evlist, idx); - else if (leader =3D=3D NULL) - pos->metric_leader =3D pos; - } - } - metricgroup__copy_metric_events(&pevlist->evlist, /*cgrp=3D*/NULL, - &pevlist->evlist.metric_events, - &evlist->metric_events); - for (node =3D rb_first_cached(&pevlist->evlist.metric_events.entries); no= de; - node =3D rb_next(node)) { - struct metric_event *me =3D container_of(node, struct metric_event, nd); - struct list_head *mpos; - int idx =3D evlist__pos(evlist, me->evsel); - - if (idx >=3D 0) - me->evsel =3D evlist__at(&pevlist->evlist, idx); - list_for_each(mpos, &me->head) { - struct metric_expr *e =3D container_of(mpos, struct metric_expr, nd); - - for (int j =3D 0; e->metric_events[j]; j++) { - idx =3D evlist__pos(evlist, e->metric_events[j]); - if (idx >=3D 0) - e->metric_events[j] =3D evlist__at(&pevlist->evlist, idx); - } - } - } + pevlist->evlist =3D evlist__get(evlist); return (PyObject *)pevlist; } =20 static PyObject *pyrf__parse_events(PyObject *self, PyObject *args) { const char *input; - struct evlist evlist =3D {}; + struct evlist *evlist =3D evlist__new(); struct parse_events_error err; PyObject *result; PyObject *pcpus =3D NULL, *pthreads =3D NULL; struct perf_cpu_map *cpus; struct perf_thread_map *threads; =20 - if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads)) + if (!evlist) + return PyErr_NoMemory(); + + if (!PyArg_ParseTuple(args, "s|OO", &input, &pcpus, &pthreads)) { + evlist__put(evlist); return NULL; + } =20 threads =3D pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NU= LL; cpus =3D pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL; =20 parse_events_error__init(&err); - evlist__init(&evlist, cpus, threads); - if (parse_events(&evlist, input, &err)) { + perf_evlist__set_maps(&evlist->core, cpus, threads); + if (parse_events(evlist, input, &err)) { parse_events_error__print(&err, input); PyErr_SetFromErrno(PyExc_OSError); + evlist__put(evlist); return NULL; } - result =3D pyrf_evlist__from_evlist(&evlist); - evlist__exit(&evlist); + result =3D pyrf_evlist__from_evlist(evlist); + evlist__put(evlist); return result; } =20 static PyObject *pyrf__parse_metrics(PyObject *self, PyObject *args) { const char *input, *pmu =3D NULL; - struct evlist evlist =3D {}; + struct evlist *evlist =3D evlist__new(); PyObject *result; PyObject *pcpus =3D NULL, *pthreads =3D NULL; struct perf_cpu_map *cpus; struct perf_thread_map *threads; int ret; =20 - if (!PyArg_ParseTuple(args, "s|sOO", &input, &pmu, &pcpus, &pthreads)) + if (!evlist) + return PyErr_NoMemory(); + + if (!PyArg_ParseTuple(args, "s|sOO", &input, &pmu, &pcpus, &pthreads)) { + evlist__put(evlist); return NULL; + } =20 threads =3D pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NU= LL; cpus =3D pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL; =20 - evlist__init(&evlist, cpus, threads); - ret =3D metricgroup__parse_groups(&evlist, pmu ?: "all", input, + perf_evlist__set_maps(&evlist->core, cpus, threads); + ret =3D metricgroup__parse_groups(evlist, pmu ?: "all", input, /*metric_no_group=3D*/ false, /*metric_no_merge=3D*/ false, /*metric_no_threshold=3D*/ true, @@ -2135,12 +2112,13 @@ static PyObject *pyrf__parse_metrics(PyObject *self= , PyObject *args) /*system_wide=3D*/true, /*hardware_aware_grouping=3D*/ false); if (ret) { + evlist__put(evlist); errno =3D -ret; PyErr_SetFromErrno(PyExc_OSError); return NULL; } - result =3D pyrf_evlist__from_evlist(&evlist); - evlist__exit(&evlist); + result =3D pyrf_evlist__from_evlist(evlist); + evlist__put(evlist); return result; } =20 diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index e867de8ddaaa..8a5fc7d5e43c 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -264,7 +264,7 @@ bool evlist__can_select_event(struct evlist *evlist, co= nst char *str) ret =3D true; =20 out_delete: - evlist__delete(temp_evlist); + evlist__put(temp_evlist); return ret; } =20 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1a9a008ddda3..1bc25d5c2715 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -264,7 +264,7 @@ void perf_session__delete(struct perf_session *session) machines__exit(&session->machines); if (session->data) { if (perf_data__is_read(session->data)) - evlist__delete(session->evlist); + evlist__put(session->evlist); perf_data__close(session->data); } #ifdef HAVE_LIBTRACEEVENT diff --git a/tools/perf/util/sideband_evlist.c b/tools/perf/util/sideband_e= vlist.c index 388846f17bc1..b84a5463e039 100644 --- a/tools/perf/util/sideband_evlist.c +++ b/tools/perf/util/sideband_evlist.c @@ -102,7 +102,7 @@ int evlist__start_sb_thread(struct evlist *evlist, stru= ct target *target) return 0; =20 if (evlist__create_maps(evlist, target)) - goto out_delete_evlist; + goto out_put_evlist; =20 if (evlist->core.nr_entries > 1) { bool can_sample_identifier =3D perf_can_sample_identifier(); @@ -116,25 +116,25 @@ int evlist__start_sb_thread(struct evlist *evlist, st= ruct target *target) evlist__for_each_entry(evlist, counter) { if (evsel__open(counter, evlist->core.user_requested_cpus, evlist->core.threads) < 0) - goto out_delete_evlist; + goto out_put_evlist; } =20 if (evlist__mmap(evlist, UINT_MAX)) - goto out_delete_evlist; + goto out_put_evlist; =20 evlist__for_each_entry(evlist, counter) { if (evsel__enable(counter)) - goto out_delete_evlist; + goto out_put_evlist; } =20 evlist->thread.done =3D 0; if (pthread_create(&evlist->thread.th, NULL, perf_evlist__poll_thread, ev= list)) - goto out_delete_evlist; + goto out_put_evlist; =20 return 0; =20 -out_delete_evlist: - evlist__delete(evlist); +out_put_evlist: + evlist__put(evlist); evlist =3D NULL; return -1; } @@ -145,5 +145,5 @@ void evlist__stop_sb_thread(struct evlist *evlist) return; evlist->thread.done =3D 1; pthread_join(evlist->thread.th, NULL); - evlist__delete(evlist); + evlist__put(evlist); } --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11B1642EEBE for ; Fri, 5 Jun 2026 19:15:24 +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=1780686936; cv=none; b=hyTWbXXdV4HKw1cb951Rr3/Faw2XZEERkCFdmzGVEDZK7FRyYoSr7EIUMPDe28m14qtzxNwNm+4gITQTSqKfCgSsyTrCeoczTUZBZNx0c+Vsn/xDX/l2LJzY3z37iv2M39er6G6IQgNH8u24td+hb+9k72BQoQvhjQYrirHeRgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686936; c=relaxed/simple; bh=uNhp+56lUuwVWdRjJ4IT2zjGZ8hi7QWjQSB0TWuRWPA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mOLzDmvAx5DVhE9c2sTRuaZdHVcK4i6mfWdn1I0o4aBwr/Lj/JRJalRRPbw2k1+88xqlQ8E34rcJenZj/RYoyp/r8cn+iUcQ1lbyA/C+l8IpWeqbr25dhq/jbp7hpnxnUCO5DX7PeLHh2hQxHfxtJ6MneWQNtRPoNIcJpf2vhbo= 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=UftLpKX+; 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="UftLpKX+" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-30761ab3483so8331689eec.0 for ; Fri, 05 Jun 2026 12:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686924; x=1781291724; 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=jBc7+etiW1qt26xQHJK6a+eucgAdyO7ymG8/QopXBEM=; b=UftLpKX+Kmj8Wkg4zFKTzvqWjO0lpeQNJFAU33Rsrp1cGbioQqXIiYdYlWvLYJ/Tiw CoQMjCtahgRDroEICwbKu1JUoVxPypmzSDFe0dKqodUSrmuaK7eI+DOmUws0TyxmJvDO bXYa9cr//ffAmBDqncv6PTvXqA/ciUg5lufOsUwAGBkgr5soIwyoNJu3BKG6RQ7gDp1c +jCKTq/VbQ1q+q1CfA4m299MvRZA44kRpnSHhwzccMU60sGdIywGUvMC35X6t3VDOAVG yF6QDtO8LjVWAzeRq7FkHvc4vdRwWxcDw6Yd0wU++EWO1H/EHP3EkWcvzz7Bbv8GPjXP 99Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686924; x=1781291724; 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=jBc7+etiW1qt26xQHJK6a+eucgAdyO7ymG8/QopXBEM=; b=YxqeNm90CBGqx0/F6p4D3YyvR7zXSKqDgaH9Qbl1dBMPfQv1j8jMN8/dKnHPEsak6g RP4ngpifZO/5BMsUSGkOwMA8TO6pX+zEW3i1UAyt0+/aUD7/JoVfpEyKLlzL7wQ5OyH1 xgSyIJbzZnWKIF4ko32XQpZPseVphvG6Nrv3IZgWdtRuvqF/sK+boyZjnpW06LtmsXEK Ta2qcT/Mmon3A+MA1nGqADeWL3dgfjw0u85ATChWkp2tqOGeAz/l5U1X3pAIgOcvD9sO dLnQ1s6nm6isPNk4lAJ2cq8HZc0UbhQMpp/XkIt/j7tX5EkLLdKzgPhz0lWXFNBxT8KB X7TQ== X-Forwarded-Encrypted: i=1; AFNElJ82xyFH14Pj/g88oylO52b17IGVtijJWiVfbShsCGs1tquq1OYC2CEyGdSsVh7Da8sXgP95cDfrlLigDsM=@vger.kernel.org X-Gm-Message-State: AOJu0YxYZOGMspsXezJNjQBf0yMkMquOOStPJJ6OsUIeYHomJcVrTfVx g3wFgkee0HGbNnqSbSaZobj6ubjagr2Ry8PROIdmw1Pwkj8cOuG6SRz2v/F/RhgMd34hD2+JkHi pfwRM7Iy67Q== X-Received: from dybqg7.prod.google.com ([2002:a05:7301:6207:b0:2d5:d26c:d4bc]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1e94:b0:307:26a3:75d8 with SMTP id 5a478bee46e88-3077b270c7emr2950562eec.1.1780686923530; Fri, 05 Jun 2026 12:15:23 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:47 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-7-irogers@google.com> Subject: [PATCH v11 06/19] perf evsel: Add reference count From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As with evlist this a no-op for most of the perf tool. The reference count is set to 1 at allocation, the put will see the 1, decrement it and perform the delete. The purpose for adding the reference count is for the python code. Prior to this change the python code would clone evsels, but this has issues if events are opened, etc. leading to assertion failures. With a reference count the same evsel can be used and the reference count incremented for the python usage. To not change the python evsel API getset functions are added for the evsel members, no set function is provided for size as it doesn't make sense to alter this. Signed-off-by: Ian Rogers --- v2: 1. Fixed Potential Crash in pyrf_event__new : Initialized pevent->evsel =3D NULL; to avoid garbage pointer dereference if evlist__event2evsel() fails in read_on_cpu . 2. Fixed Memory Leak in pyrf_evsel__init : Added evsel__put(pevsel->evsel) before overwriting it to handle repeated __init__ calls. 3. Fixed Exception Contract: Added PyErr_NoMemory() when evsel__new() fails in pyrf_evsel__init . 4. Fixed NULL Pointer Dereference on Property Access: Added a custom tp_getattro ( pyrf_evsel__getattro ) to pyrf_evsel__type to check if pevsel->evsel is NULL and raise a ValueError if so, covering all property accesses. 5. Fixed Reference Count in pyrf_evlist__add : Added evsel__get(evsel) when adding to the evlist . 6. Fixed Reference Count in pyrf_evlist__read_on_cpu : Added evsel__get(evsel) when assigning to pevent->evsel . v7: - Added pyrf_evsel__new to zero-initialize pevsel->evsel to fix crash on re-initialization. v8: - Added O! type validation to pyrf_evlist__add to prevent type confusion. v10: - Added strict CHECK_INITIALIZED/CHECK_INITIALIZED_INT checks to all pyrf_evsel methods and property getters/setters to prevent NULL pointer dereferences if the object is instantiated without calling __init__. --- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/evsel-tp-sched.c | 4 +- tools/perf/tests/openat-syscall-all-cpus.c | 6 +- tools/perf/tests/openat-syscall.c | 6 +- tools/perf/util/bpf_counter_cgroup.c | 2 +- tools/perf/util/cgroup.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 26 +- tools/perf/util/evsel.h | 11 +- tools/perf/util/parse-events.y | 2 +- tools/perf/util/pfm.c | 2 +- tools/perf/util/print-events.c | 2 +- tools/perf/util/python.c | 311 ++++++++++++++++++--- tools/perf/util/session.c | 3 + 14 files changed, 310 insertions(+), 81 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index ae1977082749..cbe25b96b8fb 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -460,10 +460,10 @@ static int evsel__init_tp_ptr_field(struct evsel *evs= el, struct tp_field *field, ({ struct syscall_tp *sc =3D __evsel__syscall_tp(evsel);\ evsel__init_tp_ptr_field(evsel, &sc->name, #name); }) =20 -static void evsel__delete_priv(struct evsel *evsel) +static void evsel__put_and_free_priv(struct evsel *evsel) { zfree(&evsel->priv); - evsel__delete(evsel); + evsel__put(evsel); } =20 static int evsel__init_syscall_tp(struct evsel *evsel) @@ -543,7 +543,7 @@ static struct evsel *perf_evsel__raw_syscall_newtp(cons= t char *direction, void * return evsel; =20 out_delete: - evsel__delete_priv(evsel); + evsel__put_and_free_priv(evsel); return NULL; } =20 @@ -3612,7 +3612,7 @@ static bool evlist__add_vfs_getname(struct evlist *ev= list) =20 list_del_init(&evsel->core.node); evsel->evlist =3D NULL; - evsel__delete(evsel); + evsel__put(evsel); } =20 return found; @@ -3728,9 +3728,9 @@ static int trace__add_syscall_newtp(struct trace *tra= ce) return ret; =20 out_delete_sys_exit: - evsel__delete_priv(sys_exit); + evsel__put_and_free_priv(sys_exit); out_delete_sys_enter: - evsel__delete_priv(sys_enter); + evsel__put_and_free_priv(sys_enter); goto out; } =20 diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-= sched.c index 226196fb9677..9e456f88a13a 100644 --- a/tools/perf/tests/evsel-tp-sched.c +++ b/tools/perf/tests/evsel-tp-sched.c @@ -64,7 +64,7 @@ static int test__perf_evsel__tp_sched_test(struct test_su= ite *test __maybe_unuse if (evsel__test_field(evsel, "next_prio", 4, true)) ret =3D TEST_FAIL; =20 - evsel__delete(evsel); + evsel__put(evsel); =20 evsel =3D evsel__newtp("sched", "sched_wakeup"); =20 @@ -85,7 +85,7 @@ static int test__perf_evsel__tp_sched_test(struct test_su= ite *test __maybe_unuse if (evsel__test_field(evsel, "target_cpu", 4, true)) ret =3D TEST_FAIL; =20 - evsel__delete(evsel); + evsel__put(evsel); return ret; } =20 diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/= openat-syscall-all-cpus.c index 0be43f8db3bd..cc63df2b3bc5 100644 --- a/tools/perf/tests/openat-syscall-all-cpus.c +++ b/tools/perf/tests/openat-syscall-all-cpus.c @@ -59,7 +59,7 @@ static int test__openat_syscall_event_on_all_cpus(struct = test_suite *test __mayb "tweak /proc/sys/kernel/perf_event_paranoid?\n", str_error_r(errno, sbuf, sizeof(sbuf))); err =3D TEST_SKIP; - goto out_evsel_delete; + goto out_evsel_put; } =20 perf_cpu_map__for_each_cpu(cpu, idx, cpus) { @@ -116,8 +116,8 @@ static int test__openat_syscall_event_on_all_cpus(struc= t test_suite *test __mayb evsel__free_counts(evsel); out_close_fd: perf_evsel__close_fd(&evsel->core); -out_evsel_delete: - evsel__delete(evsel); +out_evsel_put: + evsel__put(evsel); out_cpu_map_delete: perf_cpu_map__put(cpus); out_thread_map_delete: diff --git a/tools/perf/tests/openat-syscall.c b/tools/perf/tests/openat-sy= scall.c index b54cbe5f1808..9f16f0dd3a29 100644 --- a/tools/perf/tests/openat-syscall.c +++ b/tools/perf/tests/openat-syscall.c @@ -42,7 +42,7 @@ static int test__openat_syscall_event(struct test_suite *= test __maybe_unused, "tweak /proc/sys/kernel/perf_event_paranoid?\n", str_error_r(errno, sbuf, sizeof(sbuf))); err =3D TEST_SKIP; - goto out_evsel_delete; + goto out_evsel_put; } =20 for (i =3D 0; i < nr_openat_calls; ++i) { @@ -64,8 +64,8 @@ static int test__openat_syscall_event(struct test_suite *= test __maybe_unused, err =3D TEST_OK; out_close_fd: perf_evsel__close_fd(&evsel->core); -out_evsel_delete: - evsel__delete(evsel); +out_evsel_put: + evsel__put(evsel); out_thread_map_delete: perf_thread_map__put(threads); return err; diff --git a/tools/perf/util/bpf_counter_cgroup.c b/tools/perf/util/bpf_cou= nter_cgroup.c index e1ce5aa3b957..6842c9f6d71e 100644 --- a/tools/perf/util/bpf_counter_cgroup.c +++ b/tools/perf/util/bpf_counter_cgroup.c @@ -336,7 +336,7 @@ static int bperf_cgrp__destroy(struct evsel *evsel) return 0; =20 bperf_cgroup_bpf__destroy(skel); - evsel__delete(cgrp_switch); // it'll destroy on_switch progs too + evsel__put(cgrp_switch); // it'll destroy on_switch progs too =20 return 0; } diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 652a45aac828..914744724467 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -469,7 +469,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const = char *str, bool open_cgro =20 /* copy the list and set to the new cgroup. */ evlist__for_each_entry(orig_list, pos) { - struct evsel *evsel =3D evsel__clone(/*dest=3D*/NULL, pos); + struct evsel *evsel =3D evsel__clone(pos); =20 if (evsel =3D=3D NULL) goto out_err; diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 82cc33259d81..1721a2470fb6 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -194,7 +194,7 @@ static void evlist__purge(struct evlist *evlist) evlist__for_each_entry_safe(evlist, n, pos) { list_del_init(&pos->core.node); pos->evlist =3D NULL; - evsel__delete(pos); + evsel__put(pos); } =20 evlist->core.nr_entries =3D 0; diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 19e48b9260e9..f5a9ecf87c21 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -393,10 +393,11 @@ bool evsel__is_function_event(struct evsel *evsel) #undef FUNCTION_EVENT } =20 -void evsel__init(struct evsel *evsel, +static void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int idx) { perf_evsel__init(&evsel->core, attr, idx); + refcount_set(&evsel->refcnt, 1); evsel->tracking =3D !idx; evsel->unit =3D strdup(""); evsel->scale =3D 1.0; @@ -477,7 +478,7 @@ static int evsel__copy_config_terms(struct evsel *dst, = struct evsel *src) * The assumption is that @orig is not configured nor opened yet. * So we only care about the attributes that can be set while it's parsed. */ -struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig) +struct evsel *evsel__clone(struct evsel *orig) { struct evsel *evsel; =20 @@ -490,11 +491,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct = evsel *orig) if (orig->bpf_obj) return NULL; =20 - if (dest) - evsel =3D dest; - else - evsel =3D evsel__new(&orig->core.attr); - + evsel =3D evsel__new(&orig->core.attr); if (evsel =3D=3D NULL) return NULL; =20 @@ -579,7 +576,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct e= vsel *orig) return evsel; =20 out_err: - evsel__delete(evsel); + evsel__put(evsel); return NULL; } =20 @@ -638,6 +635,12 @@ struct evsel *evsel__newtp_idx(const char *sys, const = char *name, int idx, bool return ERR_PTR(err); } =20 +struct evsel *evsel__get(struct evsel *evsel) +{ + refcount_inc(&evsel->refcnt); + return evsel; +} + #ifdef HAVE_LIBTRACEEVENT struct tep_event *evsel__tp_format(struct evsel *evsel) { @@ -1976,7 +1979,7 @@ void evsel__set_priv_destructor(void (*destructor)(vo= id *priv)) evsel__priv_destructor =3D destructor; } =20 -void evsel__exit(struct evsel *evsel) +static void evsel__exit(struct evsel *evsel) { assert(list_empty(&evsel->core.node)); assert(evsel->evlist =3D=3D NULL); @@ -2013,11 +2016,14 @@ void evsel__exit(struct evsel *evsel) } } =20 -void evsel__delete(struct evsel *evsel) +void evsel__put(struct evsel *evsel) { if (!evsel) return; =20 + if (!refcount_dec_and_test(&evsel->refcnt)) + return; + evsel__exit(evsel); free(evsel); } diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 6b28cd754a18..3fdb68e75bd1 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -6,6 +6,7 @@ =20 #include #include +#include #include #include =20 @@ -47,6 +48,7 @@ typedef int (evsel__sb_cb_t)(union perf_event *event, voi= d *data); struct evsel { struct perf_evsel core; struct evlist *evlist; + refcount_t refcnt; off_t id_offset; int id_pos; int is_pos; @@ -268,7 +270,7 @@ static inline struct evsel *evsel__new(struct perf_even= t_attr *attr) return evsel__new_idx(attr, 0); } =20 -struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig); +struct evsel *evsel__clone(struct evsel *orig); =20 int copy_config_terms(struct list_head *dst, struct list_head *src); void free_config_terms(struct list_head *config_terms); @@ -283,14 +285,13 @@ static inline struct evsel *evsel__newtp(const char *= sys, const char *name) return evsel__newtp_idx(sys, name, 0, true); } =20 +struct evsel *evsel__get(struct evsel *evsel); +void evsel__put(struct evsel *evsel); + #ifdef HAVE_LIBTRACEEVENT struct tep_event *evsel__tp_format(struct evsel *evsel); #endif =20 -void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int id= x); -void evsel__exit(struct evsel *evsel); -void evsel__delete(struct evsel *evsel); - void evsel__set_priv_destructor(void (*destructor)(void *priv)); =20 struct callchain_param; diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index c194de5ec1ec..b531b1f0ceb3 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -47,7 +47,7 @@ static void free_list_evsel(struct list_head* list_evsel) =20 list_for_each_entry_safe(evsel, tmp, list_evsel, core.node) { list_del_init(&evsel->core.node); - evsel__delete(evsel); + evsel__put(evsel); } free(list_evsel); } diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c index d9043f4afbe7..5f53c2f68a96 100644 --- a/tools/perf/util/pfm.c +++ b/tools/perf/util/pfm.c @@ -159,7 +159,7 @@ static bool is_libpfm_event_supported(const char *name,= struct perf_cpu_map *cpu result =3D false; =20 evsel__close(evsel); - evsel__delete(evsel); + evsel__put(evsel); =20 return result; } diff --git a/tools/perf/util/print-events.c b/tools/perf/util/print-events.c index cb27e2898aa0..0242243681b6 100644 --- a/tools/perf/util/print-events.c +++ b/tools/perf/util/print-events.c @@ -174,7 +174,7 @@ bool is_event_supported(u8 type, u64 config) } =20 evsel__close(evsel); - evsel__delete(evsel); + evsel__put(evsel); } =20 perf_thread_map__put(tmap); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 7483741c024a..077832231185 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -294,6 +294,7 @@ static PyMemberDef pyrf_sample_event__members[] =3D { =20 static void pyrf_sample_event__delete(struct pyrf_event *pevent) { + evsel__put(pevent->evsel); perf_sample__exit(&pevent->sample); Py_TYPE(pevent)->tp_free((PyObject*)pevent); } @@ -526,8 +527,10 @@ static PyObject *pyrf_event__new(const union perf_even= t *event) =20 ptype =3D pyrf_event__type[event->header.type]; pevent =3D PyObject_New(struct pyrf_event, ptype); - if (pevent !=3D NULL) + if (pevent !=3D NULL) { memcpy(&pevent->event, event, event->header.size); + pevent->evsel =3D NULL; + } return (PyObject *)pevent; } =20 @@ -965,7 +968,7 @@ static int pyrf_counts_values__setup_types(void) struct pyrf_evsel { PyObject_HEAD =20 - struct evsel evsel; + struct evsel *evsel; }; =20 static int pyrf_evsel__init(struct pyrf_evsel *pevsel, @@ -1028,7 +1031,6 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel, precise_ip =3D 0, mmap_data =3D 0, sample_id_all =3D 1; - int idx =3D 0; =20 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|iKiKKiiiiiiiiiiiiiiiiiiiiiiKK", kwlist, @@ -1041,7 +1043,7 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel, &enable_on_exec, &task, &watermark, &precise_ip, &mmap_data, &sample_id_all, &attr.wakeup_events, &attr.bp_type, - &attr.bp_addr, &attr.bp_len, &idx)) + &attr.bp_addr, &attr.bp_len)) return -1; =20 /* union... */ @@ -1073,26 +1075,33 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevs= el, attr.sample_id_all =3D sample_id_all; attr.size =3D sizeof(attr); =20 - evsel__init(&pevsel->evsel, &attr, idx); + evsel__put(pevsel->evsel); + pevsel->evsel =3D evsel__new(&attr); + if (!pevsel->evsel) { + PyErr_NoMemory(); + return -1; + } return 0; } =20 static void pyrf_evsel__delete(struct pyrf_evsel *pevsel) { - evsel__exit(&pevsel->evsel); + evsel__put(pevsel->evsel); Py_TYPE(pevsel)->tp_free((PyObject*)pevsel); } =20 static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel, PyObject *args, PyObject *kwargs) { - struct evsel *evsel =3D &pevsel->evsel; + struct evsel *evsel =3D pevsel->evsel; struct perf_cpu_map *cpus =3D NULL; struct perf_thread_map *threads =3D NULL; PyObject *pcpus =3D NULL, *pthreads =3D NULL; int group =3D 0, inherit =3D 0; static char *kwlist[] =3D { "cpus", "threads", "group", "inherit", NULL }; =20 + CHECK_INITIALIZED(evsel, "evsel"); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOii", kwlist, &pcpus, &pthreads, &group, &inherit)) return NULL; @@ -1119,21 +1128,26 @@ static PyObject *pyrf_evsel__open(struct pyrf_evsel= *pevsel, =20 static PyObject *pyrf_evsel__cpus(struct pyrf_evsel *pevsel) { - struct pyrf_cpu_map *pcpu_map =3D PyObject_New(struct pyrf_cpu_map, &pyrf= _cpu_map__type); + struct pyrf_cpu_map *pcpu_map; =20 + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + pcpu_map =3D PyObject_New(struct pyrf_cpu_map, &pyrf_cpu_map__type); if (pcpu_map) - pcpu_map->cpus =3D perf_cpu_map__get(pevsel->evsel.core.cpus); + pcpu_map->cpus =3D perf_cpu_map__get(pevsel->evsel->core.cpus); =20 return (PyObject *)pcpu_map; } =20 static PyObject *pyrf_evsel__threads(struct pyrf_evsel *pevsel) { - struct pyrf_thread_map *pthread_map =3D - PyObject_New(struct pyrf_thread_map, &pyrf_thread_map__type); + struct pyrf_thread_map *pthread_map; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); =20 + pthread_map =3D PyObject_New(struct pyrf_thread_map, &pyrf_thread_map__ty= pe); if (pthread_map) - pthread_map->threads =3D perf_thread_map__get(pevsel->evsel.core.threads= ); + pthread_map->threads =3D perf_thread_map__get(pevsel->evsel->core.thread= s); =20 return (PyObject *)pthread_map; } @@ -1167,12 +1181,15 @@ static int evsel__ensure_counts(struct evsel *evsel) static PyObject *pyrf_evsel__read(struct pyrf_evsel *pevsel, PyObject *args, PyObject *kwargs) { - struct evsel *evsel =3D &pevsel->evsel; + struct evsel *evsel =3D pevsel->evsel; int cpu =3D 0, cpu_idx, thread =3D 0, thread_idx; struct perf_counts_values *old_count, *new_count; - struct pyrf_counts_values *count_values =3D PyObject_New(struct pyrf_coun= ts_values, - &pyrf_counts_values__type); + struct pyrf_counts_values *count_values; + + CHECK_INITIALIZED(evsel, "evsel"); =20 + count_values =3D PyObject_New(struct pyrf_counts_values, + &pyrf_counts_values__type); if (!count_values) return NULL; =20 @@ -1212,7 +1229,10 @@ static PyObject *pyrf_evsel__read(struct pyrf_evsel = *pevsel, static PyObject *pyrf_evsel__str(PyObject *self) { struct pyrf_evsel *pevsel =3D (void *)self; - struct evsel *evsel =3D &pevsel->evsel; + struct evsel *evsel =3D pevsel->evsel; + + if (!evsel) + return PyUnicode_FromString("evsel(uninitialized)"); =20 return PyUnicode_FromFormat("evsel(%s/%s/)", evsel__pmu_name(evsel), evse= l__name(evsel)); } @@ -1245,30 +1265,222 @@ static PyMethodDef pyrf_evsel__methods[] =3D { { .ml_name =3D NULL, } }; =20 -#define evsel_member_def(member, ptype, help) \ - { #member, ptype, \ - offsetof(struct pyrf_evsel, evsel.member), \ - 0, help } +static PyObject *pyrf_evsel__get_tracking(PyObject *self, void */*closure*= /) +{ + struct pyrf_evsel *pevsel =3D (void *)self; =20 -#define evsel_attr_member_def(member, ptype, help) \ - { #member, ptype, \ - offsetof(struct pyrf_evsel, evsel.core.attr.member), \ - 0, help } + CHECK_INITIALIZED(pevsel->evsel, "evsel"); =20 -static PyMemberDef pyrf_evsel__members[] =3D { - evsel_member_def(tracking, T_BOOL, "tracking event."), - evsel_attr_member_def(type, T_UINT, "attribute type."), - evsel_attr_member_def(size, T_UINT, "attribute size."), - evsel_attr_member_def(config, T_ULONGLONG, "attribute config."), - evsel_attr_member_def(sample_period, T_ULONGLONG, "attribute sample_perio= d."), - evsel_attr_member_def(sample_type, T_ULONGLONG, "attribute sample_type."), - evsel_attr_member_def(read_format, T_ULONGLONG, "attribute read_format."), - evsel_attr_member_def(wakeup_events, T_UINT, "attribute wakeup_events."), - { .name =3D NULL, }, + if (pevsel->evsel->tracking) + Py_RETURN_TRUE; + else + Py_RETURN_FALSE; +} + +static int pyrf_evsel__set_tracking(PyObject *self, PyObject *val, void */= *closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->tracking =3D Py_IsTrue(val) ? true : false; + return 0; +} + +static int pyrf_evsel__set_attr_config(PyObject *self, PyObject *val, void= */*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.config =3D PyLong_AsUnsignedLongLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_config(PyObject *self, void */*closu= re*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLongLong(pevsel->evsel->core.attr.config); +} + +static int pyrf_evsel__set_attr_read_format(PyObject *self, PyObject *val,= void */*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.read_format =3D PyLong_AsUnsignedLongLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_read_format(PyObject *self, void */*= closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLongLong(pevsel->evsel->core.attr.read_format); +} + +static int pyrf_evsel__set_attr_sample_period(PyObject *self, PyObject *va= l, void */*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.sample_period =3D PyLong_AsUnsignedLongLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_sample_period(PyObject *self, void *= /*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLongLong(pevsel->evsel->core.attr.sample_period= ); +} + +static int pyrf_evsel__set_attr_sample_type(PyObject *self, PyObject *val,= void */*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.sample_type =3D PyLong_AsUnsignedLongLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_sample_type(PyObject *self, void */*= closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLongLong(pevsel->evsel->core.attr.sample_type); +} + +static PyObject *pyrf_evsel__get_attr_size(PyObject *self, void */*closure= */) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLong(pevsel->evsel->core.attr.size); +} + +static int pyrf_evsel__set_attr_type(PyObject *self, PyObject *val, void *= /*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.type =3D PyLong_AsUnsignedLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_type(PyObject *self, void */*closure= */) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLong(pevsel->evsel->core.attr.type); +} + +static int pyrf_evsel__set_attr_wakeup_events(PyObject *self, PyObject *va= l, void */*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED_INT(pevsel->evsel, "evsel"); + + pevsel->evsel->core.attr.wakeup_events =3D PyLong_AsUnsignedLong(val); + return PyErr_Occurred() ? -1 : 0; +} + +static PyObject *pyrf_evsel__get_attr_wakeup_events(PyObject *self, void *= /*closure*/) +{ + struct pyrf_evsel *pevsel =3D (void *)self; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + return PyLong_FromUnsignedLong(pevsel->evsel->core.attr.wakeup_events); +} + +static PyGetSetDef pyrf_evsel__getset[] =3D { + { + .name =3D "tracking", + .get =3D pyrf_evsel__get_tracking, + .set =3D pyrf_evsel__set_tracking, + .doc =3D "tracking event.", + }, + { + .name =3D "config", + .get =3D pyrf_evsel__get_attr_config, + .set =3D pyrf_evsel__set_attr_config, + .doc =3D "attribute config.", + }, + { + .name =3D "read_format", + .get =3D pyrf_evsel__get_attr_read_format, + .set =3D pyrf_evsel__set_attr_read_format, + .doc =3D "attribute read_format.", + }, + { + .name =3D "sample_period", + .get =3D pyrf_evsel__get_attr_sample_period, + .set =3D pyrf_evsel__set_attr_sample_period, + .doc =3D "attribute sample_period.", + }, + { + .name =3D "sample_type", + .get =3D pyrf_evsel__get_attr_sample_type, + .set =3D pyrf_evsel__set_attr_sample_type, + .doc =3D "attribute sample_type.", + }, + { + .name =3D "size", + .get =3D pyrf_evsel__get_attr_size, + .doc =3D "attribute size.", + }, + { + .name =3D "type", + .get =3D pyrf_evsel__get_attr_type, + .set =3D pyrf_evsel__set_attr_type, + .doc =3D "attribute type.", + }, + { + .name =3D "wakeup_events", + .get =3D pyrf_evsel__get_attr_wakeup_events, + .set =3D pyrf_evsel__set_attr_wakeup_events, + .doc =3D "attribute wakeup_events.", + }, + { .name =3D NULL}, }; =20 static const char pyrf_evsel__doc[] =3D PyDoc_STR("perf event selector lis= t object."); =20 +static PyObject *pyrf_evsel__getattro(struct pyrf_evsel *pevsel, PyObject = *attr_name) +{ + if (!pevsel->evsel) { + PyErr_SetString(PyExc_ValueError, "evsel not initialized"); + return NULL; + } + return PyObject_GenericGetAttr((PyObject *) pevsel, attr_name); +} + +static int pyrf_evsel__setattro(struct pyrf_evsel *pevsel, PyObject *attr_= name, PyObject *value) +{ + if (!pevsel->evsel) { + PyErr_SetString(PyExc_ValueError, "evsel not initialized"); + return -1; + } + return PyObject_GenericSetAttr((PyObject *) pevsel, attr_name, value); +} + static PyTypeObject pyrf_evsel__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.evsel", @@ -1276,16 +1488,28 @@ static PyTypeObject pyrf_evsel__type =3D { .tp_dealloc =3D (destructor)pyrf_evsel__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_evsel__doc, - .tp_members =3D pyrf_evsel__members, + .tp_getset =3D pyrf_evsel__getset, .tp_methods =3D pyrf_evsel__methods, .tp_init =3D (initproc)pyrf_evsel__init, .tp_str =3D pyrf_evsel__str, .tp_repr =3D pyrf_evsel__str, + .tp_getattro =3D (getattrofunc) pyrf_evsel__getattro, + .tp_setattro =3D (setattrofunc) pyrf_evsel__setattro, }; =20 +static PyObject *pyrf_evsel__new(PyTypeObject *type, PyObject *args, PyObj= ect *kwargs) +{ + struct pyrf_evsel *pevsel; + + pevsel =3D (struct pyrf_evsel *)PyType_GenericNew(type, args, kwargs); + if (pevsel) + pevsel->evsel =3D NULL; + return (PyObject *)pevsel; +} + static int pyrf_evsel__setup_types(void) { - pyrf_evsel__type.tp_new =3D PyType_GenericNew; + pyrf_evsel__type.tp_new =3D pyrf_evsel__new; return PyType_Ready(&pyrf_evsel__type); } =20 @@ -1584,13 +1808,13 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlis= t *pevlist, PyObject *pevsel; struct evsel *evsel; =20 - if (!PyArg_ParseTuple(args, "O", &pevsel)) + if (!PyArg_ParseTuple(args, "O!", &pyrf_evsel__type, &pevsel)) return NULL; =20 Py_INCREF(pevsel); - evsel =3D &((struct pyrf_evsel *)pevsel)->evsel; + evsel =3D ((struct pyrf_evsel *)pevsel)->evsel; evsel->core.idx =3D evlist->core.nr_entries; - evlist__add(evlist, evsel); + evlist__add(evlist, evsel__get(evsel)); =20 return Py_BuildValue("i", evlist->core.nr_entries); } @@ -1648,7 +1872,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf= _evlist *pevlist, return Py_None; } =20 - pevent->evsel =3D evsel; + pevent->evsel =3D evsel__get(evsel); =20 perf_mmap__consume(&md->core); =20 @@ -1828,12 +2052,7 @@ static PyObject *pyrf_evsel__from_evsel(struct evsel= *evsel) if (!pevsel) return NULL; =20 - memset(&pevsel->evsel, 0, sizeof(pevsel->evsel)); - evsel__init(&pevsel->evsel, &evsel->core.attr, evsel->core.idx); - - evsel__clone(&pevsel->evsel, evsel); - if (evsel__is_group_leader(evsel)) - evsel__set_leader(&pevsel->evsel, &pevsel->evsel); + pevsel->evsel =3D evsel__get(evsel); return (PyObject *)pevsel; } =20 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 1bc25d5c2715..479e0844f5e1 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1844,7 +1844,10 @@ static int evlist__deliver_deferred_callchain(struct= evlist *evlist, struct evsel *saved_evsel =3D sample->evsel; =20 sample->evsel =3D evlist__id2evsel(evlist, sample->id); + if (sample->evsel) + sample->evsel =3D evsel__get(sample->evsel); ret =3D tool->callchain_deferred(tool, event, sample, machine); + evsel__put(sample->evsel); sample->evsel =3D saved_evsel; return ret; } --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4231943C05A for ; Fri, 5 Jun 2026 19:15:28 +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=1780686964; cv=none; b=haxVFZdoiUzW4uvPeVmc/oVQGhJpfhOVxChfu23D7ZZBjaOEebkGbNgat/BcNi9VZjVftnDQFkIyLyPC6cQm5r7sDRbhxch6lxfGsQ8a0R+NwIPUYmIO5uX2z2va4JB7ep0Woh6u4WzTvUzKEQIAGVueMxBdoVESARloxHRwmt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686964; c=relaxed/simple; bh=vb6MvdT+GrM9nasXbJASiZM1Jb4x/ng4fc3GrYSCJ8s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=E+5qEYEyvag5fr1SzDF5hGh/+s+dEqb6Av7+a+JJ3HkL1JRvb/RKTyxtBpscRMJrY8qVNC0KegmRcg45lXuIJy4iJIRTlfc/Wd4CUirmJziBiFxQdyw1H2Qf7k73eFGNkiiAqNM2U7dOOmJzfLzQfGz16rlUemRbbSQ2LKp5G+s= 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=Z0INlNSh; 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="Z0INlNSh" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-137f2083280so8997400c88.1 for ; Fri, 05 Jun 2026 12:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686927; x=1781291727; 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=mm46rAuZWJfiw7udlcbIIHuanKIzP8XcI8Gr57ECecI=; b=Z0INlNSh9TT/SgJS9eq9TanyEA9n81y/I8TsRhAS/iNI9BXLjy4gTt2ldUsav80mYJ v39v0WkprbzapHjxT5ij14soKBaYo21KSbaQ/ppyJW6PFXSHX6A0QF3WjmozlPCeJxK8 oevvFaW2T68gZwnxr7MKDnK+tmwTbdKoCyvgAddkpIBWgFWtjP/bJh3k0xufnwSgihGE J7SEBbZY0ugeghBLtcqhd2jUtATpGa3aoQusJoZ6HM8NgZiZFOniQ4T0Fjq7KTrrY5GE V9zOoJ7BpiLUo9+zaYy15FA0/zBP7HATWiMMvkbuWggP+bs39NEecbnwmS3noqejkTGH K4kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686927; x=1781291727; 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=mm46rAuZWJfiw7udlcbIIHuanKIzP8XcI8Gr57ECecI=; b=gWsLa3KcdIVwahqLlvjS/Gud1gR0MTVnJHLBIcuw5rkZaQIfSdsNQBKvOqJmo0q7y5 owcpSAnEZ0H8yoj7WppNlFDQ/ypuV0C/n139xm6gf20REBlWLEz2Ek8YDpqHOPVm6fgm 5OtEwIhf+0LPVnNkLV025O4LID/85UPDmqWoFsQkoPXf4L9p7d0TWBdZsBaWDDBSC0UW AHHyyshnf9rZq6sm7eHYBmUymUGShhtQQKYuLMsSgvG7AwTANlorODequtK/jE/SNeVo 9HxL9F0MkwrwcAbuv9zaBUQnDHEPs0TdFNKPueXQy6AQj/1HYCvAj/Vbak3KZoKbrUgd QEHg== X-Forwarded-Encrypted: i=1; AFNElJ8fJRccrhL2THi4+DxLd2zEXDiLTDUaKskVUDoJj0aa+OdwAPUm0Z6/eUQlTorLz1TdXUoIBHEKtSTAP+E=@vger.kernel.org X-Gm-Message-State: AOJu0YzumefHglzlGYvIAODyVG6yTxwqcl52JzBqTWVjGuANvo/Og+L+ 1F4JXA4+H7piNiZEdmo/i+aAtoDJ7/ekiprjB1n5/9BP5b+lw5V7hnyJWgBHmDq38gBl7C/Xko1 iZzxW+JrNkw== X-Received: from dlak16.prod.google.com ([2002:a05:701b:2910:b0:137:f0b5:7870]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:699d:b0:137:d08e:e5b1 with SMTP id a92af1059eb24-138066d7b7dmr2512260c88.16.1780686926095; Fri, 05 Jun 2026 12:15:26 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:48 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-8-irogers@google.com> Subject: [PATCH v11 07/19] perf evlist: Add reference count checking From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now the evlist is reference counted, add reference count checking so that gets and puts are paired and easy to debug. Reference count checking is documented here: https://perfwiki.github.io/main/reference-count-checking/ This large patch is adding accessors to evlist functions and switching to their use. There was some minor renaming as evlist__mmap is now an accessor to the mmap variable, and the original evlist__mmap is renamed to evlist__do_mmap. Signed-off-by: Ian Rogers --- v2: 1. Fixed Memory Leak in evlist__new : Added free(evlist) in the else branch if ADD_RC_CHK fails, preventing a leak of the allocated raw structure. 2. Fixed Potential NULL Dereference: Added a NULL check after from_list_start(_evlist) in perf_evlist__mmap_cb_get() . 3. Fixed Use-After-Free Risk: In evlist__add() , I changed entry->evlist =3D evlist; to entry->evlist =3D evlist__get(evlist); . This ensures that the evsel holds a valid reference (wrapper) to the evlist , preventing it from becoming a dangling pointer if the original wrapper is freed. 4. Fixed Test Masking Bug: In test__perf_time__parse_for_ranges() , I replaced TEST_ASSERT_VAL with a manual check and return false; to avoid boolean evaluation of -1 inadvertently passing the test. 5. Fix reference count checker memory leaks from missed puts and due to cyclic evsel to evlist references. A leak still exists in __perf_evlist__propagate_maps due to empty CPU maps and not deleting the removed evsel. v8: 1. Handle evsel__new failure in sample-parsing.c test and extra ref count checking integrity in evlist.c 2. Use standard per_sample initialization in cs-etm.c. v10: - Added CHECK_INITIALIZED checks to pyrf_evlist methods to prevent NULL pointer dereferences on uninitialized objects. --- tools/perf/arch/arm/util/cs-etm.c | 10 +- tools/perf/arch/arm64/util/arm-spe.c | 8 +- tools/perf/arch/arm64/util/hisi-ptt.c | 2 +- tools/perf/arch/x86/tests/hybrid.c | 20 +- tools/perf/arch/x86/util/auxtrace.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 6 +- tools/perf/arch/x86/util/intel-pt.c | 9 +- tools/perf/arch/x86/util/iostat.c | 12 +- tools/perf/bench/evlist-open-close.c | 11 +- tools/perf/builtin-annotate.c | 7 +- tools/perf/builtin-ftrace.c | 6 +- tools/perf/builtin-inject.c | 4 +- tools/perf/builtin-kvm.c | 10 +- tools/perf/builtin-kwork.c | 8 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-record.c | 91 ++--- tools/perf/builtin-report.c | 6 +- tools/perf/builtin-sched.c | 24 +- tools/perf/builtin-script.c | 13 +- tools/perf/builtin-stat.c | 73 ++-- tools/perf/builtin-top.c | 52 +-- tools/perf/builtin-trace.c | 22 +- tools/perf/tests/backward-ring-buffer.c | 8 +- tools/perf/tests/code-reading.c | 10 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/hwmon_pmu.c | 5 +- tools/perf/tests/keep-tracking.c | 8 +- tools/perf/tests/mmap-basic.c | 6 +- tools/perf/tests/openat-syscall-tp-fields.c | 8 +- tools/perf/tests/parse-events.c | 135 +++---- tools/perf/tests/parse-metric.c | 4 +- tools/perf/tests/perf-record.c | 20 +- tools/perf/tests/perf-time-to-tsc.c | 10 +- tools/perf/tests/pfm.c | 8 +- tools/perf/tests/pmu-events.c | 5 +- tools/perf/tests/sample-parsing.c | 44 +-- tools/perf/tests/sw-clock.c | 6 +- tools/perf/tests/switch-tracking.c | 8 +- tools/perf/tests/task-exit.c | 6 +- tools/perf/tests/time-utils-test.c | 14 +- tools/perf/tests/tool_pmu.c | 5 +- tools/perf/tests/topology.c | 2 +- tools/perf/tests/uncore-event-sorting.c | 4 +- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/ui/browsers/hists.c | 22 +- tools/perf/util/amd-sample-raw.c | 2 +- tools/perf/util/annotate-data.c | 2 +- tools/perf/util/annotate.c | 10 +- tools/perf/util/auxtrace.c | 14 +- tools/perf/util/block-info.c | 4 +- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter_cgroup.c | 12 +- tools/perf/util/bpf_ftrace.c | 9 +- tools/perf/util/bpf_lock_contention.c | 12 +- tools/perf/util/bpf_off_cpu.c | 14 +- tools/perf/util/cgroup.c | 20 +- tools/perf/util/cs-etm.c | 5 +- tools/perf/util/evlist.c | 391 ++++++++++++-------- tools/perf/util/evlist.h | 251 ++++++++++++- tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 47 +-- tools/perf/util/header.h | 2 +- tools/perf/util/intel-tpebs.c | 7 +- tools/perf/util/iostat.c | 2 +- tools/perf/util/iostat.h | 2 +- tools/perf/util/metricgroup.c | 6 +- tools/perf/util/parse-events.c | 6 +- tools/perf/util/pfm.c | 2 +- tools/perf/util/python.c | 92 +++-- tools/perf/util/record.c | 9 +- tools/perf/util/sample-raw.c | 4 +- tools/perf/util/session.c | 54 +-- tools/perf/util/sideband_evlist.c | 24 +- tools/perf/util/sort.c | 2 +- tools/perf/util/stat-display.c | 6 +- tools/perf/util/stat-shadow.c | 4 +- tools/perf/util/stat.c | 4 +- tools/perf/util/stream.c | 4 +- tools/perf/util/synthetic-events.c | 11 +- tools/perf/util/time-utils.c | 12 +- tools/perf/util/top.c | 4 +- 84 files changed, 1088 insertions(+), 720 deletions(-) diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/c= s-etm.c index cdf8e3e60606..d2861d66a661 100644 --- a/tools/perf/arch/arm/util/cs-etm.c +++ b/tools/perf/arch/arm/util/cs-etm.c @@ -201,7 +201,7 @@ static int cs_etm_validate_config(struct perf_pmu *cs_e= tm_pmu, { unsigned int idx; int err =3D 0; - struct perf_cpu_map *event_cpus =3D evsel->evlist->core.user_requested_cp= us; + struct perf_cpu_map *event_cpus =3D evlist__core(evsel->evlist)->user_req= uested_cpus; struct perf_cpu_map *intersect_cpus; struct perf_cpu cpu; =20 @@ -325,7 +325,7 @@ static int cs_etm_recording_options(struct auxtrace_rec= ord *itr, container_of(itr, struct cs_etm_recording, itr); struct perf_pmu *cs_etm_pmu =3D ptr->cs_etm_pmu; struct evsel *evsel, *cs_etm_evsel =3D NULL; - struct perf_cpu_map *cpus =3D evlist->core.user_requested_cpus; + struct perf_cpu_map *cpus =3D evlist__core(evlist)->user_requested_cpus; bool privileged =3D perf_event_paranoid_check(-1); int err =3D 0; =20 @@ -551,7 +551,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr, { unsigned int idx; int etmv3 =3D 0, etmv4 =3D 0, ete =3D 0; - struct perf_cpu_map *event_cpus =3D evlist->core.user_requested_cpus; + struct perf_cpu_map *event_cpus =3D evlist__core(evlist)->user_requested_= cpus; struct perf_cpu_map *intersect_cpus; struct perf_cpu cpu; struct perf_pmu *cs_etm_pmu =3D cs_etm_get_pmu(itr); @@ -790,7 +790,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, u32 offset; u64 nr_cpu, type; struct perf_cpu_map *cpu_map; - struct perf_cpu_map *event_cpus =3D session->evlist->core.user_requested_= cpus; + struct perf_cpu_map *event_cpus =3D evlist__core(session->evlist)->user_r= equested_cpus; struct perf_cpu_map *online_cpus =3D perf_cpu_map__new_online_cpus(); struct cs_etm_recording *ptr =3D container_of(itr, struct cs_etm_recording, itr); @@ -800,7 +800,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, if (priv_size !=3D cs_etm_info_priv_size(itr, session->evlist)) return -EINVAL; =20 - if (!session->evlist->core.nr_mmaps) + if (!evlist__core(session->evlist)->nr_mmaps) return -EINVAL; =20 /* If the cpu_map has the "any" CPU all online CPUs are involved */ diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/u= til/arm-spe.c index 91bb28cad79a..1ba803a8d9b4 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -60,7 +60,7 @@ static bool arm_spe_is_set_freq(struct evsel *evsel) */ static struct perf_cpu_map *arm_spe_find_cpus(struct evlist *evlist) { - struct perf_cpu_map *event_cpus =3D evlist->core.user_requested_cpus; + struct perf_cpu_map *event_cpus =3D evlist__core(evlist)->user_requested_= cpus; struct perf_cpu_map *online_cpus =3D perf_cpu_map__new_online_cpus(); struct perf_cpu_map *intersect_cpus; =20 @@ -157,7 +157,7 @@ static int arm_spe_info_fill(struct auxtrace_record *it= r, if (priv_size !=3D arm_spe_info_priv_size(itr, session->evlist)) return -EINVAL; =20 - if (!session->evlist->core.nr_mmaps) + if (!evlist__core(session->evlist)->nr_mmaps) return -EINVAL; =20 cpu_map =3D arm_spe_find_cpus(session->evlist); @@ -363,7 +363,7 @@ static int arm_spe_setup_tracking_event(struct evlist *= evlist, { int err; struct evsel *tracking_evsel; - struct perf_cpu_map *cpus =3D evlist->core.user_requested_cpus; + struct perf_cpu_map *cpus =3D evlist__core(evlist)->user_requested_cpus; =20 /* Add dummy event to keep tracking */ err =3D parse_event(evlist, "dummy:u"); @@ -396,7 +396,7 @@ static int arm_spe_recording_options(struct auxtrace_re= cord *itr, struct arm_spe_recording *sper =3D container_of(itr, struct arm_spe_recording, itr); struct evsel *evsel, *tmp; - struct perf_cpu_map *cpus =3D evlist->core.user_requested_cpus; + struct perf_cpu_map *cpus =3D evlist__core(evlist)->user_requested_cpus; bool discard =3D false; int err; u64 discard_bit; diff --git a/tools/perf/arch/arm64/util/hisi-ptt.c b/tools/perf/arch/arm64/= util/hisi-ptt.c index fe457fd58c9e..52257715d2b7 100644 --- a/tools/perf/arch/arm64/util/hisi-ptt.c +++ b/tools/perf/arch/arm64/util/hisi-ptt.c @@ -53,7 +53,7 @@ static int hisi_ptt_info_fill(struct auxtrace_record *itr, if (priv_size !=3D HISI_PTT_AUXTRACE_PRIV_SIZE) return -EINVAL; =20 - if (!session->evlist->core.nr_mmaps) + if (!evlist__core(session->evlist)->nr_mmaps) return -EINVAL; =20 auxtrace_info->type =3D PERF_AUXTRACE_HISI_PTT; diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests= /hybrid.c index dfb0ffc0d030..0477e17b8e53 100644 --- a/tools/perf/arch/x86/tests/hybrid.c +++ b/tools/perf/arch/x86/tests/hybrid.c @@ -26,7 +26,7 @@ static int test__hybrid_hw_event_with_pmu(struct evlist *= evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RA= W)); TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); @@ -38,7 +38,7 @@ static int test__hybrid_hw_group_event(struct evlist *evl= ist) struct evsel *evsel, *leader; =20 evsel =3D leader =3D evlist__first(evlist); - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RA= W)); TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); @@ -57,7 +57,7 @@ static int test__hybrid_sw_hw_group_event(struct evlist *= evlist) struct evsel *evsel, *leader; =20 evsel =3D leader =3D evlist__first(evlist); - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader)); =20 @@ -74,7 +74,7 @@ static int test__hybrid_hw_sw_group_event(struct evlist *= evlist) struct evsel *evsel, *leader; =20 evsel =3D leader =3D evlist__first(evlist); - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RA= W)); TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); @@ -91,7 +91,7 @@ static int test__hybrid_group_modifier1(struct evlist *ev= list) struct evsel *evsel, *leader; =20 evsel =3D leader =3D evlist__first(evlist); - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RA= W)); TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); @@ -113,7 +113,7 @@ static int test__hybrid_raw1(struct evlist *evlist) { struct perf_evsel *evsel; =20 - perf_evlist__for_each_evsel(&evlist->core, evsel) { + perf_evlist__for_each_evsel(evlist__core(evlist), evsel) { struct perf_pmu *pmu =3D perf_pmus__find_by_type(evsel->attr.type); =20 TEST_ASSERT_VAL("missing pmu", pmu); @@ -127,7 +127,7 @@ static int test__hybrid_raw2(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", test_config(evsel, 0x1a)); return TEST_OK; @@ -137,7 +137,7 @@ static int test__hybrid_cache_event(struct evlist *evli= st) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong config", 0x2 =3D=3D (evsel->core.attr.config & 0xf= fffffff)); return TEST_OK; @@ -148,7 +148,7 @@ static int test__checkevent_pmu(struct evlist *evlist) =20 struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", 10 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong config1", 1 =3D=3D evsel->core.attr.config1); @@ -168,7 +168,7 @@ static int test__hybrid_hw_group_event_2(struct evlist = *evlist) struct evsel *evsel, *leader; =20 evsel =3D leader =3D evlist__first(evlist); - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist__nr_entries(ev= list)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RA= W)); TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_CPU_CYCL= ES)); diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util= /auxtrace.c index ecbf61a7eb3a..84fce0b51ccf 100644 --- a/tools/perf/arch/x86/util/auxtrace.c +++ b/tools/perf/arch/x86/util/auxtrace.c @@ -55,7 +55,7 @@ struct auxtrace_record *auxtrace_record__init(struct evli= st *evlist, int *err) { char buffer[64]; - struct perf_cpu cpu =3D perf_cpu_map__min(evlist->core.all_cpus); + struct perf_cpu cpu =3D perf_cpu_map__min(evlist__core(evlist)->all_cpus); int ret; =20 *err =3D 0; diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/uti= l/intel-bts.c index 100a23d27998..d44d568a6d21 100644 --- a/tools/perf/arch/x86/util/intel-bts.c +++ b/tools/perf/arch/x86/util/intel-bts.c @@ -79,10 +79,10 @@ static int intel_bts_info_fill(struct auxtrace_record *= itr, if (priv_size !=3D INTEL_BTS_AUXTRACE_PRIV_SIZE) return -EINVAL; =20 - if (!session->evlist->core.nr_mmaps) + if (!evlist__core(session->evlist)->nr_mmaps) return -EINVAL; =20 - pc =3D session->evlist->mmap[0].core.base; + pc =3D evlist__mmap(session->evlist)[0].core.base; if (pc) { err =3D perf_read_tsc_conversion(pc, &tc); if (err) { @@ -114,7 +114,7 @@ static int intel_bts_recording_options(struct auxtrace_= record *itr, container_of(itr, struct intel_bts_recording, itr); struct perf_pmu *intel_bts_pmu =3D btsr->intel_bts_pmu; struct evsel *evsel, *intel_bts_evsel =3D NULL; - const struct perf_cpu_map *cpus =3D evlist->core.user_requested_cpus; + const struct perf_cpu_map *cpus =3D evlist__core(evlist)->user_requested_= cpus; bool privileged =3D perf_event_paranoid_check(-1); =20 if (opts->auxtrace_sample_mode) { diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util= /intel-pt.c index 0307ff15d9fc..a533114c0048 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -360,10 +360,10 @@ static int intel_pt_info_fill(struct auxtrace_record = *itr, filter =3D intel_pt_find_filter(session->evlist, ptr->intel_pt_pmu); filter_str_len =3D filter ? strlen(filter) : 0; =20 - if (!session->evlist->core.nr_mmaps) + if (!evlist__core(session->evlist)->nr_mmaps) return -EINVAL; =20 - pc =3D session->evlist->mmap[0].core.base; + pc =3D evlist__mmap(session->evlist)[0].core.base; if (pc) { err =3D perf_read_tsc_conversion(pc, &tc); if (err) { @@ -376,7 +376,8 @@ static int intel_pt_info_fill(struct auxtrace_record *i= tr, ui__warning("Intel Processor Trace: TSC not available\n"); } =20 - per_cpu_mmaps =3D !perf_cpu_map__is_any_cpu_or_is_empty(session->evlist->= core.user_requested_cpus); + per_cpu_mmaps =3D !perf_cpu_map__is_any_cpu_or_is_empty( + evlist__core(session->evlist)->user_requested_cpus); =20 auxtrace_info->type =3D PERF_AUXTRACE_INTEL_PT; auxtrace_info->priv[INTEL_PT_PMU_TYPE] =3D intel_pt_pmu->type; @@ -621,7 +622,7 @@ static int intel_pt_recording_options(struct auxtrace_r= ecord *itr, struct perf_pmu *intel_pt_pmu =3D ptr->intel_pt_pmu; bool have_timing_info, need_immediate =3D false; struct evsel *evsel, *intel_pt_evsel =3D NULL; - const struct perf_cpu_map *cpus =3D evlist->core.user_requested_cpus; + const struct perf_cpu_map *cpus =3D evlist__core(evlist)->user_requested_= cpus; bool privileged =3D perf_event_paranoid_check(-1); u64 tsc_bit; int err; diff --git a/tools/perf/arch/x86/util/iostat.c b/tools/perf/arch/x86/util/i= ostat.c index e0417552b0cb..b13abea3a6f4 100644 --- a/tools/perf/arch/x86/util/iostat.c +++ b/tools/perf/arch/x86/util/iostat.c @@ -332,13 +332,15 @@ static int iostat_event_group(struct evlist *evl, return ret; } =20 -int iostat_prepare(struct evlist *evlist, struct perf_stat_config *config) +int iostat_prepare(struct evlist **evlist_ptr, struct perf_stat_config *co= nfig) { - if (evlist->core.nr_entries > 0) { + struct evlist *evlist =3D *evlist_ptr; + + if (evlist__nr_entries(evlist) > 0) { pr_warning("The -e and -M options are not supported." "All chosen events/metrics will be dropped\n"); evlist__put(evlist); - evlist =3D evlist__new(); + *evlist_ptr =3D evlist =3D evlist__new(); if (!evlist) return -ENOMEM; } @@ -400,7 +402,7 @@ void iostat_prefix(struct evlist *evlist, struct perf_stat_config *config, char *prefix, struct timespec *ts) { - struct iio_root_port *rp =3D evlist->selected->priv; + struct iio_root_port *rp =3D evlist__selected(evlist)->priv; =20 if (rp) { /* @@ -463,7 +465,7 @@ void iostat_print_counters(struct evlist *evlist, iostat_prefix(evlist, config, prefix, ts); fprintf(config->output, "%s", prefix); evlist__for_each_entry(evlist, counter) { - perf_device =3D evlist->selected->priv; + perf_device =3D evlist__selected(evlist)->priv; if (perf_device && perf_device !=3D counter->priv) { evlist__set_selected(evlist, counter); iostat_prefix(evlist, config, prefix, ts); diff --git a/tools/perf/bench/evlist-open-close.c b/tools/perf/bench/evlist= -open-close.c index 304929d1f67f..748ebbe458f4 100644 --- a/tools/perf/bench/evlist-open-close.c +++ b/tools/perf/bench/evlist-open-close.c @@ -116,7 +116,7 @@ static int bench__do_evlist_open_close(struct evlist *e= vlist) return err; } =20 - err =3D evlist__mmap(evlist, opts.mmap_pages); + err =3D evlist__do_mmap(evlist, opts.mmap_pages); if (err < 0) { pr_err("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); return err; @@ -124,7 +124,7 @@ static int bench__do_evlist_open_close(struct evlist *e= vlist) =20 evlist__enable(evlist); evlist__disable(evlist); - evlist__munmap(evlist); + evlist__do_munmap(evlist); evlist__close(evlist); =20 return 0; @@ -145,10 +145,11 @@ static int bench_evlist_open_close__run(char *evstr, = const char *uid_str) =20 init_stats(&time_stats); =20 - printf(" Number of cpus:\t%d\n", perf_cpu_map__nr(evlist->core.user_requ= ested_cpus)); - printf(" Number of threads:\t%d\n", evlist->core.threads->nr); + printf(" Number of cpus:\t%d\n", + perf_cpu_map__nr(evlist__core(evlist)->user_requested_cpus)); + printf(" Number of threads:\t%d\n", evlist__core(evlist)->threads->nr); printf(" Number of events:\t%d (%d fds)\n", - evlist->core.nr_entries, evlist__count_evsel_fds(evlist)); + evlist__nr_entries(evlist), evlist__count_evsel_fds(evlist)); printf(" Number of iterations:\t%d\n", iterations); =20 evlist__put(evlist); diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 8a0eb30eac24..69cb72b2082a 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -562,7 +562,7 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out; =20 if ((use_browser =3D=3D 1 || ann->use_stdio2) && ann->has_br_stack) - if (session->evlist->nr_br_cntr > 0) + if (evlist__nr_br_cntr(session->evlist) > 0) annotate_opts.show_br_cntr =3D true; =20 if (dump_trace) { @@ -928,8 +928,11 @@ int cmd_annotate(int argc, const char **argv) * branch counters, if the corresponding branch info is available * in the perf data in the TUI mode. */ - if ((use_browser =3D=3D 1 || annotate.use_stdio2) && annotate.has_br_stac= k) + if ((use_browser =3D=3D 1 || annotate.use_stdio2) && annotate.has_br_stac= k) { sort__mode =3D SORT_MODE__BRANCH; + if (evlist__nr_br_cntr(annotate.session->evlist) > 0) + annotate_opts.show_br_cntr =3D true; + } =20 if (setup_sorting(/*evlist=3D*/NULL, perf_session__env(annotate.session))= < 0) usage_with_options(annotate_usage, options); diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 676239148b87..9e4c5220d43c 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -377,9 +377,9 @@ static int set_tracing_pid(struct perf_ftrace *ftrace) if (target__has_cpu(&ftrace->target)) return 0; =20 - for (i =3D 0; i < perf_thread_map__nr(ftrace->evlist->core.threads); i++)= { + for (i =3D 0; i < perf_thread_map__nr(evlist__core(ftrace->evlist)->threa= ds); i++) { scnprintf(buf, sizeof(buf), "%d", - perf_thread_map__pid(ftrace->evlist->core.threads, i)); + perf_thread_map__pid(evlist__core(ftrace->evlist)->threads, i)); if (append_tracing_file("set_ftrace_pid", buf) < 0) return -1; } @@ -413,7 +413,7 @@ static int set_tracing_cpumask(struct perf_cpu_map *cpu= map) =20 static int set_tracing_cpu(struct perf_ftrace *ftrace) { - struct perf_cpu_map *cpumap =3D ftrace->evlist->core.user_requested_cpus; + struct perf_cpu_map *cpumap =3D evlist__core(ftrace->evlist)->user_reques= ted_cpus; =20 if (!target__has_cpu(&ftrace->target)) return 0; diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 75ffe31d03fe..0c7e27917bb8 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -1496,7 +1496,7 @@ static int synthesize_id_index(struct perf_inject *in= ject, size_t new_cnt) struct perf_session *session =3D inject->session; struct evlist *evlist =3D session->evlist; struct machine *machine =3D &session->machines.host; - size_t from =3D evlist->core.nr_entries - new_cnt; + size_t from =3D evlist__nr_entries(evlist) - new_cnt; =20 return __perf_event__synthesize_id_index(&inject->tool, perf_event__repip= e, evlist, machine, from); @@ -2031,7 +2031,7 @@ static int host__finished_init(const struct perf_tool= *tool, struct perf_session if (ret) return ret; =20 - ret =3D synthesize_id_index(inject, gs->session->evlist->core.nr_entries); + ret =3D synthesize_id_index(inject, evlist__nr_entries(gs->session->evlis= t)); if (ret) { pr_err("Failed to synthesize id_index\n"); return ret; diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 993dabff2a72..2c6aef1e13a0 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1221,7 +1221,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_st= at *kvm, int idx, int err; =20 *mmap_time =3D ULLONG_MAX; - md =3D &evlist->mmap[idx]; + md =3D &evlist__mmap(evlist)[idx]; err =3D perf_mmap__read_init(&md->core); if (err < 0) return (err =3D=3D -EAGAIN) ? 0 : -1; @@ -1266,7 +1266,7 @@ static int perf_kvm__mmap_read(struct perf_kvm_stat *= kvm) s64 n, ntotal =3D 0; u64 flush_time =3D ULLONG_MAX, mmap_time; =20 - for (i =3D 0; i < kvm->evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(kvm->evlist)->nr_mmaps; i++) { n =3D perf_kvm__mmap_read_idx(kvm, i, &mmap_time); if (n < 0) return -1; @@ -1449,7 +1449,7 @@ static int kvm_events_live_report(struct perf_kvm_sta= t *kvm) evlist__enable(kvm->evlist); =20 while (!done) { - struct fdarray *fda =3D &kvm->evlist->core.pollfd; + struct fdarray *fda =3D &evlist__core(kvm->evlist)->pollfd; int rc; =20 rc =3D perf_kvm__mmap_read(kvm); @@ -1531,7 +1531,7 @@ static int kvm_live_open_events(struct perf_kvm_stat = *kvm) goto out; } =20 - if (evlist__mmap(evlist, kvm->opts.mmap_pages) < 0) { + if (evlist__do_mmap(evlist, kvm->opts.mmap_pages) < 0) { ui__error("Failed to mmap the events: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__close(evlist); @@ -1931,7 +1931,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, perf_session__set_id_hdr_size(kvm->session); ordered_events__set_copy_on_queue(&kvm->session->ordered_events, true); machine__synthesize_threads(&kvm->session->machines.host, &kvm->opts.targ= et, - kvm->evlist->core.threads, true, false, 1); + evlist__core(kvm->evlist)->threads, true, false, 1); err =3D kvm_live_open_events(kvm); if (err) goto out; diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index 7b61168e01e9..fce588441e49 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -1814,7 +1814,7 @@ static int perf_kwork__check_config(struct perf_kwork= *kwork, } } =20 - list_for_each_entry(evsel, &session->evlist->core.entries, core.node) { + list_for_each_entry(evsel, &evlist__core(session->evlist)->entries, core.= node) { if (kwork->show_callchain && !evsel__has_callchain(evsel)) { pr_debug("Samples do not have callchains\n"); kwork->show_callchain =3D 0; @@ -1864,9 +1864,9 @@ static int perf_kwork__read_events(struct perf_kwork = *kwork) goto out_delete; } =20 - kwork->nr_events =3D session->evlist->stats.nr_events[0]; - kwork->nr_lost_events =3D session->evlist->stats.total_lost; - kwork->nr_lost_chunks =3D session->evlist->stats.nr_events[PERF_RECORD_LO= ST]; + kwork->nr_events =3D evlist__stats(session->evlist)->nr_events[0]; + kwork->nr_lost_events =3D evlist__stats(session->evlist)->total_lost; + kwork->nr_lost_chunks =3D evlist__stats(session->evlist)->nr_events[PERF_= RECORD_LOST]; =20 out_delete: perf_session__delete(session); diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index d925543a68c0..d5c0d55cb82d 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -2129,7 +2129,7 @@ static int __cmd_contention(int argc, const char **ar= gv) evlist__start_workload(con.evlist); =20 while (!done) { - if (argc && waitpid(con.evlist->workload.pid, NULL, WNOHANG) > 0) + if (argc && waitpid(evlist__workload_pid(con.evlist), NULL, WNOHANG) > = 0) break; sleep(1); } diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index e76dc4e34ba1..7c892ea32596 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -502,12 +502,12 @@ static void record__aio_mmap_read_sync(struct record = *rec) { int i; struct evlist *evlist =3D rec->evlist; - struct mmap *maps =3D evlist->mmap; + struct mmap *maps =3D evlist__mmap(evlist); =20 if (!record__aio_enabled(rec)) return; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { struct mmap *map =3D &maps[i]; =20 if (map->core.base) @@ -811,8 +811,8 @@ static int record__auxtrace_read_snapshot_all(struct re= cord *rec) int i; int rc =3D 0; =20 - for (i =3D 0; i < rec->evlist->core.nr_mmaps; i++) { - struct mmap *map =3D &rec->evlist->mmap[i]; + for (i =3D 0; i < evlist__core(rec->evlist)->nr_mmaps; i++) { + struct mmap *map =3D &evlist__mmap(rec->evlist)[i]; =20 if (!map->auxtrace_mmap.base) continue; @@ -1055,15 +1055,15 @@ static void record__thread_data_close_pipes(struct = record_thread *thread_data) =20 static bool evlist__per_thread(struct evlist *evlist) { - return cpu_map__is_dummy(evlist->core.user_requested_cpus); + return cpu_map__is_dummy(evlist__core(evlist)->user_requested_cpus); } =20 static int record__thread_data_init_maps(struct record_thread *thread_data= , struct evlist *evlist) { - int m, tm, nr_mmaps =3D evlist->core.nr_mmaps; - struct mmap *mmap =3D evlist->mmap; - struct mmap *overwrite_mmap =3D evlist->overwrite_mmap; - struct perf_cpu_map *cpus =3D evlist->core.all_cpus; + int m, tm, nr_mmaps =3D evlist__core(evlist)->nr_mmaps; + struct mmap *mmap =3D evlist__mmap(evlist); + struct mmap *overwrite_mmap =3D evlist__overwrite_mmap(evlist); + struct perf_cpu_map *cpus =3D evlist__core(evlist)->all_cpus; bool per_thread =3D evlist__per_thread(evlist); =20 if (per_thread) @@ -1118,16 +1118,17 @@ static int record__thread_data_init_pollfd(struct r= ecord_thread *thread_data, st overwrite_map =3D thread_data->overwrite_maps ? thread_data->overwrite_maps[tm] : NULL; =20 - for (f =3D 0; f < evlist->core.pollfd.nr; f++) { - void *ptr =3D evlist->core.pollfd.priv[f].ptr; + for (f =3D 0; f < evlist__core(evlist)->pollfd.nr; f++) { + void *ptr =3D evlist__core(evlist)->pollfd.priv[f].ptr; =20 if ((map && ptr =3D=3D map) || (overwrite_map && ptr =3D=3D overwrite_m= ap)) { pos =3D fdarray__dup_entry_from(&thread_data->pollfd, f, - &evlist->core.pollfd); + &evlist__core(evlist)->pollfd); if (pos < 0) return pos; pr_debug2("thread_data[%p]: pollfd[%d] <- event_fd=3D%d\n", - thread_data, pos, evlist->core.pollfd.entries[f].fd); + thread_data, pos, + evlist__core(evlist)->pollfd.entries[f].fd); } } } @@ -1171,7 +1172,7 @@ static int record__update_evlist_pollfd_from_thread(s= truct record *rec, struct evlist *evlist, struct record_thread *thread_data) { - struct pollfd *e_entries =3D evlist->core.pollfd.entries; + struct pollfd *e_entries =3D evlist__core(evlist)->pollfd.entries; struct pollfd *t_entries =3D thread_data->pollfd.entries; int err =3D 0; size_t i; @@ -1195,7 +1196,7 @@ static int record__dup_non_perf_events(struct record = *rec, struct evlist *evlist, struct record_thread *thread_data) { - struct fdarray *fda =3D &evlist->core.pollfd; + struct fdarray *fda =3D &evlist__core(evlist)->pollfd; int i, ret; =20 for (i =3D 0; i < fda->nr; i++) { @@ -1322,17 +1323,17 @@ static int record__mmap_evlist(struct record *rec, return ret; =20 if (record__threads_enabled(rec)) { - ret =3D perf_data__create_dir(&rec->data, evlist->core.nr_mmaps); + ret =3D perf_data__create_dir(&rec->data, evlist__core(evlist)->nr_mmaps= ); if (ret) { errno =3D -ret; pr_err("Failed to create data directory: %m\n"); return ret; } - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - if (evlist->mmap) - evlist->mmap[i].file =3D &rec->data.dir.files[i]; - if (evlist->overwrite_mmap) - evlist->overwrite_mmap[i].file =3D &rec->data.dir.files[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + if (evlist__mmap(evlist)) + evlist__mmap(evlist)[i].file =3D &rec->data.dir.files[i]; + if (evlist__overwrite_mmap(evlist)) + evlist__overwrite_mmap(evlist)[i].file =3D &rec->data.dir.files[i]; } } =20 @@ -1481,11 +1482,11 @@ static int record__open(struct record *rec) =20 static void set_timestamp_boundary(struct record *rec, u64 sample_time) { - if (rec->evlist->first_sample_time =3D=3D 0) - rec->evlist->first_sample_time =3D sample_time; + if (evlist__first_sample_time(rec->evlist) =3D=3D 0) + evlist__set_first_sample_time(rec->evlist, sample_time); =20 if (sample_time) - rec->evlist->last_sample_time =3D sample_time; + evlist__set_last_sample_time(rec->evlist, sample_time); } =20 static int process_sample_event(const struct perf_tool *tool, @@ -1653,7 +1654,7 @@ static int record__mmap_read_evlist(struct record *re= c, struct evlist *evlist, if (!maps) return 0; =20 - if (overwrite && evlist->bkw_mmap_state !=3D BKW_MMAP_DATA_PENDING) + if (overwrite && evlist__bkw_mmap_state(evlist) !=3D BKW_MMAP_DATA_PENDIN= G) return 0; =20 if (record__aio_enabled(rec)) @@ -1808,7 +1809,7 @@ static void record__init_features(struct record *rec) if (rec->no_buildid) perf_header__clear_feat(&session->header, HEADER_BUILD_ID); =20 - if (!have_tracepoints(&rec->evlist->core.entries)) + if (!have_tracepoints(&evlist__core(rec->evlist)->entries)) perf_header__clear_feat(&session->header, HEADER_TRACING_DATA); =20 if (!rec->opts.branch_stack) @@ -1874,7 +1875,7 @@ static int record__synthesize_workload(struct record = *rec, bool tail) if (rec->opts.tail_synthesize !=3D tail) return 0; =20 - thread_map =3D thread_map__new_by_tid(rec->evlist->workload.pid); + thread_map =3D thread_map__new_by_tid(evlist__workload_pid(rec->evlist)); if (thread_map =3D=3D NULL) return -1; =20 @@ -2067,10 +2068,10 @@ static void alarm_sig_handler(int sig); static const struct perf_event_mmap_page *evlist__pick_pc(struct evlist *e= vlist) { if (evlist) { - if (evlist->mmap && evlist->mmap[0].core.base) - return evlist->mmap[0].core.base; - if (evlist->overwrite_mmap && evlist->overwrite_mmap[0].core.base) - return evlist->overwrite_mmap[0].core.base; + if (evlist__mmap(evlist) && evlist__mmap(evlist)[0].core.base) + return evlist__mmap(evlist)[0].core.base; + if (evlist__overwrite_mmap(evlist) && evlist__overwrite_mmap(evlist)[0].= core.base) + return evlist__overwrite_mmap(evlist)[0].core.base; } return NULL; } @@ -2150,7 +2151,7 @@ static int record__synthesize(struct record *rec, boo= l tail) if (err) goto out; =20 - err =3D perf_event__synthesize_thread_map2(&rec->tool, rec->evlist->core.= threads, + err =3D perf_event__synthesize_thread_map2(&rec->tool, evlist__core(rec->= evlist)->threads, process_synthesized_event, NULL); if (err < 0) { @@ -2158,7 +2159,7 @@ static int record__synthesize(struct record *rec, boo= l tail) return err; } =20 - err =3D perf_event__synthesize_cpu_map(&rec->tool, rec->evlist->core.all_= cpus, + err =3D perf_event__synthesize_cpu_map(&rec->tool, evlist__core(rec->evli= st)->all_cpus, process_synthesized_event, NULL); if (err < 0) { pr_err("Couldn't synthesize cpu map.\n"); @@ -2191,7 +2192,7 @@ static int record__synthesize(struct record *rec, boo= l tail) bool needs_mmap =3D rec->opts.synth & PERF_SYNTH_MMAP; =20 err =3D __machine__synthesize_threads(machine, tool, &opts->target, - rec->evlist->core.threads, + evlist__core(rec->evlist)->threads, f, needs_mmap, opts->record_data_mmap, rec->opts.nr_threads_synthesize); } @@ -2544,7 +2545,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) * because we synthesize event name through the pipe * and need the id for that. */ - if (data->is_pipe && rec->evlist->core.nr_entries =3D=3D 1) + if (data->is_pipe && evlist__nr_entries(rec->evlist) =3D=3D 1) rec->opts.sample_id =3D true; =20 if (rec->timestamp_filename && perf_data__is_pipe(data)) { @@ -2568,7 +2569,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) } /* Debug message used by test scripts */ pr_debug3("perf record done opening and mmapping events\n"); - env->comp_mmap_len =3D session->evlist->core.mmap_len; + env->comp_mmap_len =3D evlist__core(session->evlist)->mmap_len; =20 if (rec->opts.kcore) { err =3D record__kcore_copy(&session->machines.host, data); @@ -2669,7 +2670,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) * Synthesize COMM event to prevent it. */ tgid =3D perf_event__synthesize_comm(tool, event, - rec->evlist->workload.pid, + evlist__workload_pid(rec->evlist), process_synthesized_event, machine); free(event); @@ -2689,7 +2690,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) * Synthesize NAMESPACES event for the command specified. */ perf_event__synthesize_namespaces(tool, event, - rec->evlist->workload.pid, + evlist__workload_pid(rec->evlist), tgid, process_synthesized_event, machine); free(event); @@ -2706,7 +2707,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) } } =20 - err =3D event_enable_timer__start(rec->evlist->eet); + err =3D event_enable_timer__start(evlist__event_enable_timer(rec->evlist)= ); if (err) goto out_child; =20 @@ -2768,7 +2769,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) * record__mmap_read_all() didn't collect data from * overwritable ring buffer. Read again. */ - if (rec->evlist->bkw_mmap_state =3D=3D BKW_MMAP_RUNNING) + if (evlist__bkw_mmap_state(rec->evlist) =3D=3D BKW_MMAP_RUNNING) continue; trigger_ready(&switch_output_trigger); =20 @@ -2837,7 +2838,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) } } =20 - err =3D event_enable_timer__process(rec->evlist->eet); + err =3D event_enable_timer__process(evlist__event_enable_timer(rec->evli= st)); if (err < 0) goto out_child; if (err) { @@ -2909,7 +2910,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) int exit_status; =20 if (!child_finished) - kill(rec->evlist->workload.pid, SIGTERM); + kill(evlist__workload_pid(rec->evlist), SIGTERM); =20 wait(&exit_status); =20 @@ -4031,7 +4032,7 @@ static int record__init_thread_default_masks(struct r= ecord *rec, struct perf_cpu static int record__init_thread_masks(struct record *rec) { int ret =3D 0; - struct perf_cpu_map *cpus =3D rec->evlist->core.all_cpus; + struct perf_cpu_map *cpus =3D evlist__core(rec->evlist)->all_cpus; =20 if (!record__threads_enabled(rec)) return record__init_thread_default_masks(rec, cpus); @@ -4282,14 +4283,14 @@ int cmd_record(int argc, const char **argv) if (record.opts.overwrite) record.opts.tail_synthesize =3D true; =20 - if (rec->evlist->core.nr_entries =3D=3D 0) { + if (evlist__nr_entries(rec->evlist) =3D=3D 0) { struct evlist *def_evlist =3D evlist__new_default(&rec->opts.target, callchain_param.enabled); =20 if (!def_evlist) goto out; =20 - evlist__splice_list_tail(rec->evlist, &def_evlist->core.entries); + evlist__splice_list_tail(rec->evlist, &evlist__core(def_evlist)->entries= ); evlist__put(def_evlist); } =20 diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index dd1309c32094..10db1e5f1e6c 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -561,7 +561,7 @@ static int evlist__tty_browse_hists(struct evlist *evli= st, struct report *rep, c =20 if (!quiet) { fprintf(stdout, "#\n# Total Lost Samples: %" PRIu64 "\n#\n", - evlist->stats.total_lost_samples); + evlist__stats(evlist)->total_lost_samples); } =20 evlist__for_each_entry(evlist, pos) { @@ -1156,7 +1156,7 @@ static int __cmd_report(struct report *rep) PERF_HPP_REPORT__BLOCK_AVG_CYCLES, }; =20 - if (session->evlist->nr_br_cntr > 0) + if (evlist__nr_br_cntr(session->evlist) > 0) block_hpps[nr_hpps++] =3D PERF_HPP_REPORT__BLOCK_BRANCH_COUNTER; =20 block_hpps[nr_hpps++] =3D PERF_HPP_REPORT__BLOCK_RANGE; @@ -1291,7 +1291,7 @@ static int process_attr(const struct perf_tool *tool = __maybe_unused, * on events sample_type. */ sample_type =3D evlist__combined_sample_type(*pevlist); - session =3D (*pevlist)->session; + session =3D evlist__session(*pevlist); callchain_param_setup(sample_type, perf_session__e_machine(session, /*e_f= lags=3D*/NULL)); return 0; } diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index a6a52c89ea9f..2ad827ac1862 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1972,9 +1972,9 @@ static int perf_sched__read_events(struct perf_sched = *sched) goto out_delete; } =20 - sched->nr_events =3D session->evlist->stats.nr_events[0]; - sched->nr_lost_events =3D session->evlist->stats.total_lost; - sched->nr_lost_chunks =3D session->evlist->stats.nr_events[PERF_RECORD_L= OST]; + sched->nr_events =3D evlist__stats(session->evlist)->nr_events[0]; + sched->nr_lost_events =3D evlist__stats(session->evlist)->total_lost; + sched->nr_lost_chunks =3D evlist__stats(session->evlist)->nr_events[PERF= _RECORD_LOST]; } =20 rc =3D 0; @@ -3227,7 +3227,7 @@ static int timehist_check_attr(struct perf_sched *sch= ed, struct evsel *evsel; struct evsel_runtime *er; =20 - list_for_each_entry(evsel, &evlist->core.entries, core.node) { + list_for_each_entry(evsel, &evlist__core(evlist)->entries, core.node) { er =3D evsel__get_runtime(evsel); if (er =3D=3D NULL) { pr_err("Failed to allocate memory for evsel runtime data\n"); @@ -3399,9 +3399,9 @@ static int perf_sched__timehist(struct perf_sched *sc= hed) goto out; } =20 - sched->nr_events =3D evlist->stats.nr_events[0]; - sched->nr_lost_events =3D evlist->stats.total_lost; - sched->nr_lost_chunks =3D evlist->stats.nr_events[PERF_RECORD_LOST]; + sched->nr_events =3D evlist__stats(evlist)->nr_events[0]; + sched->nr_lost_events =3D evlist__stats(evlist)->total_lost; + sched->nr_lost_chunks =3D evlist__stats(evlist)->nr_events[PERF_RECORD_LO= ST]; =20 if (sched->summary) timehist_print_summary(sched, session); @@ -3906,7 +3906,7 @@ static int perf_sched__schedstat_record(struct perf_s= ched *sched, if (err < 0) goto out; =20 - user_requested_cpus =3D evlist->core.user_requested_cpus; + user_requested_cpus =3D evlist__core(evlist)->user_requested_cpus; =20 err =3D perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_schedstat_event, @@ -3922,7 +3922,7 @@ static int perf_sched__schedstat_record(struct perf_s= ched *sched, evlist__start_workload(evlist); =20 while (!done) { - if (argc && waitpid(evlist->workload.pid, NULL, WNOHANG) > 0) + if (argc && waitpid(evlist__workload_pid(evlist), NULL, WNOHANG) > 0) break; sleep(1); } @@ -4623,7 +4623,7 @@ static int perf_sched__schedstat_report(struct perf_s= ched *sched) if (err < 0) goto out; =20 - user_requested_cpus =3D session->evlist->core.user_requested_cpus; + user_requested_cpus =3D evlist__core(session->evlist)->user_requested_cpu= s; =20 err =3D perf_session__process_events(session); =20 @@ -4799,7 +4799,7 @@ static int perf_sched__schedstat_live(struct perf_sch= ed *sched, if (err < 0) goto out; =20 - user_requested_cpus =3D evlist->core.user_requested_cpus; + user_requested_cpus =3D evlist__core(evlist)->user_requested_cpus; =20 err =3D perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_event_live, @@ -4815,7 +4815,7 @@ static int perf_sched__schedstat_live(struct perf_sch= ed *sched, evlist__start_workload(evlist); =20 while (!done) { - if (argc && waitpid(evlist->workload.pid, NULL, WNOHANG) > 0) + if (argc && waitpid(evlist__workload_pid(evlist), NULL, WNOHANG) > 0) break; sleep(1); } diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index f612a6d39ab9..2f011dd63cfd 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2229,9 +2229,10 @@ static int script_find_metrics(const struct pmu_metr= ic *pm, evlist__for_each_entry(metric_evlist, metric_evsel) { struct evsel *script_evsel =3D map_metric_evsel_to_script_evsel(script_evlist, metric_evsel); - struct metric_event *metric_me =3D metricgroup__lookup(&metric_evlist->m= etric_events, - metric_evsel, - /*create=3D*/false); + struct metric_event *metric_me =3D + metricgroup__lookup(evlist__metric_events(metric_evlist), + metric_evsel, + /*create=3D*/false); =20 if (script_evsel->metric_id =3D=3D NULL) { script_evsel->metric_id =3D metric_evsel->metric_id; @@ -2251,7 +2252,7 @@ static int script_find_metrics(const struct pmu_metri= c *pm, if (metric_me) { struct metric_expr *expr; struct metric_event *script_me =3D - metricgroup__lookup(&script_evlist->metric_events, + metricgroup__lookup(evlist__metric_events(script_evlist), script_evsel, /*create=3D*/true); =20 @@ -2321,7 +2322,7 @@ static void perf_sample__fprint_metric(struct thread = *thread, assert(stat_config.aggr_mode =3D=3D AGGR_GLOBAL); stat_config.aggr_get_id =3D script_aggr_cpu_id_get; stat_config.aggr_map =3D - cpu_aggr_map__new(evsel->evlist->core.user_requested_cpus, + cpu_aggr_map__new(evlist__core(evsel->evlist)->user_requested_cpus, aggr_cpu_id__global, /*data=3D*/NULL, /*needs_sort=3D*/false); } @@ -3909,7 +3910,7 @@ static int set_maps(struct perf_script *script) if (WARN_ONCE(script->allocated, "stats double allocation\n")) return -EINVAL; =20 - perf_evlist__set_maps(&evlist->core, script->cpus, script->threads); + perf_evlist__set_maps(evlist__core(evlist), script->cpus, script->threads= ); =20 if (evlist__alloc_stats(&stat_config, evlist, /*alloc_raw=3D*/true)) return -ENOMEM; diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index bfa3512e1686..4058d22d8c5d 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -321,7 +321,7 @@ static int read_single_counter(struct evsel *counter, i= nt cpu_map_idx, int threa */ static int read_counter_cpu(struct evsel *counter, int cpu_map_idx) { - int nthreads =3D perf_thread_map__nr(evsel_list->core.threads); + int nthreads =3D perf_thread_map__nr(evlist__core(evsel_list)->threads); int thread; =20 if (!counter->supported) @@ -628,11 +628,12 @@ static int dispatch_events(bool forks, int timeout, i= nt interval, int *times) time_to_sleep =3D sleep_time; =20 while (!done) { - if (forks) + if (forks) { child_exited =3D waitpid(child_pid, &status, WNOHANG); - else - child_exited =3D !is_target_alive(&target, evsel_list->core.threads) ? = 1 : 0; - + } else { + child_exited =3D !is_target_alive(&target, + evlist__core(evsel_list)->threads) ? 1 : 0; + } if (child_exited) break; =20 @@ -681,14 +682,15 @@ static enum counter_recovery stat_handle_error(struct= evsel *counter, int err) return COUNTER_RETRY; } if (target__has_per_thread(&target) && err !=3D EOPNOTSUPP && - evsel_list->core.threads && evsel_list->core.threads->err_thread !=3D= -1) { + evlist__core(evsel_list)->threads && + evlist__core(evsel_list)->threads->err_thread !=3D -1) { /* * For global --per-thread case, skip current * error thread. */ - if (!thread_map__remove(evsel_list->core.threads, - evsel_list->core.threads->err_thread)) { - evsel_list->core.threads->err_thread =3D -1; + if (!thread_map__remove(evlist__core(evsel_list)->threads, + evlist__core(evsel_list)->threads->err_thread)) { + evlist__core(evsel_list)->threads->err_thread =3D -1; counter->supported =3D true; return COUNTER_RETRY; } @@ -787,11 +789,12 @@ static int __run_perf_stat(int argc, const char **arg= v, int run_idx) bool second_pass =3D false, has_supported_counters; =20 if (forks) { - if (evlist__prepare_workload(evsel_list, &target, argv, is_pipe, workloa= d_exec_failed_signal) < 0) { + if (evlist__prepare_workload(evsel_list, &target, argv, is_pipe, + workload_exec_failed_signal) < 0) { perror("failed to prepare workload"); return -1; } - child_pid =3D evsel_list->workload.pid; + child_pid =3D evlist__workload_pid(evsel_list); } =20 evlist__for_each_entry(evsel_list, counter) { @@ -1199,7 +1202,7 @@ static int parse_cputype(const struct option *opt, const struct perf_pmu *pmu; struct evlist *evlist =3D *(struct evlist **)opt->value; =20 - if (!list_empty(&evlist->core.entries)) { + if (!list_empty(&evlist__core(evlist)->entries)) { fprintf(stderr, "Must define cputype before events/metrics\n"); return -1; } @@ -1220,7 +1223,7 @@ static int parse_pmu_filter(const struct option *opt, { struct evlist *evlist =3D *(struct evlist **)opt->value; =20 - if (!list_empty(&evlist->core.entries)) { + if (!list_empty(&evlist__core(evlist)->entries)) { fprintf(stderr, "Must define pmu-filter before events/metrics\n"); return -1; } @@ -1586,8 +1589,9 @@ static int perf_stat_init_aggr_mode(void) =20 if (get_id) { bool needs_sort =3D stat_config.aggr_mode !=3D AGGR_NONE; - stat_config.aggr_map =3D cpu_aggr_map__new(evsel_list->core.user_request= ed_cpus, - get_id, /*data=3D*/NULL, needs_sort); + stat_config.aggr_map =3D cpu_aggr_map__new( + evlist__core(evsel_list)->user_requested_cpus, + get_id, /*data=3D*/NULL, needs_sort); if (!stat_config.aggr_map) { pr_err("cannot build %s map\n", aggr_mode__string[stat_config.aggr_mode= ]); return -1; @@ -1596,7 +1600,7 @@ static int perf_stat_init_aggr_mode(void) } =20 if (stat_config.aggr_mode =3D=3D AGGR_THREAD) { - nr =3D perf_thread_map__nr(evsel_list->core.threads); + nr =3D perf_thread_map__nr(evlist__core(evsel_list)->threads); stat_config.aggr_map =3D cpu_aggr_map__empty_new(nr); if (stat_config.aggr_map =3D=3D NULL) return -ENOMEM; @@ -1615,7 +1619,7 @@ static int perf_stat_init_aggr_mode(void) * taking the highest cpu number to be the size of * the aggregation translate cpumap. */ - nr =3D perf_cpu_map__max(evsel_list->core.all_cpus).cpu + 1; + nr =3D perf_cpu_map__max(evlist__core(evsel_list)->all_cpus).cpu + 1; stat_config.cpus_aggr_map =3D cpu_aggr_map__empty_new(nr); return stat_config.cpus_aggr_map ? 0 : -ENOMEM; } @@ -1896,7 +1900,7 @@ static int perf_stat_init_aggr_mode_file(struct perf_= stat *st) bool needs_sort =3D stat_config.aggr_mode !=3D AGGR_NONE; =20 if (stat_config.aggr_mode =3D=3D AGGR_THREAD) { - int nr =3D perf_thread_map__nr(evsel_list->core.threads); + int nr =3D perf_thread_map__nr(evlist__core(evsel_list)->threads); =20 stat_config.aggr_map =3D cpu_aggr_map__empty_new(nr); if (stat_config.aggr_map =3D=3D NULL) @@ -1914,7 +1918,7 @@ static int perf_stat_init_aggr_mode_file(struct perf_= stat *st) if (!get_id) return 0; =20 - stat_config.aggr_map =3D cpu_aggr_map__new(evsel_list->core.user_requeste= d_cpus, + stat_config.aggr_map =3D cpu_aggr_map__new(evlist__core(evsel_list)->user= _requested_cpus, get_id, env, needs_sort); if (!stat_config.aggr_map) { pr_err("cannot build %s map\n", aggr_mode__string[stat_config.aggr_mode]= ); @@ -2082,7 +2086,7 @@ static int add_default_events(void) if (!stat_config.topdown_level) stat_config.topdown_level =3D 1; =20 - if (!evlist->core.nr_entries && !evsel_list->core.nr_entries) { + if (!evlist__nr_entries(evlist) && !evlist__nr_entries(evsel_list)) { /* * Add Default metrics. To minimize multiplexing, don't request * threshold computation, but it will be computed if the events @@ -2121,13 +2125,13 @@ static int add_default_events(void) evlist__for_each_entry(metric_evlist, evsel) evsel->default_metricgroup =3D true; =20 - evlist__splice_list_tail(evlist, &metric_evlist->core.entries); + evlist__splice_list_tail(evlist, &evlist__core(metric_evlist)->entries); metricgroup__copy_metric_events(evlist, /*cgrp=3D*/NULL, - &evlist->metric_events, - &metric_evlist->metric_events); + evlist__metric_events(evlist), + evlist__metric_events(metric_evlist)); evlist__put(metric_evlist); } - list_sort(/*priv=3D*/NULL, &evlist->core.entries, default_evlist_evsel_c= mp); + list_sort(/*priv=3D*/NULL, &evlist__core(evlist)->entries, default_evlis= t_evsel_cmp); =20 } out: @@ -2142,10 +2146,10 @@ static int add_default_events(void) } } parse_events_error__exit(&err); - evlist__splice_list_tail(evsel_list, &evlist->core.entries); + evlist__splice_list_tail(evsel_list, &evlist__core(evlist)->entries); metricgroup__copy_metric_events(evsel_list, /*cgrp=3D*/NULL, - &evsel_list->metric_events, - &evlist->metric_events); + evlist__metric_events(evsel_list), + evlist__metric_events(evlist)); evlist__put(evlist); return ret; } @@ -2266,7 +2270,7 @@ static int set_maps(struct perf_stat *st) if (WARN_ONCE(st->maps_allocated, "stats double allocation\n")) return -EINVAL; =20 - perf_evlist__set_maps(&evsel_list->core, st->cpus, st->threads); + perf_evlist__set_maps(evlist__core(evsel_list), st->cpus, st->threads); =20 if (evlist__alloc_stats(&stat_config, evsel_list, /*alloc_raw=3D*/true)) return -ENOMEM; @@ -2418,7 +2422,7 @@ static void setup_system_wide(int forks) } } =20 - if (evsel_list->core.nr_entries) + if (evlist__nr_entries(evsel_list)) target.system_wide =3D true; } } @@ -2645,7 +2649,7 @@ int cmd_stat(int argc, const char **argv) stat_config.csv_sep =3D DEFAULT_SEPARATOR; =20 if (affinity_set) - evsel_list->no_affinity =3D !affinity; + evlist__set_no_affinity(evsel_list, !affinity); =20 if (argc && strlen(argv[0]) > 2 && strstarts("record", argv[0])) { argc =3D __cmd_record(stat_options, &opt_mode, argc, argv); @@ -2812,7 +2816,7 @@ int cmd_stat(int argc, const char **argv) } =20 if (stat_config.iostat_run) { - status =3D iostat_prepare(evsel_list, &stat_config); + status =3D iostat_prepare(&evsel_list, &stat_config); if (status) goto out; if (iostat_mode =3D=3D IOSTAT_LIST) { @@ -2876,9 +2880,10 @@ int cmd_stat(int argc, const char **argv) } #ifdef HAVE_BPF_SKEL if (target.use_bpf && nr_cgroups && - (evsel_list->core.nr_entries / nr_cgroups) > BPERF_CGROUP__MAX_EVENTS= ) { + (evlist__nr_entries(evsel_list) / nr_cgroups) > BPERF_CGROUP__MAX_EVE= NTS) { pr_warning("Disabling BPF counters due to more events (%d) than the max = (%d)\n", - evsel_list->core.nr_entries / nr_cgroups, BPERF_CGROUP__MAX_EVENTS); + evlist__nr_entries(evsel_list) / nr_cgroups, + BPERF_CGROUP__MAX_EVENTS); target.use_bpf =3D false; } #endif // HAVE_BPF_SKEL @@ -2916,7 +2921,7 @@ int cmd_stat(int argc, const char **argv) * so we could print it out on output. */ if (stat_config.aggr_mode =3D=3D AGGR_THREAD) { - thread_map__read_comms(evsel_list->core.threads); + thread_map__read_comms(evlist__core(evsel_list)->threads); } =20 if (stat_config.aggr_mode =3D=3D AGGR_NODE) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index ff24ae35c67f..5933c46ee137 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -141,7 +141,7 @@ static int perf_top__parse_source(struct perf_top *top,= struct hist_entry *he) notes =3D symbol__annotation(sym); annotation__lock(notes); =20 - if (!symbol__hists(sym, top->evlist->core.nr_entries)) { + if (!symbol__hists(sym, evlist__nr_entries(top->evlist))) { annotation__unlock(notes); pr_err("Not enough memory for annotating '%s' symbol!\n", sym->name); @@ -267,7 +267,7 @@ static void perf_top__show_details(struct perf_top *top) =20 more =3D hist_entry__annotate_printf(he, top->sym_evsel); =20 - if (top->evlist->enabled) { + if (evlist__enabled(top->evlist)) { if (top->zero) symbol__annotate_zero_histogram(symbol, top->sym_evsel); else @@ -293,7 +293,7 @@ static void perf_top__resort_hists(struct perf_top *t) */ hists__unlink(hists); =20 - if (evlist->enabled) { + if (evlist__enabled(evlist)) { if (t->zero) { hists__delete_entries(hists); } else { @@ -334,13 +334,13 @@ static void perf_top__print_sym_table(struct perf_top= *top) printf("%-*.*s\n", win_width, win_width, graph_dotted_line); =20 if (!top->record_opts.overwrite && - (top->evlist->stats.nr_lost_warned !=3D - top->evlist->stats.nr_events[PERF_RECORD_LOST])) { - top->evlist->stats.nr_lost_warned =3D - top->evlist->stats.nr_events[PERF_RECORD_LOST]; + (evlist__stats(top->evlist)->nr_lost_warned !=3D + evlist__stats(top->evlist)->nr_events[PERF_RECORD_LOST])) { + evlist__stats(top->evlist)->nr_lost_warned =3D + evlist__stats(top->evlist)->nr_events[PERF_RECORD_LOST]; color_fprintf(stdout, PERF_COLOR_RED, "WARNING: LOST %d chunks, Check IO/CPU overload", - top->evlist->stats.nr_lost_warned); + evlist__stats(top->evlist)->nr_lost_warned); ++printed; } =20 @@ -447,7 +447,7 @@ static void perf_top__print_mapped_keys(struct perf_top= *top) fprintf(stdout, "\t[d] display refresh delay. \t(%d)\n", = top->delay_secs); fprintf(stdout, "\t[e] display entries (lines). \t(%d)\n", = top->print_entries); =20 - if (top->evlist->core.nr_entries > 1) + if (evlist__nr_entries(top->evlist) > 1) fprintf(stdout, "\t[E] active event counter. \t(%s)\n",= evsel__name(top->sym_evsel)); =20 fprintf(stdout, "\t[f] profile display filter (count). \t(%d)\n", = top->count_filter); @@ -482,7 +482,7 @@ static int perf_top__key_mapped(struct perf_top *top, i= nt c) case 'S': return 1; case 'E': - return top->evlist->core.nr_entries > 1 ? 1 : 0; + return evlist__nr_entries(top->evlist) > 1 ? 1 : 0; default: break; } @@ -528,7 +528,7 @@ static bool perf_top__handle_keypress(struct perf_top *= top, int c) } break; case 'E': - if (top->evlist->core.nr_entries > 1) { + if (evlist__nr_entries(top->evlist) > 1) { /* Select 0 as the default event: */ int counter =3D 0; =20 @@ -539,7 +539,7 @@ static bool perf_top__handle_keypress(struct perf_top *= top, int c) =20 prompt_integer(&counter, "Enter details event counter"); =20 - if (counter >=3D top->evlist->core.nr_entries) { + if (counter >=3D evlist__nr_entries(top->evlist)) { top->sym_evsel =3D evlist__first(top->evlist); fprintf(stderr, "Sorry, no such event, using %s.\n", evsel__name(top-= >sym_evsel)); sleep(1); @@ -598,8 +598,8 @@ static void perf_top__sort_new_samples(void *arg) { struct perf_top *t =3D arg; =20 - if (t->evlist->selected !=3D NULL) - t->sym_evsel =3D t->evlist->selected; + if (evlist__selected(t->evlist) !=3D NULL) + t->sym_evsel =3D evlist__selected(t->evlist); =20 perf_top__resort_hists(t); =20 @@ -766,7 +766,7 @@ static void perf_event__process_sample(const struct per= f_tool *tool, =20 if (!machine) { pr_err("%u unprocessable samples recorded.\r", - top->session->evlist->stats.nr_unprocessable_samples++); + evlist__stats(top->session->evlist)->nr_unprocessable_samples++); return; } =20 @@ -859,7 +859,7 @@ perf_top__process_lost(struct perf_top *top, union perf= _event *event, { top->lost +=3D event->lost.lost; top->lost_total +=3D event->lost.lost; - evsel->evlist->stats.total_lost +=3D event->lost.lost; + evlist__stats(evsel->evlist)->total_lost +=3D event->lost.lost; } =20 static void @@ -869,7 +869,7 @@ perf_top__process_lost_samples(struct perf_top *top, { top->lost +=3D event->lost_samples.lost; top->lost_total +=3D event->lost_samples.lost; - evsel->evlist->stats.total_lost_samples +=3D event->lost_samples.lost; + evlist__stats(evsel->evlist)->total_lost_samples +=3D event->lost_samples= .lost; } =20 static u64 last_timestamp; @@ -881,7 +881,7 @@ static void perf_top__mmap_read_idx(struct perf_top *to= p, int idx) struct mmap *md; union perf_event *event; =20 - md =3D opts->overwrite ? &evlist->overwrite_mmap[idx] : &evlist->mmap[idx= ]; + md =3D opts->overwrite ? &evlist__overwrite_mmap(evlist)[idx] : &evlist__= mmap(evlist)[idx]; if (perf_mmap__read_init(&md->core) < 0) return; =20 @@ -918,7 +918,7 @@ static void perf_top__mmap_read(struct perf_top *top) if (overwrite) evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING); =20 - for (i =3D 0; i < top->evlist->core.nr_mmaps; i++) + for (i =3D 0; i < evlist__core(top->evlist)->nr_mmaps; i++) perf_top__mmap_read_idx(top, i); =20 if (overwrite) { @@ -1063,7 +1063,7 @@ static int perf_top__start_counters(struct perf_top *= top) goto out_err; } =20 - if (evlist__mmap(evlist, opts->mmap_pages) < 0) { + if (evlist__do_mmap(evlist, opts->mmap_pages) < 0) { ui__error("Failed to mmap with %d (%s)\n", errno, str_error_r(errno, msg, sizeof(msg))); goto out_err; @@ -1218,10 +1218,10 @@ static int deliver_event(struct ordered_events *qe, } else if (event->header.type =3D=3D PERF_RECORD_LOST_SAMPLES) { perf_top__process_lost_samples(top, event, evsel); } else if (event->header.type < PERF_RECORD_MAX) { - events_stats__inc(&session->evlist->stats, event->header.type); + events_stats__inc(evlist__stats(session->evlist), event->header.type); machine__process_event(machine, event, &sample); } else - ++session->evlist->stats.nr_unknown_events; + ++evlist__stats(session->evlist)->nr_unknown_events; =20 ret =3D 0; next_event: @@ -1296,7 +1296,7 @@ static int __cmd_top(struct perf_top *top) pr_debug("Couldn't synthesize cgroup events.\n"); =20 machine__synthesize_threads(&top->session->machines.host, &opts->target, - top->evlist->core.threads, true, false, + evlist__core(top->evlist)->threads, true, false, top->nr_threads_synthesize); =20 perf_set_multithreaded(); @@ -1714,13 +1714,13 @@ int cmd_top(int argc, const char **argv) if (target__none(target)) target->system_wide =3D true; =20 - if (!top.evlist->core.nr_entries) { + if (!evlist__nr_entries(top.evlist)) { struct evlist *def_evlist =3D evlist__new_default(target, callchain_para= m.enabled); =20 if (!def_evlist) goto out_put_evlist; =20 - evlist__splice_list_tail(top.evlist, &def_evlist->core.entries); + evlist__splice_list_tail(top.evlist, &evlist__core(def_evlist)->entries); evlist__put(def_evlist); } =20 @@ -1797,7 +1797,7 @@ int cmd_top(int argc, const char **argv) top.session =3D NULL; goto out_put_evlist; } - top.evlist->session =3D top.session; + evlist__set_session(top.evlist, top.session); =20 if (setup_sorting(top.evlist, perf_session__env(top.session)) < 0) { if (sort_order) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index cbe25b96b8fb..570750b9c27d 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2023,7 +2023,7 @@ static int trace__symbols_init(struct trace *trace, i= nt argc, const char **argv, goto out; =20 err =3D __machine__synthesize_threads(trace->host, &trace->tool, &trace->= opts.target, - evlist->core.threads, trace__tool_process, + evlist__core(evlist)->threads, trace__tool_process, /*needs_mmap=3D*/callchain_param.enabled && !trace->summary_only, /*mmap_data=3D*/false, @@ -4195,7 +4195,7 @@ static int trace__set_filter_pids(struct trace *trace) err =3D augmented_syscalls__set_filter_pids(trace->filter_pids.nr, trace->filter_pids.entries); } - } else if (perf_thread_map__pid(trace->evlist->core.threads, 0) =3D=3D -1= ) { + } else if (perf_thread_map__pid(evlist__core(trace->evlist)->threads, 0) = =3D=3D -1) { err =3D trace__set_filter_loop_pids(trace); } =20 @@ -4509,7 +4509,7 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) fprintf(trace->output, "Couldn't run the workload!\n"); goto out_put_evlist; } - workload_pid =3D evlist->workload.pid; + workload_pid =3D evlist__workload_pid(evlist); } =20 err =3D evlist__open(evlist); @@ -4561,7 +4561,7 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) goto out_error_apply_filters; =20 if (!trace->summary_only || !trace->summary_bpf) { - err =3D evlist__mmap(evlist, trace->opts.mmap_pages); + err =3D evlist__do_mmap(evlist, trace->opts.mmap_pages); if (err < 0) goto out_error_mmap; } @@ -4580,8 +4580,8 @@ static int trace__run(struct trace *trace, int argc, = const char **argv) if (trace->summary_bpf) trace_start_bpf_summary(); =20 - trace->multiple_threads =3D perf_thread_map__pid(evlist->core.threads, 0)= =3D=3D -1 || - perf_thread_map__nr(evlist->core.threads) > 1 || + trace->multiple_threads =3D perf_thread_map__pid(evlist__core(evlist)->th= reads, 0) =3D=3D -1 || + perf_thread_map__nr(evlist__core(evlist)->threads) > 1 || evlist__first(evlist)->core.attr.inherit; =20 /* @@ -4598,11 +4598,11 @@ static int trace__run(struct trace *trace, int argc= , const char **argv) again: before =3D trace->nr_events; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { union perf_event *event; struct mmap *md; =20 - md =3D &evlist->mmap[i]; + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 @@ -5304,7 +5304,7 @@ static int trace__parse_cgroups(const struct option *= opt, const char *str, int u { struct trace *trace =3D opt->value; =20 - if (!list_empty(&trace->evlist->core.entries)) { + if (!list_empty(&evlist__core(trace->evlist)->entries)) { struct option o =3D { .value =3D &trace->evlist, }; @@ -5578,7 +5578,7 @@ int cmd_trace(int argc, const char **argv) * .perfconfig trace.add_events, and filter those out. */ if (!trace.trace_syscalls && !trace.trace_pgfaults && - trace.evlist->core.nr_entries =3D=3D 0 /* Was --events used? */) { + evlist__nr_entries(trace.evlist) =3D=3D 0 /* Was --events used? */) { trace.trace_syscalls =3D true; } /* @@ -5664,7 +5664,7 @@ int cmd_trace(int argc, const char **argv) symbol_conf.use_callchain =3D true; } =20 - if (trace.evlist->core.nr_entries > 0) { + if (evlist__nr_entries(trace.evlist) > 0) { bool use_btf =3D false; =20 evlist__set_default_evsel_handler(trace.evlist, trace__event_handler); diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/bac= kward-ring-buffer.c index 2b49b002d749..2735cc26d7ee 100644 --- a/tools/perf/tests/backward-ring-buffer.c +++ b/tools/perf/tests/backward-ring-buffer.c @@ -34,8 +34,8 @@ static int count_samples(struct evlist *evlist, int *samp= le_count, { int i; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - struct mmap *map =3D &evlist->overwrite_mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + struct mmap *map =3D &evlist__overwrite_mmap(evlist)[i]; union perf_event *event; =20 perf_mmap__read_init(&map->core); @@ -65,7 +65,7 @@ static int do_test(struct evlist *evlist, int mmap_pages, int err; char sbuf[STRERR_BUFSIZE]; =20 - err =3D evlist__mmap(evlist, mmap_pages); + err =3D evlist__do_mmap(evlist, mmap_pages); if (err < 0) { pr_debug("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); @@ -77,7 +77,7 @@ static int do_test(struct evlist *evlist, int mmap_pages, evlist__disable(evlist); =20 err =3D count_samples(evlist, sample_count, comm_count); - evlist__munmap(evlist); + evlist__do_munmap(evlist); return err; } =20 diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-readin= g.c index fc65a17f67f7..28c068a35ada 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -589,8 +589,8 @@ static int process_events(struct machine *machine, stru= ct evlist *evlist, struct mmap *md; int i, ret; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - md =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 @@ -778,7 +778,7 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 str =3D events[evidx]; pr_debug("Parsing event '%s'\n", str); @@ -806,7 +806,7 @@ static int do_test_code_reading(bool try_kcore) pr_debug("perf_evlist__open() failed!\n%s\n", errbuf); } =20 - perf_evlist__set_maps(&evlist->core, NULL, NULL); + perf_evlist__set_maps(evlist__core(evlist), NULL, NULL); evlist__put(evlist); evlist =3D NULL; continue; @@ -817,7 +817,7 @@ static int do_test_code_reading(bool try_kcore) if (events[evidx] =3D=3D NULL) goto out_put; =20 - ret =3D evlist__mmap(evlist, UINT_MAX); + ret =3D evlist__do_mmap(evlist, UINT_MAX); if (ret < 0) { pr_debug("evlist__mmap failed\n"); goto out_put; diff --git a/tools/perf/tests/event-times.c b/tools/perf/tests/event-times.c index 94ab54ecd3f9..56dd37ca760e 100644 --- a/tools/perf/tests/event-times.c +++ b/tools/perf/tests/event-times.c @@ -50,7 +50,7 @@ static int attach__enable_on_exec(struct evlist *evlist) =20 static int detach__enable_on_exec(struct evlist *evlist) { - waitpid(evlist->workload.pid, NULL, 0); + waitpid(evlist__workload_pid(evlist), NULL, 0); return 0; } =20 diff --git a/tools/perf/tests/event_update.c b/tools/perf/tests/event_updat= e.c index 73141b122d2f..220cc0347747 100644 --- a/tools/perf/tests/event_update.c +++ b/tools/perf/tests/event_update.c @@ -92,7 +92,7 @@ static int test__event_update(struct test_suite *test __m= aybe_unused, int subtes TEST_ASSERT_VAL("failed to allocate ids", !perf_evsel__alloc_id(&evsel->core, 1, 1)); =20 - perf_evlist__id_add(&evlist->core, &evsel->core, 0, 0, 123); + perf_evlist__id_add(evlist__core(evlist), &evsel->core, 0, 0, 123); =20 free((char *)evsel->unit); evsel->unit =3D strdup("KRAVA"); diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.c index a7a445f12693..549fbd473ab7 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -28,7 +28,7 @@ static int test_expand_events(struct evlist *evlist) =20 TEST_ASSERT_VAL("evlist is empty", !evlist__empty(evlist)); =20 - nr_events =3D evlist->core.nr_entries; + nr_events =3D evlist__nr_entries(evlist); ev_name =3D calloc(nr_events, sizeof(*ev_name)); if (ev_name =3D=3D NULL) { pr_debug("memory allocation failure\n"); @@ -54,7 +54,7 @@ static int test_expand_events(struct evlist *evlist) } =20 ret =3D TEST_FAIL; - if (evlist->core.nr_entries !=3D nr_events * nr_cgrps) { + if (evlist__nr_entries(evlist) !=3D nr_events * nr_cgrps) { pr_debug("event count doesn't match\n"); goto out; } diff --git a/tools/perf/tests/hwmon_pmu.c b/tools/perf/tests/hwmon_pmu.c index 9e89051e7fdc..e26b3fe3fab1 100644 --- a/tools/perf/tests/hwmon_pmu.c +++ b/tools/perf/tests/hwmon_pmu.c @@ -184,9 +184,10 @@ static int do_test(size_t i, bool with_pmu, bool with_= alias) } =20 ret =3D TEST_OK; - if (with_pmu ? (evlist->core.nr_entries !=3D 1) : (evlist->core.nr_entrie= s < 1)) { + if (with_pmu ? (evlist__nr_entries(evlist) !=3D 1) + : (evlist__nr_entries(evlist) < 1)) { pr_debug("FAILED %s:%d Unexpected number of events for '%s' of %d\n", - __FILE__, __LINE__, str, evlist->core.nr_entries); + __FILE__, __LINE__, str, evlist__nr_entries(evlist)); ret =3D TEST_FAIL; goto out; } diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-track= ing.c index 51cfd6522867..b760041bed30 100644 --- a/tools/perf/tests/keep-tracking.c +++ b/tools/perf/tests/keep-tracking.c @@ -37,8 +37,8 @@ static int find_comm(struct evlist *evlist, const char *c= omm) int i, found; =20 found =3D 0; - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - md =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; while ((event =3D perf_mmap__read_event(&md->core)) !=3D NULL) { @@ -87,7 +87,7 @@ static int test__keep_tracking(struct test_suite *test __= maybe_unused, int subte evlist =3D evlist__new(); CHECK_NOT_NULL__(evlist); =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 CHECK__(parse_event(evlist, "dummy:u")); CHECK__(parse_event(evlist, "cpu-cycles:u")); @@ -106,7 +106,7 @@ static int test__keep_tracking(struct test_suite *test = __maybe_unused, int subte goto out_err; } =20 - CHECK__(evlist__mmap(evlist, UINT_MAX)); + CHECK__(evlist__do_mmap(evlist, UINT_MAX)); =20 /* * First, test that a 'comm' event can be found when the event is diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c index 5ff58eb2af8d..5cec7644952c 100644 --- a/tools/perf/tests/mmap-basic.c +++ b/tools/perf/tests/mmap-basic.c @@ -81,7 +81,7 @@ static int test__basic_mmap(struct test_suite *test __may= be_unused, int subtest goto out_free_cpus; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 for (i =3D 0; i < nsyscalls; ++i) { char name[64]; @@ -113,7 +113,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest expected_nr_events[i] =3D 1 + rand() % 127; } =20 - if (evlist__mmap(evlist, 128) < 0) { + if (evlist__do_mmap(evlist, 128) < 0) { pr_debug("failed to mmap events: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); goto out_put_evlist; @@ -124,7 +124,7 @@ static int test__basic_mmap(struct test_suite *test __m= aybe_unused, int subtest syscalls[i](); } =20 - md =3D &evlist->mmap[0]; + md =3D &evlist__mmap(evlist)[0]; if (perf_mmap__read_init(&md->core) < 0) goto out_init; =20 diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests= /openat-syscall-tp-fields.c index b30f286fb421..5365889d326f 100644 --- a/tools/perf/tests/openat-syscall-tp-fields.c +++ b/tools/perf/tests/openat-syscall-tp-fields.c @@ -64,7 +64,7 @@ static int test__syscall_openat_tp_fields(struct test_sui= te *test __maybe_unused =20 evsel__config(evsel, &opts, NULL); =20 - perf_thread_map__set_pid(evlist->core.threads, 0, getpid()); + perf_thread_map__set_pid(evlist__core(evlist)->threads, 0, getpid()); =20 err =3D evlist__open(evlist); if (err < 0) { @@ -73,7 +73,7 @@ static int test__syscall_openat_tp_fields(struct test_sui= te *test __maybe_unused goto out_put_evlist; } =20 - err =3D evlist__mmap(evlist, UINT_MAX); + err =3D evlist__do_mmap(evlist, UINT_MAX); if (err < 0) { pr_debug("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); @@ -90,11 +90,11 @@ static int test__syscall_openat_tp_fields(struct test_s= uite *test __maybe_unused while (1) { int before =3D nr_events; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { union perf_event *event; struct mmap *md; =20 - md =3D &evlist->mmap[i]; + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 19dc7b7475d2..0ad0273da923 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -109,7 +109,7 @@ static int test__checkevent_tracepoint(struct evlist *e= vlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVLIST("wrong number of groups", 0 =3D=3D evlist__nr_groups(e= vlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_TRACEPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong sample_type", @@ -122,7 +122,7 @@ static int test__checkevent_tracepoint_multi(struct evl= ist *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries > 1= , evlist); + TEST_ASSERT_EVLIST("wrong number of entries", evlist__nr_entries(evlist) = > 1, evlist); TEST_ASSERT_EVLIST("wrong number of groups", 0 =3D=3D evlist__nr_groups(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -144,7 +144,7 @@ static int test__checkevent_raw(struct evlist *evlist) struct evsel *evsel; bool raw_type_match =3D false; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist__nr_entries(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { struct perf_pmu *pmu __maybe_unused =3D NULL; @@ -182,7 +182,7 @@ static int test__checkevent_numeric(struct evlist *evli= st) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", 1 =3D=3D evsel->core.attr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 1 =3D=3D evsel->core.attr.config, evsel= ); return TEST_OK; @@ -193,7 +193,7 @@ static int test__checkevent_symbolic_name(struct evlist= *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist__nr_entries(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("unexpected event", @@ -207,7 +207,7 @@ static int test__checkevent_symbolic_name_config(struct= evlist *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist__nr_entries(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("unexpected event", @@ -228,7 +228,7 @@ static int test__checkevent_symbolic_alias(struct evlis= t *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type/config", evsel__match(evsel, SOFTWARE, SW_P= AGE_FAULTS), evsel); return TEST_OK; @@ -238,7 +238,7 @@ static int test__checkevent_genhw(struct evlist *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist__nr_entries(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_HW_CACHE =3D=3D evsel->core.at= tr.type, evsel); @@ -251,7 +251,7 @@ static int test__checkevent_breakpoint(struct evlist *e= vlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", @@ -265,7 +265,7 @@ static int test__checkevent_breakpoint_x(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", HW_BREAKPOINT_X =3D=3D evsel->core.att= r.bp_type, evsel); @@ -278,7 +278,7 @@ static int test__checkevent_breakpoint_r(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", HW_BREAKPOINT_R =3D=3D evsel->core.att= r.bp_type, evsel); @@ -290,7 +290,7 @@ static int test__checkevent_breakpoint_w(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", HW_BREAKPOINT_W =3D=3D evsel->core.att= r.bp_type, evsel); @@ -302,7 +302,7 @@ static int test__checkevent_breakpoint_rw(struct evlist= *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", @@ -316,7 +316,7 @@ static int test__checkevent_tracepoint_modifier(struct = evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong exclude_user", evsel->core.attr.exclude_user, ev= sel); TEST_ASSERT_EVSEL("wrong exclude_kernel", !evsel->core.attr.exclude_kerne= l, evsel); TEST_ASSERT_EVSEL("wrong exclude_hv", evsel->core.attr.exclude_hv, evsel); @@ -330,7 +330,7 @@ test__checkevent_tracepoint_multi_modifier(struct evlis= t *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries > 1= , evlist); + TEST_ASSERT_EVLIST("wrong number of entries", evlist__nr_entries(evlist) = > 1, evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("wrong exclude_user", !evsel->core.attr.exclude_user, = evsel); @@ -346,7 +346,7 @@ static int test__checkevent_raw_modifier(struct evlist = *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("wrong exclude_user", evsel->core.attr.exclude_user, e= vsel); @@ -361,7 +361,7 @@ static int test__checkevent_numeric_modifier(struct evl= ist *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("wrong exclude_user", evsel->core.attr.exclude_user, e= vsel); @@ -377,7 +377,7 @@ static int test__checkevent_symbolic_name_modifier(stru= ct evlist *evlist) struct evsel *evsel; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -394,7 +394,7 @@ static int test__checkevent_exclude_host_modifier(struc= t evlist *evlist) struct evsel *evsel; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -409,7 +409,7 @@ static int test__checkevent_exclude_guest_modifier(stru= ct evlist *evlist) struct evsel *evsel; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -423,7 +423,8 @@ static int test__checkevent_symbolic_alias_modifier(str= uct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", + 1 =3D=3D evlist__nr_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong exclude_user", !evsel->core.attr.exclude_user, e= vsel); TEST_ASSERT_EVSEL("wrong exclude_kernel", evsel->core.attr.exclude_kernel= , evsel); TEST_ASSERT_EVSEL("wrong exclude_hv", evsel->core.attr.exclude_hv, evsel); @@ -437,7 +438,7 @@ static int test__checkevent_genhw_modifier(struct evlis= t *evlist) struct evsel *evsel; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -454,7 +455,7 @@ static int test__checkevent_exclude_idle_modifier(struc= t evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 TEST_ASSERT_EVSEL("wrong exclude idle", evsel->core.attr.exclude_idle, ev= sel); @@ -473,7 +474,7 @@ static int test__checkevent_exclude_idle_modifier_1(str= uct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 TEST_ASSERT_EVSEL("wrong exclude idle", evsel->core.attr.exclude_idle, ev= sel); @@ -622,7 +623,7 @@ static int test__checkevent_breakpoint_2_events(struct = evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVSEL("wrong number of entries", 2 =3D=3D evlist->core.nr_ent= ries, evsel); + TEST_ASSERT_EVSEL("wrong number of entries", 2 =3D=3D evlist__nr_entries(= evlist), evsel); =20 TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong name", evsel__name_is(evsel, "breakpoint1"), evs= el); @@ -641,7 +642,7 @@ static int test__checkevent_pmu(struct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 - TEST_ASSERT_EVSEL("wrong number of entries", 1 =3D=3D evlist->core.nr_ent= ries, evsel); + TEST_ASSERT_EVSEL("wrong number of entries", 1 =3D=3D evlist__nr_entries(= evlist), evsel); TEST_ASSERT_EVSEL("wrong type", core_pmu->type =3D=3D evsel->core.attr.ty= pe, evsel); TEST_ASSERT_EVSEL("wrong config", test_hw_config(evsel, 10), evsel); TEST_ASSERT_EVSEL("wrong config1", 1 =3D=3D evsel->core.attr.config1, = evsel); @@ -661,7 +662,7 @@ static int test__checkevent_list(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVSEL("wrong number of entries", 3 <=3D evlist->core.nr_entri= es, evsel); + TEST_ASSERT_EVSEL("wrong number of entries", 3 <=3D evlist__nr_entries(ev= list), evsel); =20 /* r1 */ TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_TRACEPOINT !=3D evsel->core.att= r.type, evsel); @@ -707,14 +708,15 @@ static int test__checkevent_pmu_name(struct evlist *e= vlist) char buf[256]; =20 /* default_core/config=3D1,name=3Dkrava/u */ - TEST_ASSERT_EVLIST("wrong number of entries", 2 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", + 2 =3D=3D evlist__nr_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong type", core_pmu->type =3D=3D evsel->core.attr.ty= pe, evsel); TEST_ASSERT_EVSEL("wrong config", 1 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong name", evsel__name_is(evsel, "krava"), evsel); =20 /* default_core/config=3D2/u" */ evsel =3D evsel__next(evsel); - TEST_ASSERT_EVSEL("wrong number of entries", 2 =3D=3D evlist->core.nr_ent= ries, evsel); + TEST_ASSERT_EVSEL("wrong number of entries", 2 =3D=3D evlist__nr_entries(= evlist), evsel); TEST_ASSERT_EVSEL("wrong type", core_pmu->type =3D=3D evsel->core.attr.ty= pe, evsel); TEST_ASSERT_EVSEL("wrong config", 2 =3D=3D evsel->core.attr.config, evsel= ); snprintf(buf, sizeof(buf), "%s/config=3D2/u", core_pmu->name); @@ -729,7 +731,8 @@ static int test__checkevent_pmu_partial_time_callgraph(= struct evlist *evlist) struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 /* default_core/config=3D1,call-graph=3Dfp,time,period=3D100000/ */ - TEST_ASSERT_EVLIST("wrong number of entries", 2 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", + 2 =3D=3D evlist__nr_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong type", core_pmu->type =3D=3D evsel->core.attr.ty= pe, evsel); TEST_ASSERT_EVSEL("wrong config", 1 =3D=3D evsel->core.attr.config, evsel= ); /* @@ -760,7 +763,7 @@ static int test__checkevent_pmu_events(struct evlist *e= vlist) struct evsel *evsel; struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 <=3D evlist->core.nr_entr= ies, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 <=3D evlist__nr_entries(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_EVSEL("wrong type", @@ -787,8 +790,9 @@ static int test__checkevent_pmu_events_mix(struct evlis= t *evlist) * The wild card event will be opened at least once, but it may be * opened on each core PMU. */ - TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries >= =3D 2, evlist); - for (int i =3D 0; i < evlist->core.nr_entries - 1; i++) { + TEST_ASSERT_EVLIST("wrong number of entries", + evlist__nr_entries(evlist) >=3D 2, evlist); + for (int i =3D 0; i < evlist__nr_entries(evlist) - 1; i++) { evsel =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(evsel)); /* pmu-event:u */ TEST_ASSERT_EVSEL("wrong exclude_user", !evsel->core.attr.exclude_user, = evsel); @@ -905,7 +909,7 @@ static int test__group1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2), + evlist__nr_entries(evlist) =3D=3D (num_core_entries(evlist) * 2), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), @@ -950,7 +954,7 @@ static int test__group2(struct evlist *evlist) struct evsel *evsel, *leader =3D NULL; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist) + 1), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist) + 1), evlist); /* * TODO: Currently the software event won't be grouped with the hardware @@ -1018,7 +1022,7 @@ static int test__group3(struct evlist *evlist __maybe= _unused) struct evsel *evsel, *group1_leader =3D NULL, *group2_leader =3D NULL; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * perf_pmus__num_core_pmus() + 2), + evlist__nr_entries(evlist) =3D=3D (3 * perf_pmus__num_core_pmus() + = 2), evlist); /* * Currently the software event won't be grouped with the hardware event @@ -1144,7 +1148,7 @@ static int test__group4(struct evlist *evlist __maybe= _unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2), + evlist__nr_entries(evlist) =3D=3D (num_core_entries(evlist) * 2), evlist); TEST_ASSERT_EVLIST("wrong number of groups", num_core_entries(evlist) =3D=3D evlist__nr_groups(evlist), @@ -1191,7 +1195,7 @@ static int test__group5(struct evlist *evlist __maybe= _unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (5 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (5 * num_core_entries(evlist)), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D (2 * num_core_entries(evlist)), @@ -1284,7 +1288,7 @@ static int test__group_gh1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist)), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), @@ -1329,7 +1333,7 @@ static int test__group_gh2(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist)), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), @@ -1374,7 +1378,7 @@ static int test__group_gh3(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist)), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), @@ -1419,7 +1423,7 @@ static int test__group_gh4(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist)), evlist); TEST_ASSERT_EVLIST("wrong number of groups", evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), @@ -1464,7 +1468,7 @@ static int test__leader_sample1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (3 * num_core_entries(evlist)), evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { @@ -1520,7 +1524,7 @@ static int test__leader_sample2(struct evlist *evlist= __maybe_unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (2 * num_core_entries(evlist)), evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { @@ -1562,7 +1566,7 @@ static int test__checkevent_pinned_modifier(struct ev= list *evlist) struct evsel *evsel =3D NULL; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { @@ -1581,7 +1585,7 @@ static int test__pinned_group(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist)), + evlist__nr_entries(evlist) =3D=3D (3 * num_core_entries(evlist)), evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { @@ -1618,7 +1622,7 @@ static int test__checkevent_exclusive_modifier(struct= evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong exclude_user", !evsel->core.attr.exclude_user, e= vsel); TEST_ASSERT_EVSEL("wrong exclude_kernel", evsel->core.attr.exclude_kernel= , evsel); @@ -1634,7 +1638,7 @@ static int test__exclusive_group(struct evlist *evlis= t) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D 3 * num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D 3 * num_core_entries(evlist), evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { @@ -1669,7 +1673,7 @@ static int test__checkevent_breakpoint_len(struct evl= ist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", @@ -1684,7 +1688,7 @@ static int test__checkevent_breakpoint_len_w(struct e= vlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.a= ttr.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0 =3D=3D evsel->core.attr.config, evsel= ); TEST_ASSERT_EVSEL("wrong bp_type", HW_BREAKPOINT_W =3D=3D evsel->core.att= r.bp_type, evsel); @@ -1698,7 +1702,7 @@ test__checkevent_breakpoint_len_rw_modifier(struct ev= list *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong exclude_user", !evsel->core.attr.exclude_user, e= vsel); TEST_ASSERT_EVSEL("wrong exclude_kernel", evsel->core.attr.exclude_kernel= , evsel); TEST_ASSERT_EVSEL("wrong exclude_hv", evsel->core.attr.exclude_hv, evsel); @@ -1712,7 +1716,7 @@ static int test__checkevent_precise_max_modifier(stru= ct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D 1 + num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D 1 + num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong type/config", evsel__match(evsel, SOFTWARE, SW_T= ASK_CLOCK), evsel); return TEST_OK; @@ -1723,7 +1727,7 @@ static int test__checkevent_config_symbol(struct evli= st *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong name setting", evsel__name_is(evsel, "insn"), ev= sel); return TEST_OK; @@ -1733,7 +1737,7 @@ static int test__checkevent_config_raw(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong name setting", evsel__name_is(evsel, "rawpmu"), = evsel); return TEST_OK; } @@ -1742,7 +1746,7 @@ static int test__checkevent_config_num(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong name setting", evsel__name_is(evsel, "numpmu"), = evsel); return TEST_OK; } @@ -1752,7 +1756,7 @@ static int test__checkevent_config_cache(struct evlis= t *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong name setting", evsel__name_is(evsel, "cachepmu")= , evsel); return test__checkevent_genhw(evlist); @@ -1777,7 +1781,7 @@ static int test__intel_pt(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong name setting", evsel__name_is(evsel, "intel_pt//= u"), evsel); return TEST_OK; } @@ -1798,7 +1802,8 @@ static int test__ratio_to_prev(struct evlist *evlist) { struct evsel *evsel, *leader; =20 - TEST_ASSERT_VAL("wrong number of entries", 2 * perf_pmus__num_core_pmus()= =3D=3D evlist->core.nr_entries); + TEST_ASSERT_VAL("wrong number of entries", + 2 * perf_pmus__num_core_pmus() =3D=3D evlist__nr_entries(evlist)); =20 evlist__for_each_entry(evlist, evsel) { if (evsel !=3D evsel__leader(evsel) || @@ -1842,7 +1847,7 @@ static int test__checkevent_complex_name(struct evlis= t *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("wrong complex name parsing", evsel__name_is(evsel, @@ -1855,7 +1860,7 @@ static int test__checkevent_raw_pmu(struct evlist *ev= list) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist__nr_entries= (evlist), evlist); TEST_ASSERT_EVSEL("wrong type", PERF_TYPE_SOFTWARE =3D=3D evsel->core.att= r.type, evsel); TEST_ASSERT_EVSEL("wrong config", 0x1a =3D=3D evsel->core.attr.config, ev= sel); return TEST_OK; @@ -1866,7 +1871,7 @@ static int test__sym_event_slash(struct evlist *evlis= t) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("unexpected event", evsel__match(evsel, HARDWARE, HW_CP= U_CYCLES), evsel); TEST_ASSERT_EVSEL("wrong exclude_kernel", evsel->core.attr.exclude_kernel= , evsel); @@ -1878,7 +1883,7 @@ static int test__sym_event_dc(struct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("unexpected event", evsel__match(evsel, HARDWARE, HW_CP= U_CYCLES), evsel); TEST_ASSERT_EVSEL("wrong exclude_user", evsel->core.attr.exclude_user, ev= sel); @@ -1890,7 +1895,7 @@ static int test__term_equal_term(struct evlist *evlis= t) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("unexpected event", evsel__match(evsel, HARDWARE, HW_CP= U_CYCLES), evsel); TEST_ASSERT_EVSEL("wrong name setting", strcmp(evsel->name, "name") =3D= =3D 0, evsel); @@ -1902,7 +1907,7 @@ static int test__term_equal_legacy(struct evlist *evl= ist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_EVLIST("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist__nr_entries(evlist) =3D=3D num_core_entries(evlist), evlist); TEST_ASSERT_EVSEL("unexpected event", evsel__match(evsel, HARDWARE, HW_CP= U_CYCLES), evsel); TEST_ASSERT_EVSEL("wrong name setting", strcmp(evsel->name, "l1d") =3D=3D= 0, evsel); @@ -1958,7 +1963,7 @@ static int count_tracepoints(void) static int test__all_tracepoints(struct evlist *evlist) { TEST_ASSERT_VAL("wrong events count", - count_tracepoints() =3D=3D evlist->core.nr_entries); + count_tracepoints() =3D=3D evlist__nr_entries(evlist)); =20 return test__checkevent_tracepoint_multi(evlist); } diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.c index 3f0ec839c056..8f9211eaf341 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -53,7 +53,7 @@ static double compute_single(struct evlist *evlist, const= char *name) struct evsel *evsel; =20 evlist__for_each_entry(evlist, evsel) { - me =3D metricgroup__lookup(&evlist->metric_events, evsel, false); + me =3D metricgroup__lookup(evlist__metric_events(evlist), evsel, false); if (me !=3D NULL) { list_for_each_entry (mexp, &me->head, nd) { if (strcmp(mexp->metric_name, name)) @@ -88,7 +88,7 @@ static int __compute_metric(const char *name, struct valu= e *vals, return -ENOMEM; } =20 - perf_evlist__set_maps(&evlist->core, cpus, NULL); + perf_evlist__set_maps(evlist__core(evlist), cpus, NULL); =20 /* Parse the metric into metric_events list. */ pme_test =3D find_core_metrics_table("testarch", "testcpu"); diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c index f95752b2ed1c..0bd418e1cdc6 100644 --- a/tools/perf/tests/perf-record.c +++ b/tools/perf/tests/perf-record.c @@ -129,7 +129,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest evsel__set_sample_bit(evsel, TIME); evlist__config(evlist, &opts, NULL); =20 - err =3D sched__get_first_possible_cpu(evlist->workload.pid, cpu_mask); + err =3D sched__get_first_possible_cpu(evlist__workload_pid(evlist), cpu_m= ask); if (err < 0) { pr_debug("sched__get_first_possible_cpu: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); @@ -142,7 +142,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest /* * So that we can check perf_sample.cpu on all the samples. */ - if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, cpu_mask) < 0)= { + if (sched_setaffinity(evlist__workload_pid(evlist), cpu_mask_size, cpu_ma= sk) < 0) { pr_debug("sched_setaffinity: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); evlist__cancel_workload(evlist); @@ -166,7 +166,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest * fds in the same CPU to be injected in the same mmap ring buffer * (using ioctl(PERF_EVENT_IOC_SET_OUTPUT)). */ - err =3D evlist__mmap(evlist, opts.mmap_pages); + err =3D evlist__do_mmap(evlist, opts.mmap_pages); if (err < 0) { pr_debug("evlist__mmap: %s\n", str_error_r(errno, sbuf, sizeof(sbuf))); @@ -188,11 +188,11 @@ static int test__PERF_RECORD(struct test_suite *test = __maybe_unused, int subtest while (1) { int before =3D total_events; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { union perf_event *event; struct mmap *md; =20 - md =3D &evlist->mmap[i]; + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 @@ -231,15 +231,15 @@ static int test__PERF_RECORD(struct test_suite *test = __maybe_unused, int subtest ++errs; } =20 - if ((pid_t)sample.pid !=3D evlist->workload.pid) { + if ((pid_t)sample.pid !=3D evlist__workload_pid(evlist)) { pr_debug("%s with unexpected pid, expected %d, got %d\n", - name, evlist->workload.pid, sample.pid); + name, evlist__workload_pid(evlist), sample.pid); ++errs; } =20 - if ((pid_t)sample.tid !=3D evlist->workload.pid) { + if ((pid_t)sample.tid !=3D evlist__workload_pid(evlist)) { pr_debug("%s with unexpected tid, expected %d, got %d\n", - name, evlist->workload.pid, sample.tid); + name, evlist__workload_pid(evlist), sample.tid); ++errs; } =20 @@ -248,7 +248,7 @@ static int test__PERF_RECORD(struct test_suite *test __= maybe_unused, int subtest type =3D=3D PERF_RECORD_MMAP2 || type =3D=3D PERF_RECORD_FORK || type =3D=3D PERF_RECORD_EXIT) && - (pid_t)event->comm.pid !=3D evlist->workload.pid) { + (pid_t)event->comm.pid !=3D evlist__workload_pid(evlist)) { pr_debug("%s with unexpected pid/tid\n", name); ++errs; } diff --git a/tools/perf/tests/perf-time-to-tsc.c b/tools/perf/tests/perf-ti= me-to-tsc.c index d3538fa20af3..f8f71fdd32b1 100644 --- a/tools/perf/tests/perf-time-to-tsc.c +++ b/tools/perf/tests/perf-time-to-tsc.c @@ -99,7 +99,7 @@ static int test__perf_time_to_tsc(struct test_suite *test= __maybe_unused, int su evlist =3D evlist__new(); CHECK_NOT_NULL__(evlist); =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 CHECK__(parse_event(evlist, "cpu-cycles:u")); =20 @@ -121,9 +121,9 @@ static int test__perf_time_to_tsc(struct test_suite *te= st __maybe_unused, int su goto out_err; } =20 - CHECK__(evlist__mmap(evlist, UINT_MAX)); + CHECK__(evlist__do_mmap(evlist, UINT_MAX)); =20 - pc =3D evlist->mmap[0].core.base; + pc =3D evlist__mmap(evlist)[0].core.base; ret =3D perf_read_tsc_conversion(pc, &tc); if (ret) { if (ret =3D=3D -EOPNOTSUPP) { @@ -145,8 +145,8 @@ static int test__perf_time_to_tsc(struct test_suite *te= st __maybe_unused, int su =20 evlist__disable(evlist); =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - md =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c index 8d19b1bfecbc..f7bf55be5e6e 100644 --- a/tools/perf/tests/pfm.c +++ b/tools/perf/tests/pfm.c @@ -69,12 +69,12 @@ static int test__pfm_events(struct test_suite *test __m= aybe_unused, if (evlist =3D=3D NULL) return -ENOMEM; =20 - opt.value =3D evlist; + opt.value =3D &evlist; parse_libpfm_events_option(&opt, table[i].events, 0); TEST_ASSERT_EQUAL(table[i].events, - count_pfm_events(&evlist->core), + count_pfm_events(evlist__core(evlist)), table[i].nr_events); TEST_ASSERT_EQUAL(table[i].events, evlist__nr_groups(evlist), @@ -154,12 +154,12 @@ static int test__pfm_group(struct test_suite *test __= maybe_unused, if (evlist =3D=3D NULL) return -ENOMEM; =20 - opt.value =3D evlist; + opt.value =3D &evlist; parse_libpfm_events_option(&opt, table[i].events, 0); TEST_ASSERT_EQUAL(table[i].events, - count_pfm_events(&evlist->core), + count_pfm_events(evlist__core(evlist)), table[i].nr_events); TEST_ASSERT_EQUAL(table[i].events, evlist__nr_groups(evlist), diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 4ea6d392085b..4c6fc1207b6d 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -869,7 +869,7 @@ static int test__parsing_callback(const struct pmu_metr= ic *pm, return -ENOMEM; } =20 - perf_evlist__set_maps(&evlist->core, cpus, NULL); + perf_evlist__set_maps(evlist__core(evlist), cpus, NULL); =20 err =3D metricgroup__parse_groups_test(evlist, table, pm->metric_name); if (err) { @@ -895,7 +895,8 @@ static int test__parsing_callback(const struct pmu_metr= ic *pm, k++; } evlist__for_each_entry(evlist, evsel) { - struct metric_event *me =3D metricgroup__lookup(&evlist->metric_events, = evsel, false); + struct metric_event *me =3D metricgroup__lookup(evlist__metric_events(ev= list), + evsel, false); =20 if (me !=3D NULL) { struct metric_expr *mexp; diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-pa= rsing.c index 55f0b73ca20e..47d40d812afc 100644 --- a/tools/perf/tests/sample-parsing.c +++ b/tools/perf/tests/sample-parsing.c @@ -205,15 +205,11 @@ static bool samples_same(struct perf_sample *s1, =20 static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) { - struct evsel evsel =3D { - .needs_swap =3D false, - .core =3D { - . attr =3D { - .sample_type =3D sample_type, - .read_format =3D read_format, - }, - }, + struct perf_event_attr attr =3D { + .sample_type =3D sample_type, + .read_format =3D read_format, }; + struct evsel *evsel; union perf_event *event; union { struct ip_callchain callchain; @@ -287,16 +283,21 @@ static int do_test(u64 sample_type, u64 sample_regs, = u64 read_format) size_t i, sz, bufsz; int err, ret =3D -1; =20 + evsel =3D evsel__new(&attr); + if (!evsel) { + pr_debug("evsel__new failed\n"); + return -1; + } perf_sample__init(&sample_out, /*all=3D*/false); perf_sample__init(&sample_out_endian, /*all=3D*/false); if (sample_type & PERF_SAMPLE_REGS_USER) - evsel.core.attr.sample_regs_user =3D sample_regs; + evsel->core.attr.sample_regs_user =3D sample_regs; =20 if (sample_type & PERF_SAMPLE_REGS_INTR) - evsel.core.attr.sample_regs_intr =3D sample_regs; + evsel->core.attr.sample_regs_intr =3D sample_regs; =20 if (sample_type & PERF_SAMPLE_BRANCH_STACK) - evsel.core.attr.branch_sample_type |=3D PERF_SAMPLE_BRANCH_HW_INDEX; + evsel->core.attr.branch_sample_type |=3D PERF_SAMPLE_BRANCH_HW_INDEX; =20 for (i =3D 0; i < sizeof(regs); i++) *(i + (u8 *)regs) =3D i & 0xfe; @@ -311,12 +312,12 @@ static int do_test(u64 sample_type, u64 sample_regs, = u64 read_format) } =20 sz =3D perf_event__sample_event_size(&sample, sample_type, read_format, - evsel.core.attr.branch_sample_type); + evsel->core.attr.branch_sample_type); bufsz =3D sz + 4096; /* Add a bit for overrun checking */ event =3D malloc(bufsz); if (!event) { pr_debug("malloc failed\n"); - return -1; + goto out_free; } =20 memset(event, 0xff, bufsz); @@ -325,7 +326,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u6= 4 read_format) event->header.size =3D sz; =20 err =3D perf_event__synthesize_sample(event, sample_type, read_format, - evsel.core.attr.branch_sample_type, &sample); + evsel->core.attr.branch_sample_type, &sample); if (err) { pr_debug("%s failed for sample_type %#"PRIx64", error %d\n", "perf_event__synthesize_sample", sample_type, err); @@ -343,32 +344,32 @@ static int do_test(u64 sample_type, u64 sample_regs, = u64 read_format) goto out_free; } =20 - evsel.sample_size =3D __evsel__sample_size(sample_type); + evsel->sample_size =3D __evsel__sample_size(sample_type); =20 - err =3D evsel__parse_sample(&evsel, event, &sample_out); + err =3D evsel__parse_sample(evsel, event, &sample_out); if (err) { pr_debug("%s failed for sample_type %#"PRIx64", error %d\n", "evsel__parse_sample", sample_type, err); goto out_free; } =20 - if (!samples_same(&sample, &sample_out, sample_type, read_format, evsel.n= eeds_swap)) { + if (!samples_same(&sample, &sample_out, sample_type, read_format, evsel->= needs_swap)) { pr_debug("parsing failed for sample_type %#"PRIx64"\n", sample_type); goto out_free; } =20 if (sample_type =3D=3D PERF_SAMPLE_BRANCH_STACK) { - evsel.needs_swap =3D true; - evsel.sample_size =3D __evsel__sample_size(sample_type); - err =3D evsel__parse_sample(&evsel, event, &sample_out_endian); + evsel->needs_swap =3D true; + evsel->sample_size =3D __evsel__sample_size(sample_type); + err =3D evsel__parse_sample(evsel, event, &sample_out_endian); if (err) { pr_debug("%s failed for sample_type %#"PRIx64", error %d\n", "evsel__parse_sample", sample_type, err); goto out_free; } =20 - if (!samples_same(&sample, &sample_out_endian, sample_type, read_format,= evsel.needs_swap)) { + if (!samples_same(&sample, &sample_out_endian, sample_type, read_format,= evsel->needs_swap)) { pr_debug("parsing failed for sample_type %#"PRIx64"\n", sample_type); goto out_free; @@ -380,6 +381,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u6= 4 read_format) free(event); perf_sample__exit(&sample_out_endian); perf_sample__exit(&sample_out); + evsel__put(evsel); if (ret && read_format) pr_debug("read_format %#"PRIx64"\n", read_format); return ret; diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c index bb6b62cf51d1..d18185881635 100644 --- a/tools/perf/tests/sw-clock.c +++ b/tools/perf/tests/sw-clock.c @@ -71,7 +71,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_i= d) goto out_put_evlist; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 if (evlist__open(evlist)) { const char *knob =3D "/proc/sys/kernel/perf_event_max_sample_rate"; @@ -83,7 +83,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_i= d) goto out_put_evlist; } =20 - err =3D evlist__mmap(evlist, 128); + err =3D evlist__do_mmap(evlist, 128); if (err < 0) { pr_debug("failed to mmap event: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); @@ -98,7 +98,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_i= d) =20 evlist__disable(evlist); =20 - md =3D &evlist->mmap[0]; + md =3D &evlist__mmap(evlist)[0]; if (perf_mmap__read_init(&md->core) < 0) goto out_init; =20 diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-t= racking.c index abd08d60179c..2edc471aa5f7 100644 --- a/tools/perf/tests/switch-tracking.c +++ b/tools/perf/tests/switch-tracking.c @@ -282,8 +282,8 @@ static int process_events(struct evlist *evlist, struct mmap *md; int i, ret; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - md =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + md =3D &evlist__mmap(evlist)[i]; if (perf_mmap__read_init(&md->core) < 0) continue; =20 @@ -374,7 +374,7 @@ static int test__switch_tracking(struct test_suite *tes= t __maybe_unused, int sub goto out_err; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 /* First event */ err =3D parse_event(evlist, "cpu-clock:u"); @@ -471,7 +471,7 @@ static int test__switch_tracking(struct test_suite *tes= t __maybe_unused, int sub goto out; } =20 - err =3D evlist__mmap(evlist, UINT_MAX); + err =3D evlist__do_mmap(evlist, UINT_MAX); if (err) { pr_debug("evlist__mmap failed!\n"); goto out_err; diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index a46650b10689..95393edbfe36 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c @@ -77,7 +77,7 @@ static int test__task_exit(struct test_suite *test __mayb= e_unused, int subtest _ goto out_put_evlist; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 err =3D evlist__prepare_workload(evlist, &target, argv, false, workload_e= xec_failed_signal); if (err < 0) { @@ -104,7 +104,7 @@ static int test__task_exit(struct test_suite *test __ma= ybe_unused, int subtest _ goto out_put_evlist; } =20 - if (evlist__mmap(evlist, 128) < 0) { + if (evlist__do_mmap(evlist, 128) < 0) { pr_debug("failed to mmap events: %d (%s)\n", errno, str_error_r(errno, sbuf, sizeof(sbuf))); err =3D -1; @@ -114,7 +114,7 @@ static int test__task_exit(struct test_suite *test __ma= ybe_unused, int subtest _ evlist__start_workload(evlist); =20 retry: - md =3D &evlist->mmap[0]; + md =3D &evlist__mmap(evlist)[0]; if (perf_mmap__read_init(&md->core) < 0) goto out_init; =20 diff --git a/tools/perf/tests/time-utils-test.c b/tools/perf/tests/time-uti= ls-test.c index 38df10373c1e..90a9a4b4f178 100644 --- a/tools/perf/tests/time-utils-test.c +++ b/tools/perf/tests/time-utils-test.c @@ -69,16 +69,19 @@ struct test_data { =20 static bool test__perf_time__parse_for_ranges(struct test_data *d) { - struct evlist evlist =3D { - .first_sample_time =3D d->first, - .last_sample_time =3D d->last, - }; - struct perf_session session =3D { .evlist =3D &evlist }; + struct evlist *evlist =3D evlist__new(); + struct perf_session session =3D { .evlist =3D evlist }; struct perf_time_interval *ptime =3D NULL; int range_size, range_num; bool pass =3D false; int i, err; =20 + if (!evlist) { + pr_debug("Missing evlist\n"); + return false; + } + evlist__set_first_sample_time(evlist, d->first); + evlist__set_last_sample_time(evlist, d->last); pr_debug("\nperf_time__parse_for_ranges(\"%s\")\n", d->str); =20 if (strchr(d->str, '%')) @@ -127,6 +130,7 @@ static bool test__perf_time__parse_for_ranges(struct te= st_data *d) =20 pass =3D true; out: + evlist__put(evlist); free(ptime); return pass; } diff --git a/tools/perf/tests/tool_pmu.c b/tools/perf/tests/tool_pmu.c index e78ff9dcea97..c6c5ebf0e935 100644 --- a/tools/perf/tests/tool_pmu.c +++ b/tools/perf/tests/tool_pmu.c @@ -40,9 +40,10 @@ static int do_test(enum tool_pmu_event ev, bool with_pmu) } =20 ret =3D TEST_OK; - if (with_pmu ? (evlist->core.nr_entries !=3D 1) : (evlist->core.nr_entrie= s < 1)) { + if (with_pmu ? (evlist__nr_entries(evlist) !=3D 1) + : (evlist__nr_entries(evlist) < 1)) { pr_debug("FAILED %s:%d Unexpected number of events for '%s' of %d\n", - __FILE__, __LINE__, str, evlist->core.nr_entries); + __FILE__, __LINE__, str, evlist__nr_entries(evlist)); ret =3D TEST_FAIL; goto out; } diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index 15741abec8c6..77cb8318c0b1 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c @@ -46,7 +46,7 @@ static int session_write_header(char *path) =20 session->evlist =3D evlist__new_default(&target, /*sample_callchains=3D*/= false); TEST_ASSERT_VAL("can't get evlist", session->evlist); - session->evlist->session =3D session; + evlist__set_session(session->evlist, session); =20 perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY); perf_header__set_feat(&session->header, HEADER_NRCPUS); diff --git a/tools/perf/tests/uncore-event-sorting.c b/tools/perf/tests/unc= ore-event-sorting.c index 2e741aef4a59..7756777c54c2 100644 --- a/tools/perf/tests/uncore-event-sorting.c +++ b/tools/perf/tests/uncore-event-sorting.c @@ -147,8 +147,8 @@ static int test__uncore_event_sorting(struct test_suite= *test __maybe_unused, goto out_err; } =20 - CHECK_COND(evlist->core.nr_entries >=3D 4, "Number of events is >=3D 4"); - CHECK_EQUAL(evlist->core.nr_entries % 2, 0, "Number of events is a multip= le of 2"); + CHECK_COND(evlist__nr_entries(evlist) >=3D 4, "Number of events is >=3D 4= "); + CHECK_EQUAL(evlist__nr_entries(evlist) % 2, 0, "Number of events is a mul= tiple of 2"); =20 evlist__for_each_entry(evlist, evsel) { struct evsel *next; diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/ann= otate.c index 97ae4c86bebb..d25761a8d25e 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -597,7 +597,7 @@ static bool annotate_browser__callq(struct annotate_bro= wser *browser, notes =3D symbol__annotation(dl->ops.target.sym); annotation__lock(notes); =20 - if (!symbol__hists(dl->ops.target.sym, evsel->evlist->core.nr_entries)) { + if (!symbol__hists(dl->ops.target.sym, evlist__nr_entries(evsel->evlist))= ) { annotation__unlock(notes); ui__warning("Not enough memory for annotating '%s' symbol!\n", dl->ops.target.sym->name); diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index cfa6386e6e1d..da7cc195b9f4 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -688,10 +688,10 @@ static int hist_browser__handle_hotkey(struct hist_br= owser *browser, bool warn_l ui_browser__update_nr_entries(&browser->b, nr_entries); =20 if (warn_lost_event && - (evsel->evlist->stats.nr_lost_warned !=3D - evsel->evlist->stats.nr_events[PERF_RECORD_LOST])) { - evsel->evlist->stats.nr_lost_warned =3D - evsel->evlist->stats.nr_events[PERF_RECORD_LOST]; + (evlist__stats(evsel->evlist)->nr_lost_warned !=3D + evlist__stats(evsel->evlist)->nr_events[PERF_RECORD_LOST])) { + evlist__stats(evsel->evlist)->nr_lost_warned =3D + evlist__stats(evsel->evlist)->nr_events[PERF_RECORD_LOST]; ui_browser__warn_lost_events(&browser->b); } =20 @@ -3321,7 +3321,7 @@ static int evsel__hists_browse(struct evsel *evsel, i= nt nr_events, const char *h * No need to refresh, resort/decay histogram * entries if we are not collecting samples: */ - if (top->evlist->enabled) { + if (evlist__enabled(top->evlist)) { helpline =3D "Press 'f' to disable the events or 'h' to see other hot= keys"; hbt->refresh =3D delay_secs; } else { @@ -3493,7 +3493,7 @@ static void perf_evsel_menu__write(struct ui_browser = *browser, unit, unit =3D=3D ' ' ? "" : " ", ev_name); ui_browser__printf(browser, "%s", bf); =20 - nr_events =3D evsel->evlist->stats.nr_events[PERF_RECORD_LOST]; + nr_events =3D evlist__stats(evsel->evlist)->nr_events[PERF_RECORD_LOST]; if (nr_events !=3D 0) { menu->lost_events =3D true; if (!current_entry) @@ -3559,13 +3559,13 @@ static int perf_evsel_menu__run(struct evsel_menu *= menu, ui_browser__show_title(&menu->b, title); switch (key) { case K_TAB: - if (pos->core.node.next =3D=3D &evlist->core.entries) + if (pos->core.node.next =3D=3D &evlist__core(evlist)->entries) pos =3D evlist__first(evlist); else pos =3D evsel__next(pos); goto browse_hists; case K_UNTAB: - if (pos->core.node.prev =3D=3D &evlist->core.entries) + if (pos->core.node.prev =3D=3D &evlist__core(evlist)->entries) pos =3D evlist__last(evlist); else pos =3D evsel__prev(pos); @@ -3618,7 +3618,7 @@ static int __evlist__tui_browse_hists(struct evlist *= evlist, int nr_entries, con struct evsel *pos; struct evsel_menu menu =3D { .b =3D { - .entries =3D &evlist->core.entries, + .entries =3D &evlist__core(evlist)->entries, .refresh =3D ui_browser__list_head_refresh, .seek =3D ui_browser__list_head_seek, .write =3D perf_evsel_menu__write, @@ -3646,7 +3646,7 @@ static int __evlist__tui_browse_hists(struct evlist *= evlist, int nr_entries, con =20 static bool evlist__single_entry(struct evlist *evlist) { - int nr_entries =3D evlist->core.nr_entries; + int nr_entries =3D evlist__nr_entries(evlist); =20 if (nr_entries =3D=3D 1) return true; @@ -3664,7 +3664,7 @@ static bool evlist__single_entry(struct evlist *evlis= t) int evlist__tui_browse_hists(struct evlist *evlist, const char *help, stru= ct hist_browser_timer *hbt, float min_pcnt, struct perf_env *env, bool warn_lost_event) { - int nr_entries =3D evlist->core.nr_entries; + int nr_entries =3D evlist__nr_entries(evlist); =20 if (evlist__single_entry(evlist)) { single_entry: { diff --git a/tools/perf/util/amd-sample-raw.c b/tools/perf/util/amd-sample-= raw.c index 394c061fbeb3..cda3836329c3 100644 --- a/tools/perf/util/amd-sample-raw.c +++ b/tools/perf/util/amd-sample-raw.c @@ -421,7 +421,7 @@ static void parse_cpuid(struct perf_env *env) */ bool evlist__has_amd_ibs(struct evlist *evlist) { - struct perf_env *env =3D perf_session__env(evlist->session); + struct perf_env *env =3D perf_session__env(evlist__session(evlist)); int ret, nr_pmu_mappings =3D perf_env__nr_pmu_mappings(env); const char *pmu_mapping =3D perf_env__pmu_mappings(env); char name[sizeof("ibs_fetch")]; diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-dat= a.c index 63e3c54fab42..4e4c58764082 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -1829,7 +1829,7 @@ int annotated_data_type__update_samples(struct annota= ted_data_type *adt, return 0; =20 if (adt->histograms =3D=3D NULL) { - int nr =3D evsel->evlist->core.nr_entries; + int nr =3D evlist__nr_entries(evsel->evlist); =20 if (alloc_data_type_histograms(adt, nr) < 0) return -1; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 02505222d8c2..53b2a224b21d 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -328,7 +328,7 @@ static int symbol__inc_addr_samples(struct map_symbol *= ms, =20 if (sym =3D=3D NULL) return 0; - src =3D symbol__hists(sym, sample->evsel->evlist->core.nr_entries); + src =3D symbol__hists(sym, evlist__nr_entries(sample->evsel->evlist)); return src ? __symbol__inc_addr_samples(ms, src, addr, sample) : 0; } =20 @@ -339,7 +339,7 @@ static int symbol__account_br_cntr(struct annotated_bra= nch *branch, { unsigned int br_cntr_nr =3D evsel__leader(evsel)->br_cntr_nr; unsigned int base =3D evsel__leader(evsel)->br_cntr_idx; - unsigned int off =3D offset * evsel->evlist->nr_br_cntr; + unsigned int off =3D offset * evlist__nr_br_cntr(evsel->evlist); u64 *branch_br_cntr =3D branch->br_cntr; unsigned int i, mask, width; =20 @@ -369,7 +369,7 @@ static int symbol__account_cycles(u64 addr, u64 start, = struct symbol *sym, =20 if (sym =3D=3D NULL) return 0; - branch =3D symbol__find_branch_hist(sym, evsel->evlist->nr_br_cntr); + branch =3D symbol__find_branch_hist(sym, evlist__nr_br_cntr(evsel->evlist= )); if (!branch) return -ENOMEM; if (addr < sym->start || addr >=3D sym->end) @@ -511,7 +511,7 @@ static void annotation__count_and_fill(struct annotatio= n *notes, u64 start, u64 static int annotation__compute_ipc(struct annotation *notes, size_t size, struct evsel *evsel) { - unsigned int br_cntr_nr =3D evsel->evlist->nr_br_cntr; + unsigned int br_cntr_nr =3D evlist__nr_br_cntr(evsel->evlist); int err =3D 0; s64 offset; =20 @@ -1813,7 +1813,7 @@ int annotation_br_cntr_abbr_list(char **str, struct e= vsel *evsel, bool header) struct evsel *pos; struct strbuf sb; =20 - if (evsel->evlist->nr_br_cntr <=3D 0) + if (evlist__nr_br_cntr(evsel->evlist) <=3D 0) return -ENOTSUP; =20 strbuf_init(&sb, /*hint=3D*/ 0); diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 5f4aa1701aef..9771a65e2da8 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -191,7 +191,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap= _params *mp, struct evlist *evlist, struct evsel *evsel, int idx) { - bool per_cpu =3D !perf_cpu_map__has_any_cpu(evlist->core.user_requested_c= pus); + bool per_cpu =3D !perf_cpu_map__has_any_cpu(evlist__core(evlist)->user_re= quested_cpus); =20 mp->mmap_needed =3D evsel->needs_auxtrace_mmap; =20 @@ -201,11 +201,11 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mm= ap_params *mp, mp->idx =3D idx; =20 if (per_cpu) { - mp->cpu =3D perf_cpu_map__cpu(evlist->core.all_cpus, idx); - mp->tid =3D perf_thread_map__pid(evlist->core.threads, 0); + mp->cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->all_cpus, idx); + mp->tid =3D perf_thread_map__pid(evlist__core(evlist)->threads, 0); } else { mp->cpu.cpu =3D -1; - mp->tid =3D perf_thread_map__pid(evlist->core.threads, idx); + mp->tid =3D perf_thread_map__pid(evlist__core(evlist)->threads, idx); } } =20 @@ -667,10 +667,10 @@ int auxtrace_parse_snapshot_options(struct auxtrace_r= ecord *itr, =20 static int evlist__enable_event_idx(struct evlist *evlist, struct evsel *e= vsel, int idx) { - bool per_cpu_mmaps =3D !perf_cpu_map__has_any_cpu(evlist->core.user_reque= sted_cpus); + bool per_cpu_mmaps =3D !perf_cpu_map__has_any_cpu(evlist__core(evlist)->u= ser_requested_cpus); =20 if (per_cpu_mmaps) { - struct perf_cpu evlist_cpu =3D perf_cpu_map__cpu(evlist->core.all_cpus, = idx); + struct perf_cpu evlist_cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->a= ll_cpus, idx); int cpu_map_idx =3D perf_cpu_map__idx(evsel->core.cpus, evlist_cpu); =20 if (cpu_map_idx =3D=3D -1) @@ -1837,7 +1837,7 @@ void perf_session__auxtrace_error_inc(struct perf_ses= sion *session, struct perf_record_auxtrace_error *e =3D &event->auxtrace_error; =20 if (e->type < PERF_AUXTRACE_ERROR_MAX) - session->evlist->stats.nr_auxtrace_errors[e->type] +=3D 1; + evlist__stats(session->evlist)->nr_auxtrace_errors[e->type] +=3D 1; } =20 void events_stats__auxtrace_error_warn(const struct events_stats *stats) diff --git a/tools/perf/util/block-info.c b/tools/perf/util/block-info.c index 8d3a9a661f26..1135e54f4c7f 100644 --- a/tools/perf/util/block-info.c +++ b/tools/perf/util/block-info.c @@ -472,7 +472,7 @@ struct block_report *block_info__create_report(struct e= vlist *evlist, int *nr_reps) { struct block_report *block_reports; - int nr_hists =3D evlist->core.nr_entries, i =3D 0; + int nr_hists =3D evlist__nr_entries(evlist), i =3D 0; struct evsel *pos; =20 block_reports =3D calloc(nr_hists, sizeof(struct block_report)); @@ -483,7 +483,7 @@ struct block_report *block_info__create_report(struct e= vlist *evlist, struct hists *hists =3D evsel__hists(pos); =20 process_block_report(hists, &block_reports[i], total_cycles, - block_hpps, nr_hpps, evlist->nr_br_cntr); + block_hpps, nr_hpps, evlist__nr_br_cntr(evlist)); i++; } =20 diff --git a/tools/perf/util/bpf_counter.c b/tools/perf/util/bpf_counter.c index 34b6b0da18b7..9362e45e17ce 100644 --- a/tools/perf/util/bpf_counter.c +++ b/tools/perf/util/bpf_counter.c @@ -443,7 +443,7 @@ static int bperf_check_target(struct evsel *evsel, } else if (target->tid) { *filter_type =3D BPERF_FILTER_PID; *filter_entry_cnt =3D perf_thread_map__nr(evsel->core.threads); - } else if (target->pid || evsel->evlist->workload.pid !=3D -1) { + } else if (target->pid || evlist__workload_pid(evsel->evlist) !=3D -1) { *filter_type =3D BPERF_FILTER_TGID; *filter_entry_cnt =3D perf_thread_map__nr(evsel->core.threads); } else { diff --git a/tools/perf/util/bpf_counter_cgroup.c b/tools/perf/util/bpf_cou= nter_cgroup.c index 6842c9f6d71e..4e5f4b9dd442 100644 --- a/tools/perf/util/bpf_counter_cgroup.c +++ b/tools/perf/util/bpf_counter_cgroup.c @@ -104,7 +104,7 @@ static int bperf_load_program(struct evlist *evlist) =20 set_max_rlimit(); =20 - if (nr_cgroups =3D=3D 0 || evlist->core.nr_entries % nr_cgroups !=3D 0) { + if (nr_cgroups =3D=3D 0 || evlist__nr_entries(evlist) % nr_cgroups !=3D 0= ) { pr_err("Invalid cgroup or event count\n"); return -EINVAL; } @@ -116,7 +116,7 @@ static int bperf_load_program(struct evlist *evlist) pr_err("Failed to open cgroup skeleton\n"); return -1; } - setup_rodata(skel, evlist->core.nr_entries); + setup_rodata(skel, evlist__nr_entries(evlist)); =20 err =3D bperf_cgroup_bpf__load(skel); if (err) { @@ -127,12 +127,12 @@ static int bperf_load_program(struct evlist *evlist) err =3D -1; =20 cgrp_switch =3D evsel__new(&cgrp_switch_attr); - if (evsel__open_per_cpu(cgrp_switch, evlist->core.all_cpus, -1) < 0) { + if (evsel__open_per_cpu(cgrp_switch, evlist__core(evlist)->all_cpus, -1) = < 0) { pr_err("Failed to open cgroup switches event\n"); goto out; } =20 - perf_cpu_map__for_each_cpu(cpu, i, evlist->core.all_cpus) { + perf_cpu_map__for_each_cpu(cpu, i, evlist__core(evlist)->all_cpus) { link =3D bpf_program__attach_perf_event(skel->progs.on_cgrp_switch, FD(cgrp_switch, i)); if (IS_ERR(link)) { @@ -197,7 +197,7 @@ static int bperf_load_program(struct evlist *evlist) */ { struct evsel *leader; - int num_events =3D evlist->core.nr_entries / nr_cgroups; + int num_events =3D evlist__nr_entries(evlist) / nr_cgroups; =20 evlist__for_each_entry(evlist, evsel) { leader =3D evlist__find_evsel(evlist, evsel->core.idx % num_events); @@ -258,7 +258,7 @@ static int bperf_cgrp__sync_counters(struct evlist *evl= ist) unsigned int idx; int prog_fd =3D bpf_program__fd(skel->progs.trigger_read); =20 - perf_cpu_map__for_each_cpu(cpu, idx, evlist->core.all_cpus) + perf_cpu_map__for_each_cpu(cpu, idx, evlist__core(evlist)->all_cpus) bperf_trigger_reading(prog_fd, cpu.cpu); =20 return 0; diff --git a/tools/perf/util/bpf_ftrace.c b/tools/perf/util/bpf_ftrace.c index c456d24efa30..abeafd406e8e 100644 --- a/tools/perf/util/bpf_ftrace.c +++ b/tools/perf/util/bpf_ftrace.c @@ -59,13 +59,13 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace= *ftrace) =20 /* don't need to set cpu filter for system-wide mode */ if (ftrace->target.cpu_list) { - ncpus =3D perf_cpu_map__nr(ftrace->evlist->core.user_requested_cpus); + ncpus =3D perf_cpu_map__nr(evlist__core(ftrace->evlist)->user_requested_= cpus); bpf_map__set_max_entries(skel->maps.cpu_filter, ncpus); skel->rodata->has_cpu =3D 1; } =20 if (target__has_task(&ftrace->target) || target__none(&ftrace->target)) { - ntasks =3D perf_thread_map__nr(ftrace->evlist->core.threads); + ntasks =3D perf_thread_map__nr(evlist__core(ftrace->evlist)->threads); bpf_map__set_max_entries(skel->maps.task_filter, ntasks); skel->rodata->has_task =3D 1; } @@ -87,7 +87,8 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *= ftrace) fd =3D bpf_map__fd(skel->maps.cpu_filter); =20 for (i =3D 0; i < ncpus; i++) { - cpu =3D perf_cpu_map__cpu(ftrace->evlist->core.user_requested_cpus, i).= cpu; + cpu =3D perf_cpu_map__cpu( + evlist__core(ftrace->evlist)->user_requested_cpus, i).cpu; bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); } } @@ -99,7 +100,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace = *ftrace) fd =3D bpf_map__fd(skel->maps.task_filter); =20 for (i =3D 0; i < ntasks; i++) { - pid =3D perf_thread_map__pid(ftrace->evlist->core.threads, i); + pid =3D perf_thread_map__pid(evlist__core(ftrace->evlist)->threads, i); bpf_map_update_elem(fd, &pid, &val, BPF_ANY); } } diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lo= ck_contention.c index b1cfa63a488f..c20bd075664e 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -223,11 +223,11 @@ int lock_contention_prepare(struct lock_contention *c= on) =20 if (target__has_cpu(target)) { skel->rodata->has_cpu =3D 1; - ncpus =3D perf_cpu_map__nr(evlist->core.user_requested_cpus); + ncpus =3D perf_cpu_map__nr(evlist__core(evlist)->user_requested_cpus); } if (target__has_task(target)) { skel->rodata->has_task =3D 1; - ntasks =3D perf_thread_map__nr(evlist->core.threads); + ntasks =3D perf_thread_map__nr(evlist__core(evlist)->threads); } if (con->filters->nr_types) { skel->rodata->has_type =3D 1; @@ -334,7 +334,7 @@ int lock_contention_prepare(struct lock_contention *con) fd =3D bpf_map__fd(skel->maps.cpu_filter); =20 for (i =3D 0; i < ncpus; i++) { - cpu =3D perf_cpu_map__cpu(evlist->core.user_requested_cpus, i).cpu; + cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->user_requested_cpus, i)= .cpu; bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); } } @@ -346,13 +346,13 @@ int lock_contention_prepare(struct lock_contention *c= on) fd =3D bpf_map__fd(skel->maps.task_filter); =20 for (i =3D 0; i < ntasks; i++) { - pid =3D perf_thread_map__pid(evlist->core.threads, i); + pid =3D perf_thread_map__pid(evlist__core(evlist)->threads, i); bpf_map_update_elem(fd, &pid, &val, BPF_ANY); } } =20 - if (target__none(target) && evlist->workload.pid > 0) { - u32 pid =3D evlist->workload.pid; + if (target__none(target) && evlist__workload_pid(evlist) > 0) { + u32 pid =3D evlist__workload_pid(evlist); u8 val =3D 1; =20 fd =3D bpf_map__fd(skel->maps.task_filter); diff --git a/tools/perf/util/bpf_off_cpu.c b/tools/perf/util/bpf_off_cpu.c index 48cb930cdd2e..c4639f6a5776 100644 --- a/tools/perf/util/bpf_off_cpu.c +++ b/tools/perf/util/bpf_off_cpu.c @@ -73,13 +73,13 @@ static void off_cpu_start(void *arg) =20 /* update task filter for the given workload */ if (skel->rodata->has_task && skel->rodata->uses_tgid && - perf_thread_map__pid(evlist->core.threads, 0) !=3D -1) { + perf_thread_map__pid(evlist__core(evlist)->threads, 0) !=3D -1) { int fd; u32 pid; u8 val =3D 1; =20 fd =3D bpf_map__fd(skel->maps.task_filter); - pid =3D perf_thread_map__pid(evlist->core.threads, 0); + pid =3D perf_thread_map__pid(evlist__core(evlist)->threads, 0); bpf_map_update_elem(fd, &pid, &val, BPF_ANY); } =20 @@ -168,7 +168,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, =20 /* don't need to set cpu filter for system-wide mode */ if (target->cpu_list) { - ncpus =3D perf_cpu_map__nr(evlist->core.user_requested_cpus); + ncpus =3D perf_cpu_map__nr(evlist__core(evlist)->user_requested_cpus); bpf_map__set_max_entries(skel->maps.cpu_filter, ncpus); skel->rodata->has_cpu =3D 1; } @@ -199,7 +199,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, skel->rodata->has_task =3D 1; skel->rodata->uses_tgid =3D 1; } else if (target__has_task(target)) { - ntasks =3D perf_thread_map__nr(evlist->core.threads); + ntasks =3D perf_thread_map__nr(evlist__core(evlist)->threads); bpf_map__set_max_entries(skel->maps.task_filter, ntasks); skel->rodata->has_task =3D 1; } else if (target__none(target)) { @@ -209,7 +209,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, } =20 if (evlist__first(evlist)->cgrp) { - ncgrps =3D evlist->core.nr_entries - 1; /* excluding a dummy */ + ncgrps =3D evlist__nr_entries(evlist) - 1; /* excluding a dummy */ bpf_map__set_max_entries(skel->maps.cgroup_filter, ncgrps); =20 if (!cgroup_is_v2("perf_event")) @@ -240,7 +240,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, fd =3D bpf_map__fd(skel->maps.cpu_filter); =20 for (i =3D 0; i < ncpus; i++) { - cpu =3D perf_cpu_map__cpu(evlist->core.user_requested_cpus, i).cpu; + cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->user_requested_cpus, i)= .cpu; bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); } } @@ -269,7 +269,7 @@ int off_cpu_prepare(struct evlist *evlist, struct targe= t *target, fd =3D bpf_map__fd(skel->maps.task_filter); =20 for (i =3D 0; i < ntasks; i++) { - pid =3D perf_thread_map__pid(evlist->core.threads, i); + pid =3D perf_thread_map__pid(evlist__core(evlist)->threads, i); bpf_map_update_elem(fd, &pid, &val, BPF_ANY); } } diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 914744724467..c7be16a7915e 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c @@ -367,7 +367,7 @@ int parse_cgroups(const struct option *opt, const char = *str, char *s; int ret, i; =20 - if (list_empty(&evlist->core.entries)) { + if (list_empty(&evlist__core(evlist)->entries)) { fprintf(stderr, "must define events before cgroups\n"); return -1; } @@ -423,7 +423,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const = char *str, bool open_cgro int ret =3D -1; int prefix_len; =20 - if (evlist->core.nr_entries =3D=3D 0) { + if (evlist__nr_entries(evlist) =3D=3D 0) { fprintf(stderr, "must define events before cgroups\n"); return -EINVAL; } @@ -436,11 +436,11 @@ int evlist__expand_cgroup(struct evlist *evlist, cons= t char *str, bool open_cgro } =20 /* save original events and init evlist */ - evlist__splice_list_tail(orig_list, &evlist->core.entries); - evlist->core.nr_entries =3D 0; + evlist__splice_list_tail(orig_list, &evlist__core(evlist)->entries); + evlist__core(evlist)->nr_entries =3D 0; =20 - orig_metric_events =3D evlist->metric_events; - metricgroup__rblist_init(&evlist->metric_events); + orig_metric_events =3D *evlist__metric_events(evlist); + metricgroup__rblist_init(evlist__metric_events(evlist)); =20 if (has_pattern_string(str)) prefix_len =3D match_cgroups(str); @@ -503,15 +503,15 @@ int evlist__expand_cgroup(struct evlist *evlist, cons= t char *str, bool open_cgro nr_cgroups++; =20 if (metricgroup__copy_metric_events(tmp_list, cgrp, - &evlist->metric_events, + evlist__metric_events(evlist), &orig_metric_events) < 0) goto out_err; =20 - evlist__splice_list_tail(evlist, &tmp_list->core.entries); - tmp_list->core.nr_entries =3D 0; + evlist__splice_list_tail(evlist, &evlist__core(tmp_list)->entries); + evlist__core(tmp_list)->nr_entries =3D 0; } =20 - if (list_empty(&evlist->core.entries)) { + if (list_empty(&evlist__core(evlist)->entries)) { fprintf(stderr, "no cgroup matched: %s\n", str); goto out_err; } diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 40c6ddfa8c8d..0b0a32ecab49 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1636,8 +1636,9 @@ static int cs_etm__synth_branch_sample(struct cs_etm_= queue *etmq, { int ret =3D 0; struct cs_etm_auxtrace *etm =3D etmq->etm; - struct perf_sample sample =3D {.ip =3D 0,}; + struct perf_sample sample; union perf_event *event =3D tidq->event_buf; + struct dummy_branch_stack { u64 nr; u64 hw_idx; @@ -1645,6 +1646,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_= queue *etmq, } dummy_bs; u64 ip; =20 + perf_sample__init(&sample, /*all=3D*/true); ip =3D cs_etm__last_executed_instr(tidq->prev_packet); =20 event->sample.header.type =3D PERF_RECORD_SAMPLE; @@ -1698,6 +1700,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_= queue *etmq, "CS ETM Trace: failed to deliver instruction event, error %d\n", ret); =20 + perf_sample__exit(&sample); return ret; } =20 diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 1721a2470fb6..6688454b70ce 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -31,6 +31,7 @@ =20 #include #include // page_size +#include #include #include #include @@ -75,30 +76,31 @@ int sigqueue(pid_t pid, int sig, const union sigval val= ue); #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y)) #define SID(e, x, y) xyarray__entry(e->core.sample_id, x, y) =20 -static void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, - struct perf_thread_map *threads) -{ - perf_evlist__init(&evlist->core); - perf_evlist__set_maps(&evlist->core, cpus, threads); - evlist->workload.pid =3D -1; - evlist->bkw_mmap_state =3D BKW_MMAP_NOTREADY; - evlist->ctl_fd.fd =3D -1; - evlist->ctl_fd.ack =3D -1; - evlist->ctl_fd.pos =3D -1; - evlist->nr_br_cntr =3D -1; - metricgroup__rblist_init(&evlist->metric_events); - INIT_LIST_HEAD(&evlist->deferred_samples); - refcount_set(&evlist->refcnt, 1); -} +static void event_enable_timer__exit(struct event_enable_timer **ep); =20 struct evlist *evlist__new(void) { - struct evlist *evlist =3D zalloc(sizeof(*evlist)); - - if (evlist !=3D NULL) - evlist__init(evlist, NULL, NULL); - - return evlist; + struct evlist *result; + RC_STRUCT(evlist) *evlist; + + evlist =3D zalloc(sizeof(*evlist)); + if (ADD_RC_CHK(result, evlist)) { + perf_evlist__init(evlist__core(result)); + perf_evlist__set_maps(evlist__core(result), /*cpus=3D*/NULL, /*threads= =3D*/NULL); + evlist__set_workload_pid(result, -1); + evlist__set_bkw_mmap_state(result, BKW_MMAP_NOTREADY); + evlist__set_ctl_fd_fd(result, -1); + evlist__set_ctl_fd_ack(result, -1); + evlist__set_ctl_fd_pos(result, -1); + evlist__set_nr_br_cntr(result, -1); + metricgroup__rblist_init(evlist__metric_events(result)); + INIT_LIST_HEAD(&evlist->deferred_samples); + refcount_set(evlist__refcnt(result), 1); + } else { + free(evlist); + result =3D NULL; + } + return result; } =20 struct evlist *evlist__new_default(const struct target *target, bool sampl= e_callchains) @@ -106,7 +108,6 @@ struct evlist *evlist__new_default(const struct target = *target, bool sample_call struct evlist *evlist =3D evlist__new(); bool can_profile_kernel; struct perf_pmu *pmu =3D NULL; - struct evsel *evsel; char buf[256]; int err; =20 @@ -133,7 +134,9 @@ struct evlist *evlist__new_default(const struct target = *target, bool sample_call } =20 /* If there is only 1 event a sample identifier isn't necessary. */ - if (evlist->core.nr_entries > 1) { + if (evlist__nr_entries(evlist) > 1) { + struct evsel *evsel; + evlist__for_each_entry(evlist, evsel) evsel__set_sample_id(evsel, /*can_sample_identifier=3D*/false); } @@ -158,8 +161,12 @@ struct evlist *evlist__new_dummy(void) =20 struct evlist *evlist__get(struct evlist *evlist) { - refcount_inc(&evlist->refcnt); - return evlist; + struct evlist *result; + + if (RC_CHK_GET(result, evlist)) + refcount_inc(evlist__refcnt(evlist)); + + return result; } =20 /** @@ -173,8 +180,8 @@ void evlist__set_id_pos(struct evlist *evlist) { struct evsel *first =3D evlist__first(evlist); =20 - evlist->id_pos =3D first->id_pos; - evlist->is_pos =3D first->is_pos; + RC_CHK_ACCESS(evlist)->id_pos =3D first->id_pos; + RC_CHK_ACCESS(evlist)->is_pos =3D first->is_pos; } =20 static void evlist__update_id_pos(struct evlist *evlist) @@ -193,52 +200,81 @@ static void evlist__purge(struct evlist *evlist) =20 evlist__for_each_entry_safe(evlist, n, pos) { list_del_init(&pos->core.node); + if (pos->evlist) { + /* Minimal evlist__put. */ + refcount_dec_and_test(evlist__refcnt(pos->evlist)); + RC_CHK_PUT(pos->evlist); + } pos->evlist =3D NULL; evsel__put(pos); } =20 - evlist->core.nr_entries =3D 0; + evlist__core(evlist)->nr_entries =3D 0; } =20 static void evlist__exit(struct evlist *evlist) { - metricgroup__rblist_exit(&evlist->metric_events); - event_enable_timer__exit(&evlist->eet); - zfree(&evlist->mmap); - zfree(&evlist->overwrite_mmap); - perf_evlist__exit(&evlist->core); + metricgroup__rblist_exit(evlist__metric_events(evlist)); + event_enable_timer__exit(&RC_CHK_ACCESS(evlist)->eet); + free(evlist__mmap(evlist)); + free(evlist__overwrite_mmap(evlist)); + perf_evlist__exit(evlist__core(evlist)); } =20 void evlist__put(struct evlist *evlist) { + struct evsel *evsel; + unsigned int count, ref_cnt; + if (evlist =3D=3D NULL) return; =20 - if (!refcount_dec_and_test(&evlist->refcnt)) - return; + if (refcount_dec_and_test(evlist__refcnt(evlist))) + goto out_delete; + +retry: + count =3D refcount_read(evlist__refcnt(evlist)); + ref_cnt =3D count; + evlist__for_each_entry(evlist, evsel) { + if (RC_CHK_EQUAL(evsel->evlist, evlist) && count) + count--; + } + if (refcount_read(evlist__refcnt(evlist)) !=3D ref_cnt) + goto retry; =20 + if (count !=3D 0) { + /* + * Not the last reference except for back references from + * evsels. + */ + RC_CHK_PUT(evlist); + return; + } +out_delete: evlist__free_stats(evlist); - evlist__munmap(evlist); + evlist__do_munmap(evlist); evlist__close(evlist); evlist__purge(evlist); evlist__exit(evlist); - free(evlist); + RC_CHK_FREE(evlist); } =20 void evlist__add(struct evlist *evlist, struct evsel *entry) { - perf_evlist__add(&evlist->core, &entry->core); - entry->evlist =3D evlist; + perf_evlist__add(evlist__core(evlist), &entry->core); + evlist__put(entry->evlist); + entry->evlist =3D evlist__get(evlist); entry->tracking =3D !entry->core.idx; =20 - if (evlist->core.nr_entries =3D=3D 1) + if (evlist__nr_entries(evlist) =3D=3D 1) evlist__set_id_pos(evlist); } =20 void evlist__remove(struct evlist *evlist, struct evsel *evsel) { + perf_evlist__remove(evlist__core(evlist), &evsel->core); + evlist__put(evsel->evlist); evsel->evlist =3D NULL; - perf_evlist__remove(&evlist->core, &evsel->core); } =20 void evlist__splice_list_tail(struct evlist *evlist, struct list_head *lis= t) @@ -287,7 +323,7 @@ int __evlist__set_tracepoints_handlers(struct evlist *e= vlist, =20 static void evlist__set_leader(struct evlist *evlist) { - perf_evlist__set_leader(&evlist->core); + perf_evlist__set_leader(evlist__core(evlist)); } =20 static struct evsel *evlist__dummy_event(struct evlist *evlist) @@ -301,7 +337,7 @@ static struct evsel *evlist__dummy_event(struct evlist = *evlist) .sample_period =3D 1, }; =20 - return evsel__new_idx(&attr, evlist->core.nr_entries); + return evsel__new_idx(&attr, evlist__nr_entries(evlist)); } =20 int evlist__add_dummy(struct evlist *evlist) @@ -390,8 +426,8 @@ static bool evlist__use_affinity(struct evlist *evlist) struct perf_cpu_map *used_cpus =3D NULL; bool ret =3D false; =20 - if (evlist->no_affinity || !evlist->core.user_requested_cpus || - cpu_map__is_dummy(evlist->core.user_requested_cpus)) + if (evlist__no_affinity(evlist) || !evlist__core(evlist)->user_requested_= cpus || + cpu_map__is_dummy(evlist__core(evlist)->user_requested_cpus)) return false; =20 evlist__for_each_entry(evlist, pos) { @@ -446,7 +482,7 @@ void evlist_cpu_iterator__init(struct evlist_cpu_iterat= or *itr, struct evlist *e .evsel =3D NULL, .cpu_map_idx =3D 0, .evlist_cpu_map_idx =3D 0, - .evlist_cpu_map_nr =3D perf_cpu_map__nr(evlist->core.all_cpus), + .evlist_cpu_map_nr =3D perf_cpu_map__nr(evlist__core(evlist)->all_cpus), .cpu =3D (struct perf_cpu){ .cpu =3D -1}, .affinity =3D NULL, }; @@ -462,7 +498,7 @@ void evlist_cpu_iterator__init(struct evlist_cpu_iterat= or *itr, struct evlist *e itr->affinity =3D &itr->saved_affinity; } itr->evsel =3D evlist__first(evlist); - itr->cpu =3D perf_cpu_map__cpu(evlist->core.all_cpus, 0); + itr->cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->all_cpus, 0); if (itr->affinity) affinity__set(itr->affinity, itr->cpu.cpu); itr->cpu_map_idx =3D perf_cpu_map__idx(itr->evsel->core.cpus, itr->cpu); @@ -497,7 +533,7 @@ void evlist_cpu_iterator__next(struct evlist_cpu_iterat= or *evlist_cpu_itr) if (evlist_cpu_itr->evlist_cpu_map_idx < evlist_cpu_itr->evlist_cpu_map_n= r) { evlist_cpu_itr->evsel =3D evlist__first(evlist_cpu_itr->container); evlist_cpu_itr->cpu =3D - perf_cpu_map__cpu(evlist_cpu_itr->container->core.all_cpus, + perf_cpu_map__cpu(evlist__core(evlist_cpu_itr->container)->all_cpus, evlist_cpu_itr->evlist_cpu_map_idx); if (evlist_cpu_itr->affinity) affinity__set(evlist_cpu_itr->affinity, evlist_cpu_itr->cpu.cpu); @@ -524,7 +560,7 @@ static int evsel__strcmp(struct evsel *pos, char *evsel= _name) return !evsel__name_is(pos, evsel_name); } =20 -static int evlist__is_enabled(struct evlist *evlist) +static bool evlist__is_enabled(struct evlist *evlist) { struct evsel *pos; =20 @@ -581,10 +617,7 @@ static void __evlist__disable(struct evlist *evlist, c= har *evsel_name, bool excl * If we disabled only single event, we need to check * the enabled state of the evlist manually. */ - if (evsel_name) - evlist->enabled =3D evlist__is_enabled(evlist); - else - evlist->enabled =3D false; + evlist__set_enabled(evlist, evsel_name ? evlist__is_enabled(evlist) : fal= se); } =20 void evlist__disable(struct evlist *evlist) @@ -635,7 +668,7 @@ static void __evlist__enable(struct evlist *evlist, cha= r *evsel_name, bool excl_ * so the toggle can work properly and toggle to * 'disabled' state. */ - evlist->enabled =3D true; + evlist__set_enabled(evlist, true); } =20 void evlist__enable(struct evlist *evlist) @@ -655,23 +688,24 @@ void evlist__enable_evsel(struct evlist *evlist, char= *evsel_name) =20 void evlist__toggle_enable(struct evlist *evlist) { - (evlist->enabled ? evlist__disable : evlist__enable)(evlist); + (evlist__enabled(evlist) ? evlist__disable : evlist__enable)(evlist); } =20 int evlist__add_pollfd(struct evlist *evlist, int fd) { - return perf_evlist__add_pollfd(&evlist->core, fd, NULL, POLLIN, fdarray_f= lag__default); + return perf_evlist__add_pollfd(evlist__core(evlist), fd, NULL, POLLIN, + fdarray_flag__default); } =20 int evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask) { - return perf_evlist__filter_pollfd(&evlist->core, revents_and_mask); + return perf_evlist__filter_pollfd(evlist__core(evlist), revents_and_mask); } =20 #ifdef HAVE_EVENTFD_SUPPORT int evlist__add_wakeup_eventfd(struct evlist *evlist, int fd) { - return perf_evlist__add_pollfd(&evlist->core, fd, NULL, POLLIN, + return perf_evlist__add_pollfd(evlist__core(evlist), fd, NULL, POLLIN, fdarray_flag__nonfilterable | fdarray_flag__non_perf_event); } @@ -679,7 +713,7 @@ int evlist__add_wakeup_eventfd(struct evlist *evlist, i= nt fd) =20 int evlist__poll(struct evlist *evlist, int timeout) { - return perf_evlist__poll(&evlist->core, timeout); + return perf_evlist__poll(evlist__core(evlist), timeout); } =20 struct perf_sample_id *evlist__id2sid(struct evlist *evlist, u64 id) @@ -689,7 +723,7 @@ struct perf_sample_id *evlist__id2sid(struct evlist *ev= list, u64 id) int hash; =20 hash =3D hash_64(id, PERF_EVLIST__HLIST_BITS); - head =3D &evlist->core.heads[hash]; + head =3D &evlist__core(evlist)->heads[hash]; =20 hlist_for_each_entry(sid, head, node) if (sid->id =3D=3D id) @@ -702,7 +736,7 @@ struct evsel *evlist__id2evsel(struct evlist *evlist, u= 64 id) { struct perf_sample_id *sid; =20 - if (evlist->core.nr_entries =3D=3D 1 || !id) + if (evlist__nr_entries(evlist) =3D=3D 1 || !id) return evlist__first(evlist); =20 sid =3D evlist__id2sid(evlist, id); @@ -737,13 +771,13 @@ static int evlist__event2id(struct evlist *evlist, un= ion perf_event *event, u64 n =3D (event->header.size - sizeof(event->header)) >> 3; =20 if (event->header.type =3D=3D PERF_RECORD_SAMPLE) { - if (evlist->id_pos >=3D n) + if (evlist__id_pos(evlist) >=3D n) return -1; - *id =3D array[evlist->id_pos]; + *id =3D array[evlist__id_pos(evlist)]; } else { - if (evlist->is_pos > n) + if (evlist__is_pos(evlist) > n) return -1; - n -=3D evlist->is_pos; + n -=3D evlist__is_pos(evlist); *id =3D array[n]; } return 0; @@ -757,7 +791,7 @@ struct evsel *evlist__event2evsel(struct evlist *evlist= , union perf_event *event int hash; u64 id; =20 - if (evlist->core.nr_entries =3D=3D 1) + if (evlist__nr_entries(evlist) =3D=3D 1) return first; =20 if (!first->core.attr.sample_id_all && @@ -772,7 +806,7 @@ struct evsel *evlist__event2evsel(struct evlist *evlist= , union perf_event *event return first; =20 hash =3D hash_64(id, PERF_EVLIST__HLIST_BITS); - head =3D &evlist->core.heads[hash]; + head =3D &evlist__core(evlist)->heads[hash]; =20 hlist_for_each_entry(sid, head, node) { if (sid->id =3D=3D id) @@ -785,11 +819,11 @@ static int evlist__set_paused(struct evlist *evlist, = bool value) { int i; =20 - if (!evlist->overwrite_mmap) + if (!evlist__overwrite_mmap(evlist)) return 0; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - int fd =3D evlist->overwrite_mmap[i].core.fd; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + int fd =3D evlist__overwrite_mmap(evlist)[i].core.fd; int err; =20 if (fd < 0) @@ -815,20 +849,20 @@ static void evlist__munmap_nofree(struct evlist *evli= st) { int i; =20 - if (evlist->mmap) - for (i =3D 0; i < evlist->core.nr_mmaps; i++) - perf_mmap__munmap(&evlist->mmap[i].core); + if (evlist__mmap(evlist)) + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) + perf_mmap__munmap(&evlist__mmap(evlist)[i].core); =20 - if (evlist->overwrite_mmap) - for (i =3D 0; i < evlist->core.nr_mmaps; i++) - perf_mmap__munmap(&evlist->overwrite_mmap[i].core); + if (evlist__overwrite_mmap(evlist)) + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) + perf_mmap__munmap(&evlist__overwrite_mmap(evlist)[i].core); } =20 -void evlist__munmap(struct evlist *evlist) +void evlist__do_munmap(struct evlist *evlist) { evlist__munmap_nofree(evlist); - zfree(&evlist->mmap); - zfree(&evlist->overwrite_mmap); + zfree(&RC_CHK_ACCESS(evlist)->mmap); + zfree(&RC_CHK_ACCESS(evlist)->overwrite_mmap); } =20 static void perf_mmap__unmap_cb(struct perf_mmap *map) @@ -842,12 +876,12 @@ static struct mmap *evlist__alloc_mmap(struct evlist = *evlist, bool overwrite) { int i; - struct mmap *map =3D calloc(evlist->core.nr_mmaps, sizeof(struct mmap)); + struct mmap *map =3D calloc(evlist__core(evlist)->nr_mmaps, sizeof(struct= mmap)); =20 if (!map) return NULL; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { struct perf_mmap *prev =3D i ? &map[i - 1].core : NULL; =20 /* @@ -865,41 +899,73 @@ static struct mmap *evlist__alloc_mmap(struct evlist = *evlist, return map; } =20 +static struct evlist *from_list_start(struct perf_evlist *core) +{ +#ifdef REFCNT_CHECKING + RC_STRUCT(evlist) *core_evlist =3D container_of(core, RC_STRUCT(evlist), = core); + struct evlist *evlist; + + if (ADD_RC_CHK(evlist, core_evlist)) + refcount_inc(evlist__refcnt(evlist)); + + return evlist; +#else + return container_of(core, struct evlist, core); +#endif +} + +static void from_list_end(struct evlist *evlist __maybe_unused) +{ +#ifdef REFCNT_CHECKING + evlist__put(evlist); +#endif +} + static void perf_evlist__mmap_cb_idx(struct perf_evlist *_evlist, struct perf_evsel *_evsel, struct perf_mmap_param *_mp, int idx) { - struct evlist *evlist =3D container_of(_evlist, struct evlist, core); + struct evlist *evlist =3D from_list_start(_evlist); struct mmap_params *mp =3D container_of(_mp, struct mmap_params, core); struct evsel *evsel =3D container_of(_evsel, struct evsel, core); =20 + if (!evlist) + return; + auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, evsel, idx); + + from_list_end(evlist); } =20 static struct perf_mmap* perf_evlist__mmap_cb_get(struct perf_evlist *_evlist, bool overwrite, int = idx) { - struct evlist *evlist =3D container_of(_evlist, struct evlist, core); + struct evlist *evlist =3D from_list_start(_evlist); struct mmap *maps; =20 - maps =3D overwrite ? evlist->overwrite_mmap : evlist->mmap; + if (!evlist) + return NULL; + + maps =3D overwrite ? evlist__overwrite_mmap(evlist) : evlist__mmap(evlist= ); =20 if (!maps) { maps =3D evlist__alloc_mmap(evlist, overwrite); - if (!maps) + if (!maps) { + from_list_end(evlist); return NULL; + } =20 if (overwrite) { - evlist->overwrite_mmap =3D maps; - if (evlist->bkw_mmap_state =3D=3D BKW_MMAP_NOTREADY) + RC_CHK_ACCESS(evlist)->overwrite_mmap =3D maps; + if (evlist__bkw_mmap_state(evlist) =3D=3D BKW_MMAP_NOTREADY) evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING); } else { - evlist->mmap =3D maps; + RC_CHK_ACCESS(evlist)->mmap =3D maps; } } - + from_list_end(evlist); return &maps[idx].core; } =20 @@ -1056,16 +1122,16 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned= int pages, .mmap =3D perf_evlist__mmap_cb_mmap, }; =20 - evlist->core.mmap_len =3D evlist__mmap_size(pages); - pr_debug("mmap size %zuB\n", evlist->core.mmap_len); + evlist__core(evlist)->mmap_len =3D evlist__mmap_size(pages); + pr_debug("mmap size %zuB\n", evlist__core(evlist)->mmap_len); =20 - auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist->core.mmap_len, + auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist__core(evlist)->mmap_le= n, auxtrace_pages, auxtrace_overwrite); =20 - return perf_evlist__mmap_ops(&evlist->core, &ops, &mp.core); + return perf_evlist__mmap_ops(evlist__core(evlist), &ops, &mp.core); } =20 -int evlist__mmap(struct evlist *evlist, unsigned int pages) +int evlist__do_mmap(struct evlist *evlist, unsigned int pages) { return evlist__mmap_ex(evlist, pages, 0, false, 0, PERF_AFFINITY_SYS, 1, = 0); } @@ -1107,9 +1173,9 @@ int evlist__create_maps(struct evlist *evlist, struct= target *target) if (!cpus) goto out_delete_threads; =20 - evlist->core.has_user_cpus =3D !!target->cpu_list; + evlist__core(evlist)->has_user_cpus =3D !!target->cpu_list; =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); =20 /* as evlist now has references, put count here */ perf_cpu_map__put(cpus); @@ -1249,15 +1315,15 @@ bool evlist__valid_sample_type(struct evlist *evlis= t) { struct evsel *pos; =20 - if (evlist->core.nr_entries =3D=3D 1) + if (evlist__nr_entries(evlist) =3D=3D 1) return true; =20 - if (evlist->id_pos < 0 || evlist->is_pos < 0) + if (evlist__id_pos(evlist) < 0 || evlist__is_pos(evlist) < 0) return false; =20 evlist__for_each_entry(evlist, pos) { - if (pos->id_pos !=3D evlist->id_pos || - pos->is_pos !=3D evlist->is_pos) + if (pos->id_pos !=3D evlist__id_pos(evlist) || + pos->is_pos !=3D evlist__is_pos(evlist)) return false; } =20 @@ -1268,18 +1334,18 @@ u64 __evlist__combined_sample_type(struct evlist *e= vlist) { struct evsel *evsel; =20 - if (evlist->combined_sample_type) - return evlist->combined_sample_type; + if (RC_CHK_ACCESS(evlist)->combined_sample_type) + return RC_CHK_ACCESS(evlist)->combined_sample_type; =20 evlist__for_each_entry(evlist, evsel) - evlist->combined_sample_type |=3D evsel->core.attr.sample_type; + RC_CHK_ACCESS(evlist)->combined_sample_type |=3D evsel->core.attr.sample= _type; =20 - return evlist->combined_sample_type; + return RC_CHK_ACCESS(evlist)->combined_sample_type; } =20 u64 evlist__combined_sample_type(struct evlist *evlist) { - evlist->combined_sample_type =3D 0; + RC_CHK_ACCESS(evlist)->combined_sample_type =3D 0; return __evlist__combined_sample_type(evlist); } =20 @@ -1356,7 +1422,7 @@ void evlist__update_br_cntr(struct evlist *evlist) evlist__new_abbr_name(evsel->abbr_name); } } - evlist->nr_br_cntr =3D i; + evlist__set_nr_br_cntr(evlist, i); } =20 bool evlist__valid_read_format(struct evlist *evlist) @@ -1406,11 +1472,6 @@ bool evlist__sample_id_all(struct evlist *evlist) return first->core.attr.sample_id_all; } =20 -void evlist__set_selected(struct evlist *evlist, struct evsel *evsel) -{ - evlist->selected =3D evsel; -} - void evlist__close(struct evlist *evlist) { struct evsel *evsel; @@ -1427,7 +1488,7 @@ void evlist__close(struct evlist *evlist) perf_evsel__free_fd(&evsel->core); perf_evsel__free_id(&evsel->core); } - perf_evlist__reset_id_hash(&evlist->core); + perf_evlist__reset_id_hash(evlist__core(evlist)); } =20 static int evlist__create_syswide_maps(struct evlist *evlist) @@ -1454,7 +1515,7 @@ static int evlist__create_syswide_maps(struct evlist = *evlist) return -ENOMEM; } =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); perf_thread_map__put(threads); perf_cpu_map__put(cpus); return 0; @@ -1469,7 +1530,8 @@ int evlist__open(struct evlist *evlist) * Default: one fd per CPU, all threads, aka systemwide * as sys_perf_event_open(cpu =3D -1, thread =3D -1) is EINVAL */ - if (evlist->core.threads =3D=3D NULL && evlist->core.user_requested_cpus = =3D=3D NULL) { + if (evlist__core(evlist)->threads =3D=3D NULL && + evlist__core(evlist)->user_requested_cpus =3D=3D NULL) { err =3D evlist__create_syswide_maps(evlist); if (err < 0) goto out_err; @@ -1496,7 +1558,7 @@ int evlist__prepare_workload(struct evlist *evlist, s= truct target *target, const int child_ready_pipe[2], go_pipe[2]; char bf; =20 - evlist->workload.cork_fd =3D -1; + evlist__set_workload_cork_fd(evlist, -1); =20 if (pipe(child_ready_pipe) < 0) { perror("failed to create 'ready' pipe"); @@ -1508,13 +1570,13 @@ int evlist__prepare_workload(struct evlist *evlist,= struct target *target, const goto out_close_ready_pipe; } =20 - evlist->workload.pid =3D fork(); - if (evlist->workload.pid < 0) { + evlist__set_workload_pid(evlist, fork()); + if (evlist__workload_pid(evlist) < 0) { perror("failed to fork"); goto out_close_pipes; } =20 - if (!evlist->workload.pid) { + if (!evlist__workload_pid(evlist)) { int ret; =20 if (pipe_output) @@ -1580,12 +1642,13 @@ int evlist__prepare_workload(struct evlist *evlist,= struct target *target, const } =20 if (target__none(target)) { - if (evlist->core.threads =3D=3D NULL) { + if (evlist__core(evlist)->threads =3D=3D NULL) { fprintf(stderr, "FATAL: evlist->threads need to be set at this point (%= s:%d).\n", __func__, __LINE__); goto out_close_pipes; } - perf_thread_map__set_pid(evlist->core.threads, 0, evlist->workload.pid); + perf_thread_map__set_pid(evlist__core(evlist)->threads, 0, + evlist__workload_pid(evlist)); } =20 close(child_ready_pipe[1]); @@ -1599,7 +1662,7 @@ int evlist__prepare_workload(struct evlist *evlist, s= truct target *target, const } =20 fcntl(go_pipe[1], F_SETFD, FD_CLOEXEC); - evlist->workload.cork_fd =3D go_pipe[1]; + evlist__set_workload_cork_fd(evlist, go_pipe[1]); close(child_ready_pipe[0]); return 0; =20 @@ -1614,18 +1677,18 @@ int evlist__prepare_workload(struct evlist *evlist,= struct target *target, const =20 int evlist__start_workload(struct evlist *evlist) { - if (evlist->workload.cork_fd >=3D 0) { + if (evlist__workload_cork_fd(evlist) >=3D 0) { char bf =3D 0; int ret; /* * Remove the cork, let it rip! */ - ret =3D write(evlist->workload.cork_fd, &bf, 1); + ret =3D write(evlist__workload_cork_fd(evlist), &bf, 1); if (ret < 0) perror("unable to write to pipe"); =20 - close(evlist->workload.cork_fd); - evlist->workload.cork_fd =3D -1; + close(evlist__workload_cork_fd(evlist)); + evlist__set_workload_cork_fd(evlist, -1); return ret; } =20 @@ -1636,10 +1699,10 @@ void evlist__cancel_workload(struct evlist *evlist) { int status; =20 - if (evlist->workload.cork_fd >=3D 0) { - close(evlist->workload.cork_fd); - evlist->workload.cork_fd =3D -1; - waitpid(evlist->workload.pid, &status, WNOHANG); + if (evlist__workload_cork_fd(evlist) >=3D 0) { + close(evlist__workload_cork_fd(evlist)); + evlist__set_workload_cork_fd(evlist, -1); + waitpid(evlist__workload_pid(evlist), &status, WNOHANG); } } =20 @@ -1733,7 +1796,8 @@ int evlist__strerror_open(struct evlist *evlist, int = err, char *buf, size_t size =20 int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_= t size) { - int pages_attempted =3D evlist->core.mmap_len / 1024, pages_max_per_user,= printed =3D 0; + int pages_attempted =3D evlist__core(evlist)->mmap_len / 1024; + int pages_max_per_user, printed =3D 0; =20 switch (err) { case EPERM: @@ -1776,7 +1840,7 @@ void evlist__to_front(struct evlist *evlist, struct e= vsel *move_evsel) list_move_tail(&evsel->core.node, &move); } =20 - list_splice(&move, &evlist->core.entries); + list_splice(&move, &evlist__core(evlist)->entries); } =20 struct evsel *evlist__get_tracking_event(struct evlist *evlist) @@ -1818,7 +1882,7 @@ struct evsel *evlist__findnew_tracking_event(struct e= vlist *evlist, bool system_ =20 evlist__set_tracking_event(evlist, evsel); } else if (system_wide) { - perf_evlist__go_system_wide(&evlist->core, &evsel->core); + perf_evlist__go_system_wide(evlist__core(evlist), &evsel->core); } =20 return evsel; @@ -1840,14 +1904,14 @@ struct evsel *evlist__find_evsel_by_str(struct evli= st *evlist, const char *str) =20 void evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state st= ate) { - enum bkw_mmap_state old_state =3D evlist->bkw_mmap_state; + enum bkw_mmap_state old_state =3D evlist__bkw_mmap_state(evlist); enum action { NONE, PAUSE, RESUME, } action =3D NONE; =20 - if (!evlist->overwrite_mmap) + if (!evlist__overwrite_mmap(evlist)) return; =20 switch (old_state) { @@ -1877,7 +1941,7 @@ void evlist__toggle_bkw_mmap(struct evlist *evlist, e= num bkw_mmap_state state) WARN_ONCE(1, "Shouldn't get there\n"); } =20 - evlist->bkw_mmap_state =3D state; + evlist__set_bkw_mmap_state(evlist, state); =20 switch (action) { case PAUSE: @@ -2055,40 +2119,41 @@ int evlist__initialize_ctlfd(struct evlist *evlist,= int fd, int ack) return 0; } =20 - evlist->ctl_fd.pos =3D perf_evlist__add_pollfd(&evlist->core, fd, NULL, P= OLLIN, - fdarray_flag__nonfilterable | - fdarray_flag__non_perf_event); - if (evlist->ctl_fd.pos < 0) { - evlist->ctl_fd.pos =3D -1; + evlist__set_ctl_fd_pos(evlist, + perf_evlist__add_pollfd(evlist__core(evlist), fd, NULL, POLLIN, + fdarray_flag__nonfilterable | + fdarray_flag__non_perf_event)); + if (evlist__ctl_fd_pos(evlist) < 0) { + evlist__set_ctl_fd_pos(evlist, -1); pr_err("Failed to add ctl fd entry: %m\n"); return -1; } =20 - evlist->ctl_fd.fd =3D fd; - evlist->ctl_fd.ack =3D ack; + evlist__set_ctl_fd_fd(evlist, fd); + evlist__set_ctl_fd_ack(evlist, ack); =20 return 0; } =20 bool evlist__ctlfd_initialized(struct evlist *evlist) { - return evlist->ctl_fd.pos >=3D 0; + return evlist__ctl_fd_pos(evlist) >=3D 0; } =20 int evlist__finalize_ctlfd(struct evlist *evlist) { - struct pollfd *entries =3D evlist->core.pollfd.entries; + struct pollfd *entries =3D evlist__core(evlist)->pollfd.entries; =20 if (!evlist__ctlfd_initialized(evlist)) return 0; =20 - entries[evlist->ctl_fd.pos].fd =3D -1; - entries[evlist->ctl_fd.pos].events =3D 0; - entries[evlist->ctl_fd.pos].revents =3D 0; + entries[evlist__ctl_fd_pos(evlist)].fd =3D -1; + entries[evlist__ctl_fd_pos(evlist)].events =3D 0; + entries[evlist__ctl_fd_pos(evlist)].revents =3D 0; =20 - evlist->ctl_fd.pos =3D -1; - evlist->ctl_fd.ack =3D -1; - evlist->ctl_fd.fd =3D -1; + evlist__set_ctl_fd_pos(evlist, -1); + evlist__set_ctl_fd_ack(evlist, -1); + evlist__set_ctl_fd_fd(evlist, -1); =20 return 0; } @@ -2105,7 +2170,7 @@ static int evlist__ctlfd_recv(struct evlist *evlist, = enum evlist_ctl_cmd *cmd, data_size--; =20 do { - err =3D read(evlist->ctl_fd.fd, &c, 1); + err =3D read(evlist__ctl_fd_fd(evlist), &c, 1); if (err > 0) { if (c =3D=3D '\n' || c =3D=3D '\0') break; @@ -2119,7 +2184,8 @@ static int evlist__ctlfd_recv(struct evlist *evlist, = enum evlist_ctl_cmd *cmd, if (errno =3D=3D EAGAIN || errno =3D=3D EWOULDBLOCK) err =3D 0; else - pr_err("Failed to read from ctlfd %d: %m\n", evlist->ctl_fd.fd); + pr_err("Failed to read from ctlfd %d: %m\n", + evlist__ctl_fd_fd(evlist)); } break; } while (1); @@ -2157,13 +2223,13 @@ int evlist__ctlfd_ack(struct evlist *evlist) { int err; =20 - if (evlist->ctl_fd.ack =3D=3D -1) + if (evlist__ctl_fd_ack(evlist) =3D=3D -1) return 0; =20 - err =3D write(evlist->ctl_fd.ack, EVLIST_CTL_CMD_ACK_TAG, + err =3D write(evlist__ctl_fd_ack(evlist), EVLIST_CTL_CMD_ACK_TAG, sizeof(EVLIST_CTL_CMD_ACK_TAG)); if (err =3D=3D -1) - pr_err("failed to write to ctl_ack_fd %d: %m\n", evlist->ctl_fd.ack); + pr_err("failed to write to ctl_ack_fd %d: %m\n", evlist__ctl_fd_ack(evli= st)); =20 return err; } @@ -2264,8 +2330,8 @@ int evlist__ctlfd_process(struct evlist *evlist, enum= evlist_ctl_cmd *cmd) { int err =3D 0; char cmd_data[EVLIST_CTL_CMD_MAX_LEN]; - int ctlfd_pos =3D evlist->ctl_fd.pos; - struct pollfd *entries =3D evlist->core.pollfd.entries; + int ctlfd_pos =3D evlist__ctl_fd_pos(evlist); + struct pollfd *entries =3D evlist__core(evlist)->pollfd.entries; =20 if (!evlist__ctlfd_initialized(evlist) || !entries[ctlfd_pos].revents) return 0; @@ -2436,14 +2502,15 @@ int evlist__parse_event_enable_time(struct evlist *= evlist, struct record_opts *o goto free_eet_times; } =20 - eet->pollfd_pos =3D perf_evlist__add_pollfd(&evlist->core, eet->timerfd, = NULL, POLLIN, flags); + eet->pollfd_pos =3D perf_evlist__add_pollfd(evlist__core(evlist), eet->ti= merfd, + NULL, POLLIN, flags); if (eet->pollfd_pos < 0) { err =3D eet->pollfd_pos; goto close_timerfd; } =20 eet->evlist =3D evlist; - evlist->eet =3D eet; + RC_CHK_ACCESS(evlist)->eet =3D eet; opts->target.initial_delay =3D eet->times[0].start; =20 return 0; @@ -2493,7 +2560,7 @@ int event_enable_timer__process(struct event_enable_t= imer *eet) if (!eet) return 0; =20 - entries =3D eet->evlist->core.pollfd.entries; + entries =3D evlist__core(eet->evlist)->pollfd.entries; revents =3D entries[eet->pollfd_pos].revents; entries[eet->pollfd_pos].revents =3D 0; =20 @@ -2529,7 +2596,7 @@ int event_enable_timer__process(struct event_enable_t= imer *eet) return 0; } =20 -void event_enable_timer__exit(struct event_enable_timer **ep) +static void event_enable_timer__exit(struct event_enable_timer **ep) { if (!ep || !*ep) return; @@ -2633,7 +2700,7 @@ void evlist__warn_user_requested_cpus(struct evlist *= evlist, const char *cpu_lis } =20 /* Should uniquify be disabled for the evlist? */ -static bool evlist__disable_uniquify(const struct evlist *evlist) +static bool evlist__disable_uniquify(struct evlist *evlist) { struct evsel *counter; struct perf_pmu *last_pmu =3D NULL; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index a9820a6aad5b..838e263b76f3 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -14,6 +14,7 @@ #include #include #include +#include #include =20 #include "affinity.h" @@ -59,7 +60,7 @@ enum bkw_mmap_state { =20 struct event_enable_timer; =20 -struct evlist { +DECLARE_RC_STRUCT(evlist) { struct perf_evlist core; refcount_t refcnt; bool enabled; @@ -86,7 +87,7 @@ struct evlist { struct { pthread_t th; volatile int done; - } thread; + } sb_thread; struct { int fd; /* control file descriptor */ int ack; /* ack file descriptor for control commands */ @@ -107,6 +108,227 @@ struct evsel_str_handler { void *handler; }; =20 +static inline struct perf_evlist *evlist__core(struct evlist *evlist) +{ + return &RC_CHK_ACCESS(evlist)->core; +} + +static inline const struct perf_evlist *evlist__const_core(const struct ev= list *evlist) +{ + return &RC_CHK_ACCESS(evlist)->core; +} + +static inline int evlist__nr_entries(const struct evlist *evlist) +{ + return evlist__const_core(evlist)->nr_entries; +} + +static inline bool evlist__enabled(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->enabled; +} + +static inline void evlist__set_enabled(struct evlist *evlist, bool enabled) +{ + RC_CHK_ACCESS(evlist)->enabled =3D enabled; +} + +static inline bool evlist__no_affinity(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->no_affinity; +} + +static inline void evlist__set_no_affinity(struct evlist *evlist, bool no_= affinity) +{ + RC_CHK_ACCESS(evlist)->no_affinity =3D no_affinity; +} + +static inline int evlist__sb_thread_done(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->sb_thread.done; +} + +static inline void evlist__set_sb_thread_done(struct evlist *evlist, int d= one) +{ + RC_CHK_ACCESS(evlist)->sb_thread.done =3D done; +} + +static inline pthread_t *evlist__sb_thread_th(struct evlist *evlist) +{ + return &RC_CHK_ACCESS(evlist)->sb_thread.th; +} + +static inline int evlist__id_pos(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->id_pos; +} + +static inline int evlist__is_pos(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->is_pos; +} + +static inline struct event_enable_timer *evlist__event_enable_timer(struct= evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->eet; +} + +static inline enum bkw_mmap_state evlist__bkw_mmap_state(const struct evli= st *evlist) +{ + return RC_CHK_ACCESS(evlist)->bkw_mmap_state; +} + +static inline void evlist__set_bkw_mmap_state(struct evlist *evlist, enum = bkw_mmap_state state) +{ + RC_CHK_ACCESS(evlist)->bkw_mmap_state =3D state; +} + +static inline struct mmap *evlist__mmap(struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->mmap; +} + +static inline struct mmap *evlist__overwrite_mmap(struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->overwrite_mmap; +} + +static inline struct events_stats *evlist__stats(struct evlist *evlist) +{ + return &RC_CHK_ACCESS(evlist)->stats; +} + +static inline u64 evlist__first_sample_time(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->first_sample_time; +} + +static inline void evlist__set_first_sample_time(struct evlist *evlist, u6= 4 first) +{ + RC_CHK_ACCESS(evlist)->first_sample_time =3D first; +} + +static inline u64 evlist__last_sample_time(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->last_sample_time; +} + +static inline void evlist__set_last_sample_time(struct evlist *evlist, u64= last) +{ + RC_CHK_ACCESS(evlist)->last_sample_time =3D last; +} + +static inline int evlist__nr_br_cntr(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->nr_br_cntr; +} + +static inline void evlist__set_nr_br_cntr(struct evlist *evlist, int nr) +{ + RC_CHK_ACCESS(evlist)->nr_br_cntr =3D nr; +} + +static inline struct perf_session *evlist__session(struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->session; +} + +static inline void evlist__set_session(struct evlist *evlist, struct perf_= session *session) +{ + RC_CHK_ACCESS(evlist)->session =3D session; +} + +static inline void (*evlist__trace_event_sample_raw(struct evlist *evlist)) + (struct evlist *evlist, + union perf_event *event, + struct perf_sample *sample) +{ + return RC_CHK_ACCESS(evlist)->trace_event_sample_raw; +} + +static inline void evlist__set_trace_event_sample_raw(struct evlist *evlis= t, + void (*fun)(struct evlist *evlist, + union perf_event *event, + struct perf_sample *sample)) +{ + RC_CHK_ACCESS(evlist)->trace_event_sample_raw =3D fun; +} + +static inline pid_t evlist__workload_pid(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->workload.pid; +} + +static inline void evlist__set_workload_pid(struct evlist *evlist, pid_t p= id) +{ + RC_CHK_ACCESS(evlist)->workload.pid =3D pid; +} + +static inline int evlist__workload_cork_fd(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->workload.cork_fd; +} + +static inline void evlist__set_workload_cork_fd(struct evlist *evlist, int= cork_fd) +{ + RC_CHK_ACCESS(evlist)->workload.cork_fd =3D cork_fd; +} + +static inline int evlist__ctl_fd_fd(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->ctl_fd.fd; +} + +static inline void evlist__set_ctl_fd_fd(struct evlist *evlist, int fd) +{ + RC_CHK_ACCESS(evlist)->ctl_fd.fd =3D fd; +} + +static inline int evlist__ctl_fd_ack(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->ctl_fd.ack; +} + +static inline void evlist__set_ctl_fd_ack(struct evlist *evlist, int ack) +{ + RC_CHK_ACCESS(evlist)->ctl_fd.ack =3D ack; +} + +static inline int evlist__ctl_fd_pos(const struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->ctl_fd.pos; +} + +static inline void evlist__set_ctl_fd_pos(struct evlist *evlist, int pos) +{ + RC_CHK_ACCESS(evlist)->ctl_fd.pos =3D pos; +} + +static inline refcount_t *evlist__refcnt(struct evlist *evlist) +{ + return &RC_CHK_ACCESS(evlist)->refcnt; +} + +static inline struct rblist *evlist__metric_events(struct evlist *evlist) +{ + return &RC_CHK_ACCESS(evlist)->metric_events; +} + +static inline struct list_head *evlist__deferred_samples(struct evlist *ev= list) +{ + return &RC_CHK_ACCESS(evlist)->deferred_samples; +} + +static inline struct evsel *evlist__selected(struct evlist *evlist) +{ + return RC_CHK_ACCESS(evlist)->selected; +} + +static inline void evlist__set_selected(struct evlist *evlist, struct evse= l *evsel) +{ + RC_CHK_ACCESS(evlist)->selected =3D evsel; +} + struct evlist *evlist__new(void); struct evlist *evlist__new_default(const struct target *target, bool sampl= e_callchains); struct evlist *evlist__new_dummy(void); @@ -200,8 +422,8 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int= pages, unsigned int auxtrace_pages, bool auxtrace_overwrite, int nr_cblocks, int affinity, int flush, int comp_level); -int evlist__mmap(struct evlist *evlist, unsigned int pages); -void evlist__munmap(struct evlist *evlist); +int evlist__do_mmap(struct evlist *evlist, unsigned int pages); +void evlist__do_munmap(struct evlist *evlist); =20 size_t evlist__mmap_size(unsigned long pages); =20 @@ -213,8 +435,6 @@ void evlist__enable_evsel(struct evlist *evlist, char *= evsel_name); void evlist__disable_non_dummy(struct evlist *evlist); void evlist__enable_non_dummy(struct evlist *evlist); =20 -void evlist__set_selected(struct evlist *evlist, struct evsel *evsel); - int evlist__create_maps(struct evlist *evlist, struct target *target); int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel, struct target *target); @@ -237,26 +457,26 @@ void evlist__splice_list_tail(struct evlist *evlist, = struct list_head *list); =20 static inline bool evlist__empty(struct evlist *evlist) { - return list_empty(&evlist->core.entries); + return list_empty(&evlist__core(evlist)->entries); } =20 static inline struct evsel *evlist__first(struct evlist *evlist) { - struct perf_evsel *evsel =3D perf_evlist__first(&evlist->core); + struct perf_evsel *evsel =3D perf_evlist__first(evlist__core(evlist)); =20 return container_of(evsel, struct evsel, core); } =20 static inline struct evsel *evlist__last(struct evlist *evlist) { - struct perf_evsel *evsel =3D perf_evlist__last(&evlist->core); + struct perf_evsel *evsel =3D perf_evlist__last(evlist__core(evlist)); =20 return container_of(evsel, struct evsel, core); } =20 static inline int evlist__nr_groups(struct evlist *evlist) { - return perf_evlist__nr_groups(&evlist->core); + return perf_evlist__nr_groups(evlist__core(evlist)); } =20 int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_= t size); @@ -279,7 +499,7 @@ void evlist__to_front(struct evlist *evlist, struct evs= el *move_evsel); * @evsel: struct evsel iterator */ #define evlist__for_each_entry(evlist, evsel) \ - __evlist__for_each_entry(&(evlist)->core.entries, evsel) + __evlist__for_each_entry(&evlist__core(evlist)->entries, evsel) =20 /** * __evlist__for_each_entry_continue - continue iteration thru all the evs= els @@ -295,7 +515,7 @@ void evlist__to_front(struct evlist *evlist, struct evs= el *move_evsel); * @evsel: struct evsel iterator */ #define evlist__for_each_entry_continue(evlist, evsel) \ - __evlist__for_each_entry_continue(&(evlist)->core.entries, evsel) + __evlist__for_each_entry_continue(&evlist__core(evlist)->entries, evsel) =20 /** * __evlist__for_each_entry_from - continue iteration from @evsel (include= d) @@ -311,7 +531,7 @@ void evlist__to_front(struct evlist *evlist, struct evs= el *move_evsel); * @evsel: struct evsel iterator */ #define evlist__for_each_entry_from(evlist, evsel) \ - __evlist__for_each_entry_from(&(evlist)->core.entries, evsel) + __evlist__for_each_entry_from(&evlist__core(evlist)->entries, evsel) =20 /** * __evlist__for_each_entry_reverse - iterate thru all the evsels in rever= se order @@ -327,7 +547,7 @@ void evlist__to_front(struct evlist *evlist, struct evs= el *move_evsel); * @evsel: struct evsel iterator */ #define evlist__for_each_entry_reverse(evlist, evsel) \ - __evlist__for_each_entry_reverse(&(evlist)->core.entries, evsel) + __evlist__for_each_entry_reverse(&evlist__core(evlist)->entries, evsel) =20 /** * __evlist__for_each_entry_safe - safely iterate thru all the evsels @@ -345,7 +565,7 @@ void evlist__to_front(struct evlist *evlist, struct evs= el *move_evsel); * @tmp: struct evsel temp iterator */ #define evlist__for_each_entry_safe(evlist, tmp, evsel) \ - __evlist__for_each_entry_safe(&(evlist)->core.entries, tmp, evsel) + __evlist__for_each_entry_safe(&evlist__core(evlist)->entries, tmp, evsel) =20 /** Iterator state for evlist__for_each_cpu */ struct evlist_cpu_iterator { @@ -451,7 +671,6 @@ int evlist__ctlfd_ack(struct evlist *evlist); int evlist__parse_event_enable_time(struct evlist *evlist, struct record_o= pts *opts, const char *str, int unset); int event_enable_timer__start(struct event_enable_timer *eet); -void event_enable_timer__exit(struct event_enable_timer **ep); int event_enable_timer__process(struct event_enable_timer *eet); =20 struct evsel *evlist__find_evsel(struct evlist *evlist, int idx); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f5a9ecf87c21..ba88c29ebe5c 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3308,7 +3308,7 @@ static inline bool evsel__has_branch_counters(const s= truct evsel *evsel) if (!leader || !evsel->evlist) return false; =20 - if (evsel->evlist->nr_br_cntr < 0) + if (evlist__nr_br_cntr(evsel->evlist) < 0) evlist__update_br_cntr(evsel->evlist); =20 if (leader->br_cntr_nr > 0) @@ -4340,7 +4340,7 @@ int evsel__open_strerror(struct evsel *evsel, struct = target *target, =20 struct perf_session *evsel__session(struct evsel *evsel) { - return evsel && evsel->evlist ? evsel->evlist->session : NULL; + return evsel && evsel->evlist ? evlist__session(evsel->evlist) : NULL; } =20 struct perf_env *evsel__env(struct evsel *evsel) @@ -4365,7 +4365,7 @@ static int store_evsel_ids(struct evsel *evsel, struc= t evlist *evlist) thread++) { int fd =3D FD(evsel, cpu_map_idx, thread); =20 - if (perf_evlist__id_add_fd(&evlist->core, &evsel->core, + if (perf_evlist__id_add_fd(evlist__core(evlist), &evsel->core, cpu_map_idx, thread, fd) < 0) return -1; } diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 3fdb68e75bd1..a708ffc0f85f 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -509,7 +509,7 @@ for ((_evsel) =3D list_entry((_leader)->core.node.next,= struct evsel, core.node); (_evsel) =3D list_entry((_evsel)->core.node.next, struct evsel, core.node= )) =20 #define for_each_group_member(_evsel, _leader) \ - for_each_group_member_head(_evsel, _leader, &(_leader)->evlist->core.entr= ies) + for_each_group_member_head(_evsel, _leader, &evlist__core((_leader)->evli= st)->entries) =20 /* Iterates group WITH the leader. */ #define for_each_group_evsel_head(_evsel, _leader, _head) \ @@ -519,7 +519,7 @@ for ((_evsel) =3D _leader; \ (_evsel) =3D list_entry((_evsel)->core.node.next, struct evsel, core.node= )) =20 #define for_each_group_evsel(_evsel, _leader) \ - for_each_group_evsel_head(_evsel, _leader, &(_leader)->evlist->core.entri= es) + for_each_group_evsel_head(_evsel, _leader, &evlist__core((_leader)->evlis= t)->entries) =20 static inline bool evsel__has_branch_callstack(const struct evsel *evsel) { diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index e16362176986..d8691a8c1c9d 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -385,7 +385,7 @@ static int write_tracing_data(struct feat_fd *ff, return -1; =20 #ifdef HAVE_LIBTRACEEVENT - return read_tracing_data(ff->fd, &evlist->core.entries); + return read_tracing_data(ff->fd, &evlist__core(evlist)->entries); #else pr_err("ERROR: Trying to write tracing data without libtraceevent support= .\n"); return -1; @@ -434,8 +434,8 @@ static int write_osrelease(struct feat_fd *ff, struct utsname uts; const char *release =3D NULL; =20 - if (evlist->session) - release =3D perf_env__os_release(perf_session__env(evlist->session)); + if (evlist__session(evlist)) + release =3D perf_env__os_release(perf_session__env(evlist__session(evlis= t))); =20 if (!release) { int ret =3D uname(&uts); @@ -452,8 +452,8 @@ static int write_arch(struct feat_fd *ff, struct evlist= *evlist) struct utsname uts; const char *arch =3D NULL; =20 - if (evlist->session) - arch =3D perf_env__arch(perf_session__env(evlist->session)); + if (evlist__session(evlist)) + arch =3D perf_env__arch(perf_session__env(evlist__session(evlist))); =20 if (!arch) { int ret =3D uname(&uts); @@ -469,7 +469,7 @@ static int write_e_machine(struct feat_fd *ff, struct e= vlist *evlist) { /* e_machine expanded from 16 to 32-bits for alignment. */ uint32_t e_flags; - uint32_t e_machine =3D perf_session__e_machine(evlist->session, &e_flags); + uint32_t e_machine =3D perf_session__e_machine(evlist__session(evlist), &= e_flags); int ret; =20 ret =3D do_write(ff, &e_machine, sizeof(e_machine)); @@ -605,7 +605,7 @@ static int write_event_desc(struct feat_fd *ff, u32 nre, nri, sz; int ret; =20 - nre =3D evlist->core.nr_entries; + nre =3D evlist__nr_entries(evlist); =20 /* * write number of events @@ -987,7 +987,7 @@ int __weak get_cpuid(char *buffer __maybe_unused, size_= t sz __maybe_unused, =20 static int write_cpuid(struct feat_fd *ff, struct evlist *evlist) { - struct perf_cpu cpu =3D perf_cpu_map__min(evlist->core.all_cpus); + struct perf_cpu cpu =3D perf_cpu_map__min(evlist__core(evlist)->all_cpus); char buffer[64]; int ret; =20 @@ -1420,14 +1420,14 @@ static int write_sample_time(struct feat_fd *ff, struct evlist *evlist) { int ret; + u64 data =3D evlist__first_sample_time(evlist); =20 - ret =3D do_write(ff, &evlist->first_sample_time, - sizeof(evlist->first_sample_time)); + ret =3D do_write(ff, &data, sizeof(data)); if (ret < 0) return ret; =20 - return do_write(ff, &evlist->last_sample_time, - sizeof(evlist->last_sample_time)); + data =3D evlist__last_sample_time(evlist); + return do_write(ff, &data, sizeof(data)); } =20 =20 @@ -2552,16 +2552,16 @@ static void print_sample_time(struct feat_fd *ff, F= ILE *fp) =20 session =3D container_of(ff->ph, struct perf_session, header); =20 - timestamp__scnprintf_usec(session->evlist->first_sample_time, + timestamp__scnprintf_usec(evlist__first_sample_time(session->evlist), time_buf, sizeof(time_buf)); fprintf(fp, "# time of first sample : %s\n", time_buf); =20 - timestamp__scnprintf_usec(session->evlist->last_sample_time, + timestamp__scnprintf_usec(evlist__last_sample_time(session->evlist), time_buf, sizeof(time_buf)); fprintf(fp, "# time of last sample : %s\n", time_buf); =20 - d =3D (double)(session->evlist->last_sample_time - - session->evlist->first_sample_time) / NSEC_PER_MSEC; + d =3D (double)(evlist__last_sample_time(session->evlist) - + evlist__first_sample_time(session->evlist)) / NSEC_PER_MSEC; =20 fprintf(fp, "# sample duration : %10.3f ms\n", d); } @@ -3520,8 +3520,8 @@ static int process_sample_time(struct feat_fd *ff, vo= id *data __maybe_unused) if (ret) return -1; =20 - session->evlist->first_sample_time =3D first_sample_time; - session->evlist->last_sample_time =3D last_sample_time; + evlist__set_first_sample_time(session->evlist, first_sample_time); + evlist__set_last_sample_time(session->evlist, last_sample_time); return 0; } =20 @@ -4611,7 +4611,7 @@ int perf_session__write_header(struct perf_session *s= ession, /*write_attrs_after_data=3D*/false); } =20 -size_t perf_session__data_offset(const struct evlist *evlist) +size_t perf_session__data_offset(struct evlist *evlist) { struct evsel *evsel; size_t data_offset; @@ -4620,7 +4620,7 @@ size_t perf_session__data_offset(const struct evlist = *evlist) evlist__for_each_entry(evlist, evsel) { data_offset +=3D evsel->core.ids * sizeof(u64); } - data_offset +=3D evlist->core.nr_entries * sizeof(struct perf_file_attr); + data_offset +=3D evlist__nr_entries(evlist) * sizeof(struct perf_file_att= r); =20 return data_offset; } @@ -5111,7 +5111,7 @@ int perf_session__read_header(struct perf_session *se= ssion) if (session->evlist =3D=3D NULL) return -ENOMEM; =20 - session->evlist->session =3D session; + evlist__set_session(session->evlist, session); session->machines.host.env =3D &header->env; =20 /* @@ -5244,7 +5244,8 @@ int perf_session__read_header(struct perf_session *se= ssion) if (perf_header__getbuffer64(header, fd, &f_id, sizeof(f_id))) goto out_errno; =20 - perf_evlist__id_add(&session->evlist->core, &evsel->core, 0, j, f_id); + perf_evlist__id_add(evlist__core(session->evlist), + &evsel->core, 0, j, f_id); } =20 lseek(fd, tmp, SEEK_SET); @@ -5608,7 +5609,7 @@ int perf_event__process_attr(const struct perf_tool *= tool __maybe_unused, */ ids =3D (void *)&event->attr.attr + attr_size; for (i =3D 0; i < n_ids; i++) { - perf_evlist__id_add(&evlist->core, &evsel->core, 0, i, ids[i]); + perf_evlist__id_add(evlist__core(evlist), &evsel->core, 0, i, ids[i]); } =20 return 0; diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 86b1a72026d3..5e03f884b7cc 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -158,7 +158,7 @@ int perf_session__inject_header(struct perf_session *se= ssion, struct feat_copier *fc, bool write_attrs_after_data); =20 -size_t perf_session__data_offset(const struct evlist *evlist); +size_t perf_session__data_offset(struct evlist *evlist); =20 void perf_header__set_feat(struct perf_header *header, int feat); void perf_header__clear_feat(struct perf_header *header, int feat); diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index bc3b79bfa01a..b41171b5df77 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -98,8 +98,9 @@ static int evsel__tpebs_start_perf_record(struct evsel *e= vsel) record_argv[i++] =3D "-o"; record_argv[i++] =3D PERF_DATA; =20 - if (!perf_cpu_map__is_any_cpu_or_is_empty(evsel->evlist->core.user_reques= ted_cpus)) { - cpu_map__snprint(evsel->evlist->core.user_requested_cpus, cpumap_buf, + if (!perf_cpu_map__is_any_cpu_or_is_empty( + evlist__core(evsel->evlist)->user_requested_cpus)) { + cpu_map__snprint(evlist__core(evsel->evlist)->user_requested_cpus, cpuma= p_buf, sizeof(cpumap_buf)); record_argv[i++] =3D "-C"; record_argv[i++] =3D cpumap_buf; @@ -176,7 +177,7 @@ static bool should_ignore_sample(const struct perf_samp= le *sample, const struct if (t->evsel->evlist =3D=3D NULL) return true; =20 - workload_pid =3D t->evsel->evlist->workload.pid; + workload_pid =3D evlist__workload_pid(t->evsel->evlist); if (workload_pid < 0 || workload_pid =3D=3D sample_pid) return false; =20 diff --git a/tools/perf/util/iostat.c b/tools/perf/util/iostat.c index b770bd473af7..c9d5028a47f3 100644 --- a/tools/perf/util/iostat.c +++ b/tools/perf/util/iostat.c @@ -4,7 +4,7 @@ =20 enum iostat_mode_t iostat_mode =3D IOSTAT_NONE; =20 -__weak int iostat_prepare(struct evlist *evlist __maybe_unused, +__weak int iostat_prepare(struct evlist **evlist __maybe_unused, struct perf_stat_config *config __maybe_unused) { return -1; diff --git a/tools/perf/util/iostat.h b/tools/perf/util/iostat.h index a4e7299c5c2f..df8a241fbc32 100644 --- a/tools/perf/util/iostat.h +++ b/tools/perf/util/iostat.h @@ -30,7 +30,7 @@ extern enum iostat_mode_t iostat_mode; =20 typedef void (*iostat_print_counter_t)(struct perf_stat_config *, struct e= vsel *, void *); =20 -int iostat_prepare(struct evlist *evlist, struct perf_stat_config *config); +int iostat_prepare(struct evlist **evlist, struct perf_stat_config *config= ); int iostat_parse(const struct option *opt, const char *str, int unset __maybe_unused); void iostat_list(struct evlist *evlist, struct perf_stat_config *config); diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 2c4e9fefb41f..8c7b299a55db 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1490,7 +1490,7 @@ static int parse_groups(struct evlist *perf_evlist, goto out; } =20 - me =3D metricgroup__lookup(&perf_evlist->metric_events, + me =3D metricgroup__lookup(evlist__metric_events(perf_evlist), pick_display_evsel(&metric_list, metric_events), /*create=3D*/true); =20 @@ -1541,13 +1541,13 @@ static int parse_groups(struct evlist *perf_evlist, =20 =20 if (combined_evlist) { - evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries); + evlist__splice_list_tail(perf_evlist, &evlist__core(combined_evlist)->en= tries); evlist__put(combined_evlist); } =20 list_for_each_entry(m, &metric_list, nd) { if (m->evlist) - evlist__splice_list_tail(perf_evlist, &m->evlist->core.entries); + evlist__splice_list_tail(perf_evlist, &evlist__core(m->evlist)->entries= ); } =20 out: diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 8fb5626d5d37..194bc94dfc1e 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2294,7 +2294,7 @@ int __parse_events(struct evlist *evlist, const char = *str, const char *pmu_filte { struct parse_events_state parse_state =3D { .list =3D LIST_HEAD_INIT(parse_state.list), - .idx =3D evlist->core.nr_entries, + .idx =3D evlist__nr_entries(evlist), .error =3D err, .stoken =3D PE_START_EVENTS, .fake_pmu =3D fake_pmu, @@ -2568,7 +2568,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist, * * So no need to WARN here, let *func do this. */ - if (evlist->core.nr_entries > 0) + if (evlist__nr_entries(evlist) > 0) last =3D evlist__last(evlist); =20 do { @@ -2578,7 +2578,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist, if (!last) return 0; =20 - if (last->core.node.prev =3D=3D &evlist->core.entries) + if (last->core.node.prev =3D=3D &evlist__core(evlist)->entries) return 0; last =3D list_entry(last->core.node.prev, struct evsel, core.node); } while (!last->cmdline_group_boundary); diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c index 5f53c2f68a96..f80d6b0df47a 100644 --- a/tools/perf/util/pfm.c +++ b/tools/perf/util/pfm.c @@ -85,7 +85,7 @@ int parse_libpfm_events_option(const struct option *opt, = const char *str, } =20 pmu =3D perf_pmus__find_by_type((unsigned int)attr.type); - evsel =3D parse_events__add_event(evlist->core.nr_entries, + evsel =3D parse_events__add_event(evlist__nr_entries(evlist), &attr, q, /*metric_id=3D*/NULL, pmu); if (evsel =3D=3D NULL) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 077832231185..efe8c3b898ea 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1539,7 +1539,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevl= ist, } threads =3D ((struct pyrf_thread_map *)pthreads)->threads; cpus =3D ((struct pyrf_cpu_map *)pcpus)->cpus; - perf_evlist__set_maps(&pevlist->evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(pevlist->evlist), cpus, threads); =20 return 0; } @@ -1552,23 +1552,29 @@ static void pyrf_evlist__delete(struct pyrf_evlist = *pevlist) =20 static PyObject *pyrf_evlist__all_cpus(struct pyrf_evlist *pevlist) { - struct pyrf_cpu_map *pcpu_map =3D PyObject_New(struct pyrf_cpu_map, &pyrf= _cpu_map__type); + struct pyrf_cpu_map *pcpu_map; + + CHECK_INITIALIZED(pevlist->evlist, "evlist"); =20 + pcpu_map =3D PyObject_New(struct pyrf_cpu_map, &pyrf_cpu_map__type); if (pcpu_map) - pcpu_map->cpus =3D perf_cpu_map__get(pevlist->evlist->core.all_cpus); + pcpu_map->cpus =3D perf_cpu_map__get(evlist__core(pevlist->evlist)->all_= cpus); =20 return (PyObject *)pcpu_map; } =20 static PyObject *pyrf_evlist__metrics(struct pyrf_evlist *pevlist) { - PyObject *list =3D PyList_New(/*len=3D*/0); + PyObject *list; struct rb_node *node; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + list =3D PyList_New(/*len=3D*/0); if (!list) return NULL; =20 - for (node =3D rb_first_cached(&pevlist->evlist->metric_events.entries); n= ode; + for (node =3D rb_first_cached(&evlist__metric_events(pevlist->evlist)->en= tries); node; node =3D rb_next(node)) { struct metric_event *me =3D container_of(node, struct metric_event, nd); struct list_head *pos; @@ -1671,10 +1677,12 @@ static PyObject *pyrf_evlist__compute_metric(struct= pyrf_evlist *pevlist, double result =3D 0; struct evsel *metric_evsel =3D NULL; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + if (!PyArg_ParseTuple(args, "sii", &metric, &cpu, &thread)) return NULL; =20 - for (node =3D rb_first_cached(&pevlist->evlist->metric_events.entries); + for (node =3D rb_first_cached(&evlist__metric_events(pevlist->evlist)->en= tries); mexp =3D=3D NULL && node; node =3D rb_next(node)) { struct metric_event *me =3D container_of(node, struct metric_event, nd); @@ -1735,15 +1743,18 @@ static PyObject *pyrf_evlist__compute_metric(struct= pyrf_evlist *pevlist, static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; static char *kwlist[] =3D { "pages", "overwrite", NULL }; int pages =3D 128, overwrite =3D false; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii", kwlist, &pages, &overwrite)) return NULL; =20 - if (evlist__mmap(evlist, pages) < 0) { + if (evlist__do_mmap(evlist, pages) < 0) { PyErr_SetFromErrno(PyExc_OSError); return NULL; } @@ -1755,10 +1766,13 @@ static PyObject *pyrf_evlist__mmap(struct pyrf_evli= st *pevlist, static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; static char *kwlist[] =3D { "timeout", NULL }; int timeout =3D -1, n; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &timeout)) return NULL; =20 @@ -1775,13 +1789,18 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyr= f_evlist *pevlist, PyObject *args __maybe_unused, PyObject *kwargs __maybe_unused) { - struct evlist *evlist =3D pevlist->evlist; - PyObject *list =3D PyList_New(0); + struct evlist *evlist; + PyObject *list; int i; =20 - for (i =3D 0; i < evlist->core.pollfd.nr; ++i) { + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; + list =3D PyList_New(0); + + for (i =3D 0; i < evlist__core(evlist)->pollfd.nr; ++i) { PyObject *file; - file =3D PyFile_FromFd(evlist->core.pollfd.entries[i].fd, "perf", "r", -= 1, + file =3D PyFile_FromFd(evlist__core(evlist)->pollfd.entries[i].fd, "perf= ", "r", -1, NULL, NULL, NULL, 0); if (file =3D=3D NULL) goto free_list; @@ -1804,27 +1823,32 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlis= t *pevlist, PyObject *args, PyObject *kwargs __maybe_unused) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; PyObject *pevsel; struct evsel *evsel; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; if (!PyArg_ParseTuple(args, "O!", &pyrf_evsel__type, &pevsel)) return NULL; =20 - Py_INCREF(pevsel); evsel =3D ((struct pyrf_evsel *)pevsel)->evsel; - evsel->core.idx =3D evlist->core.nr_entries; + CHECK_INITIALIZED(evsel, "evsel"); + + Py_INCREF(pevsel); + evsel->core.idx =3D evlist__nr_entries(evlist); evlist__add(evlist, evsel__get(evsel)); =20 - return Py_BuildValue("i", evlist->core.nr_entries); + return Py_BuildValue("i", evlist__nr_entries(evlist)); } =20 static struct mmap *get_md(struct evlist *evlist, int cpu) { int i; =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - struct mmap *md =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + struct mmap *md =3D &evlist__mmap(evlist)[i]; =20 if (md->core.cpu.cpu =3D=3D cpu) return md; @@ -1836,13 +1860,16 @@ static struct mmap *get_md(struct evlist *evlist, i= nt cpu) static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; union perf_event *event; int sample_id_all =3D 1, cpu; static char *kwlist[] =3D { "cpu", "sample_id_all", NULL }; struct mmap *md; int err; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, &cpu, &sample_id_all)) return NULL; @@ -1893,8 +1920,11 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyr= f_evlist *pevlist, static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist, PyObject *args, PyObject *kwargs) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; + + CHECK_INITIALIZED(pevlist->evlist, "evlist"); =20 + evlist =3D pevlist->evlist; if (evlist__open(evlist) < 0) { PyErr_SetFromErrno(PyExc_OSError); return NULL; @@ -1906,8 +1936,11 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlis= t *pevlist, =20 static PyObject *pyrf_evlist__close(struct pyrf_evlist *pevlist) { - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; =20 + CHECK_INITIALIZED(pevlist->evlist, "evlist"); + + evlist =3D pevlist->evlist; evlist__close(evlist); =20 Py_INCREF(Py_None); @@ -1932,8 +1965,11 @@ static PyObject *pyrf_evlist__config(struct pyrf_evl= ist *pevlist) .no_buffering =3D true, .no_inherit =3D true, }; - struct evlist *evlist =3D pevlist->evlist; + struct evlist *evlist; + + CHECK_INITIALIZED(pevlist->evlist, "evlist"); =20 + evlist =3D pevlist->evlist; evlist__config(evlist, &opts, &callchain_param); Py_INCREF(Py_None); return Py_None; @@ -1941,6 +1977,7 @@ static PyObject *pyrf_evlist__config(struct pyrf_evli= st *pevlist) =20 static PyObject *pyrf_evlist__disable(struct pyrf_evlist *pevlist) { + CHECK_INITIALIZED(pevlist->evlist, "evlist"); evlist__disable(pevlist->evlist); Py_INCREF(Py_None); return Py_None; @@ -1948,6 +1985,7 @@ static PyObject *pyrf_evlist__disable(struct pyrf_evl= ist *pevlist) =20 static PyObject *pyrf_evlist__enable(struct pyrf_evlist *pevlist) { + CHECK_INITIALIZED(pevlist->evlist, "evlist"); evlist__enable(pevlist->evlist); Py_INCREF(Py_None); return Py_None; @@ -2042,7 +2080,7 @@ static Py_ssize_t pyrf_evlist__length(PyObject *obj) if (!pevlist->evlist) return 0; =20 - return pevlist->evlist->core.nr_entries; + return evlist__nr_entries(pevlist->evlist); } =20 static PyObject *pyrf_evsel__from_evsel(struct evsel *evsel) @@ -2061,7 +2099,7 @@ static PyObject *pyrf_evlist__item(PyObject *obj, Py_= ssize_t i) struct pyrf_evlist *pevlist =3D (void *)obj; struct evsel *pos; =20 - if (!pevlist->evlist || i >=3D pevlist->evlist->core.nr_entries) { + if (!pevlist->evlist || i >=3D evlist__nr_entries(pevlist->evlist)) { PyErr_SetString(PyExc_IndexError, "Index out of range"); return NULL; } @@ -2289,7 +2327,7 @@ static PyObject *pyrf__parse_events(PyObject *self, P= yObject *args) cpus =3D pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL; =20 parse_events_error__init(&err); - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); if (parse_events(evlist, input, &err)) { parse_events_error__print(&err, input); PyErr_SetFromErrno(PyExc_OSError); @@ -2322,7 +2360,7 @@ static PyObject *pyrf__parse_metrics(PyObject *self, = PyObject *args) threads =3D pthreads ? ((struct pyrf_thread_map *)pthreads)->threads : NU= LL; cpus =3D pcpus ? ((struct pyrf_cpu_map *)pcpus)->cpus : NULL; =20 - perf_evlist__set_maps(&evlist->core, cpus, threads); + perf_evlist__set_maps(evlist__core(evlist), cpus, threads); ret =3D metricgroup__parse_groups(evlist, pmu ?: "all", input, /*metric_no_group=3D*/ false, /*metric_no_merge=3D*/ false, diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index 8a5fc7d5e43c..38e8aee3106b 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -99,7 +99,7 @@ void evlist__config(struct evlist *evlist, struct record_= opts *opts, struct call bool use_comm_exec; bool sample_id =3D opts->sample_id; =20 - if (perf_cpu_map__cpu(evlist->core.user_requested_cpus, 0).cpu < 0) + if (perf_cpu_map__cpu(evlist__core(evlist)->user_requested_cpus, 0).cpu <= 0) opts->no_inherit =3D true; =20 use_comm_exec =3D perf_can_comm_exec(); @@ -122,7 +122,7 @@ void evlist__config(struct evlist *evlist, struct recor= d_opts *opts, struct call */ use_sample_identifier =3D perf_can_sample_identifier(); sample_id =3D true; - } else if (evlist->core.nr_entries > 1) { + } else if (evlist__nr_entries(evlist) > 1) { struct evsel *first =3D evlist__first(evlist); =20 evlist__for_each_entry(evlist, evsel) { @@ -237,7 +237,8 @@ bool evlist__can_select_event(struct evlist *evlist, co= nst char *str) =20 evsel =3D evlist__last(temp_evlist); =20 - if (!evlist || perf_cpu_map__is_any_cpu_or_is_empty(evlist->core.user_req= uested_cpus)) { + if (!evlist || + perf_cpu_map__is_any_cpu_or_is_empty(evlist__core(evlist)->user_reque= sted_cpus)) { struct perf_cpu_map *cpus =3D perf_cpu_map__new_online_cpus(); =20 if (cpus) @@ -245,7 +246,7 @@ bool evlist__can_select_event(struct evlist *evlist, co= nst char *str) =20 perf_cpu_map__put(cpus); } else { - cpu =3D perf_cpu_map__cpu(evlist->core.user_requested_cpus, 0); + cpu =3D perf_cpu_map__cpu(evlist__core(evlist)->user_requested_cpus, 0); } =20 while (1) { diff --git a/tools/perf/util/sample-raw.c b/tools/perf/util/sample-raw.c index e20b73c0c5bd..f5ae9f468983 100644 --- a/tools/perf/util/sample-raw.c +++ b/tools/perf/util/sample-raw.c @@ -18,11 +18,11 @@ void evlist__init_trace_event_sample_raw(struct evlist = *evlist, struct perf_env uint16_t e_machine =3D perf_env__e_machine(env, /*e_flags=3D*/NULL); =20 if (e_machine =3D=3D EM_S390) { - evlist->trace_event_sample_raw =3D evlist__s390_sample_raw; + evlist__set_trace_event_sample_raw(evlist, evlist__s390_sample_raw); } else if (e_machine =3D=3D EM_X86_64 || e_machine =3D=3D EM_386) { const char *cpuid =3D perf_env__cpuid(env); =20 if (cpuid && strstarts(cpuid, "AuthenticAMD") && evlist__has_amd_ibs(evl= ist)) - evlist->trace_event_sample_raw =3D evlist__amd_sample_raw; + evlist__set_trace_event_sample_raw(evlist, evlist__amd_sample_raw); } } diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 479e0844f5e1..227e54879975 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -204,7 +204,7 @@ struct perf_session *__perf_session__new(struct perf_da= ta *data, session->machines.host.env =3D host_env; } if (session->evlist) - session->evlist->session =3D session; + evlist__set_session(session->evlist, session); =20 session->machines.host.single_address_space =3D perf_env__single_address_space(session->machines.host.env); @@ -1548,8 +1548,8 @@ static void dump_event(struct evlist *evlist, union p= erf_event *event, file_offset, file_path, event->header.size, event->header.type); =20 trace_event(event); - if (event->header.type =3D=3D PERF_RECORD_SAMPLE && evlist->trace_event_s= ample_raw) - evlist->trace_event_sample_raw(evlist, event, sample); + if (event->header.type =3D=3D PERF_RECORD_SAMPLE && evlist__trace_event_s= ample_raw(evlist)) + evlist__trace_event_sample_raw(evlist)(evlist, event, sample); =20 if (sample) evlist__print_tstamp(evlist, event, sample); @@ -1750,7 +1750,7 @@ static int deliver_sample_value(struct evlist *evlist, } =20 if (!storage || sid->evsel =3D=3D NULL) { - ++evlist->stats.nr_unknown_id; + ++evlist__stats(evlist)->nr_unknown_id; return 0; } =20 @@ -1852,7 +1852,7 @@ static int evlist__deliver_deferred_callchain(struct = evlist *evlist, return ret; } =20 - list_for_each_entry_safe(de, tmp, &evlist->deferred_samples, list) { + list_for_each_entry_safe(de, tmp, evlist__deferred_samples(evlist), list)= { struct perf_sample orig_sample; =20 perf_sample__init(&orig_sample, /*all=3D*/false); @@ -1875,6 +1875,8 @@ static int evlist__deliver_deferred_callchain(struct = evlist *evlist, orig_sample.deferred_callchain =3D false; =20 orig_sample.evsel =3D evlist__id2evsel(evlist, orig_sample.id); + if (orig_sample.evsel) + orig_sample.evsel =3D evsel__get(orig_sample.evsel); ret =3D evlist__deliver_sample(evlist, tool, de->event, &orig_sample, machine); =20 @@ -1901,7 +1903,7 @@ static int session__flush_deferred_samples(struct per= f_session *session, struct deferred_event *de, *tmp; int ret =3D 0; =20 - list_for_each_entry_safe(de, tmp, &evlist->deferred_samples, list) { + list_for_each_entry_safe(de, tmp, evlist__deferred_samples(evlist), list)= { struct perf_sample sample; =20 perf_sample__init(&sample, /*all=3D*/false); @@ -1914,6 +1916,8 @@ static int session__flush_deferred_samples(struct per= f_session *session, sample.file_offset =3D de->file_offset; =20 sample.evsel =3D evlist__id2evsel(evlist, sample.id); + if (sample.evsel) + sample.evsel =3D evsel__get(sample.evsel); ret =3D evlist__deliver_sample(evlist, tool, de->event, &sample, machine); =20 @@ -1959,21 +1963,23 @@ static int machines__deliver_event(struct machines = *machines, =20 dump_event(evlist, event, file_offset, sample, file_path); =20 - if (!sample->evsel) + if (!sample->evsel) { sample->evsel =3D evlist__id2evsel(evlist, sample->id); - else + if (sample->evsel) + sample->evsel =3D evsel__get(sample->evsel); + } else { assert(sample->evsel =3D=3D evlist__id2evsel(evlist, sample->id)); - + } machine =3D machines__find_for_cpumode(machines, event, sample); =20 switch (event->header.type) { case PERF_RECORD_SAMPLE: if (sample->evsel =3D=3D NULL) { - ++evlist->stats.nr_unknown_id; + ++evlist__stats(evlist)->nr_unknown_id; return 0; } if (machine =3D=3D NULL) { - ++evlist->stats.nr_unprocessable_samples; + ++evlist__stats(evlist)->nr_unprocessable_samples; dump_sample(machine, event, sample); return 0; } @@ -1992,7 +1998,7 @@ static int machines__deliver_event(struct machines *m= achines, } memcpy(de->event, event, sz); de->file_offset =3D sample->file_offset; - list_add_tail(&de->list, &evlist->deferred_samples); + list_add_tail(&de->list, evlist__deferred_samples(evlist)); return 0; } return evlist__deliver_sample(evlist, tool, event, sample, machine); @@ -2004,7 +2010,7 @@ static int machines__deliver_event(struct machines *m= achines, return tool->mmap(tool, event, sample, machine); case PERF_RECORD_MMAP2: if (event->header.misc & PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT) - ++evlist->stats.nr_proc_map_timeout; + ++evlist__stats(evlist)->nr_proc_map_timeout; if (!perf_event__check_nul(event->mmap2.filename, (void *)event + event->header.size, "MMAP2", file_offset)) @@ -2049,13 +2055,13 @@ static int machines__deliver_event(struct machines = *machines, return tool->exit(tool, event, sample, machine); case PERF_RECORD_LOST: if (tool->lost =3D=3D perf_event__process_lost) - evlist->stats.total_lost +=3D event->lost.lost; + evlist__stats(evlist)->total_lost +=3D event->lost.lost; return tool->lost(tool, event, sample, machine); case PERF_RECORD_LOST_SAMPLES: if (event->header.misc & PERF_RECORD_MISC_LOST_SAMPLES_BPF) - evlist->stats.total_dropped_samples +=3D event->lost_samples.lost; + evlist__stats(evlist)->total_dropped_samples +=3D event->lost_samples.l= ost; else if (tool->lost_samples =3D=3D perf_event__process_lost_samples) - evlist->stats.total_lost_samples +=3D event->lost_samples.lost; + evlist__stats(evlist)->total_lost_samples +=3D event->lost_samples.lost; return tool->lost_samples(tool, event, sample, machine); case PERF_RECORD_READ: dump_read(sample->evsel, event); @@ -2067,11 +2073,11 @@ static int machines__deliver_event(struct machines = *machines, case PERF_RECORD_AUX: if (tool->aux =3D=3D perf_event__process_aux) { if (event->aux.flags & PERF_AUX_FLAG_TRUNCATED) - evlist->stats.total_aux_lost +=3D 1; + evlist__stats(evlist)->total_aux_lost +=3D 1; if (event->aux.flags & PERF_AUX_FLAG_PARTIAL) - evlist->stats.total_aux_partial +=3D 1; + evlist__stats(evlist)->total_aux_partial +=3D 1; if (event->aux.flags & PERF_AUX_FLAG_COLLISION) - evlist->stats.total_aux_collision +=3D 1; + evlist__stats(evlist)->total_aux_collision +=3D 1; } return tool->aux(tool, event, sample, machine); case PERF_RECORD_ITRACE_START: @@ -2107,7 +2113,7 @@ static int machines__deliver_event(struct machines *m= achines, return evlist__deliver_deferred_callchain(evlist, tool, event, sample, machine); default: - ++evlist->stats.nr_unknown_events; + ++evlist__stats(evlist)->nr_unknown_events; return -1; } } @@ -2519,7 +2525,7 @@ int perf_session__deliver_synth_event(struct perf_ses= sion *session, struct evlist *evlist =3D session->evlist; const struct perf_tool *tool =3D session->tool; =20 - events_stats__inc(&evlist->stats, event->header.type); + events_stats__inc(evlist__stats(evlist), event->header.type); =20 if (event->header.type >=3D PERF_RECORD_USER_TYPE_START) return perf_session__process_user_event(session, event, 0, NULL); @@ -2929,7 +2935,7 @@ static s64 perf_session__process_event(struct perf_se= ssion *session, return 0; } =20 - events_stats__inc(&evlist->stats, event->header.type); + events_stats__inc(evlist__stats(evlist), event->header.type); =20 if (event->header.type >=3D PERF_RECORD_USER_TYPE_START) return perf_session__process_user_event(session, event, file_offset, fil= e_path); @@ -2990,7 +2996,7 @@ perf_session__warn_order(const struct perf_session *s= ession) =20 static void perf_session__warn_about_errors(const struct perf_session *ses= sion) { - const struct events_stats *stats =3D &session->evlist->stats; + const struct events_stats *stats =3D evlist__stats(session->evlist); =20 if (session->tool->lost =3D=3D perf_event__process_lost && stats->nr_events[PERF_RECORD_LOST] !=3D 0) { @@ -3823,7 +3829,7 @@ size_t perf_session__fprintf_nr_events(struct perf_se= ssion *session, FILE *fp) =20 ret =3D fprintf(fp, "\nAggregated stats:%s\n", msg); =20 - ret +=3D events_stats__fprintf(&session->evlist->stats, fp); + ret +=3D events_stats__fprintf(evlist__stats(session->evlist), fp); return ret; } =20 diff --git a/tools/perf/util/sideband_evlist.c b/tools/perf/util/sideband_e= vlist.c index b84a5463e039..c07dacf3c54c 100644 --- a/tools/perf/util/sideband_evlist.c +++ b/tools/perf/util/sideband_evlist.c @@ -22,7 +22,7 @@ int evlist__add_sb_event(struct evlist *evlist, struct pe= rf_event_attr *attr, attr->sample_id_all =3D 1; } =20 - evsel =3D evsel__new_idx(attr, evlist->core.nr_entries); + evsel =3D evsel__new_idx(attr, evlist__nr_entries(evlist)); if (!evsel) return -1; =20 @@ -49,14 +49,14 @@ static void *perf_evlist__poll_thread(void *arg) while (!done) { bool got_data =3D false; =20 - if (evlist->thread.done) + if (evlist__sb_thread_done(evlist)) draining =3D true; =20 if (!draining) evlist__poll(evlist, 1000); =20 - for (i =3D 0; i < evlist->core.nr_mmaps; i++) { - struct mmap *map =3D &evlist->mmap[i]; + for (i =3D 0; i < evlist__core(evlist)->nr_mmaps; i++) { + struct mmap *map =3D &evlist__mmap(evlist)[i]; union perf_event *event; =20 if (perf_mmap__read_init(&map->core)) @@ -104,7 +104,7 @@ int evlist__start_sb_thread(struct evlist *evlist, stru= ct target *target) if (evlist__create_maps(evlist, target)) goto out_put_evlist; =20 - if (evlist->core.nr_entries > 1) { + if (evlist__nr_entries(evlist) > 1) { bool can_sample_identifier =3D perf_can_sample_identifier(); =20 evlist__for_each_entry(evlist, counter) @@ -114,12 +114,12 @@ int evlist__start_sb_thread(struct evlist *evlist, st= ruct target *target) } =20 evlist__for_each_entry(evlist, counter) { - if (evsel__open(counter, evlist->core.user_requested_cpus, - evlist->core.threads) < 0) + if (evsel__open(counter, evlist__core(evlist)->user_requested_cpus, + evlist__core(evlist)->threads) < 0) goto out_put_evlist; } =20 - if (evlist__mmap(evlist, UINT_MAX)) + if (evlist__do_mmap(evlist, UINT_MAX)) goto out_put_evlist; =20 evlist__for_each_entry(evlist, counter) { @@ -127,8 +127,8 @@ int evlist__start_sb_thread(struct evlist *evlist, stru= ct target *target) goto out_put_evlist; } =20 - evlist->thread.done =3D 0; - if (pthread_create(&evlist->thread.th, NULL, perf_evlist__poll_thread, ev= list)) + evlist__set_sb_thread_done(evlist, 0); + if (pthread_create(evlist__sb_thread_th(evlist), NULL, perf_evlist__poll_= thread, evlist)) goto out_put_evlist; =20 return 0; @@ -143,7 +143,7 @@ void evlist__stop_sb_thread(struct evlist *evlist) { if (!evlist) return; - evlist->thread.done =3D 1; - pthread_join(evlist->thread.th, NULL); + evlist__set_sb_thread_done(evlist, 1); + pthread_join(*evlist__sb_thread_th(evlist), NULL); evlist__put(evlist); } diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 005e7d85dc4a..dcf9189786f8 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -3487,7 +3487,7 @@ static struct evsel *find_evsel(struct evlist *evlist= , char *event_name) if (event_name[0] =3D=3D '%') { int nr =3D strtol(event_name+1, NULL, 0); =20 - if (nr > evlist->core.nr_entries) + if (nr > evlist__nr_entries(evlist)) return NULL; =20 evsel =3D evlist__first(evlist); diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index 2b69d238858c..4fde6180b39e 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -667,7 +667,7 @@ static void print_metric_header(struct perf_stat_config= *config, =20 /* In case of iostat, print metric header for first root port only */ if (config->iostat_run && - os->evsel->priv !=3D os->evsel->evlist->selected->priv) + os->evsel->priv !=3D evlist__selected(os->evsel->evlist)->priv) return; =20 if (os->evsel->cgrp !=3D os->cgrp) @@ -1126,7 +1126,7 @@ static void print_no_aggr_metric(struct perf_stat_con= fig *config, unsigned int all_idx; struct perf_cpu cpu; =20 - perf_cpu_map__for_each_cpu(cpu, all_idx, evlist->core.user_requested_cpus= ) { + perf_cpu_map__for_each_cpu(cpu, all_idx, evlist__core(evlist)->user_reque= sted_cpus) { struct evsel *counter; bool first =3D true; =20 @@ -1543,7 +1543,7 @@ void evlist__print_counters(struct evlist *evlist, st= ruct perf_stat_config *conf evlist__uniquify_evsel_names(evlist, config); =20 if (config->iostat_run) - evlist->selected =3D evlist__first(evlist); + evlist__set_selected(evlist, evlist__first(evlist)); =20 if (config->interval) prepare_timestamp(config, &os, ts); diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 35062f964618..525a3fe4a46e 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -287,7 +287,7 @@ void *perf_stat__print_shadow_stats_metricgroup(struct = perf_stat_config *config, void *ctxp =3D out->ctx; bool header_printed =3D false; const char *name =3D NULL; - struct rblist *metric_events =3D &evsel->evlist->metric_events; + struct rblist *metric_events =3D evlist__metric_events(evsel->evlist); =20 me =3D metricgroup__lookup(metric_events, evsel, false); if (me =3D=3D NULL) @@ -355,5 +355,5 @@ bool perf_stat__skip_metric_event(struct evsel *evsel) if (!evsel->default_metricgroup) return false; =20 - return !metricgroup__lookup(&evsel->evlist->metric_events, evsel, false); + return !metricgroup__lookup(evlist__metric_events(evsel->evlist), evsel, = false); } diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 66eb9a66a4f7..25f31a174368 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -547,8 +547,8 @@ static void evsel__merge_aliases(struct evsel *evsel) struct evlist *evlist =3D evsel->evlist; struct evsel *alias; =20 - alias =3D list_prepare_entry(evsel, &(evlist->core.entries), core.node); - list_for_each_entry_continue(alias, &evlist->core.entries, core.node) { + alias =3D list_prepare_entry(evsel, &(evlist__core(evlist)->entries), cor= e.node); + list_for_each_entry_continue(alias, &evlist__core(evlist)->entries, core.= node) { if (alias->first_wildcard_match =3D=3D evsel) { /* Merge the same events on different PMUs. */ evsel__merge_aggr_counters(evsel, alias); diff --git a/tools/perf/util/stream.c b/tools/perf/util/stream.c index 3de4a6130853..7bccd2378344 100644 --- a/tools/perf/util/stream.c +++ b/tools/perf/util/stream.c @@ -131,7 +131,7 @@ static int evlist__init_callchain_streams(struct evlist= *evlist, struct evsel *pos; int i =3D 0; =20 - BUG_ON(els->nr_evsel < evlist->core.nr_entries); + BUG_ON(els->nr_evsel < evlist__nr_entries(evlist)); =20 evlist__for_each_entry(evlist, pos) { struct hists *hists =3D evsel__hists(pos); @@ -148,7 +148,7 @@ static int evlist__init_callchain_streams(struct evlist= *evlist, struct evlist_streams *evlist__create_streams(struct evlist *evlist, int nr_streams_max) { - int nr_evsel =3D evlist->core.nr_entries, ret =3D -1; + int nr_evsel =3D evlist__nr_entries(evlist), ret =3D -1; struct evlist_streams *els =3D evlist_streams__new(nr_evsel, nr_streams_max); =20 diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 5307d707711d..b75f9dcf4dbf 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2247,7 +2247,7 @@ int perf_event__synthesize_tracing_data(const struct = perf_tool *tool, int fd, st * - write the tracing data from the temp file * to the pipe */ - tdata =3D tracing_data_get(&evlist->core.entries, fd, true); + tdata =3D tracing_data_get(&evlist__core(evlist)->entries, fd, true); if (!tdata) return -1; =20 @@ -2404,13 +2404,16 @@ int perf_event__synthesize_stat_events(struct perf_= stat_config *config, const st } =20 err =3D perf_event__synthesize_extra_attr(tool, evlist, process, attrs); - err =3D perf_event__synthesize_thread_map2(tool, evlist->core.threads, pr= ocess, NULL); + err =3D perf_event__synthesize_thread_map2(tool, evlist__core(evlist)->th= reads, + process, /*machine=3D*/NULL); if (err < 0) { pr_err("Couldn't synthesize thread map.\n"); return err; } =20 - err =3D perf_event__synthesize_cpu_map(tool, evlist->core.user_requested_= cpus, process, NULL); + err =3D perf_event__synthesize_cpu_map(tool, + evlist__core(evlist)->user_requested_cpus, + process, /*machine=3D*/NULL); if (err < 0) { pr_err("Couldn't synthesize thread map.\n"); return err; @@ -2518,7 +2521,7 @@ int perf_event__synthesize_for_pipe(const struct perf= _tool *tool, ret +=3D err; =20 #ifdef HAVE_LIBTRACEEVENT - if (have_tracepoints(&evlist->core.entries)) { + if (have_tracepoints(&evlist__core(evlist)->entries)) { int fd =3D perf_data__fd(data); =20 /* diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c index d43c4577d7eb..5558a5a0fea4 100644 --- a/tools/perf/util/time-utils.c +++ b/tools/perf/util/time-utils.c @@ -473,8 +473,8 @@ int perf_time__parse_for_ranges_reltime(const char *tim= e_str, return -ENOMEM; =20 if (has_percent || reltime) { - if (session->evlist->first_sample_time =3D=3D 0 && - session->evlist->last_sample_time =3D=3D 0) { + if (evlist__first_sample_time(session->evlist) =3D=3D 0 && + evlist__last_sample_time(session->evlist) =3D=3D 0) { pr_err("HINT: no first/last sample time found in perf data.\n" "Please use latest perf binary to execute 'perf record'\n" "(if '--buildid-all' is enabled, please set '--timestamp-boundar= y').\n"); @@ -486,8 +486,8 @@ int perf_time__parse_for_ranges_reltime(const char *tim= e_str, num =3D perf_time__percent_parse_str( ptime_range, size, time_str, - session->evlist->first_sample_time, - session->evlist->last_sample_time); + evlist__first_sample_time(session->evlist), + evlist__last_sample_time(session->evlist)); } else { num =3D perf_time__parse_strs(ptime_range, time_str, size); } @@ -499,8 +499,8 @@ int perf_time__parse_for_ranges_reltime(const char *tim= e_str, int i; =20 for (i =3D 0; i < num; i++) { - ptime_range[i].start +=3D session->evlist->first_sample_time; - ptime_range[i].end +=3D session->evlist->first_sample_time; + ptime_range[i].start +=3D evlist__first_sample_time(session->evlist); + ptime_range[i].end +=3D evlist__first_sample_time(session->evlist); } } =20 diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c index b06e10a116bb..851a26be6931 100644 --- a/tools/perf/util/top.c +++ b/tools/perf/util/top.c @@ -71,7 +71,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, ch= ar *bf, size_t size) esamples_percent); } =20 - if (top->evlist->core.nr_entries =3D=3D 1) { + if (evlist__nr_entries(top->evlist) =3D=3D 1) { struct evsel *first =3D evlist__first(top->evlist); ret +=3D SNPRINTF(bf + ret, size - ret, "%" PRIu64 "%s ", (uint64_t)first->core.attr.sample_period, @@ -94,7 +94,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, ch= ar *bf, size_t size) else ret +=3D SNPRINTF(bf + ret, size - ret, " (all"); =20 - nr_cpus =3D perf_cpu_map__nr(top->evlist->core.user_requested_cpus); + nr_cpus =3D perf_cpu_map__nr(evlist__core(top->evlist)->user_requested_cp= us); if (target->cpu_list) ret +=3D SNPRINTF(bf + ret, size - ret, ", CPU%s: %s)", nr_cpus > 1 ? "s" : "", --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3988140E8E9 for ; Fri, 5 Jun 2026 19:15:30 +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=1780686938; cv=none; b=VFjS57l24pxldlU8MiaOKtasOfiwcPpYxOodf6Viji4nCMKRK8LGXi4Eju4CKst6U+LE2EDsXA3C/6ns2NHTN0zik1cMC6osmGcseOCDofDlhxgrw8UKcq7a33z5a8RtyRrgmNzvkcdwEO/Cbcf2KufmIyR2+ORNvr1YMjH9v+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686938; c=relaxed/simple; bh=xmtIENNajy6s2avADkic3uk2mTmWfZy7KD5pWYP2COk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B8T2Fg6Pc0S+ZLqueHNC0svYBQjp9p7LAZAsxOboBWgw6eoWpMTMddwg1PfZAZe+D8Oboh/VPShNU3X6e/kL/G3pBhmZtqt7LukVv+A+xRsYERVeEeL5CUmogNNbCjoOnT1Jr8bzl8B2tX0co5y82YWZYssBu5boXjZBUMTNKjI= 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=U13m0lvr; 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="U13m0lvr" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-30762d67a64so3304175eec.0 for ; Fri, 05 Jun 2026 12:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686929; x=1781291729; 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=X9w81A1e/wdJiOZvP0teOaZnpSggvivJtvNKbzR4KV0=; b=U13m0lvr9LoY2zcfufeBDYsx0gv/kXtDTv+7ER5sA0/qmePyLctT8PTOdIx9/OHNuq G9zRCi/bcx52N5Eg1j5ew4+m4mGYhq83N4rkjqXYfERpwXOT9oh0Mdd1AvQn0dqMaYDY yTrUQrWw3NA00WVYQ4g+sMm69ZO34wfv+KAe0kvusxGhqX9a4QQWq86z84Ls8T77Pu7V 68n3ImCT9+mGIxuCjZdawL2hwU7cWvS14Pyp7jQcXADr5iBf2kSFKA3MJ2oC6oHZ82Nn 5P1rzTVmCER4BEoFdF0YVeN49vW9LWlI0K7mmXyfJlrW579gh1ipsiI+5ZaQXGPkHM8a mdoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686929; x=1781291729; 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=X9w81A1e/wdJiOZvP0teOaZnpSggvivJtvNKbzR4KV0=; b=shK7vgfWOhXuNkBkZetCaqdXt5nkjC9glJku1ClYLTieFWaVpTFzS+HddeJf7fXBjk vqnk0JI/RPN/Y2QYYhzg8iR/5+gGeg9fLmtqEWXMV6zR2fY9u4LSU8omlpWVfCXmDkXN 4FAF17duyy50NN8Ux1+OnfQErw1eoDgbZfrU73CZjElBWDGMFJKC0dNNBNmDDooxsbie r086cnWVxJUKeWggvotkXe5NE5+/XaL/AuMPauCTMaYVLDmYNKu2Z54THa0uYRzVHMqW NWaNi3OBhWPc7Jz6c99vGL/m8PZGqqwKFo7XyvN4z4V0dm3oSPMNoDIeih72ZitB9CA0 oxWw== X-Forwarded-Encrypted: i=1; AFNElJ+zMO8wrV9G/2dswTH73uxXbkoqo+gP8Q74fUQEQGHhNzBiuU8gFQOsh+L4wyk1EQy+Qf5+zpBK28cnMBA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2RUgvCmCb9JpA89X9AV1xXEGrXpeVboPbeiovmAtA5OFX+/zW Dj8FNlp57jLgh8M11NZMwZcmVYHOAboDYpoclEDR692gTEY4oohs79+QYOexYMvJY0W3xu8utQY h1qMEgzTPlQ== X-Received: from dycnc21.prod.google.com ([2002:a05:7301:b95:b0:304:d831:cdfc]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e619:b0:304:6448:dfd7 with SMTP id 5a478bee46e88-3077b5950admr2501720eec.18.1780686928895; Fri, 05 Jun 2026 12:15:28 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:49 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-9-irogers@google.com> Subject: [PATCH v11 08/19] perf python: Use evsel in sample in pyrf_event From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Avoid a duplicated evsel by using the one in sample. Add evsel__get/put to the evsel in perf_sample. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 2 +- tools/perf/util/python.c | 10 +++------- tools/perf/util/sample.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index ba88c29ebe5c..d01c78da51e2 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3365,7 +3365,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, union u64_swap u; =20 perf_sample__init(data, /*all=3D*/true); - data->evsel =3D evsel; + data->evsel =3D evsel__get(evsel); data->cpu =3D data->pid =3D data->tid =3D -1; data->stream_id =3D data->id =3D data->time =3D -1ULL; data->period =3D evsel->core.attr.sample_period; diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index efe8c3b898ea..8b922d3013f2 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -63,7 +63,6 @@ PyMODINIT_FUNC PyInit_perf(void); =20 struct pyrf_event { PyObject_HEAD - struct evsel *evsel; struct perf_sample sample; union perf_event event; }; @@ -294,7 +293,6 @@ static PyMemberDef pyrf_sample_event__members[] =3D { =20 static void pyrf_sample_event__delete(struct pyrf_event *pevent) { - evsel__put(pevent->evsel); perf_sample__exit(&pevent->sample); Py_TYPE(pevent)->tp_free((PyObject*)pevent); } @@ -316,7 +314,7 @@ static PyObject *pyrf_sample_event__repr(const struct p= yrf_event *pevent) #ifdef HAVE_LIBTRACEEVENT static bool is_tracepoint(const struct pyrf_event *pevent) { - return pevent->evsel->core.attr.type =3D=3D PERF_TYPE_TRACEPOINT; + return pevent->sample.evsel->core.attr.type =3D=3D PERF_TYPE_TRACEPOINT; } =20 static PyObject* @@ -363,7 +361,7 @@ tracepoint_field(const struct pyrf_event *pe, struct te= p_format_field *field) static PyObject* get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name) { - struct evsel *evsel =3D pevent->evsel; + struct evsel *evsel =3D pevent->sample.evsel; struct tep_event *tp_format =3D evsel__tp_format(evsel); struct tep_format_field *field; =20 @@ -529,7 +527,7 @@ static PyObject *pyrf_event__new(const union perf_event= *event) pevent =3D PyObject_New(struct pyrf_event, ptype); if (pevent !=3D NULL) { memcpy(&pevent->event, event, event->header.size); - pevent->evsel =3D NULL; + perf_sample__init(&pevent->sample, /*all=3D*/false); } return (PyObject *)pevent; } @@ -1899,8 +1897,6 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf= _evlist *pevlist, return Py_None; } =20 - pevent->evsel =3D evsel__get(evsel); - perf_mmap__consume(&md->core); =20 err =3D evsel__parse_sample(evsel, &pevent->event, &pevent->sample); diff --git a/tools/perf/util/sample.c b/tools/perf/util/sample.c index cf73329326d7..bccc19e2aaf2 100644 --- a/tools/perf/util/sample.c +++ b/tools/perf/util/sample.c @@ -1,18 +1,23 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include "sample.h" + +#include +#include + +#include +#include + +#include "../../arch/x86/include/asm/insn.h" #include "debug.h" +#include "evsel.h" #include "thread.h" -#include + #ifndef EM_CSKY #define EM_CSKY 252 #endif #ifndef EM_LOONGARCH #define EM_LOONGARCH 258 #endif -#include -#include -#include -#include "../../arch/x86/include/asm/insn.h" =20 void perf_sample__init(struct perf_sample *sample, bool all) { @@ -29,6 +34,8 @@ void perf_sample__init(struct perf_sample *sample, bool a= ll) =20 void perf_sample__exit(struct perf_sample *sample) { + evsel__put(sample->evsel); + sample->evsel =3D NULL; zfree(&sample->user_regs); zfree(&sample->intr_regs); if (sample->merged_callchain) { --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0809343E4B1 for ; Fri, 5 Jun 2026 19:15:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686943; cv=none; b=afX+yURT/MNLUF5GsNfi1o7Rb5zsKCfS52tanYK5bi8bIT14D9AlztAGHF1tQSRfC4oh2Huf0hPhZI3l6wYUZh3dhnVDBNahmsqCMECfoPTmnB8QiAYnVgLyV/R4hwkOYHIwUMXyYZigDRTCOdd/zHi0WCwK5kSqREEUDcBnaJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686943; c=relaxed/simple; bh=hy773N83K+DDTQHFzzMyFLdUXbCTVIslZxomCgTAO7A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=guSZuz280NV1clcOTvnhcMxp2ZXJGRkaMVgHak8heNkd6FM/tSFPz+iebFiZDcB+U5qKYpV3C8ejnMeir0qnh4qVKryD55nymWUGG2C83dXXYSCE1lF/Hc1fzIlfv7WeMd/Gn8dniWWZBLguUHk57AS10WZiAwj1fnXfZfj1oH4= 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=eLlz7XhV; 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="eLlz7XhV" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304f1820babso2973349eec.1 for ; Fri, 05 Jun 2026 12:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686932; x=1781291732; 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=xkRZrzadx99hywv7ejqiJIrnyOSG70s4V7BCHBJLtuo=; b=eLlz7XhVHG2KbXqvDl9+tsSVhVLWUnrChB4UHFHh61Icj+SY3rUxrqrBq/R4clfwVq lb1dzVV33KLk7UgyjjHonIkHg8pNtUYxjkGfovcHw5hjmss1F0AIWUdEQ6luvxuvl3NT zRdPoSxNCTOYOj5DkqXEOHmsaaVoBNV+f+17kd98YMhJpkHtqJLd55Lz/x85rffuNqfz 8bmfHYRfVX/zp2VFAGyAuLbYdKVj0qmb82ILutUCOKEMsm1BY+i7siMmSCt3Axjzl0gt WHUkbJvkfQInSV7YXGfxxPVw8ithp+qajHgdM92N9++cJHD/W2dd1CbYHkjzG6C6cSME sleg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686932; x=1781291732; 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=xkRZrzadx99hywv7ejqiJIrnyOSG70s4V7BCHBJLtuo=; b=PCwgyqnBHmRcFjKLcivexNJJIVgUbKoAIwWeb1/1ylzkCkwU5XjZlG2dzi4feqzfDk UtAaQOWOQNWMoGzXzunNZ2geWGFJtLesuVmyDhziA7SvGXWQj/dyy9EYe6YvbtZon8vw tfZdOZLsOPACoE11qFrmbF4Aj5qpNe5KQRIuo2PbXqDIU1o46XLuiZJ4Rh1+n3UyFk4w PxPgEt9Fp+6kkJQsndAq3pgdcpBwIgMzxDtwMwIlnkN+nl99uhxGGu7uwtyyoh6nPRJr 6bwUStZmB2ubs1KPKlEd6VGq7qjQEl28++8RAIXF3dNThCZ0tl2+Tt85OLy9Rc87Q7E2 7vdA== X-Forwarded-Encrypted: i=1; AFNElJ/WkfFXDADX5mmqbcbgpsRGmOGglIXchauUGN21mLKd8VUR9e51+/TXMYMjHuBv9Gs4xw5ZAmU01YgMisk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyx6qMAdql4RCeYUv8KEv27wmTCEIJ0dPC8zqg0xZOpSEo/zHeI vXd9P9CoLkSlSe8C2lsgPgw/ZUI5DuizI8PLOjRrkfeJU2ygv6YOTxpF7U2R2NaqvU3CjToBhtF ZiXcUYDeHHw== X-Received: from dycai7.prod.google.com ([2002:a05:7300:fb07:b0:304:ed39:7b0c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:37c8:b0:304:5a9c:644c with SMTP id 5a478bee46e88-3077b3cf48emr2635023eec.15.1780686931370; Fri, 05 Jun 2026 12:15:31 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:50 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-10-irogers@google.com> Subject: [PATCH v11 09/19] perf python: Add wrapper for perf_data file abstraction From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The perf_data struct is needed for session supported. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Fixed Memory & FD Leaks in pyrf_data__init : Added cleanup of old state (closing file and freeing path) if __init__ is called multiple times on the same object. 2. Fixed Invalid Free in pyrf_data__delete : Ensured pdata->data.path is always dynamically allocated via strdup() , even for the default "perf.data" . This avoids passing a static string literal to free(). 3. Fixed NULL Pointer Dereference in pyrf_data__str : Added a check for NULL path to prevent segfaults if str() or repr() is called on an uninitialized object. 4. Guarded fd Argument Usage: Added a check to ensure that if an fd is provided, it corresponds to a pipe, failing gracefully with a ValueError otherwise. v7: - Added pyrf_data__new to zero-initialize pdata->data to fix crash on re-initialization. --- tools/perf/util/python.c | 123 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 8b922d3013f2..5f57e2336929 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -6,6 +6,7 @@ =20 #include #include +#include =20 #include #include @@ -14,6 +15,7 @@ =20 #include "callchain.h" #include "counts.h" +#include "data.h" #include "event.h" #include "evlist.h" #include "evsel.h" @@ -2454,6 +2456,121 @@ static PyObject *pyrf__metrics(PyObject *self, PyOb= ject *args) return list; } =20 +struct pyrf_data { + PyObject_HEAD + + struct perf_data data; +}; + +static int pyrf_data__init(struct pyrf_data *pdata, PyObject *args, PyObje= ct *kwargs) +{ + static char *kwlist[] =3D { "path", "fd", NULL }; + char *path =3D NULL; + int fd =3D -1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", kwlist, &path, &fd)) + return -1; + + if (pdata->data.open) + perf_data__close(&pdata->data); + free((char *)pdata->data.path); + pdata->data.path =3D NULL; + + if (fd !=3D -1) { + struct stat st; + + if (fstat(fd, &st) < 0 || !S_ISFIFO(st.st_mode)) { + PyErr_SetString(PyExc_ValueError, + "fd argument is only supported for pipes"); + return -1; + } + if (!path) + path =3D "-"; + else if (strcmp(path, "-") !=3D 0) { + PyErr_SetString(PyExc_ValueError, + "path must be '-' when fd is provided"); + return -1; + } + fd =3D dup(fd); + if (fd < 0) { + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + } else if (path && strcmp(path, "-") =3D=3D 0) { + fd =3D dup(0); + if (fd < 0) { + PyErr_SetFromErrno(PyExc_OSError); + return -1; + } + } + + if (!path) + path =3D "perf.data"; + + pdata->data.path =3D strdup(path); + if (!pdata->data.path) { + if (fd !=3D -1) + close(fd); + PyErr_NoMemory(); + return -1; + } + + pdata->data.mode =3D PERF_DATA_MODE_READ; + pdata->data.file.fd =3D fd; + if (perf_data__open(&pdata->data) < 0) { + PyErr_Format(PyExc_IOError, "Failed to open perf data: %s", + pdata->data.path ? pdata->data.path : "perf.data"); + return -1; + } + return 0; +} + +static void pyrf_data__delete(struct pyrf_data *pdata) +{ + perf_data__close(&pdata->data); + free((char *)pdata->data.path); + Py_TYPE(pdata)->tp_free((PyObject *)pdata); +} + +static PyObject *pyrf_data__str(PyObject *self) +{ + const struct pyrf_data *pdata =3D (const struct pyrf_data *)self; + + if (!pdata->data.path) + return PyUnicode_FromString("[uninitialized]"); + return PyUnicode_FromString(pdata->data.path); +} + +static PyObject *pyrf_data__new(PyTypeObject *type, PyObject *args, PyObje= ct *kwargs) +{ + struct pyrf_data *pdata; + + pdata =3D (struct pyrf_data *)PyType_GenericNew(type, args, kwargs); + if (pdata) + memset(&pdata->data, 0, sizeof(pdata->data)); + return (PyObject *)pdata; +} + +static const char pyrf_data__doc[] =3D PyDoc_STR("perf data file object."); + +static PyTypeObject pyrf_data__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.data", + .tp_basicsize =3D sizeof(struct pyrf_data), + .tp_dealloc =3D (destructor)pyrf_data__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D pyrf_data__doc, + .tp_init =3D (initproc)pyrf_data__init, + .tp_repr =3D pyrf_data__str, + .tp_str =3D pyrf_data__str, +}; + +static int pyrf_data__setup_types(void) +{ + pyrf_data__type.tp_new =3D pyrf_data__new; + return PyType_Ready(&pyrf_data__type); +} + static PyMethodDef perf__methods[] =3D { { .ml_name =3D "metrics", @@ -2516,7 +2633,8 @@ PyMODINIT_FUNC PyInit_perf(void) pyrf_cpu_map__setup_types() < 0 || pyrf_pmu_iterator__setup_types() < 0 || pyrf_pmu__setup_types() < 0 || - pyrf_counts_values__setup_types() < 0) + pyrf_counts_values__setup_types() < 0 || + pyrf_data__setup_types() < 0) return module; =20 /* The page_size is placed in util object. */ @@ -2564,6 +2682,9 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_counts_values__type); PyModule_AddObject(module, "counts_values", (PyObject *)&pyrf_counts_valu= es__type); =20 + Py_INCREF(&pyrf_data__type); + PyModule_AddObject(module, "data", (PyObject *)&pyrf_data__type); + dict =3D PyModule_GetDict(module); if (dict =3D=3D NULL) goto error; --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFF3F4279E9 for ; Fri, 5 Jun 2026 19:15:35 +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=1780686947; cv=none; b=derVkOzB5QRLcPBFqJDzqlzftvL1h7wQ6pgMQhVGrqNfGOV7fiyKP/Z76s7E01pHdU2tEvMB4QZGJccakvpFhS0mEwnj1M3ngbVLFz4X3ynchXJFU6GV2GyW05szq+/jJdG9W5R4BKZTu74XIq5rZwC2abubBtFQet/x+/LIUL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686947; c=relaxed/simple; bh=SwWYSJJsmIhIIICULJTOlF2riz0gPQ3g8fVcveK8Ob8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aBT9eyxRhHOBvmG8ooCRZu8UpfQkQ2NkZ+m5xBk5r3ZTsCz3UCmuNZts2ajEozaUAGQvj18+xVfTxwn/T0izPhXlrm2TCl0f5ki1R1lnSLlTuc/CVETtpIcQgDRpJqLVsxKHkuM2HGuaPQgjAqxTVMX5q2lUPlsvcyRS++Z5oPQ= 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=pDfHA1EU; 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="pDfHA1EU" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304d2447962so2112630eec.0 for ; Fri, 05 Jun 2026 12:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686934; x=1781291734; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=O5X0Nv7+lyW68EORikhbaFgi8SVyjOygslIJGcAiFP0=; b=pDfHA1EU++Zd1Hp3wadmf6BND9mT0K9ZFMp/Lwa1SADvdovCOgls+GLN4LmfX/6Dxs pX4SICsz7gf2Bh79OhmNQYL5kWhZn4A+J+mdGJIs2AE2nJCIHoSbrREQr3OmWlNM4KpA gmHMKuZFt8XgOEQI7NoqqNxqVwSZSDmuGp+7c8TeM3zxcgIF1P3NchSg9QOUE7qtLdhl jposRsRbIKI+W7ZAXbiFctbQlG5rbZd4DxItkmXZwKZO/22Hrd8mUn5g22op2zCkUxDF ooxsG+zaufYBS5Xh/j1XDYg/RIrn12MTRZnzvgOtoyE73aQnt7RUtAhzFQrQcoahzwR4 ygeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686934; x=1781291734; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=O5X0Nv7+lyW68EORikhbaFgi8SVyjOygslIJGcAiFP0=; b=UfAHouh0aYsYS7zXtfMKwHXgPlVMJbQJTNczUu1nP/aywcr+inyXwyz3JpcjVaUbLo iLjreXHTHcjiIrMSzQx/8HIZH2DKAx+RugVIVNxrFQlM7sj1G91m+HlsmJBGzgCpdrwB Oh429pu0Gr3i5e4E91pZcC6BNRkostQiYZUFkvLO6UUJ1Bt8ODTSaarizZkaWdslflxI rRpSp6/OgnjuS/a21jc9I6ATzLHdJ33KyvepJ5nCAua5HYE6m818KyjAj1a3VY9Cju80 OEPRPSXrCWARIkO8SSympoCQrdEolpTyoTy1FSInAJIftlCKOUXi4bnMcfTxGID2maH6 YYvQ== X-Forwarded-Encrypted: i=1; AFNElJ9/62f3vHNkbrfvMPtxamDDOaH492jm2CG8jKuVM13bcRyyZO2PfvAJjH5PvLLkG0tlFK0n5dMmo4M2vWc=@vger.kernel.org X-Gm-Message-State: AOJu0YxxOlQEsHFzT6azha13HNJKVwgLzPO5Mi43Lm2umyDAv3XBXELc FLpcMG07QZ2cB7zSXupoA2IZtVLDgO5koNlA4dNgZO+6MFVUFmFUUkuy19KXRHZ4fVd9fe+/oNE tUYKCN0d43g== X-Received: from dyvs26.prod.google.com ([2002:a05:693c:42da:b0:304:cda1:27ce]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:327:b0:132:d1d:ef5a with SMTP id a92af1059eb24-13807d7b5d7mr1672572c88.12.1780686934261; Fri, 05 Jun 2026 12:15:34 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:51 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-11-irogers@google.com> Subject: [PATCH v11 10/19] perf python: Add python session abstraction wrapping perf's session From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sessions are necessary to be able to use perf.data files within a tool. Add a wrapper python type that incorporates the tool. Allow a sample callback to be passed when creating the session. When process_events is run this callback will be called, if supplied, for sample events. An example use looks like: ``` $ perf record -e cycles,instructions -a sleep 3 $ PYTHONPATH=3D..../perf/python python3 Python 3.13.7 (main, Aug 20 2025, 22:17:40) [GCC 14.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import perf >>> count=3D0 ... def handle_sample(x): ... global count ... if count < 3: ... print(dir(x)) ... count =3D count + 1 ... perf.session(perf.data("perf.data"),sample=3Dhandle_sample).process_eve= nts() ... ['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', = '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init= __', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduc= e__', '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', '__str__', = '__subclasshook__', 'sample_addr', 'sample_cpu', 'sample_id', 'sample_ip', = 'sample_period', 'sample_pid', 'sample_stream_id', 'sample_tid', 'sample_ti= me', 'type'] ['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', = '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init= __', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduc= e__', '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', '__str__', = '__subclasshook__', 'sample_addr', 'sample_cpu', 'sample_id', 'sample_ip', = 'sample_period', 'sample_pid', 'sample_stream_id', 'sample_tid', 'sample_ti= me', 'type'] ['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', = '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init= __', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduc= e__', '__reduce_ex__', '__repr__', '__setattr__', '__sizeof__', '__str__', = '__subclasshook__', 'sample_addr', 'sample_cpu', 'sample_id', 'sample_ip', = 'sample_period', 'sample_pid', 'sample_stream_id', 'sample_tid', 'sample_ti= me', 'type'] ``` Also, add the ability to get the thread associated with a session. For threads, allow the comm string to be retrieved. This can be useful for filtering threads. Connect up some of the standard event handling in psession->tool to better support queries of the machine. Also connect up the symbols. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Fixed Potential Crash in pyrf_thread__comm : Used thread__comm_str() to safely retrieve the command name, avoiding a crash if thread__comm() returns NULL. 2. Fixed Double Free Risk: Zeroed out user_regs , intr_regs , and callchain in the shallow copy of perf_sample to prevent Python from attempting to free pointers it doesn't own. 3. Fixed Memory Leak & Exception Handling in Callback: Handled the return value of PyObject_CallFunction() to avoid leaks, and checked for failure to abort the loop and propagate Python exceptions cleanly. 4. Enforced Type Safety: Used O! with &pyrf_data__type in PyArg_ParseTupleAndKeywords to prevent bad casts from passing arbitrary objects as perf.data. 5. Added Missing Build ID Handler: Registered perf_event__process_build_id to allow correct symbol resolution. 6. Fixed Double Free Crash on Init Failure: Set session and pdata to NULL on failure to prevent tp_dealloc from double-freeing them. 7. Preserved C-level Errors: Made pyrf_session__process_events return the error code integer rather than always returning None . v7: - Fixed NULL comm handling. - Avoided swallowing exceptions in module init. - Fixed checkpatch warning for missing blank line. v8: - Switch from pyrf_session__init to pyrf_session__new to avoid dealing with= a potentially NULL session variable. - Added pid, tid, ppid, and cpu attributes to perf.thread. v10: - Added CHECK_INITIALIZED checks to pyrf_session methods to prevent NULL pointer dereferences on uninitialized objects. --- tools/perf/util/python.c | 341 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 335 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 5f57e2336929..6105ab183d7a 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -14,8 +14,10 @@ #include =20 #include "callchain.h" +#include "comm.h" #include "counts.h" #include "data.h" +#include "debug.h" #include "event.h" #include "evlist.h" #include "evsel.h" @@ -25,8 +27,14 @@ #include "pmus.h" #include "print_binary.h" #include "record.h" +#include "session.h" #include "strbuf.h" +#include "symbol.h" +#include "stat.h" +#include "header.h" +#include "thread.h" #include "thread_map.h" +#include "tool.h" #include "tp_pmu.h" #include "trace-event.h" #include "util/sample.h" @@ -2571,6 +2579,316 @@ static int pyrf_data__setup_types(void) return PyType_Ready(&pyrf_data__type); } =20 +struct pyrf_thread { + PyObject_HEAD + + struct thread *thread; +}; + +static void pyrf_thread__delete(struct pyrf_thread *pthread) +{ + thread__put(pthread->thread); + Py_TYPE(pthread)->tp_free((PyObject *)pthread); +} + +static PyObject *pyrf_thread__comm(PyObject *obj) +{ + struct pyrf_thread *pthread =3D (void *)obj; + const char *str =3D thread__comm_str(pthread->thread); + + if (!str) + Py_RETURN_NONE; + + return PyUnicode_FromString(str); +} + +static PyMethodDef pyrf_thread__methods[] =3D { + { + .ml_name =3D "comm", + .ml_meth =3D (PyCFunction)pyrf_thread__comm, + .ml_flags =3D METH_NOARGS, + .ml_doc =3D PyDoc_STR("Comm(and) associated with this thread.") + }, + { .ml_name =3D NULL, } +}; + +static PyObject *pyrf_thread__get_pid(struct pyrf_thread *pthread, void *c= losure __maybe_unused) +{ + return PyLong_FromLong(thread__pid(pthread->thread)); +} + +static PyObject *pyrf_thread__get_tid(struct pyrf_thread *pthread, void *c= losure __maybe_unused) +{ + return PyLong_FromLong(thread__tid(pthread->thread)); +} + +static PyObject *pyrf_thread__get_ppid(struct pyrf_thread *pthread, void *= closure __maybe_unused) +{ + return PyLong_FromLong(thread__ppid(pthread->thread)); +} + +static PyObject *pyrf_thread__get_cpu(struct pyrf_thread *pthread, void *c= losure __maybe_unused) +{ + return PyLong_FromLong(thread__cpu(pthread->thread)); +} + +static PyGetSetDef pyrf_thread__getset[] =3D { + { .name =3D "pid", .get =3D (getter)pyrf_thread__get_pid, .doc =3D "proce= ss ID" }, + { .name =3D "tid", .get =3D (getter)pyrf_thread__get_tid, .doc =3D "threa= d ID" }, + { .name =3D "ppid", .get =3D (getter)pyrf_thread__get_ppid, .doc =3D "par= ent process ID" }, + { .name =3D "cpu", .get =3D (getter)pyrf_thread__get_cpu, .doc =3D "cpu n= umber" }, + { .name =3D NULL } +}; + +static const char pyrf_thread__doc[] =3D PyDoc_STR("perf thread object."); + +static PyTypeObject pyrf_thread__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.thread", + .tp_basicsize =3D sizeof(struct pyrf_thread), + .tp_dealloc =3D (destructor)pyrf_thread__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_methods =3D pyrf_thread__methods, + .tp_getset =3D pyrf_thread__getset, + .tp_doc =3D pyrf_thread__doc, +}; + +static int pyrf_thread__setup_types(void) +{ + return PyType_Ready(&pyrf_thread__type); +} + +static PyObject *pyrf_thread__from_thread(struct thread *thread) +{ + struct pyrf_thread *pthread =3D PyObject_New(struct pyrf_thread, &pyrf_th= read__type); + + if (!pthread) + return NULL; + + pthread->thread =3D thread__get(thread); + return (PyObject *)pthread; +} + +struct pyrf_session { + PyObject_HEAD + + struct perf_session *session; + struct perf_tool tool; + struct pyrf_data *pdata; + PyObject *sample; +}; + +static int pyrf_session_tool__sample(const struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample, + struct machine *machine __maybe_unused) +{ + struct pyrf_session *psession =3D container_of(tool, struct pyrf_session,= tool); + PyObject *pyevent =3D pyrf_event__new(event); + struct pyrf_event *pevent =3D (struct pyrf_event *)pyevent; + PyObject *ret; + + if (pyevent =3D=3D NULL) + return -ENOMEM; + + memcpy(&pevent->event, event, event->header.size); + if (evsel__parse_sample(sample->evsel, &pevent->event, &pevent->sample) <= 0) { + Py_DECREF(pyevent); + return -1; + } + + ret =3D PyObject_CallFunction(psession->sample, "O", pyevent); + if (!ret) { + Py_DECREF(pyevent); + return -1; + } + Py_DECREF(ret); + Py_DECREF(pyevent); + return 0; +} + +static PyObject *pyrf_session__find_thread(struct pyrf_session *psession, = PyObject *args) +{ + struct machine *machine; + struct thread *thread =3D NULL; + PyObject *result; + int pid; + + CHECK_INITIALIZED(psession->session, "session"); + + if (!PyArg_ParseTuple(args, "i", &pid)) + return NULL; + + machine =3D &psession->session->machines.host; + thread =3D machine__find_thread(machine, pid, pid); + + if (!thread) { + machine =3D perf_session__find_machine(psession->session, pid); + if (machine) + thread =3D machine__find_thread(machine, pid, pid); + } + + if (!thread) { + PyErr_Format(PyExc_TypeError, "Failed to find thread %d", pid); + return NULL; + } + result =3D pyrf_thread__from_thread(thread); + thread__put(thread); + return result; +} + +static PyObject *pyrf_session__new(PyTypeObject *type, PyObject *args, PyO= bject *kwargs) +{ + struct pyrf_data *pdata; + PyObject *sample =3D NULL; + static char *kwlist[] =3D { "data", "sample", NULL }; + struct pyrf_session *psession; + struct perf_session *session; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O", kwlist, &pyrf_data= __type, &pdata, + &sample)) + return NULL; + + psession =3D PyObject_New(struct pyrf_session, type); + if (!psession) + return NULL; + + psession->session =3D NULL; + psession->sample =3D NULL; + psession->pdata =3D NULL; + + Py_INCREF(pdata); + psession->pdata =3D pdata; + + perf_tool__init(&psession->tool, /*ordered_events=3D*/true); + psession->tool.ordering_requires_timestamps =3D true; + + #define ADD_TOOL(name) \ + do { \ + if (name) { \ + if (!PyCallable_Check(name)) { \ + PyErr_SetString(PyExc_TypeError, #name " must be callable"); \ + goto err_out; \ + } \ + psession->tool.name =3D pyrf_session_tool__##name; \ + Py_INCREF(name); \ + psession->name =3D name; \ + } \ + } while (0) + + ADD_TOOL(sample); + #undef ADD_TOOL + + psession->tool.comm =3D perf_event__process_comm; + psession->tool.mmap =3D perf_event__process_mmap; + psession->tool.mmap2 =3D perf_event__process_mmap2; + psession->tool.namespaces =3D perf_event__process_namespaces; + psession->tool.cgroup =3D perf_event__process_cgroup; + psession->tool.exit =3D perf_event__process_exit; + psession->tool.fork =3D perf_event__process_fork; + psession->tool.ksymbol =3D perf_event__process_ksymbol; + psession->tool.text_poke =3D perf_event__process_text_poke; + psession->tool.build_id =3D perf_event__process_build_id; + psession->tool.attr =3D perf_event__process_attr; + psession->tool.feature =3D perf_event__process_feature; + psession->tool.stat =3D perf_event__process_stat_event; + session =3D perf_session__new(&pdata->data, &psession->tool); + if (IS_ERR(session)) { + PyErr_Format(PyExc_IOError, "failed to create session: %ld", PTR_ERR(ses= sion)); + goto err_out; + } + psession->session =3D session; + + if (symbol__init(perf_session__env(session)) < 0) { + PyErr_SetString(PyExc_OSError, "perf: symbol__init failed"); + goto err_out; + } + + if (perf_session__create_kernel_maps(session) < 0) + pr_warning("Cannot read kernel map\n"); + + return (PyObject *)psession; +err_out: + Py_DECREF(psession); + return NULL; +} + +static void pyrf_session__delete(struct pyrf_session *psession) +{ + perf_session__delete(psession->session); + Py_XDECREF(psession->pdata); + Py_XDECREF(psession->sample); + Py_TYPE(psession)->tp_free((PyObject *)psession); +} + +static PyObject *pyrf_session__find_thread_events(struct pyrf_session *pse= ssion) +{ + int err; + + CHECK_INITIALIZED(psession->session, "session"); + + err =3D perf_session__process_events(psession->session); + + if (PyErr_Occurred()) + return NULL; + + return PyLong_FromLong(err); +} + +static PyMethodDef pyrf_session__methods[] =3D { + { + .ml_name =3D "process_events", + .ml_meth =3D (PyCFunction)pyrf_session__find_thread_events, + .ml_flags =3D METH_NOARGS, + .ml_doc =3D PyDoc_STR("Iterate and process events.") + }, + { + .ml_name =3D "find_thread", + .ml_meth =3D (PyCFunction)pyrf_session__find_thread, + .ml_flags =3D METH_VARARGS, + .ml_doc =3D PyDoc_STR("Returns the thread associated with a pid.") + }, + { .ml_name =3D NULL, } +}; + +static const char pyrf_session__doc[] =3D PyDoc_STR("perf session object."= ); + +static PyObject *pyrf_session__getattro(struct pyrf_session *psession, PyO= bject *attr_name) +{ + if (!psession->session) { + PyErr_SetString(PyExc_ValueError, "session not initialized"); + return NULL; + } + return PyObject_GenericGetAttr((PyObject *) psession, attr_name); +} + +static int pyrf_session__setattro(struct pyrf_session *psession, PyObject = *attr_name, PyObject *value) +{ + if (!psession->session) { + PyErr_SetString(PyExc_ValueError, "session not initialized"); + return -1; + } + return PyObject_GenericSetAttr((PyObject *) psession, attr_name, value); +} + +static PyTypeObject pyrf_session__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.session", + .tp_basicsize =3D sizeof(struct pyrf_session), + .tp_dealloc =3D (destructor)pyrf_session__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_methods =3D pyrf_session__methods, + .tp_doc =3D pyrf_session__doc, + .tp_new =3D pyrf_session__new, + .tp_getattro =3D (getattrofunc) pyrf_session__getattro, + .tp_setattro =3D (setattrofunc) pyrf_session__setattro, +}; + +static int pyrf_session__setup_types(void) +{ + return PyType_Ready(&pyrf_session__type); +} + static PyMethodDef perf__methods[] =3D { { .ml_name =3D "metrics", @@ -2625,8 +2943,10 @@ PyMODINIT_FUNC PyInit_perf(void) }; PyObject *module =3D PyModule_Create(&moduledef); =20 - if (module =3D=3D NULL || - pyrf_event__setup_types() < 0 || + if (module =3D=3D NULL) + return NULL; + + if (pyrf_event__setup_types() < 0 || pyrf_evlist__setup_types() < 0 || pyrf_evsel__setup_types() < 0 || pyrf_thread_map__setup_types() < 0 || @@ -2634,8 +2954,12 @@ PyMODINIT_FUNC PyInit_perf(void) pyrf_pmu_iterator__setup_types() < 0 || pyrf_pmu__setup_types() < 0 || pyrf_counts_values__setup_types() < 0 || - pyrf_data__setup_types() < 0) - return module; + pyrf_data__setup_types() < 0 || + pyrf_session__setup_types() < 0 || + pyrf_thread__setup_types() < 0) { + Py_DECREF(module); + return NULL; + } =20 /* The page_size is placed in util object. */ page_size =3D sysconf(_SC_PAGE_SIZE); @@ -2685,6 +3009,9 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_data__type); PyModule_AddObject(module, "data", (PyObject *)&pyrf_data__type); =20 + Py_INCREF(&pyrf_session__type); + PyModule_AddObject(module, "session", (PyObject *)&pyrf_session__type); + dict =3D PyModule_GetDict(module); if (dict =3D=3D NULL) goto error; @@ -2698,7 +3025,9 @@ PyMODINIT_FUNC PyInit_perf(void) } =20 error: - if (PyErr_Occurred()) - PyErr_SetString(PyExc_ImportError, "perf: Init failed!"); + if (PyErr_Occurred()) { + Py_XDECREF(module); + return NULL; + } return module; } --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7B72426EAE for ; Fri, 5 Jun 2026 19:15:39 +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=1780686951; cv=none; b=GbZ4Al81JBHarUBDvUCgaDPLaVpLzf3N83xxJLG012ilBplHYfGfPcdXyw86zYaiWV3CFTtzg7wDNOzwUT2Doa0uAUw833fNLB4zuZA0bSzRnqc3Qy87lhZJCfr+SWIogRJCrpuSZ0cSkexYHTPb22MaLOngR40jniUlSBcH3bA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686951; c=relaxed/simple; bh=45Lou7y4SmcWzPOjHHEJl23riYEWSu0TitHDAgXvJSU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ebJVTdNUYTUYNg1woZi1+S2P/RThW/Xpfhze5scJTy9mvWDIoCqOGGxXfDa/hrZgNULUOCfXPB7RTvPXwYZpW1fZ26FQ5d48/mRnJlYqgf/M3y1ABITUluYriAGIhWR9+hpgSjf6UNHV3NpLvZS3crq2UChXVbUf8L0ZC5fMops= 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=wIXAwiqk; 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="wIXAwiqk" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304ec73b015so5446662eec.1 for ; Fri, 05 Jun 2026 12:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686939; x=1781291739; 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=1kg2X+lI7Kx8kJRhOMWwEOFIRV4d+ns1t3O4qWlMfEw=; b=wIXAwiqkyRwVqLEWc+Vck9bmYWu92RBBxqC9r2fERaD0YOCbYcW2vtGaADNIpFgQYX XVMVWb1eY43ywxbdNDpTxoAofKmCDY8wzLUt62n2llwtM9Dmxpkwaf8Lw30Bi/5ZyHAS tTOoWnwIqwTOkLslG9gyTUzxnsXVFgmaZuEz4TtrDx52hOiMJ47QFRGqPYcWb1chyTFa ys4sZ3FfhtxjoaP5Aq096DYFaIlY009hRKCOwC3FXexiNvaMF5OlBJfWe9PF6EFcn+Z5 6iipRv/UatTWsyjFwKcfb/lJKcsqDKBjDTM5yiE23ZTHmTxLXWVByZ5AgwUeIcJftrza PgNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686939; x=1781291739; 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=1kg2X+lI7Kx8kJRhOMWwEOFIRV4d+ns1t3O4qWlMfEw=; b=TRIhcYerEP7voV4a0GdN1icCNlXDuds6Eq4Q59SlMbh81ptdLiMaM4PjJcJ6fYm8YI CliGHuxY3c2xoyT61cykrx0VVgRi9aOfXcyNz0pNAF+vGWlY7gaNhPjX6mzaQN++0l65 POmmqcynEwfGGUgFjSKnHR8AbqTbeZ5p+dzk4mBHyMtYfDze7grIf7meCVhfDKWB8INo ilZmbI9aFw0wy5ou6/5Sj0wmRYhQAsecI4PXuaMYQswQpc7YO+FIbdNBVaDP+oSTsFfX LTEwZJzE8Yp5/totWOAIwOPgZVScA9O3Ji0tK+7sqwBR25uVcXAJNILw+Nwk1ccueV9V Gzxg== X-Forwarded-Encrypted: i=1; AFNElJ+bj75bPWrAksx3xsA4L00uzqdbb0NO83iKfLrR3xQeUwcXv5rZNm5s3o/j9SmN9HB5RoDXQ2QzLnYc4gw=@vger.kernel.org X-Gm-Message-State: AOJu0YwZVagT60LVaUpkq/+5G+i2dSg0iyGS7pkHXMupFrRLWpddptIi t3PpoQ1b3NYLYe5bojLXu8sMTgxYsrqEl+Y/QoB4kosW6PGB9Z1J06kcP66JvCaClHYBCyuy/92 2X8H8SvqihA== X-Received: from dynm18.prod.google.com ([2002:a05:7300:2a92:b0:2df:46bf:2390]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:7250:b0:2ca:8099:ffc0 with SMTP id 5a478bee46e88-3077b2701b5mr2608207eec.7.1780686938404; Fri, 05 Jun 2026 12:15:38 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:52 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-12-irogers@google.com> Subject: [PATCH v11 11/19] perf python: Refactor and add accessors to sample event From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add common evsel field for events and move sample specific fields to only be present in sample events. Add accessors for sample events. Ensure offsets are within the bounds of the event. Allocate just enough memory for the copied event, don't make the maximum event size each time. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v5: 1. Fix Uninitialized Memory: Restore zero-initialization of `pevent->sample` in `pyrf_event__new()` to prevent wild free crashes on error paths. v6: - Refactored `pyrf_event__new` to take `evsel` and `session`, and use dynamic allocation based on event size. Updated callers. v8: - Ensure events are properly deallocated. --- tools/perf/util/python.c | 499 +++++++++++++++++++++++++++++++------- tools/perf/util/session.c | 2 +- tools/perf/util/session.h | 2 + 3 files changed, 418 insertions(+), 85 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 6105ab183d7a..acd280794f66 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -13,21 +13,28 @@ #include #include =20 +#include "addr_location.h" +#include "build-id.h" #include "callchain.h" #include "comm.h" #include "counts.h" #include "data.h" #include "debug.h" +#include "dso.h" #include "event.h" #include "evlist.h" #include "evsel.h" #include "expr.h" +#include "map.h" #include "metricgroup.h" #include "mmap.h" #include "pmus.h" #include "print_binary.h" #include "record.h" +#include "sample.h" #include "session.h" +#include "srccode.h" +#include "srcline.h" #include "strbuf.h" #include "symbol.h" #include "stat.h" @@ -37,7 +44,6 @@ #include "tool.h" #include "tp_pmu.h" #include "trace-event.h" -#include "util/sample.h" =20 #ifdef HAVE_LIBTRACEEVENT #include @@ -45,6 +51,8 @@ =20 PyMODINIT_FUNC PyInit_perf(void); =20 +static PyObject *pyrf_evsel__from_evsel(struct evsel *evsel); + #define member_def(type, member, ptype, help) \ { #member, ptype, \ offsetof(struct pyrf_event, event) + offsetof(struct type, member), \ @@ -73,21 +81,53 @@ PyMODINIT_FUNC PyInit_perf(void); =20 struct pyrf_event { PyObject_HEAD + /** @sample: The parsed sample from the event. */ struct perf_sample sample; - union perf_event event; + /** @al: The address location from machine__resolve, lazily computed. */ + struct addr_location al; + /** @al_resolved: True when machine__resolve been called. */ + bool al_resolved; + /** @event: The underlying perf_event that may be in a file or ring buffe= r. */ + union perf_event event; }; =20 #define sample_members \ - sample_member_def(sample_ip, ip, T_ULONGLONG, "event ip"), \ sample_member_def(sample_pid, pid, T_INT, "event pid"), \ sample_member_def(sample_tid, tid, T_INT, "event tid"), \ sample_member_def(sample_time, time, T_ULONGLONG, "event timestamp"), \ - sample_member_def(sample_addr, addr, T_ULONGLONG, "event addr"), \ sample_member_def(sample_id, id, T_ULONGLONG, "event id"), \ sample_member_def(sample_stream_id, stream_id, T_ULONGLONG, "event stream= id"), \ sample_member_def(sample_period, period, T_ULONGLONG, "event period"), \ sample_member_def(sample_cpu, cpu, T_UINT, "event cpu"), =20 +static PyObject *pyrf_event__get_evsel(PyObject *self, void *closure __may= be_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (!pevent->sample.evsel) + Py_RETURN_NONE; + + return pyrf_evsel__from_evsel(pevent->sample.evsel); +} + +static PyGetSetDef pyrf_event__getset[] =3D { + { + .name =3D "evsel", + .get =3D pyrf_event__get_evsel, + .set =3D NULL, + .doc =3D "tracking event.", + }, + { .name =3D NULL, }, +}; + +static void pyrf_event__delete(struct pyrf_event *pevent) +{ + if (pevent->al_resolved) + addr_location__exit(&pevent->al); + perf_sample__exit(&pevent->sample); + Py_TYPE(pevent)->tp_free((PyObject *)pevent); +} + static const char pyrf_mmap_event__doc[] =3D PyDoc_STR("perf mmap event ob= ject."); =20 static PyMemberDef pyrf_mmap_event__members[] =3D { @@ -126,9 +166,11 @@ static PyTypeObject pyrf_mmap_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.mmap_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_mmap_event__doc, .tp_members =3D pyrf_mmap_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_mmap_event__repr, }; =20 @@ -161,9 +203,11 @@ static PyTypeObject pyrf_task_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.task_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_task_event__doc, .tp_members =3D pyrf_task_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_task_event__repr, }; =20 @@ -190,9 +234,11 @@ static PyTypeObject pyrf_comm_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.comm_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_comm_event__doc, .tp_members =3D pyrf_comm_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_comm_event__repr, }; =20 @@ -222,9 +268,11 @@ static PyTypeObject pyrf_throttle_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.throttle_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_throttle_event__doc, .tp_members =3D pyrf_throttle_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_throttle_event__repr, }; =20 @@ -257,9 +305,11 @@ static PyTypeObject pyrf_lost_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.lost_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_lost_event__doc, .tp_members =3D pyrf_lost_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_lost_event__repr, }; =20 @@ -287,9 +337,11 @@ static PyTypeObject pyrf_read_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.read_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_read_event__doc, .tp_members =3D pyrf_read_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_read_event__repr, }; =20 @@ -297,16 +349,17 @@ static const char pyrf_sample_event__doc[] =3D PyDoc_= STR("perf sample event object =20 static PyMemberDef pyrf_sample_event__members[] =3D { sample_members + sample_member_def(sample_ip, ip, T_ULONGLONG, "event ip"), + sample_member_def(sample_addr, addr, T_ULONGLONG, "event addr"), + sample_member_def(sample_phys_addr, phys_addr, T_ULONGLONG, "event physic= al addr"), + sample_member_def(sample_weight, weight, T_ULONGLONG, "event weight"), + sample_member_def(sample_data_src, data_src, T_ULONGLONG, "event data sou= rce"), + sample_member_def(sample_insn_count, insn_cnt, T_ULONGLONG, "event instru= ction count"), + sample_member_def(sample_cyc_count, cyc_cnt, T_ULONGLONG, "event cycle co= unt"), member_def(perf_event_header, type, T_UINT, "event type"), { .name =3D NULL, }, }; =20 -static void pyrf_sample_event__delete(struct pyrf_event *pevent) -{ - perf_sample__exit(&pevent->sample); - Py_TYPE(pevent)->tp_free((PyObject*)pevent); -} - static PyObject *pyrf_sample_event__repr(const struct pyrf_event *pevent) { PyObject *ret; @@ -324,6 +377,8 @@ static PyObject *pyrf_sample_event__repr(const struct p= yrf_event *pevent) #ifdef HAVE_LIBTRACEEVENT static bool is_tracepoint(const struct pyrf_event *pevent) { + if (!pevent->sample.evsel) + return false; return pevent->sample.evsel->core.attr.type =3D=3D PERF_TYPE_TRACEPOINT; } =20 @@ -394,6 +449,199 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObj= ect *attr_name) } #endif /* HAVE_LIBTRACEEVENT */ =20 +static int pyrf_sample_event__resolve_al(struct pyrf_event *pevent) +{ + struct evsel *evsel =3D pevent->sample.evsel; + struct evlist *evlist =3D evsel ? evsel->evlist : NULL; + struct perf_session *session =3D evlist ? evlist__session(evlist) : NULL; + + if (pevent->al_resolved) + return 0; + + if (!session) + return -1; + + addr_location__init(&pevent->al); + if (machine__resolve(&session->machines.host, &pevent->al, &pevent->sampl= e) < 0) { + addr_location__exit(&pevent->al); + return -1; + } + + pevent->al_resolved =3D true; + return 0; +} + +static PyObject *pyrf_sample_event__get_dso(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + return PyUnicode_FromString(dso__name(map__dso(pevent->al.map))); +} + +static PyObject *pyrf_sample_event__get_dso_long_name(struct pyrf_event *p= event, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + return PyUnicode_FromString(dso__long_name(map__dso(pevent->al.map))); +} + +static PyObject *pyrf_sample_event__get_dso_bid(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + char sbuild_id[SBUILD_ID_SIZE]; + + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + build_id__snprintf(dso__bid(map__dso(pevent->al.map)), sbuild_id, sizeof(= sbuild_id)); + return PyUnicode_FromString(sbuild_id); +} + +static PyObject *pyrf_sample_event__get_map_start(struct pyrf_event *peven= t, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(map__start(pevent->al.map)); +} + +static PyObject *pyrf_sample_event__get_map_end(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(map__end(pevent->al.map)); +} + +static PyObject *pyrf_sample_event__get_map_pgoff(struct pyrf_event *peven= t, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.map) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(map__pgoff(pevent->al.map)); +} + +static PyObject *pyrf_sample_event__get_symbol(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.sym) + Py_RETURN_NONE; + + return PyUnicode_FromString(pevent->al.sym->name); +} + +static PyObject *pyrf_sample_event__get_sym_start(struct pyrf_event *peven= t, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.sym) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->al.sym->start); +} + +static PyObject *pyrf_sample_event__get_sym_end(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + if (pyrf_sample_event__resolve_al(pevent) < 0 || !pevent->al.sym) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->al.sym->end); +} + +static PyObject *pyrf_sample_event__get_raw_buf(struct pyrf_event *pevent, + void *closure __maybe_unused) +{ + if (pevent->event.header.type !=3D PERF_RECORD_SAMPLE) + Py_RETURN_NONE; + + return PyBytes_FromStringAndSize((const char *)pevent->sample.raw_data, + pevent->sample.raw_size); +} + +static PyObject *pyrf_sample_event__srccode(PyObject *self, PyObject *args) +{ + struct pyrf_event *pevent =3D (void *)self; + u64 addr =3D pevent->sample.ip; + char *srcfile =3D NULL; + char *srccode =3D NULL; + unsigned int line =3D 0; + int len =3D 0; + PyObject *result; + struct addr_location al; + + if (!PyArg_ParseTuple(args, "|K", &addr)) + return NULL; + + if (pyrf_sample_event__resolve_al(pevent) < 0) + Py_RETURN_NONE; + + if (addr !=3D pevent->sample.ip) { + addr_location__init(&al); + thread__find_symbol_fb(pevent->al.thread, pevent->sample.cpumode, addr, = &al); + } else { + addr_location__init(&al); + al.thread =3D thread__get(pevent->al.thread); + al.map =3D map__get(pevent->al.map); + al.sym =3D pevent->al.sym; + al.addr =3D pevent->al.addr; + } + + if (al.map) { + struct dso *dso =3D map__dso(al.map); + + if (dso) { + srcfile =3D get_srcline_split(dso, map__rip_2objdump(al.map, addr), + &line); + } + } + addr_location__exit(&al); + + if (srcfile) { + srccode =3D find_sourceline(srcfile, line, &len); + result =3D Py_BuildValue("(sIs#)", srcfile, line, srccode, (Py_ssize_t)l= en); + free(srcfile); + } else { + result =3D Py_BuildValue("(sIs#)", NULL, 0, NULL, (Py_ssize_t)0); + } + + return result; +} + +static PyObject *pyrf_sample_event__insn(PyObject *self, PyObject *args __= maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + struct thread *thread; + struct machine *machine; + + if (pyrf_sample_event__resolve_al(pevent) < 0) + Py_RETURN_NONE; + + thread =3D pevent->al.thread; + + if (!thread || !thread__maps(thread)) + Py_RETURN_NONE; + + machine =3D maps__machine(thread__maps(thread)); + if (!machine) + Py_RETURN_NONE; + + if (pevent->sample.ip && !pevent->sample.insn_len) + perf_sample__fetch_insn(&pevent->sample, thread, machine); + + if (!pevent->sample.insn_len) + Py_RETURN_NONE; + + return PyBytes_FromStringAndSize((const char *)pevent->sample.insn, + pevent->sample.insn_len); +} + static PyObject* pyrf_sample_event__getattro(struct pyrf_event *pevent, PyObject *attr_name) { @@ -407,13 +655,102 @@ pyrf_sample_event__getattro(struct pyrf_event *peven= t, PyObject *attr_name) return obj ?: PyObject_GenericGetAttr((PyObject *) pevent, attr_name); } =20 +static PyGetSetDef pyrf_sample_event__getset[] =3D { + { + .name =3D "raw_buf", + .get =3D (getter)pyrf_sample_event__get_raw_buf, + .set =3D NULL, + .doc =3D "event raw buffer.", + }, + { + .name =3D "evsel", + .get =3D pyrf_event__get_evsel, + .set =3D NULL, + .doc =3D "tracking event.", + }, + { + .name =3D "dso", + .get =3D (getter)pyrf_sample_event__get_dso, + .set =3D NULL, + .doc =3D "event dso short name.", + }, + { + .name =3D "dso_long_name", + .get =3D (getter)pyrf_sample_event__get_dso_long_name, + .set =3D NULL, + .doc =3D "event dso long name.", + }, + { + .name =3D "dso_bid", + .get =3D (getter)pyrf_sample_event__get_dso_bid, + .set =3D NULL, + .doc =3D "event dso build id.", + }, + { + .name =3D "map_start", + .get =3D (getter)pyrf_sample_event__get_map_start, + .set =3D NULL, + .doc =3D "event map start address.", + }, + { + .name =3D "map_end", + .get =3D (getter)pyrf_sample_event__get_map_end, + .set =3D NULL, + .doc =3D "event map end address.", + }, + { + .name =3D "map_pgoff", + .get =3D (getter)pyrf_sample_event__get_map_pgoff, + .set =3D NULL, + .doc =3D "event map page offset.", + }, + { + .name =3D "symbol", + .get =3D (getter)pyrf_sample_event__get_symbol, + .set =3D NULL, + .doc =3D "event symbol name.", + }, + { + .name =3D "sym_start", + .get =3D (getter)pyrf_sample_event__get_sym_start, + .set =3D NULL, + .doc =3D "event symbol start address.", + }, + { + .name =3D "sym_end", + .get =3D (getter)pyrf_sample_event__get_sym_end, + .set =3D NULL, + .doc =3D "event symbol end address.", + }, + { .name =3D NULL, }, +}; + +static PyMethodDef pyrf_sample_event__methods[] =3D { + { + .ml_name =3D "srccode", + .ml_meth =3D (PyCFunction)pyrf_sample_event__srccode, + .ml_flags =3D METH_VARARGS, + .ml_doc =3D PyDoc_STR("Get source code for an address.") + }, + { + .ml_name =3D "insn", + .ml_meth =3D (PyCFunction)pyrf_sample_event__insn, + .ml_flags =3D METH_NOARGS, + .ml_doc =3D PyDoc_STR("Get instruction bytes for a sample.") + }, + { .ml_name =3D NULL, } +}; + static PyTypeObject pyrf_sample_event__type =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.sample_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_sample_event__doc, .tp_members =3D pyrf_sample_event__members, + .tp_getset =3D pyrf_sample_event__getset, + .tp_methods =3D pyrf_sample_event__methods, .tp_repr =3D (reprfunc)pyrf_sample_event__repr, .tp_getattro =3D (getattrofunc) pyrf_sample_event__getattro, }; @@ -449,25 +786,17 @@ static PyTypeObject pyrf_context_switch_event__type = =3D { PyVarObject_HEAD_INIT(NULL, 0) .tp_name =3D "perf.context_switch_event", .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc =3D pyrf_context_switch_event__doc, .tp_members =3D pyrf_context_switch_event__members, + .tp_getset =3D pyrf_event__getset, .tp_repr =3D (reprfunc)pyrf_context_switch_event__repr, }; =20 static int pyrf_event__setup_types(void) { int err; - pyrf_mmap_event__type.tp_new =3D - pyrf_task_event__type.tp_new =3D - pyrf_comm_event__type.tp_new =3D - pyrf_lost_event__type.tp_new =3D - pyrf_read_event__type.tp_new =3D - pyrf_sample_event__type.tp_new =3D - pyrf_context_switch_event__type.tp_new =3D - pyrf_throttle_event__type.tp_new =3D PyType_GenericNew; - - pyrf_sample_event__type.tp_dealloc =3D (destructor)pyrf_sample_event__del= ete, =20 err =3D PyType_Ready(&pyrf_mmap_event__type); if (err < 0) @@ -511,33 +840,56 @@ static PyTypeObject *pyrf_event__type[] =3D { [PERF_RECORD_SWITCH_CPU_WIDE] =3D &pyrf_context_switch_event__type, }; =20 -static PyObject *pyrf_event__new(const union perf_event *event) +static PyObject *pyrf_event__new(const union perf_event *event, struct evs= el *evsel) { struct pyrf_event *pevent; - PyTypeObject *ptype; + int err; + u32 min_size; =20 - if ((event->header.type < PERF_RECORD_MMAP || - event->header.type > PERF_RECORD_SAMPLE) && - !(event->header.type =3D=3D PERF_RECORD_SWITCH || - event->header.type =3D=3D PERF_RECORD_SWITCH_CPU_WIDE)) { - PyErr_Format(PyExc_TypeError, "Unexpected header type %u", + if (event->header.type >=3D ARRAY_SIZE(pyrf_event__type) || + pyrf_event__type[event->header.type] =3D=3D NULL) { + return PyErr_Format(PyExc_TypeError, "Unexpected header type %u", event->header.type); - return NULL; } =20 - // FIXME this better be dynamic or we need to parse everything - // before calling perf_mmap__consume(), including tracepoint fields. - if (sizeof(pevent->event) < event->header.size) { - PyErr_Format(PyExc_TypeError, "Unexpected event size: %zd < %u", - sizeof(pevent->event), event->header.size); - return NULL; + if (perf_event__too_small(event, &min_size)) { + return PyErr_Format(PyExc_ValueError, "Event size %u too small for type = %u", + event->header.size, event->header.type); } =20 - ptype =3D pyrf_event__type[event->header.type]; - pevent =3D PyObject_New(struct pyrf_event, ptype); - if (pevent !=3D NULL) { - memcpy(&pevent->event, event, event->header.size); - perf_sample__init(&pevent->sample, /*all=3D*/false); + size_t copy_size =3D event->header.size; + + pevent =3D PyObject_New(struct pyrf_event, pyrf_event__type[event->header= .type]); + if (pevent =3D=3D NULL) + return PyErr_NoMemory(); + + if (copy_size > sizeof(pevent->event)) + copy_size =3D sizeof(pevent->event); + + /* Copy the event for memory safety and initilaize variables. */ + memcpy(&pevent->event, event, copy_size); + + if (event->header.type =3D=3D PERF_RECORD_MMAP) { + /* Ensure '\0' string termination. */ + size_t max_len =3D pevent->event.header.size - + offsetof(struct perf_record_mmap, filename); + + pevent->event.mmap.filename[max_len - 1] =3D '\0'; + } + + perf_sample__init(&pevent->sample, /*all=3D*/true); + pevent->al_resolved =3D false; + addr_location__init(&pevent->al); + + if (!evsel) + return (PyObject *)pevent; + + /* Parse the sample again so that pointers are within the copied event. */ + err =3D evsel__parse_sample(evsel, &pevent->event, &pevent->sample); + if (err < 0) { + Py_DECREF(pevent); + return PyErr_Format(PyExc_OSError, + "perf: can't parse sample, err=3D%d", err); } return (PyObject *)pevent; } @@ -1242,7 +1594,7 @@ static PyObject *pyrf_evsel__str(PyObject *self) if (!evsel) return PyUnicode_FromString("evsel(uninitialized)"); =20 - return PyUnicode_FromFormat("evsel(%s/%s/)", evsel__pmu_name(evsel), evse= l__name(evsel)); + return PyUnicode_FromFormat("evsel(%s)", evsel__name(evsel)); } =20 static PyMethodDef pyrf_evsel__methods[] =3D { @@ -1870,9 +2222,11 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyr= f_evlist *pevlist, { struct evlist *evlist; union perf_event *event; + struct evsel *evsel; int sample_id_all =3D 1, cpu; static char *kwlist[] =3D { "cpu", "sample_id_all", NULL }; struct mmap *md; + PyObject *pyevent; int err; =20 CHECK_INITIALIZED(pevlist->evlist, "evlist"); @@ -1883,44 +2237,31 @@ static PyObject *pyrf_evlist__read_on_cpu(struct py= rf_evlist *pevlist, return NULL; =20 md =3D get_md(evlist, cpu); - if (!md) { - PyErr_Format(PyExc_TypeError, "Unknown CPU '%d'", cpu); - return NULL; - } + if (!md) + return PyErr_Format(PyExc_TypeError, "Unknown CPU '%d'", cpu); =20 - if (perf_mmap__read_init(&md->core) < 0) - goto end; + err =3D perf_mmap__read_init(&md->core); + if (err < 0) { + return PyErr_Format(PyExc_OSError, + "perf: error mmap read init, err=3D%d", err); + } =20 event =3D perf_mmap__read_event(&md->core); - if (event !=3D NULL) { - PyObject *pyevent =3D pyrf_event__new(event); - struct pyrf_event *pevent =3D (struct pyrf_event *)pyevent; - struct evsel *evsel; - - if (pyevent =3D=3D NULL) - return PyErr_NoMemory(); - - evsel =3D evlist__event2evsel(evlist, event); - if (!evsel) { - Py_DECREF(pyevent); - Py_INCREF(Py_None); - return Py_None; - } + if (event =3D=3D NULL) + Py_RETURN_NONE; =20 + evsel =3D evlist__event2evsel(evlist, event); + if (!evsel) { + /* Unknown evsel. */ perf_mmap__consume(&md->core); - - err =3D evsel__parse_sample(evsel, &pevent->event, &pevent->sample); - if (err) { - Py_DECREF(pyevent); - return PyErr_Format(PyExc_OSError, - "perf: can't parse sample, err=3D%d", err); - } - - return pyevent; + Py_RETURN_NONE; } -end: - Py_INCREF(Py_None); - return Py_None; + pyevent =3D pyrf_event__new(event, evsel); + perf_mmap__consume(&md->core); + if (pyevent =3D=3D NULL) + return PyErr_Occurred() ? NULL : PyErr_NoMemory(); + + return pyevent; } =20 static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist, @@ -2132,10 +2473,7 @@ static PyObject *pyrf_evlist__str(PyObject *self) evlist__for_each_entry(pevlist->evlist, pos) { if (!first) strbuf_addch(&sb, ','); - if (!pos->pmu) - strbuf_addstr(&sb, evsel__name(pos)); - else - strbuf_addf(&sb, "%s/%s/", pos->pmu->name, evsel__name(pos)); + strbuf_addstr(&sb, evsel__name(pos)); first =3D false; } strbuf_addstr(&sb, "])"); @@ -2684,19 +3022,12 @@ static int pyrf_session_tool__sample(const struct p= erf_tool *tool, struct machine *machine __maybe_unused) { struct pyrf_session *psession =3D container_of(tool, struct pyrf_session,= tool); - PyObject *pyevent =3D pyrf_event__new(event); - struct pyrf_event *pevent =3D (struct pyrf_event *)pyevent; + PyObject *pyevent =3D pyrf_event__new(event, sample->evsel); PyObject *ret; =20 if (pyevent =3D=3D NULL) return -ENOMEM; =20 - memcpy(&pevent->event, event, event->header.size); - if (evsel__parse_sample(sample->evsel, &pevent->event, &pevent->sample) <= 0) { - Py_DECREF(pyevent); - return -1; - } - ret =3D PyObject_CallFunction(psession->sample, "O", pyevent); if (!ret) { Py_DECREF(pyevent); diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 227e54879975..d6f2fa436e50 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2666,7 +2666,7 @@ static const u32 perf_event__min_size[PERF_RECORD_HEA= DER_MAX] =3D { * Caller must ensure event->header.type < PERF_RECORD_HEADER_MAX. * If min is non-NULL, stores the required minimum on failure. */ -static bool perf_event__too_small(const union perf_event *event, u32 *min) +bool perf_event__too_small(const union perf_event *event, u32 *min) { u32 min_sz =3D perf_event__min_size[event->header.type]; =20 diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index d554e2a1a50e..ac5803d5fb4e 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -122,6 +122,8 @@ void perf_session__delete(struct perf_session *session); =20 void perf_event_header__bswap(struct perf_event_header *hdr); =20 +bool perf_event__too_small(const union perf_event *event, u32 *min); + int perf_session__peek_event(struct perf_session *session, off_t file_offs= et, void *buf, size_t buf_sz, union perf_event **event_ptr, --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A43143DA48 for ; Fri, 5 Jun 2026 19:15:42 +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=1780686954; cv=none; b=pZ3xYqF36JFZMpXvOToa40Z6vIQycEe1z8A8ubADGB4tCNZdwghpxmFcjjMxqdK+A4RQv8EEjM4UgYZdB51MLzJluT7fzk62o1BkqlUpu88YUiBZM4PS1E570F64XoxC7ri+VyAUvXwXEREFGjrCqUd2O0RgGmdCtzfpcQoKwgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686954; c=relaxed/simple; bh=U7spDKLZ/CrAjXi/ONRntH2QqOQ1Quu+3IaH5HruPS8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KMCkokC3vtdDI4yUZTOhwdfu1qXvOYWUg1XP//nx2Fe113EZIJ59ZWM7KN0XTu9hOYFTTv0IYOP38wCaQ/1nS1jWt9XjE65/Ola7AKbuHV/MAt46Q4G1zE3aO47MQcYO4XMrFxbISQr7uLgSt0nY4Coxafbx+95wxIP71bP+hJs= 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=VmcMJEnp; 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="VmcMJEnp" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1370417c0bfso2038595c88.0 for ; Fri, 05 Jun 2026 12:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686941; x=1781291741; 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=GeoFUPBCkgb9fOH4gILRdoMyWxPWNRHxpgPNdda6x2I=; b=VmcMJEnp7e5ivIR4/gEdkbBjp21Z16d46zL8DCQzo8qkO8iMkZ1D1f7UuJx2tmWCIA RmgzBOdtUgzbmaND6ek+SG7I6NGnZeg4bu4FMhedhBAjkQbSjsls9zkiXRi0IcCIO0Nm KYqQtItwKUOZyPilA059Y0aAz/90RQXz9vefh/l3/vdYPFRZhH+zOoW2E4ZtCNabYtap VNcgh0VwIY8GgPQb92xHwuPqOeFshh7EdDr7y26u2et0IMUmheNGlLQ8Yy0WJ7bjNphx g1fM7WAp0ZVIycht22eQbSF7xRUPrTqQ/1a2Novt/GvVjSSsI3Of6A22yGy0ujrH1wxy WeFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686941; x=1781291741; 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=GeoFUPBCkgb9fOH4gILRdoMyWxPWNRHxpgPNdda6x2I=; b=rnv+/lGYRe/mgaN/d1KYOZZNV314+TCTofqx+lBHZdtsk4QirPctEbr18KMWYzkyKx QtMznNodRqNPn0lYT+n8MXsZ1+BMMkpuD/AS93hQRV5Rh4fbbmUa8m4OmrCYizv1rqf6 +H9y2nTvH+OS9AeeLT2q32Y6yzY0BlQ0wwjc/FJsPuerKZQbdSb+i/cRDzdVYYsFgqLF VwB2apXelmIi6YdGXY7iRvY/MKoIHSM/iPkm9OzcBPHuDypcNUlBsCa82EPndTxngtOT 3/ZoTF2hm+rCU0+GHzVIuwUKhAPM3pLCLPnfRsuDdxx7/6Vy8awrzWPYxb9dgsfmvELg 9UpQ== X-Forwarded-Encrypted: i=1; AFNElJ+ycLXFVO9M8auZohj6CXWZnD0eL/KOLrZdH16sHBtxtUPfHK6aXm4NzK7Gl8BMcKUYQOBhL0+A/TU9it4=@vger.kernel.org X-Gm-Message-State: AOJu0YwLCOYS/aPNYqshH1i/ucc4o1fzl/yOYmoVqZy0pPWmDi1ElOCk 8B+v/DvwVICGpjLxq5snGnM9B9o7UjJeMVoBXnoDYEfeHxGqZaAeUT7WikiTFNfeZ3bz1vpu2e/ vfJDaCcYYQQ== X-Received: from dlkk22.prod.google.com ([2002:a05:7022:6096:b0:138:738:f96c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:4b:b0:12d:c3d8:1f95 with SMTP id a92af1059eb24-13807d13a37mr1436568c88.4.1780686940849; Fri, 05 Jun 2026 12:15:40 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:53 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-13-irogers@google.com> Subject: [PATCH v11 12/19] perf python: Add mmap2 event From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If mmap is handled so should mmap2 events. Add support as a distinct python event type. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/util/python.c | 162 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index acd280794f66..074dc1d9f225 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -133,7 +133,7 @@ static const char pyrf_mmap_event__doc[] =3D PyDoc_STR(= "perf mmap event object."); static PyMemberDef pyrf_mmap_event__members[] =3D { sample_members member_def(perf_event_header, type, T_UINT, "event type"), - member_def(perf_event_header, misc, T_UINT, "event misc"), + member_def(perf_event_header, misc, T_USHORT, "event misc"), member_def(perf_record_mmap, pid, T_UINT, "event pid"), member_def(perf_record_mmap, tid, T_UINT, "event tid"), member_def(perf_record_mmap, start, T_ULONGLONG, "start of the map"), @@ -174,6 +174,149 @@ static PyTypeObject pyrf_mmap_event__type =3D { .tp_repr =3D (reprfunc)pyrf_mmap_event__repr, }; =20 +static const char pyrf_mmap2_event__doc[] =3D PyDoc_STR("perf mmap2 event = object."); + +static PyObject *pyrf_mmap2_event__get_maj(PyObject *self, void *closure _= _maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(pevent->event.mmap2.maj); +} + +static PyObject *pyrf_mmap2_event__get_min(PyObject *self, void *closure _= _maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(pevent->event.mmap2.min); +} + +static PyObject *pyrf_mmap2_event__get_ino(PyObject *self, void *closure _= _maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->event.mmap2.ino); +} + +static PyObject *pyrf_mmap2_event__get_ino_generation(PyObject *self, void= *closure __maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->event.mmap2.ino_generation); +} + +static PyObject *pyrf_mmap2_event__get_build_id(PyObject *self, void *clos= ure __maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (!(pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID)) + Py_RETURN_NONE; + + int size =3D pevent->event.mmap2.build_id_size; + + if (size > 20) + size =3D 20; + + return PyBytes_FromStringAndSize((const char *)pevent->event.mmap2.build_= id, size); +} + +static PyGetSetDef pyrf_mmap2_event__getset[] =3D { + { + .name =3D "evsel", + .get =3D pyrf_event__get_evsel, + .set =3D NULL, + .doc =3D "tracking event.", + }, + { + .name =3D "maj", + .get =3D pyrf_mmap2_event__get_maj, + .set =3D NULL, + .doc =3D "major number.", + }, + { + .name =3D "min", + .get =3D pyrf_mmap2_event__get_min, + .set =3D NULL, + .doc =3D "minor number.", + }, + { + .name =3D "ino", + .get =3D pyrf_mmap2_event__get_ino, + .set =3D NULL, + .doc =3D "inode number.", + }, + { + .name =3D "ino_generation", + .get =3D pyrf_mmap2_event__get_ino_generation, + .set =3D NULL, + .doc =3D "inode generation.", + }, + { + .name =3D "build_id", + .get =3D pyrf_mmap2_event__get_build_id, + .set =3D NULL, + .doc =3D "binary build ID.", + }, + { .name =3D NULL, }, +}; + +static PyMemberDef pyrf_mmap2_event__members[] =3D { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + member_def(perf_event_header, misc, T_USHORT, "event misc"), + member_def(perf_record_mmap2, pid, T_UINT, "event pid"), + member_def(perf_record_mmap2, tid, T_UINT, "event tid"), + member_def(perf_record_mmap2, start, T_ULONGLONG, "start of the map"), + member_def(perf_record_mmap2, len, T_ULONGLONG, "map length"), + member_def(perf_record_mmap2, pgoff, T_ULONGLONG, "page offset"), + member_def(perf_record_mmap2, prot, T_UINT, "protection"), + member_def(perf_record_mmap2, flags, T_UINT, "flags"), + member_def(perf_record_mmap2, filename, T_STRING_INPLACE, "backing store"= ), + { .name =3D NULL, }, +}; + +static PyObject *pyrf_mmap2_event__repr(const struct pyrf_event *pevent) +{ + PyObject *ret; + char *s; + + if (asprintf(&s, "{ type: mmap2, pid: %u, tid: %u, start: %#" PRI_lx64 ",= " + "length: %#" PRI_lx64 ", offset: %#" PRI_lx64 ", " + "flags: %#x, prot: %#x, filename: %s }", + pevent->event.mmap2.pid, pevent->event.mmap2.tid, + pevent->event.mmap2.start, pevent->event.mmap2.len, + pevent->event.mmap2.pgoff, pevent->event.mmap2.flags, + pevent->event.mmap2.prot, pevent->event.mmap2.filename) < 0) + return PyErr_NoMemory(); + + ret =3D PyUnicode_FromString(s); + free(s); + return ret; +} + +static PyTypeObject pyrf_mmap2_event__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.mmap2_event", + .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_dealloc =3D (destructor)pyrf_event__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D pyrf_mmap2_event__doc, + .tp_members =3D pyrf_mmap2_event__members, + .tp_getset =3D pyrf_mmap2_event__getset, + .tp_repr =3D (reprfunc)pyrf_mmap2_event__repr, +}; + static const char pyrf_task_event__doc[] =3D PyDoc_STR("perf task (fork/ex= it) event object."); =20 static PyMemberDef pyrf_task_event__members[] =3D { @@ -799,6 +942,9 @@ static int pyrf_event__setup_types(void) int err; =20 err =3D PyType_Ready(&pyrf_mmap_event__type); + if (err < 0) + goto out; + err =3D PyType_Ready(&pyrf_mmap2_event__type); if (err < 0) goto out; err =3D PyType_Ready(&pyrf_lost_event__type); @@ -828,6 +974,7 @@ static int pyrf_event__setup_types(void) =20 static PyTypeObject *pyrf_event__type[] =3D { [PERF_RECORD_MMAP] =3D &pyrf_mmap_event__type, + [PERF_RECORD_MMAP2] =3D &pyrf_mmap2_event__type, [PERF_RECORD_LOST] =3D &pyrf_lost_event__type, [PERF_RECORD_COMM] =3D &pyrf_comm_event__type, [PERF_RECORD_EXIT] =3D &pyrf_task_event__type, @@ -875,6 +1022,16 @@ static PyObject *pyrf_event__new(const union perf_eve= nt *event, struct evsel *ev offsetof(struct perf_record_mmap, filename); =20 pevent->event.mmap.filename[max_len - 1] =3D '\0'; + } else if (event->header.type =3D=3D PERF_RECORD_MMAP2) { + /* Ensure '\0' string termination. */ + size_t max_len =3D pevent->event.header.size - offsetof(struct perf_reco= rd_mmap2, filename); + + pevent->event.mmap2.filename[max_len - 1] =3D '\0'; + } else if (event->header.type =3D=3D PERF_RECORD_COMM) { + /* Ensure '\0' string termination. */ + size_t max_len =3D pevent->event.header.size - offsetof(struct perf_reco= rd_comm, comm); + + pevent->event.comm.comm[max_len - 1] =3D '\0'; } =20 perf_sample__init(&pevent->sample, /*all=3D*/true); @@ -3304,6 +3461,9 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_mmap_event__type); PyModule_AddObject(module, "mmap_event", (PyObject *)&pyrf_mmap_event__ty= pe); =20 + Py_INCREF(&pyrf_mmap2_event__type); + PyModule_AddObject(module, "mmap2_event", (PyObject *)&pyrf_mmap2_event__= type); + Py_INCREF(&pyrf_lost_event__type); PyModule_AddObject(module, "lost_event", (PyObject *)&pyrf_lost_event__ty= pe); =20 --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA7F7496915 for ; Fri, 5 Jun 2026 19:15:44 +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=1780686956; cv=none; b=Kave1/kj1l5v2Aaf/4dzL5zCV/JqDcu/E8/yI5x/15oWW6DISMFMCW5OqcD/0XOZB1iIEvgkzIA8X59cmDt6DrQrPLbbYDppkQ4CAcnkltRqkIn1x5qUtklw1Y7vJ+BBarRwo2m5RfrD0QlErBlEhgtJ7MzsES3HAIZY7IwuMVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686956; c=relaxed/simple; bh=lsSpg0csC1cffjN6GdUA0bZjGMB9ONU3AhZX/5WwLnA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NdPZK0NdYeAOWf1QISGxdyNZM8I9xqUaoJn/YFmHGFjdSPzy4/pNVxEjxmEF0XrrcnO7c+OlJgN+aDaVkyt1umQgiA/YcLjjs9CPMSrMv8Ig13TKjUD3iV7/lDXLT6TVZLgmSzqntW2Gp8LuemVUM2ytOVE7211REgfil/Rh64Q= 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=RHgET3ay; 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="RHgET3ay" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-3074797dfa9so3192584eec.1 for ; Fri, 05 Jun 2026 12:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686944; x=1781291744; 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=W3F0Lui8v3m9zV0wASaRMq+XTB3ZohjDFZieCYxsPZk=; b=RHgET3ayaBZVNNHboaBC8gIJS9bQ0u4gx7u0864wg5UWsI33mu9CoYBEKvFfBnGivl dlG8f/MRo51WwTJIbofn4iHnGAnvH4QE2i95v6q2bBzkSLkCtMtRZffo/Drndxhqs4vI hOSIuUoia4JUl0IbNJSdWFjqLR3Jxj8Hllw/lgpqiZ7xjD9icXyHlApFvFvQitn8MBi1 EFoo1N2ddeCr1hXtkqNtizSqe7af2KxneefJt4z9BAjK/9opaNvg9maJiPEO6f5E3GAU KVdRBIUOv0toIG0iTqq1d3M02mhhHk9hgofhBO8mKzwEbs9bY8Ijrw1ETPflu8PqZJOP DWKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686944; x=1781291744; 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=W3F0Lui8v3m9zV0wASaRMq+XTB3ZohjDFZieCYxsPZk=; b=BuqSSearp2BpXCB1G+Gll7P+l31sPP42ZOA1ZNoRWu791q/eEZIRA8f3EId5pxy8ie JGm6nTJV5hdjQ0UBPiscRW5YmEB01jLnsu3G/BhCpel9tz7LcIXPiOsOBvYCowmIQ9VT uWSxASNrzdFRHMw95MusGlQBSk++VmrPATrqbcgMn0B9ht/OE9QJpgZlRLe7tB8EqS7I Ij+Y7MrCXZ0vemFDcdX3xYVAGbN0j67CFukHeIM5BSOULOcF7xNEkYhhUQKjJZ3/VjdO /3ZbDVxdOHm29A3ANJs2wOsAt/Jv7W16r6TKzWUPsSMgsdOBKqTlziWolaD9CrpB532z HQBA== X-Forwarded-Encrypted: i=1; AFNElJ9Y6dJeGsQPinUhriWsqB4Z/mR2wVoeKp/jnYrStd3G8GherEgB9M8exLhEbaEZULce57ojjbi60EfvQOs=@vger.kernel.org X-Gm-Message-State: AOJu0YzlRVQPAjsiw18KVNHQUj9CtZBdhb2bGUcBFIzB8QXCKh7F8Cro wAdfO9sr9vMe648dhM8Ym/ufdJaH6LmFtFEe4wXFkEDsspv2Ca4ecRD9i4vl12WVncjukrbRvT/ tdZGVeoSKaQ== X-Received: from dybml42.prod.google.com ([2002:a05:7301:152a:b0:300:7c0d:9eac]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:df49:b0:2da:2ec2:64e5 with SMTP id 5a478bee46e88-3077b10bf6bmr2070339eec.18.1780686943366; Fri, 05 Jun 2026 12:15:43 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:54 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-14-irogers@google.com> Subject: [PATCH v11 13/19] perf python: Add callchain support From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement pyrf_callchain_node and pyrf_callchain types for lazy iteration over callchain frames. Add callchain property to sample_event. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Eager Callchain Resolution: Moved the callchain resolution from deferred iteration to eager processing in pyrf_session_tool__sample() . This avoids risks of reading from unmapped memory or following dangling pointers to closed sessions. 2. Cached Callchain: Added a callchain field to struct pyrf_event to store the resolved object. 3. Simplified Access: pyrf_sample_event__get_callchain() now just returns the cached object if available. 4. Avoided Double Free: Handled lazy cleanups properly. v6: - Moved callchain resolution from `session_tool__sample` to `pyrf_event__new`. --- tools/perf/util/python.c | 210 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 207 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 074dc1d9f225..d8296d4d17d8 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -87,6 +87,8 @@ struct pyrf_event { struct addr_location al; /** @al_resolved: True when machine__resolve been called. */ bool al_resolved; + /** @callchain: Resolved callchain, eagerly computed if requested. */ + PyObject *callchain; /** @event: The underlying perf_event that may be in a file or ring buffe= r. */ union perf_event event; }; @@ -124,6 +126,7 @@ static void pyrf_event__delete(struct pyrf_event *peven= t) { if (pevent->al_resolved) addr_location__exit(&pevent->al); + Py_XDECREF(pevent->callchain); perf_sample__exit(&pevent->sample); Py_TYPE(pevent)->tp_free((PyObject *)pevent); } @@ -785,6 +788,144 @@ static PyObject *pyrf_sample_event__insn(PyObject *se= lf, PyObject *args __maybe_ pevent->sample.insn_len); } =20 +struct pyrf_callchain_node { + PyObject_HEAD + u64 ip; + struct map *map; + struct symbol *sym; +}; + +static void pyrf_callchain_node__delete(struct pyrf_callchain_node *pnode) +{ + map__put(pnode->map); + Py_TYPE(pnode)->tp_free((PyObject *)pnode); +} + +static PyObject *pyrf_callchain_node__get_ip(struct pyrf_callchain_node *p= node, + void *closure __maybe_unused) +{ + return PyLong_FromUnsignedLongLong(pnode->ip); +} + +static PyObject *pyrf_callchain_node__get_symbol(struct pyrf_callchain_nod= e *pnode, + void *closure __maybe_unused) +{ + if (pnode->sym) + return PyUnicode_FromString(pnode->sym->name); + return PyUnicode_FromString("[unknown]"); +} + +static PyObject *pyrf_callchain_node__get_dso(struct pyrf_callchain_node *= pnode, + void *closure __maybe_unused) +{ + const char *dsoname =3D "[unknown]"; + + if (pnode->map) { + struct dso *dso =3D map__dso(pnode->map); + + if (dso) { + if (symbol_conf.show_kernel_path && dso__long_name(dso)) + dsoname =3D dso__long_name(dso); + else + dsoname =3D dso__name(dso); + } + } + return PyUnicode_FromString(dsoname); +} + +static PyGetSetDef pyrf_callchain_node__getset[] =3D { + { .name =3D "ip", .get =3D (getter)pyrf_callchain_node__get_ip, }, + { .name =3D "symbol", .get =3D (getter)pyrf_callchain_node__get_symbol, }, + { .name =3D "dso", .get =3D (getter)pyrf_callchain_node__get_dso, }, + { .name =3D NULL, }, +}; + +static PyTypeObject pyrf_callchain_node__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.callchain_node", + .tp_basicsize =3D sizeof(struct pyrf_callchain_node), + .tp_dealloc =3D (destructor)pyrf_callchain_node__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D "perf callchain node object.", + .tp_getset =3D pyrf_callchain_node__getset, +}; + +struct pyrf_callchain_frame { + u64 ip; + struct map *map; + struct symbol *sym; +}; + +struct pyrf_callchain { + PyObject_HEAD + struct pyrf_callchain_frame *frames; + u64 nr_frames; +}; + +static void pyrf_callchain__delete(struct pyrf_callchain *pchain) +{ + if (pchain->frames) { + for (u64 i =3D 0; i < pchain->nr_frames; i++) + map__put(pchain->frames[i].map); + free(pchain->frames); + } + Py_TYPE(pchain)->tp_free((PyObject *)pchain); +} + +static Py_ssize_t pyrf_callchain__length(PyObject *obj) +{ + struct pyrf_callchain *pchain =3D (void *)obj; + + return pchain->nr_frames; +} + +static PyObject *pyrf_callchain__item(PyObject *obj, Py_ssize_t i) +{ + struct pyrf_callchain *pchain =3D (void *)obj; + struct pyrf_callchain_node *pnode; + + if (i < 0 || i >=3D (Py_ssize_t)pchain->nr_frames) { + PyErr_SetString(PyExc_IndexError, "Index out of range"); + return NULL; + } + + pnode =3D PyObject_New(struct pyrf_callchain_node, &pyrf_callchain_node__= type); + if (!pnode) + return NULL; + + pnode->ip =3D pchain->frames[i].ip; + pnode->map =3D map__get(pchain->frames[i].map); + pnode->sym =3D pchain->frames[i].sym; + + return (PyObject *)pnode; +} + +static PySequenceMethods pyrf_callchain__sequence_methods =3D { + .sq_length =3D pyrf_callchain__length, + .sq_item =3D pyrf_callchain__item, +}; + +static PyTypeObject pyrf_callchain__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.callchain", + .tp_basicsize =3D sizeof(struct pyrf_callchain), + .tp_dealloc =3D (destructor)pyrf_callchain__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D "perf callchain object.", + .tp_as_sequence =3D &pyrf_callchain__sequence_methods, +}; + +static PyObject *pyrf_sample_event__get_callchain(PyObject *self, void *cl= osure __maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (!pevent->callchain) + Py_RETURN_NONE; + + Py_INCREF(pevent->callchain); + return pevent->callchain; +} + static PyObject* pyrf_sample_event__getattro(struct pyrf_event *pevent, PyObject *attr_name) { @@ -799,6 +940,12 @@ pyrf_sample_event__getattro(struct pyrf_event *pevent,= PyObject *attr_name) } =20 static PyGetSetDef pyrf_sample_event__getset[] =3D { + { + .name =3D "callchain", + .get =3D pyrf_sample_event__get_callchain, + .set =3D NULL, + .doc =3D "event callchain.", + }, { .name =3D "raw_buf", .get =3D (getter)pyrf_sample_event__get_raw_buf, @@ -968,6 +1115,12 @@ static int pyrf_event__setup_types(void) err =3D PyType_Ready(&pyrf_context_switch_event__type); if (err < 0) goto out; + err =3D PyType_Ready(&pyrf_callchain_node__type); + if (err < 0) + goto out; + err =3D PyType_Ready(&pyrf_callchain__type); + if (err < 0) + goto out; out: return err; } @@ -987,9 +1140,12 @@ static PyTypeObject *pyrf_event__type[] =3D { [PERF_RECORD_SWITCH_CPU_WIDE] =3D &pyrf_context_switch_event__type, }; =20 -static PyObject *pyrf_event__new(const union perf_event *event, struct evs= el *evsel) +static PyObject *pyrf_event__new(const union perf_event *event, struct evs= el *evsel, + struct perf_session *session) { struct pyrf_event *pevent; + struct perf_sample *sample; + struct machine *machine =3D session ? &session->machines.host : NULL; int err; u32 min_size; =20 @@ -1035,6 +1191,7 @@ static PyObject *pyrf_event__new(const union perf_eve= nt *event, struct evsel *ev } =20 perf_sample__init(&pevent->sample, /*all=3D*/true); + pevent->callchain =3D NULL; pevent->al_resolved =3D false; addr_location__init(&pevent->al); =20 @@ -1048,6 +1205,50 @@ static PyObject *pyrf_event__new(const union perf_ev= ent *event, struct evsel *ev return PyErr_Format(PyExc_OSError, "perf: can't parse sample, err=3D%d", err); } + sample =3D &pevent->sample; + if (machine && sample->callchain) { + struct addr_location al; + struct callchain_cursor *cursor; + u64 i; + struct pyrf_callchain *pchain; + + addr_location__init(&al); + if (machine__resolve(machine, &al, sample) >=3D 0) { + cursor =3D get_tls_callchain_cursor(); + if (thread__resolve_callchain(al.thread, cursor, sample, + NULL, NULL, PERF_MAX_STACK_DEPTH) =3D=3D 0) { + callchain_cursor_commit(cursor); + + pchain =3D PyObject_New(struct pyrf_callchain, &pyrf_callchain__type); + if (!pchain) { + addr_location__exit(&al); + Py_DECREF(pevent); + return NULL; + } + pchain->nr_frames =3D cursor->nr; + pchain->frames =3D calloc(pchain->nr_frames, + sizeof(*pchain->frames)); + if (!pchain->frames) { + Py_DECREF(pchain); + addr_location__exit(&al); + Py_DECREF(pevent); + return PyErr_NoMemory(); + } + struct callchain_cursor_node *node; + + for (i =3D 0; i < pchain->nr_frames; i++) { + node =3D callchain_cursor_current(cursor); + pchain->frames[i].ip =3D node->ip; + pchain->frames[i].map =3D + map__get(node->ms.map); + pchain->frames[i].sym =3D node->ms.sym; + callchain_cursor_advance(cursor); + } + pevent->callchain =3D (PyObject *)pchain; + } + addr_location__exit(&al); + } + } return (PyObject *)pevent; } =20 @@ -2413,7 +2614,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf= _evlist *pevlist, perf_mmap__consume(&md->core); Py_RETURN_NONE; } - pyevent =3D pyrf_event__new(event, evsel); + pyevent =3D pyrf_event__new(event, evsel, evlist__session(evlist)); perf_mmap__consume(&md->core); if (pyevent =3D=3D NULL) return PyErr_Occurred() ? NULL : PyErr_NoMemory(); @@ -3179,7 +3380,7 @@ static int pyrf_session_tool__sample(const struct per= f_tool *tool, struct machine *machine __maybe_unused) { struct pyrf_session *psession =3D container_of(tool, struct pyrf_session,= tool); - PyObject *pyevent =3D pyrf_event__new(event, sample->evsel); + PyObject *pyevent =3D pyrf_event__new(event, sample->evsel, psession->ses= sion); PyObject *ret; =20 if (pyevent =3D=3D NULL) @@ -3287,6 +3488,9 @@ static PyObject *pyrf_session__new(PyTypeObject *type= , PyObject *args, PyObject } psession->session =3D session; =20 + symbol_conf.use_callchain =3D true; + symbol_conf.show_kernel_path =3D true; + symbol_conf.inline_name =3D false; if (symbol__init(perf_session__env(session)) < 0) { PyErr_SetString(PyExc_OSError, "perf: symbol__init failed"); goto err_out; --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7C434C8FFA for ; Fri, 5 Jun 2026 19:15:47 +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=1780686963; cv=none; b=BFAK05UkMroeeZO6tuZy3xpyvuRPtlEAvCLqBZSRiWjKM8SUWkBEJvtCdoVPZXIcCN4x3pZSXokqj6QlnCBdS59jhi8npKCKKqOLTavmi2C9rG8oIElNT5BujSr55+gmpOkXqFHdKc34W0lZql4pock6ecldvXKaFid5gUCTwN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686963; c=relaxed/simple; bh=cTY+36xGwCbA7Ok0R22v5DdbhJnIIxQAoPyT215EyfA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=He9ewFQN7reZGQsIytpuXbs2XqgxCC9HT50N5GTAHVxUL2byN1v5B9OWttf+pWy12yxY8ymENmP0h798DMiXJgwUlfKGqLJHPy8jH/haNrqUmbMJe60nJXSpa6E6YHz+ycouJ/EtmCa/21V7aJFnGYQt11GcbPNMibr4/n0y/uY= 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=asBYC2up; 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="asBYC2up" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-13807001f80so3604628c88.1 for ; Fri, 05 Jun 2026 12:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686946; x=1781291746; 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=7UNycYfT/7d7QOLsfs9/fFsWZVKf+PMTo6n7QrzonWQ=; b=asBYC2upHiXx3Qv7sqlUrgTVsgta4tF1UtubGyDYuyxEhWLKzHoatymP1ylh5tIDhd gwCv/VtmcUzRzuLwc4OgBmLVXuVMSf0QN7HOkDy6bTd3Ekv6QcWHh+YVPgL9v9toKFv0 5MSFuar5J3sHM1CY7XxnYmCSiNymdQ9G9w/kRoUZJ4Yz2wevH+hyeWvSktaYEP+Kyv/7 5BTXt5Ia9xFXIo6BJ3K8t7bSJMxouZMbgliWUt4OISVCUFvHcD4KPS+OLQlXdqg7HclG 97upi6X8ZftuEnuQBzmcMvnh/8Zjtn2du3KssR9Xqcb6rZE19F/EylX/T6IEXadtDoCh Lx2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686946; x=1781291746; 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=7UNycYfT/7d7QOLsfs9/fFsWZVKf+PMTo6n7QrzonWQ=; b=c4ivqf84BSXJTxd/qVmFrEhVckIZK6Tf3mFzLRg2G+jgtrkmtTRt/oCsfkP+1oN60B 4nHNcf7d1gxJHy34kGNioIAucN20Y6MMDQwXmMyC2IYGDcnHBqKgHA3wGJMkrqUWEDzN JKZ8B7lAefzqFTX3zbIEVtIj4QO+FXm/tT/uDagmUeN175P0YaW6YX/pb1p+n0ZlUzhp BBlCpgLfW6PMg/IgubskkjAKs5u8nAsrPgHQwZJaopqe7fd+hoRXZ2aBi5b0ePPDrrw7 qH3E7iLuEIn3BIA1HHr3Ht6nh/Eb2wUKg9MeuJqcp0ki9hYQiGqGbgEjWUyP80M31twM KONw== X-Forwarded-Encrypted: i=1; AFNElJ8nm7S3Ebdx3NGQfK6JUZ3TQBjaqFVWMDt31t+qwghslUdDUGdrhYkrKTe6eGalSbzarAAS1nMzlhfkQsM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0hy44gkIjOk4y+VWLgwCIqAheK/hHWdI5fjzeBWrGYFUWi+0T 89wNQnH2Afjj4DhElJfq/bMR8L8YRlvquiwK81c0KSaBHrZYkZu3JARf4ZHgq+YOrsdL+xQhInp 4nLb0BEilKA== X-Received: from dldoa1.prod.google.com ([2002:a05:701a:ca81:b0:132:8d92:4d65]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6999:b0:137:e45d:7c4a with SMTP id a92af1059eb24-13806720d38mr2472164c88.29.1780686946106; Fri, 05 Jun 2026 12:15:46 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:55 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-15-irogers@google.com> Subject: [PATCH v11 14/19] perf python: Extend API for stat events in python.c From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add stat information to the session. Add call backs for stat events. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v5: 1. Fix Memory Corruption: Corrected the memory offset for `stat_round_type` in `pyrf_stat_round_event__members` by adding the base offset of `struct pyrf_event`. 2. Fix Memory Leak: Added `Py_XDECREF()` to free the unused return value of the Python callback in `pyrf_session_tool__stat_round()`. --- v7: - Added comprehensive size checks in pyrf_event__new for all event types. - Fixed line length warning. v10: - Added CHECK_INITIALIZED check to pyrf_evsel__get_ids to prevent NULL pointer dereference on uninitialized evsel objects. --- tools/perf/util/python.c | 185 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index d8296d4d17d8..96694360c978 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -459,6 +459,77 @@ static PyTypeObject pyrf_lost_event__type =3D { .tp_repr =3D (reprfunc)pyrf_lost_event__repr, }; =20 +static const char pyrf_stat_event__doc[] =3D PyDoc_STR("perf stat event ob= ject."); + +static PyMemberDef pyrf_stat_event__members[] =3D { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + member_def(perf_record_stat, id, T_ULONGLONG, "event id"), + member_def(perf_record_stat, cpu, T_UINT, "event cpu"), + member_def(perf_record_stat, thread, T_UINT, "event thread"), + member_def(perf_record_stat, val, T_ULONGLONG, "counter value"), + member_def(perf_record_stat, ena, T_ULONGLONG, "enabled time"), + member_def(perf_record_stat, run, T_ULONGLONG, "running time"), + { .name =3D NULL, }, +}; + +static PyObject *pyrf_stat_event__repr(const struct pyrf_event *pevent) +{ + return PyUnicode_FromFormat( + "{ type: stat, id: %llu, cpu: %u, thread: %u, val: %llu, ena: %llu, run:= %llu }", + pevent->event.stat.id, + pevent->event.stat.cpu, + pevent->event.stat.thread, + pevent->event.stat.val, + pevent->event.stat.ena, + pevent->event.stat.run); +} + +static PyTypeObject pyrf_stat_event__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.stat_event", + .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_new =3D PyType_GenericNew, + .tp_dealloc =3D (destructor)pyrf_event__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D pyrf_stat_event__doc, + .tp_members =3D pyrf_stat_event__members, + .tp_getset =3D pyrf_event__getset, + .tp_repr =3D (reprfunc)pyrf_stat_event__repr, +}; + +static const char pyrf_stat_round_event__doc[] =3D PyDoc_STR("perf stat ro= und event object."); + +static PyMemberDef pyrf_stat_round_event__members[] =3D { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + { .name =3D "stat_round_type", .type =3D T_ULONGLONG, + .offset =3D offsetof(struct pyrf_event, event) + offsetof(struct perf_r= ecord_stat_round, type), + .doc =3D "round type" }, + member_def(perf_record_stat_round, time, T_ULONGLONG, "round time"), + { .name =3D NULL, }, +}; + +static PyObject *pyrf_stat_round_event__repr(const struct pyrf_event *peve= nt) +{ + return PyUnicode_FromFormat("{ type: stat_round, type: %llu, time: %llu }= ", + pevent->event.stat_round.type, + pevent->event.stat_round.time); +} + +static PyTypeObject pyrf_stat_round_event__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.stat_round_event", + .tp_basicsize =3D sizeof(struct pyrf_event), + .tp_new =3D PyType_GenericNew, + .tp_dealloc =3D (destructor)pyrf_event__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D pyrf_stat_round_event__doc, + .tp_members =3D pyrf_stat_round_event__members, + .tp_getset =3D pyrf_event__getset, + .tp_repr =3D (reprfunc)pyrf_stat_round_event__repr, +}; + static const char pyrf_read_event__doc[] =3D PyDoc_STR("perf read event ob= ject."); =20 static PyMemberDef pyrf_read_event__members[] =3D { @@ -1113,6 +1184,12 @@ static int pyrf_event__setup_types(void) if (err < 0) goto out; err =3D PyType_Ready(&pyrf_context_switch_event__type); + if (err < 0) + goto out; + err =3D PyType_Ready(&pyrf_stat_event__type); + if (err < 0) + goto out; + err =3D PyType_Ready(&pyrf_stat_round_event__type); if (err < 0) goto out; err =3D PyType_Ready(&pyrf_callchain_node__type); @@ -1138,6 +1215,8 @@ static PyTypeObject *pyrf_event__type[] =3D { [PERF_RECORD_SAMPLE] =3D &pyrf_sample_event__type, [PERF_RECORD_SWITCH] =3D &pyrf_context_switch_event__type, [PERF_RECORD_SWITCH_CPU_WIDE] =3D &pyrf_context_switch_event__type, + [PERF_RECORD_STAT] =3D &pyrf_stat_event__type, + [PERF_RECORD_STAT_ROUND] =3D &pyrf_stat_round_event__type, }; =20 static PyObject *pyrf_event__new(const union perf_event *event, struct evs= el *evsel, @@ -2128,7 +2207,45 @@ static PyObject *pyrf_evsel__get_attr_wakeup_events(= PyObject *self, void */*clos return PyLong_FromUnsignedLong(pevsel->evsel->core.attr.wakeup_events); } =20 +static PyObject *pyrf_evsel__get_ids(struct pyrf_evsel *pevsel, void *clos= ure __maybe_unused) +{ + struct evsel *evsel; + PyObject *list; + + CHECK_INITIALIZED(pevsel->evsel, "evsel"); + + evsel =3D pevsel->evsel; + list =3D PyList_New(0); + + if (!list) + return NULL; + + for (u32 i =3D 0; i < evsel->core.ids; i++) { + PyObject *id =3D PyLong_FromUnsignedLongLong(evsel->core.id[i]); + int ret; + + if (!id) { + Py_DECREF(list); + return NULL; + } + ret =3D PyList_Append(list, id); + Py_DECREF(id); + if (ret < 0) { + Py_DECREF(list); + return NULL; + } + } + + return list; +} + static PyGetSetDef pyrf_evsel__getset[] =3D { + { + .name =3D "ids", + .get =3D (getter)pyrf_evsel__get_ids, + .set =3D NULL, + .doc =3D "event IDs.", + }, { .name =3D "tracking", .get =3D pyrf_evsel__get_tracking, @@ -2977,6 +3094,8 @@ static const struct perf_constant perf__constants[] = =3D { PERF_CONST(RECORD_LOST_SAMPLES), PERF_CONST(RECORD_SWITCH), PERF_CONST(RECORD_SWITCH_CPU_WIDE), + PERF_CONST(RECORD_STAT), + PERF_CONST(RECORD_STAT_ROUND), =20 PERF_CONST(RECORD_MISC_SWITCH_OUT), { .name =3D NULL, }, @@ -3372,6 +3491,7 @@ struct pyrf_session { struct perf_tool tool; struct pyrf_data *pdata; PyObject *sample; + PyObject *stat; }; =20 static int pyrf_session_tool__sample(const struct perf_tool *tool, @@ -3396,6 +3516,50 @@ static int pyrf_session_tool__sample(const struct pe= rf_tool *tool, return 0; } =20 +static int pyrf_session_tool__stat(const struct perf_tool *tool, + struct perf_session *session, + union perf_event *event) +{ + struct pyrf_session *psession =3D container_of(tool, struct pyrf_session,= tool); + struct evsel *evsel =3D evlist__id2evsel(session->evlist, event->stat.id); + PyObject *pyevent =3D pyrf_event__new(event, evsel, psession->session); + const char *name =3D evsel ? evsel__name(evsel) : "unknown"; + PyObject *ret; + + if (pyevent =3D=3D NULL) + return -ENOMEM; + + ret =3D PyObject_CallFunction(psession->stat, "Oz", pyevent, name); + if (!ret) { + Py_DECREF(pyevent); + return -1; + } + Py_DECREF(ret); + Py_DECREF(pyevent); + return 0; +} + +static int pyrf_session_tool__stat_round(const struct perf_tool *tool, + struct perf_session *session __maybe_unused, + union perf_event *event) +{ + struct pyrf_session *psession =3D container_of(tool, struct pyrf_session,= tool); + PyObject *pyevent =3D pyrf_event__new(event, /*evsel=3D*/NULL, psession->= session); + PyObject *ret; + + if (pyevent =3D=3D NULL) + return -ENOMEM; + + ret =3D PyObject_CallFunction(psession->stat, "Oz", pyevent, NULL); + if (!ret) { + Py_DECREF(pyevent); + return -1; + } + Py_DECREF(ret); + Py_DECREF(pyevent); + return 0; +} + static PyObject *pyrf_session__find_thread(struct pyrf_session *psession, = PyObject *args) { struct machine *machine; @@ -3429,13 +3593,13 @@ static PyObject *pyrf_session__find_thread(struct p= yrf_session *psession, PyObje static PyObject *pyrf_session__new(PyTypeObject *type, PyObject *args, PyO= bject *kwargs) { struct pyrf_data *pdata; - PyObject *sample =3D NULL; - static char *kwlist[] =3D { "data", "sample", NULL }; + PyObject *sample =3D NULL, *stat =3D NULL; + static char *kwlist[] =3D { "data", "sample", "stat", NULL }; struct pyrf_session *psession; struct perf_session *session; =20 - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O", kwlist, &pyrf_data= __type, &pdata, - &sample)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|OO", kwlist, &pyrf_dat= a__type, &pdata, + &sample, &stat)) return NULL; =20 psession =3D PyObject_New(struct pyrf_session, type); @@ -3444,6 +3608,7 @@ static PyObject *pyrf_session__new(PyTypeObject *type= , PyObject *args, PyObject =20 psession->session =3D NULL; psession->sample =3D NULL; + psession->stat =3D NULL; psession->pdata =3D NULL; =20 Py_INCREF(pdata); @@ -3466,8 +3631,13 @@ static PyObject *pyrf_session__new(PyTypeObject *typ= e, PyObject *args, PyObject } while (0) =20 ADD_TOOL(sample); + ADD_TOOL(stat); #undef ADD_TOOL =20 + if (stat) + psession->tool.stat_round =3D pyrf_session_tool__stat_round; + + psession->tool.comm =3D perf_event__process_comm; psession->tool.mmap =3D perf_event__process_mmap; psession->tool.mmap2 =3D perf_event__process_mmap2; @@ -3510,6 +3680,7 @@ static void pyrf_session__delete(struct pyrf_session = *psession) perf_session__delete(psession->session); Py_XDECREF(psession->pdata); Py_XDECREF(psession->sample); + Py_XDECREF(psession->stat); Py_TYPE(psession)->tp_free((PyObject *)psession); } =20 @@ -3692,6 +3863,12 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_context_switch_event__type); PyModule_AddObject(module, "switch_event", (PyObject *)&pyrf_context_swit= ch_event__type); =20 + Py_INCREF(&pyrf_stat_event__type); + PyModule_AddObject(module, "stat_event", (PyObject *)&pyrf_stat_event__ty= pe); + + Py_INCREF(&pyrf_stat_round_event__type); + PyModule_AddObject(module, "stat_round_event", (PyObject *)&pyrf_stat_rou= nd_event__type); + Py_INCREF(&pyrf_thread_map__type); PyModule_AddObject(module, "thread_map", (PyObject*)&pyrf_thread_map__typ= e); =20 --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A38A40E8E9 for ; Fri, 5 Jun 2026 19:15:49 +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=1780686964; cv=none; b=i7pym4FQD/1+dLXWAghPO56wPLZkr+T0XEUN+Uhzq5qRcbPxqTPayEtLRxwMNpT5+qAQmeW5rDuOU/g2aqCk7okYnmbhBwJPspS771Uu6Kt+/B8CtYP9XzBvUOsfPzEM3vKZX2mT3eYPW6P8kN74/t5RDEqoJ2N/mXKIbe0VU7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686964; c=relaxed/simple; bh=WlsE4NSrVJ7xxYBdYTMo0YxOOO9qUuFJl7JOi2hhJUQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FP0/eoe6voK9fM7TrdW3D0QrSRGrqhfUrazF2Xgi4NNQfapfZben0nckCn6mP3JD19GUyw9+NrKZ+pby0QvDz5LmeZ5GbSKwLISwedWgRMEmaXQ/AxuGPjBuZLTbAnTbGYpUvh/PYPznDTM50v5XjOExNmZ6echS6BxvSTI9blw= 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=fxtVaGU/; 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="fxtVaGU/" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304ee7d1368so2207271eec.0 for ; Fri, 05 Jun 2026 12:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686948; x=1781291748; 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=TarWDTgoHD8bqXrwreP1QCZ6oEu5MyCv7SRaZMLqFeE=; b=fxtVaGU/V49v2xJbLzu4pQJnYsn4m1f6Qny1pJIy+keALV3dbZNS9Pcs3dqIqy43mZ v1KpI3jB3gueM7yXn4GsTJDDnkzaXZqEsHmVekoApCE5Hi30VQjeQMldFmjvS13uvsat P+RhQgFwci0+STzMUbaSP2SWf5X/ml+ni0S0LmMxM3v3tTsxVCZVIeF0WzLbu+28rdPH 9YOibXN9IRZIM36TnAeKk0Zk5H9ZMOiZM8bDr1SyNECEg1VxGHULk+aI8Dcv1lpv4svn I3b9HQ3dVymc0WCaagIfbfmJ0j8wNsn8YK86BxqNfC0EvnrmDmIB1NRAQez/wI3ukhRp yK5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686948; x=1781291748; 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=TarWDTgoHD8bqXrwreP1QCZ6oEu5MyCv7SRaZMLqFeE=; b=c04yuZVLz/kSC2dw5bo9NHPKS724RGSv/OMcfIVJpv8jMz1pzeeyUX26sNRMKkgL+V 2z5foMBN1MhCWaAr+HAbAB12Nb9Ucz5Ho6L99wUIurCkurBfmZpesi46+650rzucsEC1 QLbvMaWkoLnaczbZgm6Vintcku/SHP6VXI24XE/+zFUEPqMh1ce8+7Of40eEFmjWdyR7 bYmZiCisYLyhNLXVGFtQUmiR8gXZfr2gGyTu1l9cIVYQD6u6z4v+HrOWbDus16oZa9va 7sD8uzKiO4J+PVRCq4lAKK4cA4+Xw+UW3htCpcbY03lGC1BIZxDZ0z33OYalUH6zFIoT Zpfg== X-Forwarded-Encrypted: i=1; AFNElJ/w+YaTfViMwovDuTPV7NZvBFCkEveWyIHLz54zMbmfSkTnerB1u64xIHVC7EO4DmEydtVq2WHS6cQBxQ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yzn89v751t7YkRet6IKDF+nuNhQ5HCSSsrUH/wiA+8Xk0cZF7Mt 4SiDng++XQi6qKxlk1HKXZPPrabKJqrazknomu9sshOFEflF5xgEs+xKhvJooNfXwB8CEGDWPRV bhN0LNxvUVQ== X-Received: from dyz28.prod.google.com ([2002:a05:693c:409c:b0:304:edf2:223e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:168e:b0:304:630d:e4ec with SMTP id 5a478bee46e88-3077b272073mr2711183eec.28.1780686948324; Fri, 05 Jun 2026 12:15:48 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:56 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-16-irogers@google.com> Subject: [PATCH v11 15/19] perf python: Expose brstack in sample event From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement pyrf_branch_entry and pyrf_branch_stack for lazy iteration over branch stack entries. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Avoided Keyword Collision: Renamed the properties "from" and "to" to "from_ip" and "to_ip" in pyrf_branch_entry__getset[] to prevent syntax errors in Python. 2. Eager Branch Stack Resolution: Updated pyrf_session_tool__sample() to allocate and copy the branch stack entries eagerly when the event is processed, instead of deferring it to iteration time. This avoids reading from potentially overwritten or unmapped mmap buffers. 3. Updated Iterators: Updated pyrf_branch_stack and pyrf_branch_stack__next() to use the copied entries rather than pointing directly to the sample's buffer. 4. Avoided Reference Leak on Init Failure: Added proper error checking for PyModule_AddObject() in the module initialization function, decrementing references on failure. v6: - Moved branch stack resolution from `session_tool__sample` to `pyrf_event__new`. --- tools/perf/util/python.c | 198 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 96694360c978..eabc71c1f9a2 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -22,6 +22,7 @@ #include "debug.h" #include "dso.h" #include "event.h" +#include "branch.h" #include "evlist.h" #include "evsel.h" #include "expr.h" @@ -89,6 +90,8 @@ struct pyrf_event { bool al_resolved; /** @callchain: Resolved callchain, eagerly computed if requested. */ PyObject *callchain; + /** @brstack: Resolved branch stack, eagerly computed if requested. */ + PyObject *brstack; /** @event: The underlying perf_event that may be in a file or ring buffe= r. */ union perf_event event; }; @@ -127,6 +130,7 @@ static void pyrf_event__delete(struct pyrf_event *peven= t) if (pevent->al_resolved) addr_location__exit(&pevent->al); Py_XDECREF(pevent->callchain); + Py_XDECREF(pevent->brstack); perf_sample__exit(&pevent->sample); Py_TYPE(pevent)->tp_free((PyObject *)pevent); } @@ -997,6 +1001,154 @@ static PyObject *pyrf_sample_event__get_callchain(Py= Object *self, void *closure return pevent->callchain; } =20 +struct pyrf_branch_entry { + PyObject_HEAD + u64 from; + u64 to; + struct branch_flags flags; +}; + +static void pyrf_branch_entry__delete(struct pyrf_branch_entry *pentry) +{ + Py_TYPE(pentry)->tp_free((PyObject *)pentry); +} + +static PyObject *pyrf_branch_entry__get_from(struct pyrf_branch_entry *pen= try, + void *closure __maybe_unused) +{ + return PyLong_FromUnsignedLongLong(pentry->from); +} + +static PyObject *pyrf_branch_entry__get_to(struct pyrf_branch_entry *pentr= y, + void *closure __maybe_unused) +{ + return PyLong_FromUnsignedLongLong(pentry->to); +} + +static PyObject *pyrf_branch_entry__get_mispred(struct pyrf_branch_entry *= pentry, + void *closure __maybe_unused) +{ + return PyBool_FromLong(pentry->flags.mispred); +} + +static PyObject *pyrf_branch_entry__get_predicted(struct pyrf_branch_entry= *pentry, + void *closure __maybe_unused) +{ + return PyBool_FromLong(pentry->flags.predicted); +} + +static PyObject *pyrf_branch_entry__get_in_tx(struct pyrf_branch_entry *pe= ntry, + void *closure __maybe_unused) +{ + return PyBool_FromLong(pentry->flags.in_tx); +} + +static PyObject *pyrf_branch_entry__get_abort(struct pyrf_branch_entry *pe= ntry, + void *closure __maybe_unused) +{ + return PyBool_FromLong(pentry->flags.abort); +} + +static PyObject *pyrf_branch_entry__get_cycles(struct pyrf_branch_entry *p= entry, + void *closure __maybe_unused) +{ + return PyLong_FromUnsignedLongLong(pentry->flags.cycles); +} + +static PyObject *pyrf_branch_entry__get_type(struct pyrf_branch_entry *pen= try, + void *closure __maybe_unused) +{ + return PyLong_FromLong(pentry->flags.type); +} + +static PyGetSetDef pyrf_branch_entry__getset[] =3D { + { .name =3D "from_ip", .get =3D (getter)pyrf_branch_entry__get_from,= }, + { .name =3D "to_ip", .get =3D (getter)pyrf_branch_entry__get_to, }, + { .name =3D "mispred", .get =3D (getter)pyrf_branch_entry__get_mispred,= }, + { .name =3D "predicted", .get =3D (getter)pyrf_branch_entry__get_predicte= d, }, + { .name =3D "in_tx", .get =3D (getter)pyrf_branch_entry__get_in_tx, }, + { .name =3D "abort", .get =3D (getter)pyrf_branch_entry__get_abort, }, + { .name =3D "cycles", .get =3D (getter)pyrf_branch_entry__get_cycles, = }, + { .name =3D "type", .get =3D (getter)pyrf_branch_entry__get_type, }, + { .name =3D NULL, }, +}; + +static PyTypeObject pyrf_branch_entry__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.branch_entry", + .tp_basicsize =3D sizeof(struct pyrf_branch_entry), + .tp_dealloc =3D (destructor)pyrf_branch_entry__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D "perf branch entry object.", + .tp_getset =3D pyrf_branch_entry__getset, +}; + +struct pyrf_branch_stack { + PyObject_HEAD + struct branch_entry *entries; + u64 nr; +}; + +static void pyrf_branch_stack__delete(struct pyrf_branch_stack *pstack) +{ + free(pstack->entries); + Py_TYPE(pstack)->tp_free((PyObject *)pstack); +} + +static Py_ssize_t pyrf_branch_stack__length(PyObject *obj) +{ + struct pyrf_branch_stack *pstack =3D (void *)obj; + + return pstack->nr; +} + +static PyObject *pyrf_branch_stack__item(PyObject *obj, Py_ssize_t i) +{ + struct pyrf_branch_stack *pstack =3D (void *)obj; + struct pyrf_branch_entry *pentry; + + if (i < 0 || i >=3D (Py_ssize_t)pstack->nr) { + PyErr_SetString(PyExc_IndexError, "Index out of range"); + return NULL; + } + + pentry =3D PyObject_New(struct pyrf_branch_entry, &pyrf_branch_entry__typ= e); + if (!pentry) + return NULL; + + pentry->from =3D pstack->entries[i].from; + pentry->to =3D pstack->entries[i].to; + pentry->flags =3D pstack->entries[i].flags; + + return (PyObject *)pentry; +} + +static PySequenceMethods pyrf_branch_stack__sequence_methods =3D { + .sq_length =3D pyrf_branch_stack__length, + .sq_item =3D pyrf_branch_stack__item, +}; + +static PyTypeObject pyrf_branch_stack__type =3D { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name =3D "perf.branch_stack", + .tp_basicsize =3D sizeof(struct pyrf_branch_stack), + .tp_dealloc =3D (destructor)pyrf_branch_stack__delete, + .tp_flags =3D Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc =3D "perf branch stack object.", + .tp_as_sequence =3D &pyrf_branch_stack__sequence_methods, +}; + +static PyObject *pyrf_sample_event__get_brstack(PyObject *self, void *clos= ure __maybe_unused) +{ + struct pyrf_event *pevent =3D (void *)self; + + if (!pevent->brstack) + Py_RETURN_NONE; + + Py_INCREF(pevent->brstack); + return pevent->brstack; +} + static PyObject* pyrf_sample_event__getattro(struct pyrf_event *pevent, PyObject *attr_name) { @@ -1017,6 +1169,12 @@ static PyGetSetDef pyrf_sample_event__getset[] =3D { .set =3D NULL, .doc =3D "event callchain.", }, + { + .name =3D "brstack", + .get =3D pyrf_sample_event__get_brstack, + .set =3D NULL, + .doc =3D "event branch stack.", + }, { .name =3D "raw_buf", .get =3D (getter)pyrf_sample_event__get_raw_buf, @@ -1198,6 +1356,12 @@ static int pyrf_event__setup_types(void) err =3D PyType_Ready(&pyrf_callchain__type); if (err < 0) goto out; + err =3D PyType_Ready(&pyrf_branch_entry__type); + if (err < 0) + goto out; + err =3D PyType_Ready(&pyrf_branch_stack__type); + if (err < 0) + goto out; out: return err; } @@ -1271,6 +1435,7 @@ static PyObject *pyrf_event__new(const union perf_eve= nt *event, struct evsel *ev =20 perf_sample__init(&pevent->sample, /*all=3D*/true); pevent->callchain =3D NULL; + pevent->brstack =3D NULL; pevent->al_resolved =3D false; addr_location__init(&pevent->al); =20 @@ -1328,6 +1493,27 @@ static PyObject *pyrf_event__new(const union perf_ev= ent *event, struct evsel *ev addr_location__exit(&al); } } + if (sample->branch_stack) { + struct branch_stack *bs =3D sample->branch_stack; + struct branch_entry *entries =3D perf_sample__branch_entries(sample); + struct pyrf_branch_stack *pstack; + + pstack =3D PyObject_New(struct pyrf_branch_stack, &pyrf_branch_stack__ty= pe); + if (!pstack) { + Py_DECREF(pevent); + return NULL; + } + pstack->nr =3D bs->nr; + pstack->entries =3D calloc(bs->nr, sizeof(struct branch_entry)); + if (!pstack->entries) { + Py_DECREF(pstack); + Py_DECREF(pevent); + return PyErr_NoMemory(); + } + memcpy(pstack->entries, entries, + bs->nr * sizeof(struct branch_entry)); + pevent->brstack =3D (PyObject *)pstack; + } return (PyObject *)pevent; } =20 @@ -3884,6 +4070,18 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_session__type); PyModule_AddObject(module, "session", (PyObject *)&pyrf_session__type); =20 + Py_INCREF(&pyrf_branch_entry__type); + if (PyModule_AddObject(module, "branch_entry", (PyObject *)&pyrf_branch_e= ntry__type) < 0) { + Py_DECREF(&pyrf_branch_entry__type); + goto error; + } + + Py_INCREF(&pyrf_branch_stack__type); + if (PyModule_AddObject(module, "branch_stack", (PyObject *)&pyrf_branch_s= tack__type) < 0) { + Py_DECREF(&pyrf_branch_stack__type); + goto error; + } + dict =3D PyModule_GetDict(module); if (dict =3D=3D NULL) goto error; --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABFAA4D9904 for ; Fri, 5 Jun 2026 19:15:53 +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=1780686967; cv=none; b=dGNgETKn2den7TdaPpJ+rjAsQOYz+dsfnyUGR1HKcn9ZC7I4/y7vDayj0vZrEgihhHjz2oCgD1LZX85jpEcr5bOAsAH9iRq57pNGa099cpmc1pzCs3BqKR7ODPaRyXbYhfKhBuycvL2fdaS1jEAQwDjm4ihiSOlcFpt3RfEBuZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686967; c=relaxed/simple; bh=LvH7XaZ13QCjz/HSLWRezOA6nF11nDquatU+ITVlmO4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZFAU0ec0GLff8P2TUjn+L6U+9iU7yZUPVZLiXrHsODJb9KBjILw4fiFYoNR4NOXK+sRQ9LaWqDp6xO7YXpQrKRXoCzkaoCWtFINvlgGC7OwWvhePlrCMazhV/VqivuVLlQH09dK3Z5YV2L2OEH/LN+WClg0gY8eoGIrmLef1QUM= 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=XTbd3Be9; 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="XTbd3Be9" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-307625ee07fso4287719eec.1 for ; Fri, 05 Jun 2026 12:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686953; x=1781291753; 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=IsvRcLx17k/Op5bsqmRrLW9Bjhn9K64oYOXZ18feBi4=; b=XTbd3Be9z8CAEqWtkgbbA9gepF6Faj1OFzw3xw6TGMDNF8KbSQJshOUHVGT/sFDWoS u9VJeKMOzxHB88tiNMlOCdRrVl+LcYihP8M4tBpWk+r7ruHRjYF+0XQhwzuxUbhbbm5v B+qCi7bfx9r7a+yJF+qWarryhGQCETL7BHFyE/Ra40RyoRpfEjHrzCxabwouHpch/4kC oXkBJpNNh+8NNO2TmMuH3em8fA7VvubmXqHpc5qNInZnrJbWztmcX9KDncPY3NT63L73 CecCIU4imWBu2gLCQ1edabHo6ObV/HiBK42Vpo0VKKdsK/BKz4s8G7+UIL05Ld1iAE1v DRkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686953; x=1781291753; 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=IsvRcLx17k/Op5bsqmRrLW9Bjhn9K64oYOXZ18feBi4=; b=CJgCzvgJI68DpINo7uPjIlybvYU3wxOT/1QN4yowcxUG6Hg3S249lOv4v7Py7l6Xdf 2uItzb4wm3DD13ELMU7h/QXJpoXJRKrL1+7IcYL168hzcgsrZ3ibyIqkoxf/n2UlBbXG weicTGxABKKiHB13tPUzZLxillD/VVzrX5JMlfTfukXC9jmQx+Yx2rBNt8yGvB110tvG T9BmfuJBgoli7fyCvGEcFoB2HFlBHaLKIZQtM4H7gMtngEQszNbqFUgxVqQNd54uSEOk KGHoAUR/bue+sAIJ89RNZnrbSIqN8jEagEPwTNsu2yrjdv6jzeZrv3rkYxc6SbeNR3hJ wXUQ== X-Forwarded-Encrypted: i=1; AFNElJ8/zlQhZKJdvrnlV9J/IgwM5XSjwmwowMH835I3VYS5xokIOQzXEKK7G2JNeofaauqbgkUwzhK7oibpMss=@vger.kernel.org X-Gm-Message-State: AOJu0Yxc8iN45I/1/TxsHy/31qKVKM0Z6dCuWxKgqv2MUiB3JvqpbJkV T2/iYNrIKc0wGhmgKOU2Xc+OsFfrOHP8pkLC+HmO/JlJlJ7+Z/DQfmq2jbTIM9rd3UEq3SQF/od TiydJDbnoHA== X-Received: from dybrh10.prod.google.com ([2002:a05:7300:f00a:b0:304:e34e:e1e1]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:3b06:b0:2dd:6937:79b8 with SMTP id 5a478bee46e88-3077ae6f714mr2591891eec.5.1780686952305; Fri, 05 Jun 2026 12:15:52 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:57 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-17-irogers@google.com> Subject: [PATCH v11 16/19] perf python: Add syscall name/id to convert syscall number and name From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use perf's syscalltbl support to convert syscall number to name assuming the number is for the host machine. This avoids python libaudit support as tools/perf/scripts/python/syscall-counts.py requires. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Guarded with HAVE_LIBTRACEEVENT : Wrapped the syscall functions and their entries in perf__methods with #ifdef HAVE_LIBTRACEEVENT to avoid potential linker errors if CONFIG_TRACE is disabled. 2. Changed Exception Type: Updated pyrf__syscall_id to raise a ValueError instead of a TypeError when a syscall is not found. 3. Fixed Typo: Corrected "name number" to "name" in the docstring for syscall_id. v6: - Added optional keyword-only `elf_machine` argument to `syscall_name` and `syscall_id`. v7: - Made syscalltbl.o unconditional in Build to fix undefined symbol when building without libtraceevent. --- tools/perf/util/Build | 1 - tools/perf/util/python.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index b22cdc24082a..cb180dd77222 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -75,7 +75,6 @@ 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-y +=3D ordered-events.o perf-util-y +=3D namespaces.o perf-util-y +=3D comm.o diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index eabc71c1f9a2..b4baf8cd79fa 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -21,6 +21,7 @@ #include "data.h" #include "debug.h" #include "dso.h" +#include "dwarf-regs.h" #include "event.h" #include "branch.h" #include "evlist.h" @@ -40,6 +41,7 @@ #include "symbol.h" #include "stat.h" #include "header.h" +#include "trace/beauty/syscalltbl.h" #include "thread.h" #include "thread_map.h" #include "tool.h" @@ -3938,6 +3940,40 @@ static int pyrf_session__setup_types(void) return PyType_Ready(&pyrf_session__type); } =20 +static PyObject *pyrf__syscall_name(PyObject *self, PyObject *args, PyObje= ct *kwargs) +{ + const char *name; + int id; + int elf_machine =3D EM_HOST; + static char *kwlist[] =3D { "id", "elf_machine", NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|$i", kwlist, &id, &elf_= machine)) + return NULL; + + name =3D syscalltbl__name(elf_machine, id); + if (!name) + Py_RETURN_NONE; + return PyUnicode_FromString(name); +} + +static PyObject *pyrf__syscall_id(PyObject *self, PyObject *args, PyObject= *kwargs) +{ + const char *name; + int id; + int elf_machine =3D EM_HOST; + static char *kwlist[] =3D { "name", "elf_machine", NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|$i", kwlist, &name, &el= f_machine)) + return NULL; + + id =3D syscalltbl__id(elf_machine, name); + if (id < 0) { + PyErr_Format(PyExc_ValueError, "Failed to find syscall %s", name); + return NULL; + } + return PyLong_FromLong(id); +} + static PyMethodDef perf__methods[] =3D { { .ml_name =3D "metrics", @@ -3971,6 +4007,18 @@ static PyMethodDef perf__methods[] =3D { .ml_flags =3D METH_NOARGS, .ml_doc =3D PyDoc_STR("Returns a sequence of pmus.") }, + { + .ml_name =3D "syscall_name", + .ml_meth =3D (PyCFunction) pyrf__syscall_name, + .ml_flags =3D METH_VARARGS | METH_KEYWORDS, + .ml_doc =3D PyDoc_STR("Turns a syscall number to a string.") + }, + { + .ml_name =3D "syscall_id", + .ml_meth =3D (PyCFunction) pyrf__syscall_id, + .ml_flags =3D METH_VARARGS | METH_KEYWORDS, + .ml_doc =3D PyDoc_STR("Turns a syscall name to a number.") + }, { .ml_name =3D NULL, } }; =20 --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BFF74DBD65 for ; Fri, 5 Jun 2026 19:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686968; cv=none; b=nB4WHGst91w+SPpyGYc9gJ2GzGOENJrE+xw2VjcxzlIoDX0gYRzC7/Y00vQTnFibz2D2dy90LwEcEfrNVaoso21dyJHfjo7H6e8qGa75kwkdyIUzQ6XAylyTVw93ag/2oodWWWJj4w0kAip1RWMbGX8jhHg+SFhUAipIxwZ1RDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686968; c=relaxed/simple; bh=w1yd/z/XYQTt1hNHEuwcWfzBc4hmAKD5qco5ebYNU1E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N84txVnHogHB5VqU7LMUdwBsGaQPSKbU4IOSVPU6MJefMOQu+P3Lg8EeTmDr/qZhD05fy3e4rDugoN2aOyaO/8YXqlyM1zKzPbtJnVu0d+liOuoAeGLzp2ZLQ4JDXXhRm/CIeTiwJRECskQAc8epUGU3cfRxH3gqFSzv4VK9iak= 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=cB14jhyU; 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="cB14jhyU" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-3074d4102a9so3403892eec.0 for ; Fri, 05 Jun 2026 12:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686955; x=1781291755; 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=RC28M9mEcLkVFlz0oF4GWnFHeX+me0A8/p355m7Vpm0=; b=cB14jhyUP6BmfVkwGm/4Ucq86BoxXQJUyv/sJTnHLDdWUgKQLb8f7bmVZpn1r3DKnk RYydI+3wPTeB4jHJqtWTS0Npq6jQKJUhiY3esMTpa152ETiSzvdPQpG41xRoKMQWl+Hy 7ogtVsmI3/1/QbEZJLoS28UTXIEiatnhopF8ZKIEgsXyURi/saT6vVH+O2NRu7a5WB5t OD+NxY1PqSr/GVHLadwOaCo/z3zNQf0AScQqwCFi2cu9aBm+/BZ3UIn0EXh49sf06T/Q QveQODMMp0x40wNDdIKYLZSEaIUWaMLM1Ui1zHU7P+2VOUPj6RpdcPEM0yQQq5W0W1wl Z3Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686955; x=1781291755; 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=RC28M9mEcLkVFlz0oF4GWnFHeX+me0A8/p355m7Vpm0=; b=UYrYT1J2pRnn2I6USYvx788tw6ilhXsRmvZWttLKHOT5z2ei1SxcveYhGfhH0SC6TL G9rXg/HvWDVZIY54W8aSjd3KUi4faDVrRVz8IjfSb9XdKHn5+Obk6WJpmGD0qz74mHT7 6nRTG0hdvWFlykNHvWRMa4XrBYRuquvkbW+nRmtaLT8pa0pakOLIzuuV97AvwVciYtvh vmDrLW1Dtvrp9PchXmxA0cN9K+5OXkPGhY31dunN9FwJkcQ/X4GvabnBNU1R9PzXnXk9 88YJuQ7JFWzmLbNB5MwzpcmpnlSUPhxAuAXhiZpXH1I/+Aue+X2wiU9skpyCgyaVyBrh Qx0Q== X-Forwarded-Encrypted: i=1; AFNElJ+SjPgfAXg+OfW98aT6zwGxswjYYDqjH7Tffkk3SmAdjDjiYZP9hOufYTe67bSPKAmN4YLwaMeY07ejd8g=@vger.kernel.org X-Gm-Message-State: AOJu0Yzt91XRmU+PfAlmOUK7o1AsVLKNQSMYVV5BM8dllpxtzb1oJyLM kiXMV/BXueYBRdv/WJNK9uta6F9kX28GHfvn5QOmcvTmH6dB65owB3mk3XXSbfbt9FSBozM3a7+ 7DsjB0Fdp1g== X-Received: from dybhh11.prod.google.com ([2002:a05:7301:290b:b0:2f7:767f:edba]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:231a:b0:304:8366:9fb6 with SMTP id 5a478bee46e88-3077ae70f45mr2827804eec.2.1780686954925; Fri, 05 Jun 2026 12:15:54 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:58 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-18-irogers@google.com> Subject: [PATCH v11 17/19] perf python: Add config file access From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add perf.config_get(name) to expose the perf configuration system. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/util/python.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index b4baf8cd79fa..8f476ad5c99a 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -17,6 +17,7 @@ #include "build-id.h" #include "callchain.h" #include "comm.h" +#include "config.h" #include "counts.h" #include "data.h" #include "debug.h" @@ -3974,7 +3975,26 @@ static PyObject *pyrf__syscall_id(PyObject *self, Py= Object *args, PyObject *kwar return PyLong_FromLong(id); } =20 +static PyObject *pyrf__config_get(PyObject *self, PyObject *args) +{ + const char *config_name, *val; + + if (!PyArg_ParseTuple(args, "s", &config_name)) + return NULL; + + val =3D perf_config_get(config_name); + if (!val) + Py_RETURN_NONE; + return PyUnicode_FromString(val); +} + static PyMethodDef perf__methods[] =3D { + { + .ml_name =3D "config_get", + .ml_meth =3D (PyCFunction) pyrf__config_get, + .ml_flags =3D METH_VARARGS, + .ml_doc =3D PyDoc_STR("Get a perf config value.") + }, { .ml_name =3D "metrics", .ml_meth =3D (PyCFunction) pyrf__metrics, --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37F614266A5 for ; Fri, 5 Jun 2026 19:15: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=1780686975; cv=none; b=bejix0nSxb0XHejtfu4I9MxYPI70oA2mMOfsdaYa/hsul7J7GS5LY1tgTG6aywShXbPDMdrWktrOuZyeRmVmC5sko1y3Zfg/01g8nxmmDeb4cXhgPcXgteMzvjdDKyMl1SZanZU1umHHNuIQbCvoHCJW3Vt6baTgmvqaQGVApbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686975; c=relaxed/simple; bh=CZK1v6W7SLWQqrCff6Xp8jg8eqsJkZXvkf+sCRzhpeo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=S4uff54PTkYBHL07ssJN2su0ZipSckrXbzV7F+YGlidLYv15HV34PD7QqAjHQf7OGY3I2Wvz/ubIJPbilOfSVOZevsjP0aZWMsATXJLNb6NWXSfEAwz5ubz1g959e8lfAtMzogc8gsKsmOquwOFiEV2VPDJi+ib90k8MvKec0RA= 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=v+pZdHY4; 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="v+pZdHY4" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-304df51ff3eso1975754eec.0 for ; Fri, 05 Jun 2026 12:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686958; x=1781291758; 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=xqRZZHd+N9BDWV3UkJPCG/EV5fad9KPM1CqIp2s1Tkw=; b=v+pZdHY4LSLS908aifT/pYGs8kEvNm9CssKHkqkAVX3Jh9DbUjSU0BgXp7iWWmS2bi wJFB6+dfnMxhhieSfEAyLg8s2EfjnyVH8X1bL8R+ocKK0xqhnUCrAKKNq/WI8eeg4KXu 41+NK9gi3mSk4c8IIJWQLl1O7pf7zlvQQsvC9371wAtYil4vsbQano8w29OCbu4waGLD VCkRV5tuYSIoO/vw34Ru7J0h2eubbVeFInao4JryLnhyPkrICMIvPaL5ilUu9VqbvSEl N0OyZtAZy6gbD461BE8jf0Mw1hooHR1yvQor0uj17a2TsA2ujkA70X7/HMSP0dprW1IM lCkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686958; x=1781291758; 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=xqRZZHd+N9BDWV3UkJPCG/EV5fad9KPM1CqIp2s1Tkw=; b=ahaRMg9IJmX/MlzA+5ovjWqBwhdJO4DUhGQjAZP8Yi51FyfLRLQEZQ+4jgzxVC84XV 1QYzS+SWTbSNewBksZYIsFTZrGEkERrokjDlBFvDpUT/tf/0v7LOSaPmLvkOugZN/YYn MUYQanPTPZxzW8z/PPKfRP3uVPIIgm/JyfLXZSNxLlgt/usbX0mOhrBBvgOkHCc31DiJ alkHeHVvvfgqO3c375hDqYMGHLbZp0CrhkOlig7f4BMvTkWV/+S4sI8jp5OWDGqv7AyL DXy/OYjPLHxFRisVGExpTVqP+epgp8Y5vcEb2WYr6Fv2oZswR2bKE3LD+NQErC9E6i4O xgtQ== X-Forwarded-Encrypted: i=1; AFNElJ/YBLgrI5G+ShsdLl2GhiW7Jk5rm4Pm/wch1c6TtoZ/NEQHjlMAgcsLgRqZ4LcXSPFL6Z47t9slJspsmXw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9CVnbnQQh180oEGoGef4MZi2oXFYTzUu6kr6d40XcKIB6Vxyd ltCtQGaVsDG+eeZa9nZu+cmmOwLCrzRAaxoCzecAxrv73Rf+8peQfMGBNf2y4kZXJrFrKo3KTlW WRRCX/Wo/kQ== X-Received: from dlak21.prod.google.com ([2002:a05:701b:2915:b0:138:1ff:e092]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:45a6:b0:12c:44a5:fb4f with SMTP id a92af1059eb24-138066d0553mr2093561c88.10.1780686957553; Fri, 05 Jun 2026 12:15:57 -0700 (PDT) Date: Fri, 5 Jun 2026 12:14:59 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-19-irogers@google.com> Subject: [PATCH v11 18/19] perf python: Add perf.pyi stubs file From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add Python type stubs for the perf module to improve IDE support and static analysis. Includes docstrings for classes, methods, and constants derived from C source and JSON definitions. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Added Missing Module Functions: Added parse_metrics and pmus. Renamed metrics to parse_metrics to match python.c . 2. Added Constructors: Added __init__ methods for data , evsel , and evlist with their appropriate arguments. 3. Removed sample_comm : Removed it from sample_event since it is not exported in python.c . 4. Keyword Handling in branch_entry : I used from_ip and to_ip in the stubs to match the rename I did in python.c (in turn 145) to avoid the Python from keyword conflict. 5. Added Missing Event Classes: Added mmap_event , lost_event , comm_event , task_event , throttle_event , read_event , and switch_event . 6. Added Missing evlist Methods: Added get_pollfd and add . 7. Updated Return Types: Changed process_events to return int . v6: - Updated `perf.pyi` to use `find_thread` and `elf_machine`. v8: - Added mmap2_event class and new evsel attributes to perf.pyi. - Added pid, tid, ppid, cpu attributes to class thread in perf.pyi. --- tools/perf/Makefile.perf | 5 +- tools/perf/python/perf.pyi | 629 +++++++++++++++++++++++++++++++++++++ tools/perf/util/setup.py | 5 + 3 files changed, 638 insertions(+), 1 deletion(-) create mode 100644 tools/perf/python/perf.pyi diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ab661a1d271c..c7a390d2e7bf 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -527,7 +527,10 @@ $(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): util/p= ython.c util/setup.py $(PE CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS_PY)' \ $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ - cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ + cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/; \ + if [ "$(abspath python/perf.pyi)" !=3D "$(abspath $(OUTPUT)python/perf.py= i)" ]; then \ + cp python/perf.pyi $(OUTPUT)python/; \ + fi =20 python_perf_target: @echo "Target is: $(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX)" diff --git a/tools/perf/python/perf.pyi b/tools/perf/python/perf.pyi new file mode 100644 index 000000000000..9b00ab5f71d9 --- /dev/null +++ b/tools/perf/python/perf.pyi @@ -0,0 +1,629 @@ +"""Type stubs for the perf Python module.""" +from typing import Callable, Dict, List, Optional, Any, Iterator + +def config_get(name: str) -> Optional[str]: + """Get a configuration value from perf config. + + Args: + name: The configuration variable name (e.g., 'colors.top'). + + Returns: + The configuration value as a string, or None if not set. + """ + ... + +def metrics() -> List[Dict[str, str]]: + """Get a list of available metrics. + + Returns: + A list of dictionaries, each describing a metric. + """ + ... + +def syscall_name(sc_id: int, *, elf_machine: Optional[int] =3D None) -> st= r: + """Convert a syscall number to its name. + + Args: + sc_id: The syscall number. + elf_machine: Optional ELF machine type. + + Returns: + The name of the syscall. + """ + ... + +def syscall_id(name: str, *, elf_machine: Optional[int] =3D None) -> int: + """Convert a syscall name to its number. + + Args: + name: The syscall name. + elf_machine: Optional ELF machine type. + + Returns: + The number of the syscall. + """ + ... + +def parse_events( + event_string: str, + cpus: Optional[cpu_map] =3D None, + threads: Optional[Any] =3D None +) -> 'evlist': + """Parse an event string and return an evlist. + + Args: + event_string: The event string (e.g., 'cycles,instructions'). + cpus: Optional CPU map to bind events to. + threads: Optional thread map to bind events to. + + Returns: + An evlist containing the parsed events. + """ + ... + +def parse_metrics( + metrics_string: str, + pmu: Optional[str] =3D None, + cpus: Optional[cpu_map] =3D None, + threads: Optional[Any] =3D None +) -> 'evlist': + """Parse a string of metrics or metric groups and return an evlist.""" + ... + +def tracepoint(sys: str, name: str) -> int: + """Returns the tracepoint ID for a given system and name.""" + ... + +def pmus() -> Iterator[Any]: + """Returns a sequence of pmus.""" + ... + +class data: + """Represents a perf data file.""" + def __init__(self, path: str =3D ..., fd: int =3D ...) -> None: ... + +class thread: + """Represents a thread in the system.""" + def comm(self) -> str: + """Get the command name of the thread.""" + ... + pid: int + tid: int + ppid: int + cpu: int + +class counts_values: + """Raw counter values.""" + val: int + ena: int + run: int + +class thread_map: + """Map of threads being monitored.""" + def __init__(self, pid: int =3D -1, tid: int =3D -1) -> None: + """Initialize a thread map. + + Args: + pid: Process ID to monitor (-1 for all). + tid: Thread ID to monitor (-1 for all). + """ + ... + def __len__(self) -> int: ... + def __getitem__(self, index: int) -> int: ... + def __iter__(self) -> Iterator[int]: ... + +class evsel: + """Event selector, represents a single event being monitored.""" + def __init__( + self, + type: int =3D ..., + config: int =3D ..., + sample_freq: int =3D ..., + sample_period: int =3D ..., + sample_type: int =3D ..., + read_format: int =3D ..., + disabled: bool =3D ..., + inherit: bool =3D ..., + pinned: bool =3D ..., + exclusive: bool =3D ..., + exclude_user: bool =3D ..., + exclude_kernel: bool =3D ..., + exclude_hv: bool =3D ..., + exclude_idle: bool =3D ..., + mmap: bool =3D ..., + context_switch: bool =3D ..., + comm: bool =3D ..., + freq: bool =3D ..., + inherit_stat: bool =3D ..., + enable_on_exec: bool =3D ..., + task: bool =3D ..., + watermark: int =3D ..., + precise_ip: int =3D ..., + mmap_data: bool =3D ..., + sample_id_all: bool =3D ..., + wakeup_events: int =3D ..., + bp_type: int =3D ..., + bp_addr: int =3D ..., + bp_len: int =3D ..., + ) -> None: ... + def __str__(self) -> str: + """Return string representation of the event.""" + ... + def open(self) -> None: + """Open the event selector file descriptor table.""" + ... + def read(self, cpu: int, thread: int) -> counts_values: + """Read counter values for a specific CPU and thread.""" + ... + ids: List[int] + def cpus(self) -> cpu_map: + """Get CPU map for this event.""" + ... + def threads(self) -> thread_map: + """Get thread map for this event.""" + ... + tracking: bool + config: int + read_format: int + sample_period: int + sample_type: int + size: int + type: int + wakeup_events: int + + +class sample_event: + """Represents a sample event from perf.""" + evsel: evsel + sample_cpu: int + sample_time: int + sample_pid: int + type: int + brstack: Optional['branch_stack'] + callchain: Optional['callchain'] + def __getattr__(self, name: str) -> Any: ... + +class mmap_event: + """Represents a mmap event from perf.""" + type: int + pid: int + tid: int + addr: int + len: int + pgoff: int + filename: str + +class mmap2_event: + """Represents a mmap2 event from perf.""" + type: int + pid: int + tid: int + start: int + len: int + pgoff: int + prot: int + flags: int + filename: str + maj: Optional[int] + min: Optional[int] + ino: Optional[int] + ino_generation: Optional[int] + build_id: Optional[bytes] + +class lost_event: + """Represents a lost events record.""" + type: int + id: int + lost: int + +class comm_event: + """Represents a COMM record.""" + type: int + pid: int + tid: int + comm: str + +class task_event: + """Represents an EXIT or FORK record.""" + type: int + pid: int + ppid: int + tid: int + ptid: int + time: int + +class throttle_event: + """Represents a THROTTLE or UNTHROTTLE record.""" + type: int + time: int + id: int + stream_id: int + +class read_event: + """Represents a READ record.""" + type: int + pid: int + tid: int + value: int + +class switch_event: + """Represents a SWITCH or SWITCH_CPU_WIDE record.""" + type: int + +class branch_entry: + """Represents a branch entry in the branch stack. + + Attributes: + from_ip: Source address of the branch (corresponds to 'from' keywo= rd in C). + to_ip: Destination address of the branch. + mispred: True if the branch was mispredicted. + predicted: True if the branch was predicted. + in_tx: True if the branch was in a transaction. + abort: True if the branch was an abort. + cycles: Number of cycles since the last branch. + type: Type of branch. + """ + from_ip: int + to_ip: int + mispred: bool + predicted: bool + in_tx: bool + abort: bool + cycles: int + type: int + +class branch_stack: + """Iterator over branch entries in the branch stack.""" + def __iter__(self) -> Iterator[branch_entry]: ... + def __next__(self) -> branch_entry: ... + +class callchain_node: + """Represents a frame in the callchain.""" + ip: int + sym: Optional[Any] + map: Optional[Any] + +class callchain: + """Iterator over callchain frames.""" + def __iter__(self) -> Iterator[callchain_node]: ... + def __next__(self) -> callchain_node: ... + +class stat_event: + """Represents a stat event from perf.""" + type: int + id: int + cpu: int + thread: int + val: int + ena: int + run: int + +class stat_round_event: + """Represents a stat round event from perf.""" + type: int + time: int + +class cpu_map: + """Map of CPUs being monitored.""" + def __init__(self, cpustr: Optional[str] =3D None) -> None: ... + def __len__(self) -> int: ... + def __getitem__(self, index: int) -> int: ... + def __iter__(self) -> Iterator[int]: ... + + +class evlist: + def __init__(self, cpus: cpu_map, threads: thread_map) -> None: ... + def open(self) -> None: + """Open the events in the list.""" + ... + def close(self) -> None: + """Close the events in the list.""" + ... + def mmap(self) -> None: + """Memory map the event buffers.""" + ... + def poll(self, timeout: int) -> int: + """Poll for events. + + Args: + timeout: Timeout in milliseconds. + + Returns: + Number of events ready. + """ + ... + def read_on_cpu(self, cpu: int) -> Optional[sample_event]: + """Read a sample event from a specific CPU. + + Args: + cpu: The CPU number. + + Returns: + A sample_event if available, or None. + """ + ... + def all_cpus(self) -> cpu_map: + """Get a cpu_map of all CPUs in the system.""" + ... + def metrics(self) -> List[str]: + """Get a list of metric names within the evlist.""" + ... + def compute_metric(self, metric: str, cpu: int, thread: int) -> float: + """Compute metric for given name, cpu and thread. + + Args: + metric: The metric name. + cpu: The CPU number. + thread: The thread ID. + + Returns: + The computed metric value. + """ + ... + def config(self) -> None: + """Configure the events in the list.""" + ... + def disable(self) -> None: + """Disable all events in the list.""" + ... + def enable(self) -> None: + """Enable all events in the list.""" + ... + def get_pollfd(self) -> List[int]: + """Get a list of file descriptors for polling.""" + ... + def add(self, evsel: evsel) -> int: + """Add an event to the list.""" + ... + def __iter__(self) -> Iterator[evsel]: + """Iterate over the events (evsel) in the list.""" + ... + + +class session: + def __init__( + self, + data: data, + sample: Optional[Callable[[sample_event], None]] =3D None, + stat: Optional[Callable[[Any, Optional[str]], None]] =3D None + ) -> None: + """Initialize a perf session. + + Args: + data: The perf data file to read. + sample: Callback for sample events. + stat: Callback for stat events. + """ + ... + def process_events(self) -> int: + """Process all events in the session.""" + ... + def find_thread(self, pid: int) -> thread: + """Returns the thread associated with a pid.""" + ... + +# Event Types +TYPE_HARDWARE: int +"""Hardware event.""" + +TYPE_SOFTWARE: int +"""Software event.""" + +TYPE_TRACEPOINT: int +"""Tracepoint event.""" + +TYPE_HW_CACHE: int +"""Hardware cache event.""" + +TYPE_RAW: int +"""Raw hardware event.""" + +TYPE_BREAKPOINT: int +"""Breakpoint event.""" + + +# Hardware Counters +COUNT_HW_CPU_CYCLES: int +"""Total cycles. Be wary of what happens during CPU frequency scaling.""" + +COUNT_HW_INSTRUCTIONS: int +"""Retired instructions. Be careful, these can be affected by various issu= es, +most notably hardware interrupt counts.""" + +COUNT_HW_CACHE_REFERENCES: int +"""Cache accesses. Usually this indicates Last Level Cache accesses but th= is +may vary depending on your CPU.""" + +COUNT_HW_CACHE_MISSES: int +"""Cache misses. Usually this indicates Last Level Cache misses.""" + +COUNT_HW_BRANCH_INSTRUCTIONS: int +"""Retired branch instructions.""" + +COUNT_HW_BRANCH_MISSES: int +"""Mispredicted branch instructions.""" + +COUNT_HW_BUS_CYCLES: int +"""Bus cycles, which can be different from total cycles.""" + +COUNT_HW_STALLED_CYCLES_FRONTEND: int +"""Stalled cycles during issue [This event is an alias of idle-cycles-fron= tend].""" + +COUNT_HW_STALLED_CYCLES_BACKEND: int +"""Stalled cycles during retirement [This event is an alias of idle-cycles= -backend].""" + +COUNT_HW_REF_CPU_CYCLES: int +"""Total cycles; not affected by CPU frequency scaling.""" + + +# Cache Counters +COUNT_HW_CACHE_L1D: int +"""Level 1 data cache.""" + +COUNT_HW_CACHE_L1I: int +"""Level 1 instruction cache.""" + +COUNT_HW_CACHE_LL: int +"""Last Level Cache.""" + +COUNT_HW_CACHE_DTLB: int +"""Data TLB.""" + +COUNT_HW_CACHE_ITLB: int +"""Instruction TLB.""" + +COUNT_HW_CACHE_BPU: int +"""Branch Processing Unit.""" + +COUNT_HW_CACHE_OP_READ: int +"""Read accesses.""" + +COUNT_HW_CACHE_OP_WRITE: int +"""Write accesses.""" + +COUNT_HW_CACHE_OP_PREFETCH: int +"""Prefetch accesses.""" + +COUNT_HW_CACHE_RESULT_ACCESS: int +"""Accesses.""" + +COUNT_HW_CACHE_RESULT_MISS: int +"""Misses.""" + + +# Software Counters +COUNT_SW_CPU_CLOCK: int +"""CPU clock event.""" + +COUNT_SW_TASK_CLOCK: int +"""Task clock event.""" + +COUNT_SW_PAGE_FAULTS: int +"""Page faults.""" + +COUNT_SW_CONTEXT_SWITCHES: int +"""Context switches.""" + +COUNT_SW_CPU_MIGRATIONS: int +"""CPU migrations.""" + +COUNT_SW_PAGE_FAULTS_MIN: int +"""Minor page faults.""" + +COUNT_SW_PAGE_FAULTS_MAJ: int +"""Major page faults.""" + +COUNT_SW_ALIGNMENT_FAULTS: int +"""Alignment faults.""" + +COUNT_SW_EMULATION_FAULTS: int +"""Emulation faults.""" + +COUNT_SW_DUMMY: int +"""Dummy event.""" + + +# Sample Fields +SAMPLE_IP: int +"""Instruction pointer.""" + +SAMPLE_TID: int +"""Process and thread ID.""" + +SAMPLE_TIME: int +"""Timestamp.""" + +SAMPLE_ADDR: int +"""Sampled address.""" + +SAMPLE_READ: int +"""Read barcode.""" + +SAMPLE_CALLCHAIN: int +"""Call chain.""" + +SAMPLE_ID: int +"""Unique ID.""" + +SAMPLE_CPU: int +"""CPU number.""" + +SAMPLE_PERIOD: int +"""Sample period.""" + +SAMPLE_STREAM_ID: int +"""Stream ID.""" + +SAMPLE_RAW: int +"""Raw sample.""" + + +# Format Fields +FORMAT_TOTAL_TIME_ENABLED: int +"""Total time enabled.""" + +FORMAT_TOTAL_TIME_RUNNING: int +"""Total time running.""" + +FORMAT_ID: int +"""Event ID.""" + +FORMAT_GROUP: int +"""Event group.""" + + +# Record Types +RECORD_MMAP: int +"""MMAP record. Contains header, pid, tid, addr, len, pgoff, filename, and= sample_id.""" + +RECORD_LOST: int +"""Lost events record. Contains header, id, lost count, and sample_id.""" + +RECORD_COMM: int +"""COMM record. Contains header, pid, tid, comm, and sample_id.""" + +RECORD_EXIT: int +"""EXIT record. Contains header, pid, ppid, tid, ptid, time, and sample_id= .""" + +RECORD_THROTTLE: int +"""THROTTLE record. Contains header, time, id, stream_id, and sample_id.""" + +RECORD_UNTHROTTLE: int +"""UNTHROTTLE record. Contains header, time, id, stream_id, and sample_id.= """ + +RECORD_FORK: int +"""FORK record. Contains header, pid, ppid, tid, ptid, time, and sample_id= .""" + +RECORD_READ: int +"""READ record. Contains header, and read values.""" + +RECORD_SAMPLE: int +"""SAMPLE record. Contains header, and sample data requested by sample_typ= e.""" + +RECORD_MMAP2: int +"""MMAP2 record. Contains header, pid, tid, addr, len, pgoff, maj, min, in= o, +ino_generation, prot, flags, filename, and sample_id.""" + +RECORD_AUX: int +"""AUX record. Contains header, aux_offset, aux_size, flags, and sample_id= .""" + +RECORD_ITRACE_START: int +"""ITRACE_START record. Contains header, pid, tid, and sample_id.""" + +RECORD_LOST_SAMPLES: int +"""LOST_SAMPLES record. Contains header, lost count, and sample_id.""" + +RECORD_SWITCH: int +"""SWITCH record. Contains header, and sample_id.""" + +RECORD_SWITCH_CPU_WIDE: int +"""SWITCH_CPU_WIDE record. Contains header, and sample_id.""" + +RECORD_STAT: int +"""STAT record.""" + +RECORD_STAT_ROUND: int +"""STAT_ROUND record.""" + +RECORD_MISC_SWITCH_OUT: int +"""MISC_SWITCH_OUT record.""" diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index b65b1792ca05..16da198ad9f5 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -2,6 +2,7 @@ from os import getenv, path from subprocess import Popen, PIPE from re import sub import shlex +import shutil =20 cc =3D getenv("CC") assert cc, "Environment variable CC not set" @@ -73,6 +74,10 @@ class install_lib(_install_lib): _install_lib.finalize_options(self) self.build_dir =3D build_lib =20 + def run(self): + _install_lib.run(self) + shutil.copy2(f'{src_perf}/python/perf.pyi', self.install_dir) + =20 cflags =3D getenv('CFLAGS', '').split() # switch off several checks (need to be at the end of cflags list) --=20 2.54.0.1032.g2f8565e1d1-goog From nobody Mon Jun 8 06:36:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4B064EA389 for ; Fri, 5 Jun 2026 19:16:02 +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=1780686976; cv=none; b=Kl5/skx798J5Yvcf3Ax4U3HwiDG0gf2U3qK1VkiQLlrkJz42H42Yk84Liy7XjL2xDgVxVFUn9nX08ktojdjv1VnwMRgodw8VKzNZ0/o4aOdTTKJVfi9irMQi/spXqe+QXHYCUTCzFksY4X/E1yHM0Spl+p6NrfhQjZb2VzIDqHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780686976; c=relaxed/simple; bh=IPh+nyUkYSRCWIGS0Fz1sDF9upp1szY+E7vo4qbe9Bs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Mz7XEYrle1WRJf9DKqpnE0is+cLnopRg51ZyKW0W0d0xiTMM4y13S/8nRjJiLSpTylk6XSvTJi0d6xdc+dKVo3+XPZutt8PMT7Pfd/bDbo7zHsoYr1fqwFoCeQCrkILBAsh5BYYbgjnHBoI2Ju3NgXaAY+ynaKj1xdkGVTQdIdg= 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=A5R9LZhC; 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="A5R9LZhC" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-137f304f564so5200122c88.0 for ; Fri, 05 Jun 2026 12:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780686961; x=1781291761; 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=zWY32EDP6sbioAoYarFf13G0pdUMEK6C8OqjOpzfwMs=; b=A5R9LZhCfmWAj7XOAKhZwanX00OjwR85Y58yWQ0t6YYtuzXLCkW5CQQJJbenqP3ecB Z+c8WazOd3FH+y62Y1DrNYw2NsldAMcPWwyYD88LIjVmZ45ojQ5sM1P1adzKTs/R5PWr Do0x2e/hpFahmVTjhZMQ48wssTEVYct8OnXZ0que5umN0NY7te76/Xn6OC2rhiYNDcIw D82yZI/gw59PWLBgbSFRChYM1Y2KOWLctSnYuWpz6XtqAPLROscKdP1NJTxh1Voo9eds vg4Bou7708SaYhDnJi72wOy9Dvj4eyEp9BDZcqkbbES/RxUFvpIs1D6KfaViz1eKB3fv 2f0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780686961; x=1781291761; 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=zWY32EDP6sbioAoYarFf13G0pdUMEK6C8OqjOpzfwMs=; b=XqvUXZI0m/96s9bdATGtKZYE5vtSSS5q1DqW/7p8cQ3i0SIjoQhYkQORLwW3iGteGH WawYpCF2CrIO2ovmyknIbwi2QeMwkV54WQ62nWdwotst4Vp9tpIF+mwjDxmNeffOtDYs lt4cX0LODbdid6JxGxP3qryUdhRN2DzrupvYsqPT/Ye74tDBLUsYnuMRjoysdai88Cny 1rsVoOl9RcNQv15VJIKA/fcrAtVxG+J4eo8pTvI21XLkgE4EXMkdBLmGX79I/fPXMNXU wdrNjYtDoTrIjK19yLxvC7GhD4g3BQ09Dmr1AxyUQfxoaMQoJQh89rQjciokjK3HkMxp mTww== X-Forwarded-Encrypted: i=1; AFNElJ9oJ2sNn4WcRDqqlgj6iACi67ZTt5A3qGbkZNRj6VIiW4KzZvu3m4cakUxjNDGjTQDIEG594dmvXyw9f+I=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6bzglmMo5zzAVjiZXihfd5EyChKAZAe/1x9Cbw8T5CXsFtE4C z4hv8NMeLEip0ucOx1QkJevqOajluPDIzCtMg0LNhZp1nHU0HGgfCjacY9X9hIHkO7foG4+Golz qMYv8xK5xYg== X-Received: from dlbrh9.prod.google.com ([2002:a05:7022:f309:b0:137:ee95:320c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:211:b0:136:602b:80ac with SMTP id a92af1059eb24-138067158e2mr2096920c88.27.1780686961113; Fri, 05 Jun 2026 12:16:01 -0700 (PDT) Date: Fri, 5 Jun 2026 12:15:00 -0700 In-Reply-To: <20260605191500.2477026-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: <20260605074003.1730715-1-irogers@google.com> <20260605191500.2477026-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1032.g2f8565e1d1-goog Message-ID: <20260605191500.2477026-20-irogers@google.com> Subject: [PATCH v11 19/19] perf python: Add LiveSession helper From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add LiveSession class in tools/perf/python/perf_live.py to support live event collection using perf.evlist and perf.parse_events, avoiding the need to fork a separate perf record process. Signed-off-by: Ian Rogers Assisted-by: Gemini:gemini-3.1-pro-preview --- v2: 1. Fixed File Descriptor Leak: I moved self.evlist.mmap() inside the try block so that if it raises an exception, the finally block will still be executed and call self.evlist.close() , preventing file descriptor leaks. 2. Handled InterruptedError in poll() : I wrapped the poll() call in a try-except block to catch InterruptedError and continue the loop. This prevents the live session from crashing on non-fatal signals like SIGWINCH . 3. Added evlist.config() : I added a call to self.evlist.config() in the constructor after parse_events() . This applies the default record options to the events, enabling sampling and setting up PERF_SAMPLE_* fields so that the kernel will actually generate PERF_RECORD_SAMPLE events. 4. Enable the evlist and be robust to exceptions from reading unsupported events like mmap2. v8: - Drain all events from a CPU before moving to the next. --- tools/perf/python/perf_live.py | 60 ++++++++++++++++++++++ tools/perf/tests/shell/lib/setup_python.sh | 12 +++++ 2 files changed, 72 insertions(+) create mode 100755 tools/perf/python/perf_live.py diff --git a/tools/perf/python/perf_live.py b/tools/perf/python/perf_live.py new file mode 100755 index 000000000000..10fb974879ca --- /dev/null +++ b/tools/perf/python/perf_live.py @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: GPL-2.0 +""" +Live event session helper using perf.evlist. + +This module provides a LiveSession class that allows running a callback +for each event collected live from the system, similar to perf.session +but without requiring a perf.data file. +""" + +import perf + + +class LiveSession: + """Represents a live event collection session.""" + + def __init__(self, event_string: str, sample_callback): + self.event_string =3D event_string + self.sample_callback =3D sample_callback + # Create a cpu map for all online CPUs + self.cpus =3D perf.cpu_map() + # Parse events and set maps + self.evlist =3D perf.parse_events(self.event_string, self.cpus) + self.evlist.config() + + def run(self): + """Run the live session.""" + try: + self.evlist.open() + self.evlist.mmap() + self.evlist.enable() + + while True: + # Poll for events with 100ms timeout + try: + self.evlist.poll(100) + except InterruptedError: + continue + for cpu in self.cpus: + for _ in range(1000): # Limit to 1000 events per CPU p= er poll to prevent starvation + try: + event =3D self.evlist.read_on_cpu(cpu) + except TypeError: + # CPU might be unmapped or offline + break + except OSError as e: + # Ignore -EAGAIN on empty buffer + if "err=3D-11" in str(e): + break + # OS/mmap errors are unrecoverable + raise e + + if event is None: + break + + if event.type =3D=3D perf.RECORD_SAMPLE: + self.sample_callback(event) + except KeyboardInterrupt: + pass + finally: + self.evlist.close() diff --git a/tools/perf/tests/shell/lib/setup_python.sh b/tools/perf/tests/= shell/lib/setup_python.sh index a58e5536f2ed..86c523207c09 100644 --- a/tools/perf/tests/shell/lib/setup_python.sh +++ b/tools/perf/tests/shell/lib/setup_python.sh @@ -14,3 +14,15 @@ then echo Skipping test, python not detected please set environment variable = PYTHON. exit 2 fi + +# Set PYTHONPATH to find the in-tree built perf.so first, avoiding system-= wide perf.so +if [ "x$PYTHONPATH" =3D "x" ]; then + # If PERF_EXEC_PATH is set (pointing to the build directory), prioritize= it + if [ -n "$PERF_EXEC_PATH" ] && [ -d "$PERF_EXEC_PATH/python" ]; then + export PYTHONPATH=3D"$PERF_EXEC_PATH/python" + elif [ -d "$(dirname "$0")/../../python" ]; then + export PYTHONPATH=3D"$(dirname "$0")/../../python" + elif [ -d "$(dirname "$0")/../python" ]; then + export PYTHONPATH=3D"$(dirname "$0")/../python" + fi +fi --=20 2.54.0.1032.g2f8565e1d1-goog