perf: Reorganize scripting support
Subsystems (4)
Ian Rogers
reviewerPATCH v4 12/58 perf evlist: Add reference count checking
In reply to Ian RogersNow 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.
---
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 = evlist; to entry->evlist = 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.
--- 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 | 6 +- tools/perf/bench/evlist-open-close.c | 11 +- tools/perf/builtin-annotate.c | 2 +- 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-record.c | 91 ++--- tools/perf/builtin-report.c | 6 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 13 +- tools/perf/builtin-stat.c | 71 ++-- 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 | 38 +- 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/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 | 8 +- 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/evlist.c | 386 ++++++++++++-------- tools/perf/util/evlist.h | 251 ++++++++++++- tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 39 +- tools/perf/util/header.h | 2 +- tools/perf/util/intel-tpebs.c | 7 +- tools/perf/util/metricgroup.c | 6 +- tools/perf/util/parse-events.c | 6 +- tools/perf/util/pfm.c | 2 +- tools/perf/util/python.c | 30 +- tools/perf/util/record.c | 9 +- tools/perf/util/sample-raw.c | 4 +- tools/perf/util/session.c | 56 +-- 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 +- 79 files changed, 1004 insertions(+), 689 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +5 -5
@@ -201,7 +201,7 @@ static int cs_etm_validate_config(struct perf_pmu *cs_etm_pmu, {unsigned int idx;int err =0 ; -struct perf_cpu_map *event_cpus = evsel->evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evsel->evlist)->user_requested_cpus;struct perf_cpu_map *intersect_cpus;struct perf_cpu cpu;
@@ -325,7 +325,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;struct evsel *evsel, *cs_etm_evsel =NULL ; -struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );int err =0 ;
@@ -551,7 +551,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr, {unsigned int idx;int etmv3 =0 , etmv4 =0 , ete =0 ; -struct perf_cpu_map *event_cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evlist)->user_requested_cpus;struct perf_cpu_map *intersect_cpus;struct perf_cpu cpu;struct perf_pmu *cs_etm_pmu =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 = session->evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (session->evlist)->user_requested_cpus;struct perf_cpu_map *online_cpus =perf_cpu_map__new_online_cpus ();struct cs_etm_recording *ptr = 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 !=cs_etm_info_priv_size (itr, session->evlist))return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ;/* If the cpu_map has the "any" CPU all online CPUs are involved */
tools/perf/arch/arm64/util/arm-spe.c +4 -4
@@ -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 = evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evlist)->user_requested_cpus;struct perf_cpu_map *online_cpus =perf_cpu_map__new_online_cpus ();struct perf_cpu_map *intersect_cpus;
@@ -157,7 +157,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr,if (priv_size !=arm_spe_info_priv_size (itr, session->evlist))return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; cpu_map =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 = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;/* Add dummy event to keep tracking */ err =parse_event (evlist,"dummy:u" );
@@ -396,7 +396,7 @@ static int arm_spe_recording_options(struct auxtrace_record *itr,struct arm_spe_recording *sper = container_of(itr, struct arm_spe_recording, itr);struct evsel *evsel, *tmp; -struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool discard = false;int err;u64 discard_bit;
tools/perf/arch/arm64/util/hisi-ptt.c +1 -1
@@ -53,7 +53,7 @@ static int hisi_ptt_info_fill(struct auxtrace_record *itr,if (priv_size !=HISI_PTT_AUXTRACE_PRIV_SIZE )return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; auxtrace_info->type =PERF_AUXTRACE_HISI_PTT ;
tools/perf/arch/x86/tests/hybrid.c +10 -10
@@ -26,7 +26,7 @@ static int test__hybrid_hw_event_with_pmu(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -38,7 +38,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -57,7 +57,7 @@ static int test__hybrid_sw_hw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));
@@ -74,7 +74,7 @@ static int test__hybrid_hw_sw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -91,7 +91,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -113,7 +113,7 @@ static int test__hybrid_raw1(struct evlist *evlist) {struct perf_evsel *evsel; -perf_evlist__for_each_evsel (&evlist->core, evsel) { +perf_evlist__for_each_evsel (evlist__core (evlist), evsel) {struct perf_pmu *pmu =perf_pmus__find_by_type (evsel->attr.type);TEST_ASSERT_VAL ("missing pmu" , pmu);
@@ -127,7 +127,7 @@ static int test__hybrid_raw2(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == 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 *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HW_CACHE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,0x2 == (evsel->core.attr.config &0xffffffff ));return TEST_OK ;
@@ -148,7 +148,7 @@ static int test__checkevent_pmu(struct evlist *evlist)struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,10 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong config1" ,1 == evsel->core.attr.config1);
@@ -168,7 +168,7 @@ static int test__hybrid_hw_group_event_2(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
tools/perf/arch/x86/util/auxtrace.c +1 -1
@@ -55,7 +55,7 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist, int *err) {char buffer[64 ]; -struct perf_cpu cpu =perf_cpu_map__min (evlist->core.all_cpus); +struct perf_cpu cpu =perf_cpu_map__min (evlist__core (evlist)->all_cpus);int ret; *err =0 ;
tools/perf/arch/x86/util/intel-bts.c +3 -3
@@ -79,10 +79,10 @@ static int intel_bts_info_fill(struct auxtrace_record *itr,if (priv_size !=INTEL_BTS_AUXTRACE_PRIV_SIZE )return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; - pc = session->evlist->mmap[0 ].core.base; + pc =evlist__mmap (session->evlist)[0 ].core.base;if (pc) { err =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 = btsr->intel_bts_pmu;struct evsel *evsel, *intel_bts_evsel =NULL ; -const struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +const struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );if (opts->auxtrace_sample_mode) {
tools/perf/arch/x86/util/intel-pt.c +5 -4
@@ -360,10 +360,10 @@ static int intel_pt_info_fill(struct auxtrace_record *itr, filter =intel_pt_find_filter (session->evlist, ptr->intel_pt_pmu); filter_str_len = filter ?strlen (filter) :0 ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; - pc = session->evlist->mmap[0 ].core.base; + pc =evlist__mmap (session->evlist)[0 ].core.base;if (pc) { err =perf_read_tsc_conversion (pc, &tc);if (err) {
@@ -376,7 +376,8 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,ui__warning ("Intel Processor Trace: TSC not available\n" ); } - per_cpu_mmaps = !perf_cpu_map__is_any_cpu_or_is_empty (session->evlist->core.user_requested_cpus); + per_cpu_mmaps = !perf_cpu_map__is_any_cpu_or_is_empty ( +evlist__core (session->evlist)->user_requested_cpus); auxtrace_info->type =PERF_AUXTRACE_INTEL_PT ; auxtrace_info->priv[INTEL_PT_PMU_TYPE ] = intel_pt_pmu->type;
@@ -621,7 +622,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;bool have_timing_info, need_immediate = false;struct evsel *evsel, *intel_pt_evsel =NULL ; -const struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +const struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );u64 tsc_bit;int err;
tools/perf/arch/x86/util/iostat.c +3 -3
@@ -334,7 +334,7 @@ static int iostat_event_group(struct evlist *evl,int iostat_prepare (struct evlist *evlist,struct perf_stat_config *config) { -if (evlist->core.nr_entries >0 ) { +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);
@@ -400,7 +400,7 @@ void iostat_prefix(struct evlist *evlist,struct perf_stat_config *config, char *prefix, struct timespec *ts) { - struct iio_root_port *rp = evlist->selected->priv; + struct iio_root_port *rp = evlist__selected(evlist)->priv;if (rp) {/*
@@ -463,7 +463,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 = evlist->selected->priv; + perf_device =evlist__selected (evlist)->priv;if (perf_device && perf_device != counter->priv) {evlist__set_selected (evlist, counter);iostat_prefix (evlist, config, prefix, ts);
tools/perf/bench/evlist-open-close.c +6 -5
@@ -116,7 +116,7 @@ static int bench__do_evlist_open_close(struct evlist *evlist)return err; } - err =evlist__mmap (evlist, opts.mmap_pages); + err =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 *evlist)evlist__enable (evlist);evlist__disable (evlist); -evlist__munmap (evlist); +evlist__do_munmap (evlist);evlist__close (evlist);return 0 ;
@@ -145,10 +145,11 @@ static int bench_evlist_open_close__run(char *evstr, const char *uid_str)init_stats (&time_stats); -printf (" Number of cpus:\t%d\n" ,perf_cpu_map__nr (evlist->core.user_requested_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);evlist__put (evlist);
tools/perf/builtin-annotate.c +1 -1
@@ -928,7 +928,7 @@ int cmd_annotate(int argc, const char **argv)*/ if ((use_browser ==1 || annotate.use_stdio2) && annotate.has_br_stack) { sort__mode =SORT_MODE__BRANCH ; -if (annotate.session->evlist->nr_br_cntr >0 ) +if (evlist__nr_br_cntr (annotate.session->evlist) >0 ) annotate_opts.show_br_cntr = true; }
tools/perf/builtin-ftrace.c +3 -3
@@ -377,9 +377,9 @@ static int set_tracing_pid(struct perf_ftrace *ftrace)if (target__has_cpu (&ftrace->target))return 0 ; -for (i =0 ; i <perf_thread_map__nr (ftrace->evlist->core.threads); i++) { +for (i =0 ; i <perf_thread_map__nr (evlist__core (ftrace->evlist)->threads); 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 *cpumap)static int set_tracing_cpu (struct perf_ftrace *ftrace) { -struct perf_cpu_map *cpumap = ftrace->evlist->core.user_requested_cpus; +struct perf_cpu_map *cpumap =evlist__core (ftrace->evlist)->user_requested_cpus;if (!target__has_cpu (&ftrace->target))return 0 ;
tools/perf/builtin-inject.c +2 -2
@@ -1427,7 +1427,7 @@ static int synthesize_id_index(struct perf_inject *inject, size_t new_cnt)struct perf_session *session = inject->session;struct evlist *evlist = session->evlist;struct machine *machine = &session->machines.host; -size_t from = evlist->core.nr_entries - new_cnt; +size_t from =evlist__nr_entries (evlist) - new_cnt;return __perf_event__synthesize_id_index (&inject->tool, perf_event__repipe, evlist, machine, from);
@@ -1962,7 +1962,7 @@ static int host__finished_init(const struct perf_tool *tool, struct perf_sessionif (ret)return ret; - ret =synthesize_id_index (inject, gs->session->evlist->core.nr_entries); + ret =synthesize_id_index (inject,evlist__nr_entries (gs->session->evlist));if (ret) {pr_err ("Failed to synthesize id_index\n" );return ret;
tools/perf/builtin-kvm.c +5 -5
@@ -1222,7 +1222,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,int err; *mmap_time =ULLONG_MAX ; - md = &evlist->mmap[idx]; + md = &evlist__mmap (evlist)[idx]; err =perf_mmap__read_init (&md->core);if (err <0 )return (err == -EAGAIN ) ?0 :-1 ;
@@ -1267,7 +1267,7 @@ static int perf_kvm__mmap_read(struct perf_kvm_stat *kvm)s64 n, ntotal =0 ;u64 flush_time =ULLONG_MAX , mmap_time; -for (i =0 ; i < kvm->evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (kvm->evlist)->nr_mmaps; i++) { n =perf_kvm__mmap_read_idx (kvm, i, &mmap_time);if (n <0 )return -1 ;
@@ -1450,7 +1450,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)evlist__enable (kvm->evlist);while (!done) { -struct fdarray *fda = &kvm->evlist->core.pollfd; +struct fdarray *fda = &evlist__core (kvm->evlist)->pollfd;int rc; rc =perf_kvm__mmap_read (kvm);
@@ -1532,7 +1532,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) goto out; } -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);
@@ -1932,7 +1932,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.target, - kvm->evlist->core.threads, true, false,1 ); +evlist__core (kvm->evlist)->threads, true, false,1 ); err =kvm_live_open_events (kvm);if (err) goto out;
tools/perf/builtin-kwork.c +4 -4
@@ -1776,7 +1776,7 @@ static int perf_kwork__check_config(struct perf_kwork *kwork, } } -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 =0 ;
@@ -1826,9 +1826,9 @@ static int perf_kwork__read_events(struct perf_kwork *kwork) goto out_delete; } - kwork->nr_events = session->evlist->stats.nr_events[0 ]; - kwork->nr_lost_events = session->evlist->stats.total_lost; - kwork->nr_lost_chunks = session->evlist->stats.nr_events[PERF_RECORD_LOST ]; + kwork->nr_events =evlist__stats (session->evlist)->nr_events[0 ]; + kwork->nr_lost_events =evlist__stats (session->evlist)->total_lost; + kwork->nr_lost_chunks =evlist__stats (session->evlist)->nr_events[PERF_RECORD_LOST ]; out_delete:perf_session__delete (session);
tools/perf/builtin-record.c +46 -45
268 lines not on this page · raw message
tools/perf/builtin-report.c +3 -3
@@ -561,7 +561,7 @@ static int evlist__tty_browse_hists(struct evlist *evlist, struct report *rep, cif (!quiet) {fprintf (stdout,"#\n# Total Lost Samples: %" PRIu64"\n#\n" , - evlist->stats.total_lost_samples); +evlist__stats (evlist)->total_lost_samples); }evlist__for_each_entry (evlist, pos) {
@@ -1155,7 +1155,7 @@ static int __cmd_report(struct report *rep) PERF_HPP_REPORT__BLOCK_AVG_CYCLES, }; -if (session->evlist->nr_br_cntr >0 ) +if (evlist__nr_br_cntr (session->evlist) >0 ) block_hpps[nr_hpps++] =PERF_HPP_REPORT__BLOCK_BRANCH_COUNTER ; block_hpps[nr_hpps++] =PERF_HPP_REPORT__BLOCK_RANGE ;
@@ -1290,7 +1290,7 @@ static int process_attr(const struct perf_tool *tool __maybe_unused,* on events sample_type. */ sample_type =evlist__combined_sample_type (*pevlist); - session = (*pevlist)->session; + session =evlist__session (*pevlist);callchain_param_setup (sample_type,perf_session__e_machine (session,/*e_flags=*/ NULL ));return 0 ; }
tools/perf/builtin-sched.c +10 -10
@@ -1951,9 +1951,9 @@ static int perf_sched__read_events(struct perf_sched *sched) goto out_delete; } - sched->nr_events = session->evlist->stats.nr_events[0 ]; - sched->nr_lost_events = session->evlist->stats.total_lost; - sched->nr_lost_chunks = session->evlist->stats.nr_events[PERF_RECORD_LOST ]; + sched->nr_events =evlist__stats (session->evlist)->nr_events[0 ]; + sched->nr_lost_events =evlist__stats (session->evlist)->total_lost; + sched->nr_lost_chunks =evlist__stats (session->evlist)->nr_events[PERF_RECORD_LOST ]; } rc =0 ;
@@ -3211,7 +3211,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->core.entries, core.node) { +list_for_each_entry (evsel, &evlist__core (evlist)->entries, core.node) { er =evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
@@ -3382,9 +3382,9 @@ static int perf_sched__timehist(struct perf_sched *sched) goto out; } - sched->nr_events = evlist->stats.nr_events[0 ]; - sched->nr_lost_events = evlist->stats.total_lost; - sched->nr_lost_chunks = evlist->stats.nr_events[PERF_RECORD_LOST ]; + sched->nr_events =evlist__stats (evlist)->nr_events[0 ]; + sched->nr_lost_events =evlist__stats (evlist)->total_lost; + sched->nr_lost_chunks =evlist__stats (evlist)->nr_events[PERF_RECORD_LOST ];if (sched->summary)timehist_print_summary (sched, session);
@@ -3887,7 +3887,7 @@ static int perf_sched__schedstat_record(struct perf_sched *sched,if (err <0 ) goto out; - user_requested_cpus = evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (evlist)->user_requested_cpus; err = perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_schedstat_event,
@@ -4509,7 +4509,7 @@ static int perf_sched__schedstat_report(struct perf_sched *sched)if (err <0 ) goto out; - user_requested_cpus = session->evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (session->evlist)->user_requested_cpus; err =perf_session__process_events (session);
@@ -4675,7 +4675,7 @@ static int perf_sched__schedstat_live(struct perf_sched *sched,if (err <0 ) goto out; - user_requested_cpus = evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (evlist)->user_requested_cpus; err = perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_event_live,
tools/perf/builtin-script.c +7 -6
@@ -2224,9 +2224,10 @@ static int script_find_metrics(const struct pmu_metric *pm,evlist__for_each_entry (metric_evlist, metric_evsel) {struct evsel *script_evsel =map_metric_evsel_to_script_evsel (script_evlist, metric_evsel); -struct metric_event *metric_me =metricgroup__lookup (&metric_evlist->metric_events, - metric_evsel, -/*create=*/ false); +struct metric_event *metric_me = +metricgroup__lookup (evlist__metric_events (metric_evlist), + metric_evsel, +/*create=*/ false);if (script_evsel->metric_id ==NULL ) { script_evsel->metric_id = metric_evsel->metric_id;
@@ -2246,7 +2247,7 @@ static int script_find_metrics(const struct pmu_metric *pm,if (metric_me) {struct metric_expr *expr;struct metric_event *script_me = -metricgroup__lookup (&script_evlist->metric_events, +metricgroup__lookup (evlist__metric_events (script_evlist), script_evsel,/*create=*/ true);
@@ -2316,7 +2317,7 @@ static void perf_sample__fprint_metric(struct thread *thread,assert (stat_config.aggr_mode ==AGGR_GLOBAL ); stat_config.aggr_get_id = script_aggr_cpu_id_get; stat_config.aggr_map = -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=*/ NULL ,/*needs_sort=*/ false); }
@@ -3898,7 +3899,7 @@ static int set_maps(struct perf_script *script)if (WARN_ONCE (script->allocated,"stats double allocation\n" ))return -EINVAL ; -perf_evlist__set_maps (&evlist->core, script->cpus, script->threads); +perf_evlist__set_maps (evlist__core (evlist), script->cpus, script->threads);if (evlist__alloc_stats (&stat_config, evlist,/*alloc_raw=*/ true))return -ENOMEM ;
tools/perf/builtin-stat.c +38 -33
198 lines not on this page · raw message
tools/perf/builtin-top.c +26 -26
175 lines not on this page · raw message
tools/perf/builtin-trace.c +11 -11
@@ -2008,7 +2008,7 @@ static int trace__symbols_init(struct trace *trace, int argc, const char **argv, goto out; err = __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=*/callchain_param.enabled && !trace->summary_only, /*mmap_data=*/false,
@@ -4165,7 +4165,7 @@ static int trace__set_filter_pids(struct trace *trace) err =augmented_syscalls__set_filter_pids (trace->filter_pids.nr, trace->filter_pids.entries); } - }else if (perf_thread_map__pid (trace->evlist->core.threads,0 ) ==-1 ) { + }else if (perf_thread_map__pid (evlist__core (trace->evlist)->threads,0 ) ==-1 ) { err =trace__set_filter_loop_pids (trace); }
@@ -4479,7 +4479,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 = evlist->workload.pid; + workload_pid =evlist__workload_pid (evlist); } err =evlist__open (evlist);
@@ -4531,7 +4531,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_error_apply_filters;if (!trace->summary_only || !trace->summary_bpf) { - err =evlist__mmap (evlist, trace->opts.mmap_pages); + err =evlist__do_mmap (evlist, trace->opts.mmap_pages);if (err <0 ) goto out_error_mmap; }
@@ -4550,8 +4550,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (trace->summary_bpf)trace_start_bpf_summary (); - trace->multiple_threads =perf_thread_map__pid (evlist->core.threads,0 ) ==-1 || -perf_thread_map__nr (evlist->core.threads) >1 || + trace->multiple_threads =perf_thread_map__pid (evlist__core (evlist)->threads,0 ) ==-1 || +perf_thread_map__nr (evlist__core (evlist)->threads) >1 ||evlist__first (evlist)->core.attr.inherit;/*
@@ -4568,11 +4568,11 @@ static int trace__run(struct trace *trace, int argc, const char **argv) again: before = trace->nr_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -5272,7 +5272,7 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u {struct trace *trace = opt->value; -if (!list_empty (&trace->evlist->core.entries)) { +if (!list_empty (&evlist__core (trace->evlist)->entries)) {struct option o = { .value = &trace->evlist, };
@@ -5545,7 +5545,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 ==0 /* Was --events used? */ ) { +evlist__nr_entries (trace.evlist) ==0 /* Was --events used? */ ) { trace.trace_syscalls = true; }/*
@@ -5628,7 +5628,7 @@ int cmd_trace(int argc, const char **argv) symbol_conf.use_callchain = true; } -if (trace.evlist->core.nr_entries >0 ) { +if (evlist__nr_entries (trace.evlist) >0 ) {bool use_btf = false;evlist__set_default_evsel_handler (trace.evlist, trace__event_handler);
tools/perf/tests/backward-ring-buffer.c +4 -4
@@ -34,8 +34,8 @@ static int count_samples(struct evlist *evlist, int *sample_count, {int i; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { -struct mmap *map = &evlist->overwrite_mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { +struct mmap *map = &evlist__overwrite_mmap (evlist)[i];union perf_event *event;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 ]; - err =evlist__mmap (evlist, mmap_pages); + err =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); err =count_samples (evlist, sample_count, comm_count); -evlist__munmap (evlist); +evlist__do_munmap (evlist);return err; }
tools/perf/tests/code-reading.c +5 -5
@@ -589,8 +589,8 @@ static int process_events(struct machine *machine, struct evlist *evlist,struct mmap *md;int i, ret; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -778,7 +778,7 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads); str = 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); } -perf_evlist__set_maps (&evlist->core,NULL ,NULL ); +perf_evlist__set_maps (evlist__core (evlist),NULL ,NULL );evlist__put (evlist); evlist =NULL ;continue ;
@@ -817,7 +817,7 @@ static int do_test_code_reading(bool try_kcore)if (events[evidx] ==NULL ) goto out_put; - ret =evlist__mmap (evlist,UINT_MAX ); + ret =evlist__do_mmap (evlist,UINT_MAX );if (ret <0 ) {pr_debug ("evlist__mmap failed\n" ); goto out_put;
tools/perf/tests/event-times.c +1 -1
@@ -50,7 +50,7 @@ static int attach__enable_on_exec(struct evlist *evlist)static int detach__enable_on_exec (struct evlist *evlist) { -waitpid (evlist->workload.pid,NULL ,0 ); +waitpid (evlist__workload_pid (evlist),NULL ,0 );return 0 ; }
tools/perf/tests/event_update.c +1 -1
@@ -92,7 +92,7 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtesTEST_ASSERT_VAL ("failed to allocate ids" , !perf_evsel__alloc_id (&evsel->core,1 ,1 )); -perf_evlist__id_add (&evlist->core, &evsel->core,0 ,0 ,123 ); +perf_evlist__id_add (evlist__core (evlist), &evsel->core,0 ,0 ,123 );free ((char *)evsel->unit); evsel->unit =strdup ("KRAVA" );
tools/perf/tests/expand-cgroup.c +2 -2
@@ -28,7 +28,7 @@ static int test_expand_events(struct evlist *evlist)TEST_ASSERT_VAL ("evlist is empty" , !evlist__empty (evlist)); - nr_events = evlist->core.nr_entries; + nr_events =evlist__nr_entries (evlist); ev_name =calloc (nr_events,sizeof (*ev_name));if (ev_name ==NULL ) {pr_debug ("memory allocation failure\n" );
@@ -54,7 +54,7 @@ static int test_expand_events(struct evlist *evlist) } ret =TEST_FAIL ; -if (evlist->core.nr_entries != nr_events * nr_cgrps) { +if (evlist__nr_entries (evlist) != nr_events * nr_cgrps) {pr_debug ("event count doesn't match\n" ); goto out; }
tools/perf/tests/hwmon_pmu.c +3 -2
@@ -183,9 +183,10 @@ static int do_test(size_t i, bool with_pmu, bool with_alias) } ret =TEST_OK ; -if (with_pmu ? (evlist->core.nr_entries !=1 ) : (evlist->core.nr_entries <1 )) { +if (with_pmu ? (evlist__nr_entries (evlist) !=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 =TEST_FAIL ; goto out; }
tools/perf/tests/keep-tracking.c +4 -4
@@ -37,8 +37,8 @@ static int find_comm(struct evlist *evlist, const char *comm)int i, found; found =0 ; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;while ((event =perf_mmap__read_event (&md->core)) !=NULL ) {
@@ -87,7 +87,7 @@ static int test__keep_tracking(struct test_suite *test __maybe_unused, int subte evlist =evlist__new ();CHECK_NOT_NULL__ (evlist); -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);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; } -CHECK__ (evlist__mmap (evlist,UINT_MAX )); +CHECK__ (evlist__do_mmap (evlist,UINT_MAX ));/* * First, test that a 'comm' event can be found when the event is
tools/perf/tests/mmap-basic.c +3 -3
@@ -81,7 +81,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtest goto out_free_cpus; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);for (i =0 ; i < nsyscalls; ++i) {char name[64 ];
@@ -113,7 +113,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtest expected_nr_events[i] =1 +rand () %127 ; } -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 __maybe_unused, int subtest syscalls[i](); } - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/openat-syscall-tp-fields.c +4 -4
@@ -64,7 +64,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedevsel__config (evsel, &opts,NULL ); -perf_thread_map__set_pid (evlist->core.threads,0 ,getpid ()); +perf_thread_map__set_pid (evlist__core (evlist)->threads,0 ,getpid ()); err =evlist__open (evlist);if (err <0 ) {
@@ -73,7 +73,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unused goto out_put_evlist; } - err =evlist__mmap (evlist,UINT_MAX ); + err =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_suite *test __maybe_unusedwhile (1 ) {int before = nr_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
tools/perf/tests/parse-events.c +70 -65
519 lines not on this page · raw message
tools/perf/tests/parse-metric.c +2 -2
@@ -53,7 +53,7 @@ static double compute_single(struct evlist *evlist, const char *name)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { - me =metricgroup__lookup (&evlist->metric_events, evsel, false); + me =metricgroup__lookup (evlist__metric_events (evlist), evsel, false);if (me !=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 value *vals,return -ENOMEM ; } -perf_evlist__set_maps (&evlist->core, cpus,NULL ); +perf_evlist__set_maps (evlist__core (evlist), cpus,NULL );/* Parse the metric into metric_events list. */ pme_test =find_core_metrics_table ("testarch" ,"testcpu" );
tools/perf/tests/perf-record.c +10 -10
@@ -129,7 +129,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestevsel__set_sample_bit (evsel,TIME );evlist__config (evlist, &opts,NULL ); - err =sched__get_first_possible_cpu (evlist->workload.pid, cpu_mask); + err =sched__get_first_possible_cpu (evlist__workload_pid (evlist), cpu_mask);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_mask) <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 =evlist__mmap (evlist, opts.mmap_pages); + err =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 subtestwhile (1 ) {int before = total_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -231,15 +231,15 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest ++errs; } -if ((pid_t )sample.pid != evlist->workload.pid) { +if ((pid_t )sample.pid !=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; } -if ((pid_t )sample.tid != evlist->workload.pid) { +if ((pid_t )sample.tid !=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; }
@@ -248,7 +248,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest type == PERF_RECORD_MMAP2 || type == PERF_RECORD_FORK || type == PERF_RECORD_EXIT) && - (pid_t)event->comm.pid != evlist->workload.pid) { + (pid_t)event->comm.pid != evlist__workload_pid(evlist)) {pr_debug ("%s with unexpected pid/tid\n" , name); ++errs; }
tools/perf/tests/perf-time-to-tsc.c +5 -5
@@ -99,7 +99,7 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su evlist =evlist__new ();CHECK_NOT_NULL__ (evlist); -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);CHECK__ (parse_event (evlist,"cpu-cycles:u" ));
@@ -121,9 +121,9 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su goto out_err; } -CHECK__ (evlist__mmap (evlist,UINT_MAX )); +CHECK__ (evlist__do_mmap (evlist,UINT_MAX )); - pc = evlist->mmap[0 ].core.base; + pc =evlist__mmap (evlist)[0 ].core.base; ret =perf_read_tsc_conversion (pc, &tc);if (ret) {if (ret == -EOPNOTSUPP ) {
@@ -145,8 +145,8 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int suevlist__disable (evlist); -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
tools/perf/tests/pfm.c +4 -4
@@ -69,12 +69,12 @@ static int test__pfm_events(struct test_suite *test __maybe_unused,if (evlist ==NULL )return -ENOMEM ; - opt.value = evlist; + opt.value = &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 ==NULL )return -ENOMEM ; - opt.value = evlist; + opt.value = &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),
tools/perf/tests/pmu-events.c +3 -2
@@ -848,7 +848,7 @@ static int test__parsing_callback(const struct pmu_metric *pm,return -ENOMEM ; } -perf_evlist__set_maps (&evlist->core, cpus,NULL ); +perf_evlist__set_maps (evlist__core (evlist), cpus,NULL ); err =metricgroup__parse_groups_test (evlist, table, pm->metric_name);if (err) {
@@ -875,7 +875,8 @@ static int test__parsing_callback(const struct pmu_metric *pm, k++; }evlist__for_each_entry (evlist, evsel) { -struct metric_event *me =metricgroup__lookup (&evlist->metric_events, evsel, false); +struct metric_event *me =metricgroup__lookup (evlist__metric_events (evlist), + evsel, false);if (me !=NULL ) {struct metric_expr *mexp;
tools/perf/tests/sample-parsing.c +18 -20
@@ -205,15 +205,11 @@ static bool samples_same(struct perf_sample *s1,static int do_test (u64 sample_type,u64 sample_regs,u64 read_format) { -struct evsel evsel = { - .needs_swap = false, - .core = { - . attr = { - .sample_type = sample_type, - .read_format = read_format, - }, - }, +struct perf_event_attr attr ={ + .sample_type = sample_type, + .read_format = read_format, }; +struct evsel *evsel;union perf_event *event;union {struct ip_callchain callchain;
@@ -287,16 +283,17 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)size_t i, sz, bufsz;int err, ret =-1 ; + evsel =evsel__new (&attr);perf_sample__init (&sample_out,/*all=*/ false);perf_sample__init (&sample_out_endian,/*all=*/ false);if (sample_type &PERF_SAMPLE_REGS_USER ) - evsel.core.attr.sample_regs_user = sample_regs; + evsel->core.attr.sample_regs_user = sample_regs;if (sample_type &PERF_SAMPLE_REGS_INTR ) - evsel.core.attr.sample_regs_intr = sample_regs; + evsel->core.attr.sample_regs_intr = sample_regs;if (sample_type &PERF_SAMPLE_BRANCH_STACK ) - evsel.core.attr.branch_sample_type |=PERF_SAMPLE_BRANCH_HW_INDEX ; + evsel->core.attr.branch_sample_type |=PERF_SAMPLE_BRANCH_HW_INDEX ;for (i =0 ; i <sizeof (regs); i++) *(i + (u8 *)regs) = i &0xfe ;
@@ -311,7 +308,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) } sz =perf_event__sample_event_size (&sample, sample_type, read_format, - evsel.core.attr.branch_sample_type); + evsel->core.attr.branch_sample_type); bufsz = sz +4096 ;/* Add a bit for overrun checking */ event =malloc (bufsz);if (!event) {
@@ -325,7 +322,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) event->header.size = sz; err =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 +340,32 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) goto out_free; } - evsel.sample_size =__evsel__sample_size (sample_type); + evsel->sample_size =__evsel__sample_size (sample_type); - err =evsel__parse_sample (&evsel, event, &sample_out); + err =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; } -if (!samples_same (&sample, &sample_out, sample_type, read_format, evsel.needs_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; }if (sample_type ==PERF_SAMPLE_BRANCH_STACK ) { - evsel.needs_swap = true; - evsel.sample_size =__evsel__sample_size (sample_type); - err =evsel__parse_sample (&evsel, event, &sample_out_endian); + evsel->needs_swap = true; + evsel->sample_size =__evsel__sample_size (sample_type); + err =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; } -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 +377,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 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;
tools/perf/tests/sw-clock.c +3 -3
@@ -71,7 +71,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_put_evlist; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);if (evlist__open (evlist)) {const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ;
@@ -83,7 +83,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_put_evlist; } - err =evlist__mmap (evlist,128 ); + err =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_id)evlist__disable (evlist); - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/switch-tracking.c +4 -4
@@ -279,8 +279,8 @@ static int process_events(struct evlist *evlist,struct mmap *md;int i, ret; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -371,7 +371,7 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub goto out_err; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);/* First event */ err =parse_event (evlist,"cpu-clock:u" );
@@ -468,7 +468,7 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub goto out; } - err =evlist__mmap (evlist,UINT_MAX ); + err =evlist__do_mmap (evlist,UINT_MAX );if (err) {pr_debug ("evlist__mmap failed!\n" ); goto out_err;
tools/perf/tests/task-exit.c +3 -3
@@ -77,7 +77,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ goto out_put_evlist; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads); err =evlist__prepare_workload (evlist, &target, argv, false, workload_exec_failed_signal);if (err <0 ) {
@@ -104,7 +104,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ goto out_put_evlist; } -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 =-1 ;
@@ -114,7 +114,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _evlist__start_workload (evlist); retry: - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/time-utils-test.c +9 -5
@@ -69,16 +69,19 @@ struct test_data {static bool test__perf_time__parse_for_ranges (struct test_data *d) { -struct evlist evlist = { - .first_sample_time = d->first, - .last_sample_time = d->last, - }; -struct perf_session session = { .evlist = &evlist }; +struct evlist *evlist =evlist__new (); +struct perf_session session = { .evlist = evlist };struct perf_time_interval *ptime =NULL ;int range_size, range_num;bool pass = false;int i, err; +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);if (strchr (d->str,'%' ))
@@ -127,6 +130,7 @@ static bool test__perf_time__parse_for_ranges(struct test_data *d) pass = true; out: +evlist__put (evlist);free (ptime);return pass; }
tools/perf/tests/tool_pmu.c +3 -2
@@ -40,9 +40,10 @@ static int do_test(enum tool_pmu_event ev, bool with_pmu) } ret =TEST_OK ; -if (with_pmu ? (evlist->core.nr_entries !=1 ) : (evlist->core.nr_entries <1 )) { +if (with_pmu ? (evlist__nr_entries (evlist) !=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 =TEST_FAIL ; goto out; }
tools/perf/tests/topology.c +1 -1
@@ -45,7 +45,7 @@ static int session_write_header(char *path) session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); - session->evlist->session = session; +evlist__set_session (session->evlist, session);perf_header__set_feat (&session->header,HEADER_CPU_TOPOLOGY );perf_header__set_feat (&session->header,HEADER_NRCPUS );
tools/perf/ui/browsers/annotate.c +1 -1
@@ -594,7 +594,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, notes =symbol__annotation (dl->ops.target.sym);annotation__lock (notes); -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);
tools/perf/ui/browsers/hists.c +11 -11
@@ -688,10 +688,10 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_lui_browser__update_nr_entries (&browser->b, nr_entries);if (warn_lost_event && - (evsel->evlist->stats.nr_lost_warned != - evsel->evlist->stats.nr_events[PERF_RECORD_LOST ])) { - evsel->evlist->stats.nr_lost_warned = - evsel->evlist->stats.nr_events[PERF_RECORD_LOST ]; + (evlist__stats (evsel->evlist)->nr_lost_warned != +evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ])) { +evlist__stats (evsel->evlist)->nr_lost_warned = +evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ];ui_browser__warn_lost_events (&browser->b); }
@@ -3321,7 +3321,7 @@ static int evsel__hists_browse(struct evsel *evsel, int 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 ="Press 'f' to disable the events or 'h' to see other hotkeys" ; hbt->refresh = delay_secs; }else {
@@ -3493,7 +3493,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, unit, unit == ' ' ? "" : " ", ev_name);ui_browser__printf (browser,"%s" , bf); - nr_events = evsel->evlist->stats.nr_events[PERF_RECORD_LOST ]; + nr_events =evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ];if (nr_events !=0 ) { menu->lost_events = 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 == &evlist->core.entries) +if (pos->core.node.next == &evlist__core (evlist)->entries) pos =evlist__first (evlist);else pos =evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->core.node.prev == &evlist->core.entries) +if (pos->core.node.prev == &evlist__core (evlist)->entries) pos =evlist__last (evlist);else pos =evsel__prev (pos);
@@ -3618,7 +3618,7 @@ static int __evlist__tui_browse_hists(struct evlist *evlist, int nr_entries, construct evsel *pos;struct evsel_menu menu = { .b = { - .entries = &evlist->core.entries, + .entries = &evlist__core (evlist)->entries, .refresh = ui_browser__list_head_refresh, .seek = ui_browser__list_head_seek, .write = perf_evsel_menu__write,
@@ -3646,7 +3646,7 @@ static int __evlist__tui_browse_hists(struct evlist *evlist, int nr_entries, constatic bool evlist__single_entry (struct evlist *evlist) { -int nr_entries = evlist->core.nr_entries; +int nr_entries =evlist__nr_entries (evlist);if (nr_entries ==1 )return true;
@@ -3664,7 +3664,7 @@ static bool evlist__single_entry(struct evlist *evlist)int evlist__tui_browse_hists (struct evlist *evlist,const char *help,struct hist_browser_timer *hbt,float min_pcnt,struct perf_env *env,bool warn_lost_event) { -int nr_entries = evlist->core.nr_entries; +int nr_entries =evlist__nr_entries (evlist);if (evlist__single_entry (evlist)) { single_entry: {
tools/perf/util/amd-sample-raw.c +1 -1
@@ -354,7 +354,7 @@ static void parse_cpuid(struct perf_env *env)*/ bool evlist__has_amd_ibs (struct evlist *evlist) { -struct perf_env *env =perf_session__env (evlist->session); +struct perf_env *env =perf_session__env (evlist__session (evlist));int ret, nr_pmu_mappings =perf_env__nr_pmu_mappings (env);const char *pmu_mapping =perf_env__pmu_mappings (env);char name[sizeof ("ibs_fetch" )];
tools/perf/util/annotate-data.c +1 -1
@@ -1822,7 +1822,7 @@ int annotated_data_type__update_samples(struct annotated_data_type *adt,return 0 ;if (adt->histograms ==NULL ) { -int nr = evsel->evlist->core.nr_entries; +int nr =evlist__nr_entries (evsel->evlist);if (alloc_data_type_histograms (adt, nr) <0 )return -1 ;
tools/perf/util/annotate.c +5 -5
@@ -326,7 +326,7 @@ static int symbol__inc_addr_samples(struct map_symbol *ms,if (sym ==NULL )return 0 ; - src =symbol__hists (sym, evsel->evlist->core.nr_entries); + src =symbol__hists (sym,evlist__nr_entries (evsel->evlist));return src ?__symbol__inc_addr_samples (ms, src, evsel, addr, sample) :0 ; }
@@ -337,7 +337,7 @@ static int symbol__account_br_cntr(struct annotated_branch *branch, {unsigned int br_cntr_nr =evsel__leader (evsel)->br_cntr_nr;unsigned int base =evsel__leader (evsel)->br_cntr_idx; -unsigned int off = offset * evsel->evlist->nr_br_cntr; +unsigned int off = offset *evlist__nr_br_cntr (evsel->evlist);u64 *branch_br_cntr = branch->br_cntr;unsigned int i, mask, width;
@@ -367,7 +367,7 @@ static int symbol__account_cycles(u64 addr, u64 start, struct symbol *sym,if (sym ==NULL )return 0 ; - branch =symbol__find_branch_hist (sym, evsel->evlist->nr_br_cntr); + branch =symbol__find_branch_hist (sym,evlist__nr_br_cntr (evsel->evlist));if (!branch)return -ENOMEM ;if (addr < sym->start || addr >= sym->end)
@@ -509,7 +509,7 @@ static void annotation__count_and_fill(struct annotation *notes, u64 start, u64static int annotation__compute_ipc (struct annotation *notes,size_t size,struct evsel *evsel) { -unsigned int br_cntr_nr = evsel->evlist->nr_br_cntr; +unsigned int br_cntr_nr =evlist__nr_br_cntr (evsel->evlist);int err =0 ;s64 offset;
@@ -1813,7 +1813,7 @@ int annotation_br_cntr_abbr_list(char **str, struct evsel *evsel, bool header)struct evsel *pos;struct strbuf sb; -if (evsel->evlist->nr_br_cntr <=0 ) +if (evlist__nr_br_cntr (evsel->evlist) <=0 )return -ENOTSUP ;strbuf_init (&sb,/*hint=*/ 0 );
tools/perf/util/auxtrace.c +7 -7
@@ -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 = !perf_cpu_map__has_any_cpu(evlist->core.user_requested_cpus); + bool per_cpu = !perf_cpu_map__has_any_cpu(evlist__core(evlist)->user_requested_cpus); mp->mmap_needed = evsel->needs_auxtrace_mmap;
@@ -201,11 +201,11 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp, mp->idx = idx;if (per_cpu) { - mp->cpu =perf_cpu_map__cpu (evlist->core.all_cpus, idx); - mp->tid =perf_thread_map__pid (evlist->core.threads,0 ); + mp->cpu =perf_cpu_map__cpu (evlist__core (evlist)->all_cpus, idx); + mp->tid =perf_thread_map__pid (evlist__core (evlist)->threads,0 ); }else { mp->cpu.cpu =-1 ; - mp->tid =perf_thread_map__pid (evlist->core.threads, idx); + mp->tid =perf_thread_map__pid (evlist__core (evlist)->threads, idx); } }
@@ -667,10 +667,10 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,static int evlist__enable_event_idx (struct evlist *evlist,struct evsel *evsel,int idx) { -bool per_cpu_mmaps = !perf_cpu_map__has_any_cpu (evlist->core.user_requested_cpus); +bool per_cpu_mmaps = !perf_cpu_map__has_any_cpu (evlist__core (evlist)->user_requested_cpus);if (per_cpu_mmaps) { -struct perf_cpu evlist_cpu =perf_cpu_map__cpu (evlist->core.all_cpus, idx); +struct perf_cpu evlist_cpu =perf_cpu_map__cpu (evlist__core (evlist)->all_cpus, idx);int cpu_map_idx =perf_cpu_map__idx (evsel->core.cpus, evlist_cpu);if (cpu_map_idx ==-1 )
@@ -1806,7 +1806,7 @@ void perf_session__auxtrace_error_inc(struct perf_session *session,struct perf_record_auxtrace_error *e = &event->auxtrace_error;if (e->type <PERF_AUXTRACE_ERROR_MAX ) - session->evlist->stats.nr_auxtrace_errors[e->type] +=1 ; +evlist__stats (session->evlist)->nr_auxtrace_errors[e->type] +=1 ; }void events_stats__auxtrace_error_warn (const struct events_stats *stats)
tools/perf/util/block-info.c +2 -2
@@ -472,7 +472,7 @@ struct block_report *block_info__create_report(struct evlist *evlist, int *nr_reps) {struct block_report *block_reports; -int nr_hists = evlist->core.nr_entries, i =0 ; +int nr_hists =evlist__nr_entries (evlist), i =0 ;struct evsel *pos; block_reports =calloc (nr_hists,sizeof (struct block_report ));
@@ -483,7 +483,7 @@ struct block_report *block_info__create_report(struct evlist *evlist,struct hists *hists =evsel__hists (pos);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++; }
tools/perf/util/bpf_counter.c +1 -1
@@ -443,7 +443,7 @@ static int bperf_check_target(struct evsel *evsel, }else if (target->tid) { *filter_type =BPERF_FILTER_PID ; *filter_entry_cnt =perf_thread_map__nr (evsel->core.threads); - }else if (target->pid || evsel->evlist->workload.pid !=-1 ) { + }else if (target->pid ||evlist__workload_pid (evsel->evlist) !=-1 ) { *filter_type =BPERF_FILTER_TGID ; *filter_entry_cnt =perf_thread_map__nr (evsel->core.threads); }else {
tools/perf/util/bpf_counter_cgroup.c +4 -4
@@ -111,7 +111,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)); err =bperf_cgroup_bpf__load (skel);if (err) {
@@ -122,12 +122,12 @@ static int bperf_load_program(struct evlist *evlist) err =-1 ; cgrp_switch =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; } -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 =bpf_program__attach_perf_event (skel->progs.on_cgrp_switch,FD (cgrp_switch, i));if (IS_ERR (link)) {
@@ -238,7 +238,7 @@ static int bperf_cgrp__sync_counters(struct evlist *evlist)unsigned int idx;int prog_fd =bpf_program__fd (skel->progs.trigger_read); -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);return 0 ;
tools/perf/util/bpf_ftrace.c +5 -4
@@ -59,13 +59,13 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace)/* don't need to set cpu filter for system-wide mode */ if (ftrace->target.cpu_list) { - ncpus =perf_cpu_map__nr (ftrace->evlist->core.user_requested_cpus); + ncpus =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 =1 ; }if (target__has_task (&ftrace->target) ||target__none (&ftrace->target)) { - ntasks =perf_thread_map__nr (ftrace->evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (ftrace->evlist)->threads);bpf_map__set_max_entries (skel->maps.task_filter, ntasks); skel->rodata->has_task =1 ; }
@@ -87,7 +87,8 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (ftrace->evlist->core.user_requested_cpus, i).cpu; + cpu =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 =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (ftrace->evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (ftrace->evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } }
tools/perf/util/bpf_lock_contention.c +6 -6
@@ -222,11 +222,11 @@ int lock_contention_prepare(struct lock_contention *con)if (target__has_cpu (target)) { skel->rodata->has_cpu =1 ; - ncpus =perf_cpu_map__nr (evlist->core.user_requested_cpus); + ncpus =perf_cpu_map__nr (evlist__core (evlist)->user_requested_cpus); }if (target__has_task (target)) { skel->rodata->has_task =1 ; - ntasks =perf_thread_map__nr (evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (evlist)->threads); }if (con->filters->nr_types) { skel->rodata->has_type =1 ;
@@ -327,7 +327,7 @@ int lock_contention_prepare(struct lock_contention *con) fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (evlist->core.user_requested_cpus, i).cpu; + cpu =perf_cpu_map__cpu (evlist__core (evlist)->user_requested_cpus, i).cpu;bpf_map_update_elem (fd, &cpu, &val,BPF_ANY ); } }
@@ -339,13 +339,13 @@ int lock_contention_prepare(struct lock_contention *con) fd =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } } -if (target__none (target) && evlist->workload.pid >0 ) { -u32 pid = evlist->workload.pid; +if (target__none (target) &&evlist__workload_pid (evlist) >0 ) { +u32 pid =evlist__workload_pid (evlist);u8 val =1 ; fd =bpf_map__fd (skel->maps.task_filter);
tools/perf/util/bpf_off_cpu.c +7 -7
@@ -73,13 +73,13 @@ static void off_cpu_start(void *arg)/* update task filter for the given workload */ if (skel->rodata->has_task && skel->rodata->uses_tgid && -perf_thread_map__pid (evlist->core.threads,0 ) !=-1 ) { +perf_thread_map__pid (evlist__core (evlist)->threads,0 ) !=-1 ) {int fd;u32 pid;u8 val =1 ; fd =bpf_map__fd (skel->maps.task_filter); - pid =perf_thread_map__pid (evlist->core.threads,0 ); + pid =perf_thread_map__pid (evlist__core (evlist)->threads,0 );bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); }
@@ -168,7 +168,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target,/* don't need to set cpu filter for system-wide mode */ if (target->cpu_list) { - ncpus =perf_cpu_map__nr (evlist->core.user_requested_cpus); + ncpus =perf_cpu_map__nr (evlist__core (evlist)->user_requested_cpus);bpf_map__set_max_entries (skel->maps.cpu_filter, ncpus); skel->rodata->has_cpu =1 ; }
@@ -199,7 +199,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, skel->rodata->has_task =1 ; skel->rodata->uses_tgid =1 ; }else if (target__has_task (target)) { - ntasks =perf_thread_map__nr (evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (evlist)->threads);bpf_map__set_max_entries (skel->maps.task_filter, ntasks); skel->rodata->has_task =1 ; }else if (target__none (target)) {
@@ -209,7 +209,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, }if (evlist__first (evlist)->cgrp) { - ncgrps = evlist->core.nr_entries -1 ;/* excluding a dummy */ + ncgrps =evlist__nr_entries (evlist) -1 ;/* excluding a dummy */ bpf_map__set_max_entries (skel->maps.cgroup_filter, ncgrps);if (!cgroup_is_v2 ("perf_event" ))
@@ -240,7 +240,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (evlist->core.user_requested_cpus, i).cpu; + cpu =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 target *target, fd =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } }
tools/perf/util/cgroup.c +10 -10
@@ -367,7 +367,7 @@ int parse_cgroups(const struct option *opt, const char *str,char *s;int ret, i; -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_cgroint ret =-1 ;int prefix_len; -if (evlist->core.nr_entries ==0 ) { +if (evlist__nr_entries (evlist) ==0 ) {fprintf (stderr,"must define events before cgroups\n" );return -EINVAL ; }
@@ -436,11 +436,11 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro }/* save original events and init evlist */ -evlist__splice_list_tail (orig_list, &evlist->core.entries); - evlist->core.nr_entries =0 ; +evlist__splice_list_tail (orig_list, &evlist__core (evlist)->entries); +evlist__core (evlist)->nr_entries =0 ; - orig_metric_events = evlist->metric_events; -metricgroup__rblist_init (&evlist->metric_events); + orig_metric_events = *evlist__metric_events (evlist); +metricgroup__rblist_init (evlist__metric_events (evlist));if (has_pattern_string (str)) prefix_len =match_cgroups (str);
@@ -503,15 +503,15 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro nr_cgroups++;if (metricgroup__copy_metric_events (tmp_list, cgrp, - &evlist->metric_events, +evlist__metric_events (evlist), &orig_metric_events) <0 ) goto out_err; -evlist__splice_list_tail (evlist, &tmp_list->core.entries); - tmp_list->core.nr_entries =0 ; +evlist__splice_list_tail (evlist, &evlist__core (tmp_list)->entries); +evlist__core (tmp_list)->nr_entries =0 ; } -if (list_empty (&evlist->core.entries)) { +if (list_empty (&evlist__core (evlist)->entries)) {fprintf (stderr,"no cgroup matched: %s\n" , str); goto out_err; }
tools/perf/util/evlist.c +224 -162
304 lines not on this page · raw message
tools/perf/util/evlist.h +235 -16
251 lines not on this page · raw message
tools/perf/util/session.c +32 -24
56 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Part of the diff is not shown here. View the raw message.
Ian Rogers
reviewerPATCH v4 13/58 perf python: Use evsel in sample in pyrf_event
In reply to Ian RogersAvoid a duplicated evsel by using the one in sample. Add evsel__get/put to the evsel in perf_sample.
--- 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(-)
tools/perf/util/evsel.c +1 -1
@@ -3235,7 +3235,7 @@ int evsel__parse_sample(struct evsel *evsel, union perf_event *event,union u64_swap u;perf_sample__init (data,/*all=*/ true); - data->evsel = evsel; + data->evsel =evsel__get (evsel); data->cpu = data->pid = data->tid =-1 ; data->stream_id = data->id = data->time =-1ULL ; data->period = evsel->core.attr.sample_period;
tools/perf/util/python.c +3 -7
@@ -43,7 +43,6 @@ PyMODINIT_FUNC PyInit_perf(void);struct pyrf_event {PyObject_HEAD - struct evsel *evsel; struct perf_sample sample;union perf_event event; };
@@ -274,7 +273,6 @@ static PyMemberDef pyrf_sample_event__members[] = {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); }
@@ -296,7 +294,7 @@ static PyObject *pyrf_sample_event__repr(const struct pyrf_event *pevent)#ifdef HAVE_LIBTRACEEVENT static bool is_tracepoint (const struct pyrf_event *pevent) { -return pevent->evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ; +return pevent->sample.evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ; } static PyObject*
@@ -343,7 +341,7 @@ tracepoint_field(const struct pyrf_event *pe, struct tep_format_field *field)static PyObject *get_tracepoint_field (struct pyrf_event *pevent,PyObject *attr_name) { -struct evsel *evsel = pevent->evsel; +struct evsel *evsel = pevent->sample.evsel;struct tep_event *tp_format =evsel__tp_format (evsel);struct tep_format_field *field;
@@ -509,7 +507,7 @@ static PyObject *pyrf_event__new(const union perf_event *event) pevent = PyObject_New(struct pyrf_event, ptype);if (pevent !=NULL ) {memcpy (&pevent->event, event, event->header.size); - pevent->evsel =NULL ; +perf_sample__init (&pevent->sample,/*all=*/ false); }return (PyObject *)pevent; }
@@ -1788,8 +1786,6 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,return Py_None; } - pevent->evsel =evsel__get (evsel); -perf_mmap__consume (&md->core); err =evsel__parse_sample (evsel, &pevent->event, &pevent->sample);
tools/perf/util/sample.c +12 -5
@@ -1,18 +1,23 @@/* SPDX-License-Identifier: GPL-2.0 */ #include "sample.h" + +#include <stdlib.h> +#include <string.h> + +#include <elf.h> +#include <linux/zalloc.h> +#include "debug.h" +#include "evsel.h" #include "thread.h" -#include <elf.h> +#include "../../arch/x86/include/asm/insn.h" +#ifndef EM_CSKY #define EM_CSKY 252#endif #ifndef EM_LOONGARCH #define EM_LOONGARCH 258#endif -#include <linux/zalloc.h> -#include <stdlib.h> -#include <string.h> -#include "../../arch/x86/include/asm/insn.h" void perf_sample__init (struct perf_sample *sample,bool all) {
@@ -29,6 +34,8 @@ void perf_sample__init(struct perf_sample *sample, bool all)void perf_sample__exit (struct perf_sample *sample) { +evsel__put (sample->evsel); + sample->evsel =NULL ;zfree (&sample->user_regs);zfree (&sample->intr_regs);if (sample->merged_callchain) {
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 14/58 perf python: Add wrapper for perf_data file abstraction
In reply to Ian RogersThe perf_data struct is needed for session supported.
---
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.
--- tools/perf/util/python.c | 93 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-)
tools/perf/util/python.c +92 -1
@@ -10,6 +10,7 @@#include "callchain.h" #include "counts.h" +#include "data.h" #include "event.h" #include "evlist.h" #include "evsel.h"
@@ -2296,6 +2297,92 @@ static PyObject *pyrf__metrics(PyObject *self, PyObject *args)return list; } +struct pyrf_data { +PyObject_HEAD + + struct perf_data data; +}; + +static int pyrf_data__init (struct pyrf_data *pdata,PyObject *args,PyObject *kwargs) +{ +static char *kwlist[] = {"path" ,"fd" ,NULL }; +char *path =NULL ; +int fd =-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); + +if (!path) + path ="perf.data" ; + + pdata->data.path =strdup (path); +if (!pdata->data.path) { +PyErr_NoMemory (); +return -1 ; + } + +if (fd !=-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" ); +free ((char *)pdata->data.path); + pdata->data.path =NULL ; +return -1 ; + } + } + + pdata->data.mode =PERF_DATA_MODE_READ ; + pdata->data.file.fd = 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 = (const struct pyrf_data *)self; + +if (!pdata->data.path) +return PyUnicode_FromString ("[uninitialized]" ); +return PyUnicode_FromString (pdata->data.path); +} + +static const char pyrf_data__doc[] =PyDoc_STR ("perf data file object." ); + +static PyTypeObject pyrf_data__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.data" , + .tp_basicsize =sizeof (struct pyrf_data ), + .tp_dealloc = (destructor )pyrf_data__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_data__doc, + .tp_init = (initproc )pyrf_data__init, + .tp_repr = pyrf_data__str, + .tp_str = pyrf_data__str, +}; + +static int pyrf_data__setup_types (void ) +{ + pyrf_data__type.tp_new = PyType_GenericNew; +return PyType_Ready (&pyrf_data__type); +} +static PyMethodDef perf__methods[] = { { .ml_name ="metrics" ,
@@ -2358,7 +2445,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;/* The page_size is placed in util object. */
@@ -2406,6 +2494,9 @@ PyMODINIT_FUNC PyInit_perf(void)Py_INCREF (&pyrf_counts_values__type);PyModule_AddObject (module,"counts_values" , (PyObject *)&pyrf_counts_values__type); +Py_INCREF (&pyrf_data__type); +PyModule_AddObject (module,"data" , (PyObject *)&pyrf_data__type); + dict =PyModule_GetDict (module);if (dict ==NULL ) goto error;
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 15/58 perf python: Add python session abstraction wrapping perf's session
In reply to Ian RogersSessions 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=..../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=0
... def handle_sample(x):
... global count
... if count < 3:
... print(dir(x))
... count = count + 1
... perf.session(perf.data("perf.data"),sample=handle_sample).process_events()
...
['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init__', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduce__', '__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_time', 'type']
['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init__', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduce__', '__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_time', 'type']
['__class__', '__delattr__', '__dir__', '__doc__', '__eq__', '__format__', '__ge__', '__getattribute__', '__getstate__', '__gt__', '__hash__', '__init__', '__init_subclass__', '__le__', '__lt__', '__ne__', '__new__', '__reduce__', '__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_time', '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.
---
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 .
--- tools/perf/util/python.c | 259 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 258 insertions(+), 1 deletion(-)
tools/perf/util/python.c +258 -1
@@ -9,8 +9,10 @@#include <perf/mmap.h> #include "callchain.h" +#include "comm.h" #include "counts.h" #include "data.h" +#include "debug.h" #include "event.h" #include "evlist.h" #include "evsel.h"
@@ -20,8 +22,12 @@#include "pmus.h" #include "print_binary.h" #include "record.h" +#include "session.h" #include "strbuf.h" +#include "symbol.h" +#include "thread.h" #include "thread_map.h" +#include "tool.h" #include "tp_pmu.h" #include "trace-event.h" #include "util/sample.h"
@@ -2383,6 +2389,252 @@ static int pyrf_data__setup_types(void)return PyType_Ready (&pyrf_data__type); } +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 = (void *)obj; +const char *str =thread__comm_str (pthread->thread); + +return PyUnicode_FromString (str); +} + +static PyMethodDef pyrf_thread__methods[] = { + { + .ml_name ="comm" , + .ml_meth = (PyCFunction )pyrf_thread__comm, + .ml_flags =METH_NOARGS , + .ml_doc =PyDoc_STR ("Comm(and) associated with this thread." ) + }, + { .ml_name =NULL , } +}; + +static const char pyrf_thread__doc[] =PyDoc_STR ("perf thread object." ); + +static PyTypeObject pyrf_thread__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.thread" , + .tp_basicsize =sizeof (struct pyrf_thread ), + .tp_dealloc = (destructor )pyrf_thread__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_methods = pyrf_thread__methods, + .tp_doc = 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 = PyObject_New(struct pyrf_thread, &pyrf_thread__type); + +if (!pthread) +return NULL ; + + pthread->thread =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; +PyObject *stat; +}; + +static int pyrf_session_tool__sample (const struct perf_tool *tool, +union perf_event *event, +struct perf_sample *sample, +struct evsel *evsel, +struct machine *machine__maybe_unused ) +{ + struct pyrf_session *psession = container_of(tool, struct pyrf_session, tool); +PyObject *pyevent =pyrf_event__new (event); +struct pyrf_event *pevent = (struct pyrf_event *)pyevent; +PyObject *ret; + +if (pyevent ==NULL ) +return -ENOMEM ; + +memcpy (&pevent->event, event, event->header.size); +if (evsel__parse_sample (evsel, &pevent->event, &pevent->sample) <0 ) { +Py_DECREF (pyevent); +return -1 ; + } +/* Avoid shallow copy pointing to lazily allocated memory that would be double freed. */ + pevent->sample.user_regs =NULL ; + pevent->sample.intr_regs =NULL ; +if (pevent->sample.merged_callchain) + pevent->sample.callchain =NULL ; + + ret =PyObject_CallFunction (psession->sample,"O" , pyevent); +if (!ret) { +PyErr_Print (); +Py_DECREF (pyevent); +return -1 ; + } +Py_DECREF (ret); +Py_DECREF (pyevent); +return 0 ; +} + +static PyObject *pyrf_session__process (struct pyrf_session *psession,PyObject *args) +{ +struct machine *machine; +struct thread *thread =NULL ; +PyObject *result; +int pid; + +if (!PyArg_ParseTuple (args,"i" , &pid)) +return NULL ; + + machine = &psession->session->machines.host; + thread =machine__find_thread (machine, pid, pid); + +if (!thread) { + machine =perf_session__find_machine (psession->session, pid); +if (machine) + thread =machine__find_thread (machine, pid, pid); + } + +if (!thread) { +PyErr_Format (PyExc_TypeError,"Failed to find thread %d" , pid); +return NULL ; + } + result =pyrf_thread__from_thread (thread); +thread__put (thread); +return result; +} + +static int pyrf_session__init (struct pyrf_session *psession,PyObject *args,PyObject *kwargs) +{ +struct pyrf_data *pdata; +PyObject *sample =NULL ; +static char *kwlist[] = {"data" ,"sample" ,NULL }; + +if (!PyArg_ParseTupleAndKeywords (args, kwargs,"O!|O" , kwlist, &pyrf_data__type, &pdata, + &sample)) +return -1 ; + +Py_INCREF (pdata); + psession->pdata = pdata; +perf_tool__init (&psession->tool,/*ordered_events=*/ true); + psession->tool.ordering_requires_timestamps = true; + +#define ADD_TOOL (name) \ + do { \ + if (name) { \ + if (!PyCallable_Check(name)) { \ + PyErr_SetString(PyExc_TypeError, #name " must be callable"); \ + return -1; \ + } \ + psession->tool.name = pyrf_session_tool__##name; \ + Py_INCREF(name); \ + psession->name = name; \ + } \ + } while (0) + +ADD_TOOL (sample); +#undef ADD_TOOL + + psession->tool.comm = perf_event__process_comm; + psession->tool.mmap = perf_event__process_mmap; + psession->tool.mmap2 = perf_event__process_mmap2; + psession->tool.namespaces = perf_event__process_namespaces; + psession->tool.cgroup = perf_event__process_cgroup; + psession->tool.exit = perf_event__process_exit; + psession->tool.fork = perf_event__process_fork; + psession->tool.ksymbol = perf_event__process_ksymbol; + psession->tool.text_poke = perf_event__process_text_poke; + psession->tool.build_id = perf_event__process_build_id; + psession->session =perf_session__new (&pdata->data, &psession->tool); +if (IS_ERR (psession->session)) { +PyErr_Format (PyExc_IOError,"failed to create session: %ld" , +PTR_ERR (psession->session)); + psession->session =NULL ; +Py_DECREF (pdata); + psession->pdata =NULL ; +return -1 ; + } + +if (symbol__init (perf_session__env (psession->session)) <0 ) { +perf_session__delete (psession->session); + psession->session =NULL ; +Py_DECREF (psession->pdata); + psession->pdata =NULL ; +return -1 ; + } + +if (perf_session__create_kernel_maps (psession->session) <0 ) +pr_warning ("Cannot read kernel map\n" ); + +return 0 ; +} + +static void pyrf_session__delete (struct pyrf_session *psession) +{ +Py_XDECREF (psession->pdata); +Py_XDECREF (psession->sample); +perf_session__delete (psession->session); +Py_TYPE (psession)->tp_free ((PyObject *)psession); +} + +static PyObject *pyrf_session__process_events (struct pyrf_session *psession) +{ +int err =perf_session__process_events (psession->session); +return PyLong_FromLong (err); +} + +static PyMethodDef pyrf_session__methods[] = { + { + .ml_name ="process_events" , + .ml_meth = (PyCFunction )pyrf_session__process_events, + .ml_flags =METH_NOARGS , + .ml_doc =PyDoc_STR ("Iterate and process events." ) + }, + { + .ml_name ="process" , + .ml_meth = (PyCFunction )pyrf_session__process, + .ml_flags =METH_VARARGS , + .ml_doc =PyDoc_STR ("Returns the thread associated with a pid." ) + }, + { .ml_name =NULL , } +}; + +static const char pyrf_session__doc[] =PyDoc_STR ("perf session object." ); + +static PyTypeObject pyrf_session__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.session" , + .tp_basicsize =sizeof (struct pyrf_session ), + .tp_dealloc = (destructor )pyrf_session__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_methods = pyrf_session__methods, + .tp_doc = pyrf_session__doc, + .tp_init = (initproc )pyrf_session__init, +}; + +static int pyrf_session__setup_types (void ) +{ + pyrf_session__type.tp_new = PyType_GenericNew; +return PyType_Ready (&pyrf_session__type); +} +static PyMethodDef perf__methods[] = { { .ml_name ="metrics" ,
@@ -2446,7 +2698,9 @@ 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) +pyrf_data__setup_types () <0 || +pyrf_session__setup_types () <0 || + pyrf_thread__setup_types() < 0) return module;/* The page_size is placed in util object. */
@@ -2497,6 +2751,9 @@ PyMODINIT_FUNC PyInit_perf(void)Py_INCREF (&pyrf_data__type);PyModule_AddObject (module,"data" , (PyObject *)&pyrf_data__type); +Py_INCREF (&pyrf_session__type); +PyModule_AddObject (module,"session" , (PyObject *)&pyrf_session__type); + dict =PyModule_GetDict (module);if (dict ==NULL ) goto error;
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 16/58 perf python: Add syscall name/id to convert syscall number and name
In reply to Ian RogersUse 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.
---
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.
--- tools/perf/util/python.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
tools/perf/util/python.c +44 -0
@@ -13,6 +13,7 @@#include "counts.h" #include "data.h" #include "debug.h" +#include "dwarf-regs.h" #include "event.h" #include "evlist.h" #include "evsel.h"
@@ -25,6 +26,7 @@#include "session.h" #include "strbuf.h" #include "symbol.h" +#include "syscalltbl.h" #include "thread.h" #include "thread_map.h" #include "tool.h"
@@ -2635,6 +2637,36 @@ static int pyrf_session__setup_types(void)return PyType_Ready (&pyrf_session__type); } +static PyObject *pyrf__syscall_name (PyObject *self,PyObject *args) +{ +const char *name; +int id; + +if (!PyArg_ParseTuple (args,"i" , &id)) +return NULL ; + + name =syscalltbl__name (EM_HOST , id); +if (!name) + Py_RETURN_NONE; +return PyUnicode_FromString (name); +} + +static PyObject *pyrf__syscall_id (PyObject *self,PyObject *args) +{ +const char *name; +int id; + +if (!PyArg_ParseTuple (args,"s" , &name)) +return NULL ; + + id =syscalltbl__id (EM_HOST , name); +if (id <0 ) { +PyErr_Format (PyExc_ValueError,"Failed to find syscall %s" , name); +return NULL ; + } +return PyLong_FromLong (id); +} +static PyMethodDef perf__methods[] = { { .ml_name ="metrics" ,
@@ -2668,6 +2700,18 @@ static PyMethodDef perf__methods[] = { .ml_flags = METH_NOARGS, .ml_doc = PyDoc_STR("Returns a sequence of pmus.") }, + { + .ml_name = "syscall_name", + .ml_meth = (PyCFunction) pyrf__syscall_name, + .ml_flags = METH_VARARGS, + .ml_doc = PyDoc_STR("Turns a syscall number to a string.") + }, + { + .ml_name = "syscall_id", + .ml_meth = (PyCFunction) pyrf__syscall_id, + .ml_flags = METH_VARARGS, + .ml_doc = PyDoc_STR("Turns a syscall name to a number.") + }, { .ml_name = NULL, } };
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 17/58 perf python: Refactor and add accessors to sample event
In reply to Ian RogersAdd a common field for the evsel of an event. The evsel is derived from the PERF_SAMPLE_ID or PERF_SAMPLE_IDENTIFIER that are potentially present in all events.
Move fields, like sample_ip, to only be present in sample events. This avoids errors like getting the sample ip for an mmap event.
Add new accessors for sample event raw_buf, dso, dso_long_name, dso_bid, map_start, map_end, map_pgoff, symbol, sym_start, sym_end, srccode and insn.
Minor tweaks to pyrf_evlist__str and pyrf_evsel__str.
---
v2:
1. Fixed Uninitialized Memory: In pyrf_event__new , I initialized al_resolved to false and called addr_location__init(&pevent->al) to prevent using garbage memory.
2. Restored sample_time : Added sample_time back to sample_members to avoid breaking scripts that rely on timestamps for non-sample events.
3. Fixed NULL Pointer Dereference: Added a NULL check for pevent->sample.evsel in pyrf_event__get_evsel() .
4. Fixed Memory Leak in Destructor: Added a call to addr_location__exit(&pevent->al) in pyrf_event__delete() to free map and thread references acquired during resolution.
5. Fixed Use-After-Free and Cache Corruption in srccode : Used a local addr_location in pyrf_sample_event__srccode() instead of overwriting pevent->al in place, avoiding dangling pointer issues with the thread reference and preserving the cached info.
6. Fix pyrf_evlist__read_on_cpu so that if an unsupported event type causes an exception a NoMemory error isn't thrown on top of this.
--- tools/perf/util/python.c | 396 +++++++++++++++++++++++++++++++++++---- 1 file changed, 361 insertions(+), 35 deletions(-)
tools/perf/util/python.c +361 -35
@@ -8,22 +8,29 @@#include <internal/lib.h> #include <perf/mmap.h> +#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 "dwarf-regs.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 "syscalltbl.h"
@@ -32,7 +39,6 @@#include "tool.h" #include "tp_pmu.h" #include "trace-event.h" -#include "util/sample.h" #ifdef HAVE_LIBTRACEEVENT #include <event-parse.h>
@@ -40,6 +46,8 @@PyMODINIT_FUNC PyInit_perf (void ); +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), \
@@ -52,21 +60,53 @@ PyMODINIT_FUNC PyInit_perf(void);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 buffer. */ +union perf_event event; };#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"), +static PyObject *pyrf_event__get_evsel (PyObject *self,void *closure__maybe_unused ) +{ +struct pyrf_event *pevent = (void *)self; + +if (!pevent->sample.evsel) + Py_RETURN_NONE; + +return pyrf_evsel__from_evsel (pevent->sample.evsel); +} + +static PyGetSetDef pyrf_event__getset[] = { + { + .name ="evsel" , + .get = pyrf_event__get_evsel, + .set =NULL , + .doc ="tracking event." , + }, + { .name =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[] =PyDoc_STR ("perf mmap event object." );static PyMemberDef pyrf_mmap_event__members[] = {
@@ -105,9 +145,12 @@ static PyTypeObject pyrf_mmap_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name = "perf.mmap_event", .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_mmap_event__doc, .tp_members = pyrf_mmap_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_mmap_event__repr, };
@@ -140,9 +183,12 @@ static PyTypeObject pyrf_task_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name = "perf.task_event", .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_task_event__doc, .tp_members = pyrf_task_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_task_event__repr, };
@@ -172,6 +218,7 @@ static PyTypeObject pyrf_comm_event__type = { .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_comm_event__doc, .tp_members = pyrf_comm_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_comm_event__repr, };
@@ -201,9 +248,12 @@ static PyTypeObject pyrf_throttle_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name = "perf.throttle_event", .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_throttle_event__doc, .tp_members = pyrf_throttle_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_throttle_event__repr, };
@@ -236,9 +286,12 @@ static PyTypeObject pyrf_lost_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name = "perf.lost_event", .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_lost_event__doc, .tp_members = pyrf_lost_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_lost_event__repr, };
@@ -269,6 +322,7 @@ static PyTypeObject pyrf_read_event__type = { .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_read_event__doc, .tp_members = pyrf_read_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_read_event__repr, };
@@ -276,16 +330,17 @@ static const char pyrf_sample_event__doc[] = PyDoc_STR("perf sample event objectstatic PyMemberDef pyrf_sample_event__members[] = { 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 physical addr" ), +sample_member_def (sample_weight, weight,T_ULONGLONG ,"event weight" ), +sample_member_def (sample_data_src, data_src,T_ULONGLONG ,"event data source" ), +sample_member_def (sample_insn_count, insn_cnt,T_ULONGLONG ,"event instruction count" ), +sample_member_def (sample_cyc_count, cyc_cnt,T_ULONGLONG ,"event cycle count" ),member_def (perf_event_header, type,T_UINT ,"event type" ), { .name =NULL , }, }; -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;
@@ -373,6 +428,199 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name) }#endif /* HAVE_LIBTRACEEVENT */ +static int pyrf_sample_event__resolve_al (struct pyrf_event *pevent) +{ +struct evsel *evsel = pevent->sample.evsel; +struct evlist *evlist = evsel ? evsel->evlist :NULL ; +struct perf_session *session = 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->sample) <0 ) { +addr_location__exit (&pevent->al); +return -1 ; + } + + pevent->al_resolved = 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 *pevent, +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 *pevent, +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 *pevent, +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 *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->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 !=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 = (void *)self; +u64 addr = pevent->sample.ip; +char *srcfile =NULL ; +char *srccode =NULL ; +unsigned int line =0 ; +int len =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 != 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 =thread__get (pevent->al.thread); + al.map =map__get (pevent->al.map); + al.sym = pevent->al.sym; + al.addr = pevent->al.addr; + } + +if (al.map) { +struct dso *dso =map__dso (al.map); + +if (dso) { + srcfile =get_srcline_split (dso,map__rip_2objdump (al.map, addr), + &line); + } + } +addr_location__exit (&al); + +if (srcfile) { + srccode =find_sourceline (srcfile, line, &len); + result =Py_BuildValue ("(sIs#)" , srcfile, line, srccode, (Py_ssize_t )len); +free (srcfile); + }else { + result =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 = (void *)self; +struct thread *thread; +struct machine *machine; + +if (pyrf_sample_event__resolve_al (pevent) <0 ) + Py_RETURN_NONE; + + thread = pevent->al.thread; + +if (!thread || !thread__maps (thread)) + Py_RETURN_NONE; + + machine =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) {
@@ -386,13 +634,103 @@ pyrf_sample_event__getattro(struct pyrf_event *pevent, PyObject *attr_name)return obj ?:PyObject_GenericGetAttr ((PyObject *) pevent, attr_name); } +static PyGetSetDef pyrf_sample_event__getset[] = { + { + .name ="raw_buf" , + .get = (getter )pyrf_sample_event__get_raw_buf, + .set =NULL , + .doc ="event raw buffer." , + }, + { + .name ="evsel" , + .get = pyrf_event__get_evsel, + .set =NULL , + .doc ="tracking event." , + }, + { + .name ="dso" , + .get = (getter )pyrf_sample_event__get_dso, + .set =NULL , + .doc ="event dso short name." , + }, + { + .name ="dso_long_name" , + .get = (getter )pyrf_sample_event__get_dso_long_name, + .set =NULL , + .doc ="event dso long name." , + }, + { + .name ="dso_bid" , + .get = (getter )pyrf_sample_event__get_dso_bid, + .set =NULL , + .doc ="event dso build id." , + }, + { + .name ="map_start" , + .get = (getter )pyrf_sample_event__get_map_start, + .set =NULL , + .doc ="event map start address." , + }, + { + .name ="map_end" , + .get = (getter )pyrf_sample_event__get_map_end, + .set =NULL , + .doc ="event map end address." , + }, + { + .name ="map_pgoff" , + .get = (getter )pyrf_sample_event__get_map_pgoff, + .set =NULL , + .doc ="event map page offset." , + }, + { + .name ="symbol" , + .get = (getter )pyrf_sample_event__get_symbol, + .set =NULL , + .doc ="event symbol name." , + }, + { + .name ="sym_start" , + .get = (getter )pyrf_sample_event__get_sym_start, + .set =NULL , + .doc ="event symbol start address." , + }, + { + .name ="sym_end" , + .get = (getter )pyrf_sample_event__get_sym_end, + .set =NULL , + .doc ="event symbol end address." , + }, + { .name =NULL , }, +}; + +static PyMethodDef pyrf_sample_event__methods[] = { + { + .ml_name ="srccode" , + .ml_meth = (PyCFunction )pyrf_sample_event__srccode, + .ml_flags =METH_VARARGS , + .ml_doc =PyDoc_STR ("Get source code for an address." ) + }, + { + .ml_name ="insn" , + .ml_meth = (PyCFunction )pyrf_sample_event__insn, + .ml_flags =METH_NOARGS , + .ml_doc =PyDoc_STR ("Get instruction bytes for a sample." ) + }, + { .ml_name =NULL , } +}; +static PyTypeObject pyrf_sample_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name ="perf.sample_event" , .tp_basicsize =sizeof (struct pyrf_event ), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor )pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_sample_event__doc, .tp_members = pyrf_sample_event__members, + .tp_getset = pyrf_sample_event__getset, + .tp_methods = pyrf_sample_event__methods, .tp_repr = (reprfunc )pyrf_sample_event__repr, .tp_getattro = (getattrofunc ) pyrf_sample_event__getattro, };
@@ -428,25 +766,18 @@ static PyTypeObject pyrf_context_switch_event__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name = "perf.context_switch_event", .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_context_switch_event__doc, .tp_members = pyrf_context_switch_event__members, + .tp_getset = pyrf_event__getset, .tp_repr = (reprfunc)pyrf_context_switch_event__repr, };static int pyrf_event__setup_types (void ) {int err; - pyrf_mmap_event__type.tp_new = - pyrf_task_event__type.tp_new = - pyrf_comm_event__type.tp_new = - pyrf_lost_event__type.tp_new = - pyrf_read_event__type.tp_new = - pyrf_sample_event__type.tp_new = - pyrf_context_switch_event__type.tp_new = - pyrf_throttle_event__type.tp_new = PyType_GenericNew; - - pyrf_sample_event__type.tp_dealloc = (destructor )pyrf_sample_event__delete, err =PyType_Ready (&pyrf_mmap_event__type);if (err <0 )
@@ -516,7 +847,9 @@ static PyObject *pyrf_event__new(const union perf_event *event) pevent = PyObject_New(struct pyrf_event, ptype);if (pevent !=NULL ) {memcpy (&pevent->event, event, event->header.size); -perf_sample__init (&pevent->sample,/*all=*/ false); + pevent->sample.evsel =NULL ; + pevent->al_resolved = false; +addr_location__init (&pevent->al); }return (PyObject *)pevent; }
@@ -1209,7 +1542,7 @@ static PyObject *pyrf_evsel__str(PyObject *self)struct pyrf_evsel *pevsel = (void *)self;struct evsel *evsel = pevsel->evsel; -return PyUnicode_FromFormat ("evsel(%s/%s/)" ,evsel__pmu_name (evsel),evsel__name (evsel)); +return PyUnicode_FromFormat ("evsel(%s)" ,evsel__name (evsel)); }static PyMethodDef pyrf_evsel__methods[] = {
@@ -1771,10 +2104,8 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,return NULL ; md =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);if (perf_mmap__read_init (&md->core) <0 ) goto end;
@@ -1786,13 +2117,12 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,struct evsel *evsel;if (pyevent ==NULL ) -return PyErr_NoMemory (); +return PyErr_Occurred () ?NULL :PyErr_NoMemory (); evsel =evlist__event2evsel (evlist, event);if (!evsel) {Py_DECREF (pyevent); -Py_INCREF (Py_None); -return Py_None; + Py_RETURN_NONE; }perf_mmap__consume (&md->core);
@@ -1807,8 +2137,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,return pyevent; } end: -Py_INCREF (Py_None); -return Py_None; + Py_RETURN_NONE; } static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist,
@@ -2003,10 +2332,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 = false; }strbuf_addstr (&sb,"])" );
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 18/58 perf python: Add callchain support
In reply to Ian RogersImplement pyrf_callchain_node and pyrf_callchain types for lazy iteration over callchain frames. Add callchain property to sample_event.
---
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.
--- tools/perf/util/python.c | 237 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 237 insertions(+)
tools/perf/util/python.c +237 -0
@@ -66,6 +66,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 buffer. */ union perf_event event; };
@@ -103,6 +105,7 @@ static void pyrf_event__delete(struct pyrf_event *pevent) {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); }
@@ -621,6 +624,181 @@ static PyObject *pyrf_sample_event__insn(PyObject *self, PyObject *args __maybe_ pevent->sample.insn_len); } +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 *pnode, +void *closure__maybe_unused ) +{ +return PyLong_FromUnsignedLongLong (pnode->ip); +} + +static PyObject *pyrf_callchain_node__get_symbol (struct pyrf_callchain_node *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 ="[unknown]" ; + +if (pnode->map) { +struct dso *dso =map__dso (pnode->map); +if (dso) { +if (symbol_conf.show_kernel_path &&dso__long_name (dso)) + dsoname =dso__long_name (dso); +else + dsoname =dso__name (dso); + } + } +return PyUnicode_FromString (dsoname); +} + +static PyGetSetDef pyrf_callchain_node__getset[] = { + { .name ="ip" , .get = (getter )pyrf_callchain_node__get_ip, }, + { .name ="symbol" , .get = (getter )pyrf_callchain_node__get_symbol, }, + { .name ="dso" , .get = (getter )pyrf_callchain_node__get_dso, }, + { .name =NULL , }, +}; + +static PyTypeObject pyrf_callchain_node__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.callchain_node" , + .tp_basicsize =sizeof (struct pyrf_callchain_node ), + .tp_dealloc = (destructor )pyrf_callchain_node__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc ="perf callchain node object." , + .tp_getset = pyrf_callchain_node__getset, +}; + +struct pyrf_callchain_frame { +u64 ip; +struct map *map; +struct symbol *sym; +}; + +struct pyrf_callchain { +PyObject_HEAD + struct pyrf_event *pevent; +struct pyrf_callchain_frame *frames; +u64 nr_frames; +u64 pos; +bool resolved; +}; + +static void pyrf_callchain__delete (struct pyrf_callchain *pchain) +{ +Py_XDECREF (pchain->pevent); +if (pchain->frames) { +for (u64 i =0 ; i < pchain->nr_frames; i++) +map__put (pchain->frames[i].map); +free (pchain->frames); + } +Py_TYPE (pchain)->tp_free ((PyObject *)pchain); +} + +static PyObject *pyrf_callchain__next (struct pyrf_callchain *pchain) +{ +struct pyrf_callchain_node *pnode; + +if (!pchain->resolved) { +struct evsel *evsel = pchain->pevent->sample.evsel; +struct evlist *evlist = evsel->evlist; +struct perf_session *session = evlist ?evlist__session (evlist) :NULL ; +struct addr_location al; +struct callchain_cursor *cursor; +struct callchain_cursor_node *node; +u64 i; + +if (!session || !pchain->pevent->sample.callchain) +return NULL ; + +addr_location__init (&al); +if (machine__resolve (&session->machines.host, &al, &pchain->pevent->sample) <0 ) { +addr_location__exit (&al); +return NULL ; + } + + cursor =get_tls_callchain_cursor (); +if (thread__resolve_callchain (al.thread, cursor, evsel, + &pchain->pevent->sample,NULL ,NULL , +PERF_MAX_STACK_DEPTH ) !=0 ) { +addr_location__exit (&al); +return NULL ; + } +callchain_cursor_commit (cursor); + + pchain->nr_frames = cursor->nr; +if (pchain->nr_frames >0 ) { + pchain->frames =calloc (pchain->nr_frames,sizeof (*pchain->frames)); +if (!pchain->frames) { +addr_location__exit (&al); +return PyErr_NoMemory (); + } + +for (i =0 ; i < pchain->nr_frames; i++) { + node =callchain_cursor_current (cursor); + pchain->frames[i].ip = node->ip; + pchain->frames[i].map =map__get (node->ms.map); + pchain->frames[i].sym = node->ms.sym; +callchain_cursor_advance (cursor); + } + } + pchain->resolved = true; +addr_location__exit (&al); + } + +if (pchain->pos >= pchain->nr_frames) +return NULL ; + + pnode = PyObject_New(struct pyrf_callchain_node, &pyrf_callchain_node__type); +if (!pnode) +return NULL ; + + pnode->ip = pchain->frames[pchain->pos].ip; + pnode->map =map__get (pchain->frames[pchain->pos].map); + pnode->sym = pchain->frames[pchain->pos].sym; + + pchain->pos++; +return (PyObject *)pnode; +} + +static PyTypeObject pyrf_callchain__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.callchain" , + .tp_basicsize =sizeof (struct pyrf_callchain ), + .tp_dealloc = (destructor )pyrf_callchain__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc ="perf callchain object." , + .tp_iter = PyObject_SelfIter, + .tp_iternext = (iternextfunc )pyrf_callchain__next, +}; + +static PyObject *pyrf_sample_event__get_callchain (PyObject *self,void *closure__maybe_unused ) +{ +struct pyrf_event *pevent = (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) {
@@ -635,6 +813,12 @@ pyrf_sample_event__getattro(struct pyrf_event *pevent, PyObject *attr_name) }static PyGetSetDef pyrf_sample_event__getset[] = { + { + .name ="callchain" , + .get = pyrf_sample_event__get_callchain, + .set =NULL , + .doc ="event callchain." , + }, { .name ="raw_buf" , .get = (getter )pyrf_sample_event__get_raw_buf,
@@ -803,6 +987,12 @@ static int pyrf_event__setup_types(void) err =PyType_Ready (&pyrf_context_switch_event__type);if (err <0 ) goto out; + err =PyType_Ready (&pyrf_callchain_node__type); +if (err <0 ) + goto out; + err =PyType_Ready (&pyrf_callchain__type); +if (err <0 ) + goto out; out:return err; }
@@ -848,6 +1038,7 @@ static PyObject *pyrf_event__new(const union perf_event *event)if (pevent !=NULL ) {memcpy (&pevent->event, event, event->header.size); pevent->sample.evsel =NULL ; + pevent->callchain =NULL ; pevent->al_resolved = false;addr_location__init (&pevent->al); }
@@ -2810,6 +3001,49 @@ static int pyrf_session_tool__sample(const struct perf_tool *tool,if (pevent->sample.merged_callchain) pevent->sample.callchain =NULL ; +if (sample->callchain) { +struct addr_location al; +struct callchain_cursor *cursor; +u64 i; +struct pyrf_callchain *pchain; + +addr_location__init (&al); +if (machine__resolve (&psession->session->machines.host, &al, sample) >=0 ) { + cursor =get_tls_callchain_cursor (); +if (thread__resolve_callchain (al.thread, cursor, evsel, sample, +NULL ,NULL ,PERF_MAX_STACK_DEPTH ) ==0 ) { +callchain_cursor_commit (cursor); + + pchain = PyObject_New(struct pyrf_callchain, &pyrf_callchain__type); +if (pchain) { + pchain->pevent = pevent; +Py_INCREF (pevent); + pchain->nr_frames = cursor->nr; + pchain->pos =0 ; + pchain->resolved = true; + pchain->frames =calloc (pchain->nr_frames, +sizeof (*pchain->frames)); +if (pchain->frames) { +struct callchain_cursor_node *node; + +for (i =0 ; i < pchain->nr_frames; i++) { + node =callchain_cursor_current (cursor); + pchain->frames[i].ip = node->ip; + pchain->frames[i].map = +map__get (node->ms.map); + pchain->frames[i].sym = node->ms.sym; +callchain_cursor_advance (cursor); + } + pevent->callchain = (PyObject *)pchain; + }else { +Py_DECREF (pchain); + } + } + } +addr_location__exit (&al); + } + } + ret =PyObject_CallFunction (psession->sample,"O" , pyevent);if (!ret) {PyErr_Print ();
@@ -2900,6 +3134,9 @@ static int pyrf_session__init(struct pyrf_session *psession, PyObject *args, PyOreturn -1 ; } + symbol_conf.use_callchain = true; + symbol_conf.show_kernel_path = true; + symbol_conf.inline_name = false;if (symbol__init (perf_session__env (psession->session)) <0 ) {perf_session__delete (psession->session); psession->session =NULL ;
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 19/58 perf python: Add config file access
In reply to Ian RogersAdd perf.config_get(name) to expose the perf configuration system.
--- tools/perf/util/python.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/perf/util/python.c +20 -0
@@ -12,6 +12,7 @@#include "build-id.h" #include "callchain.h" #include "comm.h" +#include "config.h" #include "counts.h" #include "data.h" #include "debug.h"
@@ -3230,7 +3231,26 @@ static PyObject *pyrf__syscall_id(PyObject *self, PyObject *args)return PyLong_FromLong (id); } +static PyObject *pyrf__config_get (PyObject *self,PyObject *args) +{ +const char *config_name, *val; + +if (!PyArg_ParseTuple (args,"s" , &config_name)) +return NULL ; + + val =perf_config_get (config_name); +if (!val) + Py_RETURN_NONE; +return PyUnicode_FromString (val); +} +static PyMethodDef perf__methods[] = { + { + .ml_name ="config_get" , + .ml_meth = (PyCFunction ) pyrf__config_get, + .ml_flags =METH_VARARGS , + .ml_doc =PyDoc_STR ("Get a perf config value." ) + }, { .ml_name ="metrics" , .ml_meth = (PyCFunction ) pyrf__metrics,
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 20/58 perf python: Extend API for stat events in python.c
In reply to Ian RogersAdd stat information to the session. Add call backs for stat events.
---
v2:
1. Avoided Name Collision: Renamed the second "type" field in pyrf_stat_round_event__members[] to "stat_round_type" to prevent it from hiding the event header's type attribute.
2. Fixed Leak and Exception Handling in Callback: Added proper reference count handling for the result of PyObject_CallFunction() in pyrf_session_tool__stat() , and added an exception check that aborts the loop if the Python callback fails.
3. Fixed Leak in Destructor: Added Py_XDECREF(psession->stat); to pyrf_session__delete() to release the stat callback reference.
--- tools/perf/util/python.c | 170 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 4 deletions(-)
tools/perf/util/python.c +166 -4
@@ -299,6 +299,76 @@ static PyTypeObject pyrf_lost_event__type = { .tp_repr = (reprfunc)pyrf_lost_event__repr, }; +static const char pyrf_stat_event__doc[] =PyDoc_STR ("perf stat event object." ); + +static PyMemberDef pyrf_stat_event__members[] = { + 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 =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 = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.stat_event" , + .tp_basicsize =sizeof (struct pyrf_event ), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor )pyrf_event__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_stat_event__doc, + .tp_members = pyrf_stat_event__members, + .tp_getset = pyrf_event__getset, + .tp_repr = (reprfunc )pyrf_stat_event__repr, +}; + +static const char pyrf_stat_round_event__doc[] =PyDoc_STR ("perf stat round event object." ); + +static PyMemberDef pyrf_stat_round_event__members[] = { + sample_members +member_def (perf_event_header, type,T_UINT ,"event type" ), + { .name ="stat_round_type" , .type =T_ULONGLONG , + .offset = offsetof(struct perf_record_stat_round , type), .doc ="round type" }, +member_def (perf_record_stat_round, time,T_ULONGLONG ,"round time" ), + { .name =NULL , }, +}; + +static PyObject *pyrf_stat_round_event__repr (const struct pyrf_event *pevent) +{ +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 = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.stat_round_event" , + .tp_basicsize =sizeof (struct pyrf_event ), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor )pyrf_event__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_stat_round_event__doc, + .tp_members = pyrf_stat_round_event__members, + .tp_getset = pyrf_event__getset, + .tp_repr = (reprfunc )pyrf_stat_round_event__repr, +}; +static const char pyrf_read_event__doc[] =PyDoc_STR ("perf read event object." );static PyMemberDef pyrf_read_event__members[] = {
@@ -986,6 +1056,12 @@ static int pyrf_event__setup_types(void)if (err <0 ) goto out; err =PyType_Ready (&pyrf_context_switch_event__type); +if (err <0 ) + goto out; + err =PyType_Ready (&pyrf_stat_event__type); +if (err <0 ) + goto out; + err =PyType_Ready (&pyrf_stat_round_event__type);if (err <0 ) goto out; err =PyType_Ready (&pyrf_callchain_node__type);
@@ -1010,6 +1086,8 @@ static PyTypeObject *pyrf_event__type[] = { [PERF_RECORD_SAMPLE] = &pyrf_sample_event__type, [PERF_RECORD_SWITCH] = &pyrf_context_switch_event__type, [PERF_RECORD_SWITCH_CPU_WIDE] = &pyrf_context_switch_event__type, + [PERF_RECORD_STAT] = &pyrf_stat_event__type, + [PERF_RECORD_STAT_ROUND] = &pyrf_stat_round_event__type, };static PyObject *pyrf_event__new (const union perf_event *event)
@@ -1020,7 +1098,9 @@ static PyObject *pyrf_event__new(const union perf_event *event)if ((event->header.type <PERF_RECORD_MMAP || event->header.type >PERF_RECORD_SAMPLE ) && !(event->header.type ==PERF_RECORD_SWITCH || - event->header.type ==PERF_RECORD_SWITCH_CPU_WIDE )) { + event->header.type ==PERF_RECORD_SWITCH_CPU_WIDE || + event->header.type ==PERF_RECORD_STAT || + event->header.type ==PERF_RECORD_STAT_ROUND )) {PyErr_Format (PyExc_TypeError,"Unexpected header type %u" , event->header.type);return NULL ;
@@ -1880,7 +1960,40 @@ static PyObject *pyrf_evsel__get_attr_wakeup_events(PyObject *self, void */*closreturn PyLong_FromUnsignedLong (pevsel->evsel->core.attr.wakeup_events); } +static PyObject *pyrf_evsel__get_ids (struct pyrf_evsel *pevsel,void *closure__maybe_unused ) +{ +struct evsel *evsel = pevsel->evsel; +PyObject *list =PyList_New (0 ); + +if (!list) +return NULL ; + +for (u32 i =0 ; i < evsel->core.ids; i++) { +PyObject *id =PyLong_FromUnsignedLongLong (evsel->core.id[i]); +int ret; + +if (!id) { +Py_DECREF (list); +return NULL ; + } + ret =PyList_Append (list, id); +Py_DECREF (id); +if (ret <0 ) { +Py_DECREF (list); +return NULL ; + } + } + +return list; +} +static PyGetSetDef pyrf_evsel__getset[] = { + { + .name ="ids" , + .get = (getter )pyrf_evsel__get_ids, + .set =NULL , + .doc ="event IDs." , + }, { .name ="tracking" , .get = pyrf_evsel__get_tracking,
@@ -2640,6 +2753,8 @@ static const struct perf_constant perf__constants[] = {PERF_CONST (RECORD_LOST_SAMPLES ),PERF_CONST (RECORD_SWITCH ),PERF_CONST (RECORD_SWITCH_CPU_WIDE ), +PERF_CONST (RECORD_STAT ), +PERF_CONST (RECORD_STAT_ROUND ),PERF_CONST (RECORD_MISC_SWITCH_OUT ), { .name = NULL, },
@@ -3056,6 +3171,46 @@ static int pyrf_session_tool__sample(const struct perf_tool *tool,return 0 ; } +static int pyrf_session_tool__stat (const struct perf_tool *tool, +struct perf_session *session, +union perf_event *event) +{ + struct pyrf_session *psession = container_of(tool, struct pyrf_session, tool); +PyObject *pyevent =pyrf_event__new (event); +struct evsel *evsel =evlist__id2evsel (session->evlist, event->stat.id); +const char *name = evsel ?evsel__name (evsel) :"unknown" ; +PyObject *ret; + +if (pyevent ==NULL ) +return -ENOMEM ; + + ret =PyObject_CallFunction (psession->stat,"Os" , pyevent, name); +if (!ret) { +PyErr_Print (); +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 = container_of(tool, struct pyrf_session, tool); +PyObject *pyevent =pyrf_event__new (event); + +if (pyevent ==NULL ) +return -ENOMEM ; + +PyObject_CallFunction (psession->stat,"O" , pyevent); +Py_DECREF (pyevent); +return 0 ; +} + +static PyObject *pyrf_session__process (struct pyrf_session *psession,PyObject *args) {struct machine *machine;
@@ -3088,10 +3243,11 @@ static int pyrf_session__init(struct pyrf_session *psession, PyObject *args, PyO {struct pyrf_data *pdata;PyObject *sample =NULL ; -static char *kwlist[] = {"data" ,"sample" ,NULL }; +PyObject *stat =NULL ; +static char *kwlist[] = {"data" ,"sample" ,"stat" ,NULL }; -if (!PyArg_ParseTupleAndKeywords (args, kwargs,"O!|O" , kwlist, &pyrf_data__type, &pdata, - &sample)) +if (!PyArg_ParseTupleAndKeywords (args, kwargs,"O!|OO" , kwlist, &pyrf_data__type, &pdata, + &sample, &stat))return -1 ;Py_INCREF (pdata);
@@ -3113,8 +3269,13 @@ static int pyrf_session__init(struct pyrf_session *psession, PyObject *args, PyO }while (0 )ADD_TOOL (sample); +ADD_TOOL (stat);#undef ADD_TOOL +if (stat) + psession->tool.stat_round = pyrf_session_tool__stat_round; + + psession->tool.comm = perf_event__process_comm; psession->tool.mmap = perf_event__process_mmap; psession->tool.mmap2 = perf_event__process_mmap2;
@@ -3156,6 +3317,7 @@ static void pyrf_session__delete(struct pyrf_session *psession) {Py_XDECREF (psession->pdata);Py_XDECREF (psession->sample); +Py_XDECREF (psession->stat);perf_session__delete (psession->session);Py_TYPE (psession)->tp_free ((PyObject *)psession); }
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 21/58 perf python: Expose brstack in sample event
In reply to Ian RogersImplement pyrf_branch_entry and pyrf_branch_stack for lazy iteration over branch stack entries.
---
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.
--- tools/perf/util/python.c | 189 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+)
tools/perf/util/python.c +189 -0
@@ -19,6 +19,7 @@#include "dso.h" #include "dwarf-regs.h" #include "event.h" +#include "branch.h" #include "evlist.h" #include "evsel.h" #include "expr.h"
@@ -69,6 +70,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 buffer. */ union perf_event event; };
@@ -107,6 +110,7 @@ static void pyrf_event__delete(struct pyrf_event *pevent)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); }
@@ -870,6 +874,144 @@ static PyObject *pyrf_sample_event__get_callchain(PyObject *self, void *closurereturn pevent->callchain; } +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 *pentry, +void *closure__maybe_unused ) +{ +return PyLong_FromUnsignedLongLong (pentry->from); +} + +static PyObject *pyrf_branch_entry__get_to (struct pyrf_branch_entry *pentry, +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 *pentry, +void *closure__maybe_unused ) +{ +return PyBool_FromLong (pentry->flags.in_tx); +} + +static PyObject *pyrf_branch_entry__get_abort (struct pyrf_branch_entry *pentry, +void *closure__maybe_unused ) +{ +return PyBool_FromLong (pentry->flags.abort); +} + +static PyObject *pyrf_branch_entry__get_cycles (struct pyrf_branch_entry *pentry, +void *closure__maybe_unused ) +{ +return PyLong_FromUnsignedLongLong (pentry->flags.cycles); +} + +static PyObject *pyrf_branch_entry__get_type (struct pyrf_branch_entry *pentry, +void *closure__maybe_unused ) +{ +return PyLong_FromLong (pentry->flags.type); +} + +static PyGetSetDef pyrf_branch_entry__getset[] = { + { .name ="from_ip" , .get = (getter )pyrf_branch_entry__get_from, }, + { .name ="to_ip" , .get = (getter )pyrf_branch_entry__get_to, }, + { .name ="mispred" , .get = (getter )pyrf_branch_entry__get_mispred, }, + { .name ="predicted" , .get = (getter )pyrf_branch_entry__get_predicted, }, + { .name ="in_tx" , .get = (getter )pyrf_branch_entry__get_in_tx, }, + { .name ="abort" , .get = (getter )pyrf_branch_entry__get_abort, }, + { .name ="cycles" , .get = (getter )pyrf_branch_entry__get_cycles, }, + { .name ="type" , .get = (getter )pyrf_branch_entry__get_type, }, + { .name =NULL , }, +}; + +static PyTypeObject pyrf_branch_entry__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.branch_entry" , + .tp_basicsize =sizeof (struct pyrf_branch_entry ), + .tp_dealloc = (destructor )pyrf_branch_entry__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc ="perf branch entry object." , + .tp_getset = pyrf_branch_entry__getset, +}; + +struct pyrf_branch_stack { +PyObject_HEAD + struct pyrf_event *pevent; +struct branch_entry *entries; +u64 nr; +u64 pos; +}; + +static void pyrf_branch_stack__delete (struct pyrf_branch_stack *pstack) +{ +Py_XDECREF (pstack->pevent); +free (pstack->entries); +Py_TYPE (pstack)->tp_free ((PyObject *)pstack); +} + +static PyObject *pyrf_branch_stack__next (struct pyrf_branch_stack *pstack) +{ +struct pyrf_branch_entry *pentry; + +if (pstack->pos >= pstack->nr) +return NULL ; + + pentry = PyObject_New(struct pyrf_branch_entry, &pyrf_branch_entry__type); +if (!pentry) +return NULL ; + + pentry->from = pstack->entries[pstack->pos].from; + pentry->to = pstack->entries[pstack->pos].to; + pentry->flags = pstack->entries[pstack->pos].flags; + + pstack->pos++; +return (PyObject *)pentry; +} + +static PyTypeObject pyrf_branch_stack__type = { +PyVarObject_HEAD_INIT (NULL ,0 ) + .tp_name ="perf.branch_stack" , + .tp_basicsize =sizeof (struct pyrf_branch_stack ), + .tp_dealloc = (destructor )pyrf_branch_stack__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc ="perf branch stack object." , + .tp_iter = PyObject_SelfIter, + .tp_iternext = (iternextfunc )pyrf_branch_stack__next, +}; + +static PyObject *pyrf_sample_event__get_brstack (PyObject *self,void *closure__maybe_unused ) +{ +struct pyrf_event *pevent = (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) {
@@ -890,6 +1032,12 @@ static PyGetSetDef pyrf_sample_event__getset[] = { .set = NULL, .doc = "event callchain.", }, + { + .name = "brstack", + .get = pyrf_sample_event__get_brstack, + .set = NULL, + .doc = "event branch stack.", + }, { .name = "raw_buf", .get = (getter)pyrf_sample_event__get_raw_buf,
@@ -1070,6 +1218,12 @@ static int pyrf_event__setup_types(void) err =PyType_Ready (&pyrf_callchain__type);if (err <0 ) goto out; + err =PyType_Ready (&pyrf_branch_entry__type); +if (err <0 ) + goto out; + err =PyType_Ready (&pyrf_branch_stack__type); +if (err <0 ) + goto out; out:return err; }
@@ -1120,6 +1274,7 @@ static PyObject *pyrf_event__new(const union perf_event *event)memcpy (&pevent->event, event, event->header.size); pevent->sample.evsel =NULL ; pevent->callchain =NULL ; + pevent->brstack =NULL ; pevent->al_resolved = false;addr_location__init (&pevent->al); }
@@ -3160,6 +3315,28 @@ static int pyrf_session_tool__sample(const struct perf_tool *tool, } } +if (sample->branch_stack) { +struct branch_stack *bs = sample->branch_stack; +struct branch_entry *entries =perf_sample__branch_entries (sample); +struct pyrf_branch_stack *pstack; + + pstack = PyObject_New(struct pyrf_branch_stack, &pyrf_branch_stack__type); +if (pstack) { +Py_INCREF (pevent); + pstack->pevent = pevent; + pstack->pos =0 ; + pstack->nr = bs->nr; + pstack->entries =calloc (bs->nr,sizeof (struct branch_entry )); +if (pstack->entries) { +memcpy (pstack->entries, entries, + bs->nr *sizeof (struct branch_entry )); + pevent->brstack = (PyObject *)pstack; + }else { +Py_DECREF (pstack); + } + } + } + ret =PyObject_CallFunction (psession->sample,"O" , pyevent);if (!ret) {PyErr_Print ();
@@ -3543,6 +3720,18 @@ PyMODINIT_FUNC PyInit_perf(void)Py_INCREF (&pyrf_session__type);PyModule_AddObject (module,"session" , (PyObject *)&pyrf_session__type); +Py_INCREF (&pyrf_branch_entry__type); +if (PyModule_AddObject (module,"branch_entry" , (PyObject *)&pyrf_branch_entry__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_stack__type) <0 ) { +Py_DECREF (&pyrf_branch_stack__type); + goto error; + } + dict =PyModule_GetDict (module);if (dict ==NULL ) goto error;
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 22/58 perf python: Add perf.pyi stubs file
In reply to Ian RogersAdd 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.
---
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 .
--- tools/perf/python/perf.pyi | 579 +++++++++++++++++++++++++++++++++++++ 1 file changed, 579 insertions(+) create mode 100644 tools/perf/python/perf.pyi
tools/perf/python/perf.pyi new file +579 -0
@@ -0,0 +1,579 @@ +"""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) -> str: + """Convert a syscall number to its name. + + Args: + sc_id: The syscall number. + + Returns: + The name of the syscall. + """ + ... + +def syscall_id(name: str) -> int: + """Convert a syscall name to its number. + + Args: + name: The syscall name. + + Returns: + The number of the syscall. + """ + ... + +def parse_events( + event_string: str, + cpus: Optional[cpu_map] = None, + threads: Optional[Any] = 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) -> 'evlist': + """Parse a string of metrics or metric groups and return an evlist.""" + ... + +def pmus() -> Iterator[Any]: + """Returns a sequence of pmus.""" + ... + +class data: + """Represents a perf data file.""" + def __init__(self, path: str = ..., fd: int = ...) -> None: ... + +class thread: + """Represents a thread in the system.""" + def comm(self) -> str: + """Get the command name of the thread.""" + ... + +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 = -1, tid: int = -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 = ..., + config: int = ..., + sample_freq: int = ..., + sample_period: int = ..., + sample_type: int = ..., + read_format: int = ..., + disabled: bool = ..., + inherit: bool = ..., + pinned: bool = ..., + exclusive: bool = ..., + exclude_user: bool = ..., + exclude_kernel: bool = ..., + exclude_hv: bool = ..., + exclude_idle: bool = ..., + mmap: bool = ..., + context_switch: bool = ..., + comm: bool = ..., + freq: bool = ..., + idx: int = ..., + ) -> 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.""" + ... + + +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 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' keyword 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] = 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]] = None, + stat: Optional[Callable[[Any, Optional[str]], None]] = 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 process(self, pid: int) -> thread: + """Process events for a specific process.""" + ... + +# 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 issues, +most notably hardware interrupt counts.""" + +COUNT_HW_CACHE_REFERENCES: int +"""Cache accesses. Usually this indicates Last Level Cache accesses but this +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-frontend].""" + +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_type.""" + +RECORD_MMAP2: int +"""MMAP2 record. Contains header, pid, tid, addr, len, pgoff, maj, min, ino, +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."""
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 23/58 perf python: Add LiveSession helper
In reply to Ian RogersAdd 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.
---
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.
--- tools/perf/python/perf_live.py | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 tools/perf/python/perf_live.py
tools/perf/python/perf_live.py new file +48 -0
@@ -0,0 +1,48 @@ +# 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 = event_string + self.sample_callback = sample_callback + # Create a cpu map for all online CPUs + self.cpus = perf.cpu_map() + # Parse events and set maps + self.evlist = perf.parse_events(self.event_string, self.cpus) + self.evlist.config() + + def run(self): + """Run the live session.""" + self.evlist.open() + try: + 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: + try: + event = self.evlist.read_on_cpu(cpu) + if event and event.type == perf.RECORD_SAMPLE: + self.sample_callback(event) + except Exception: + pass + except KeyboardInterrupt: + pass + finally: + self.evlist.close()
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 24/58 perf python: Move exported-sql-viewer.py and parallel-perf.py to tools/perf/python/
In reply to Ian RogersThese scripts are standalone and not using the perf script libpython support. Move to tools/perf/python in an effort to deprecate the tools/perf/scripts/python support.
---
v2:
1. Updated exported-sql-viewer.py : I updated the comments at the top of the script to use the new path tools/perf/python/exported-sql-viewer.py in the usage examples.
2. Fixed Test Path in script.sh : I updated the path in tools/perf/tests/shell/script.sh to point to the new location of parallel-perf.py at ../../python/parallel-perf.py .
---
tools/perf/{scripts => }/python/exported-sql-viewer.py | 4 ++--
tools/perf/{scripts => }/python/parallel-perf.py | 0
tools/perf/tests/shell/script.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename tools/perf/{scripts => }/python/exported-sql-viewer.py (99%)
rename tools/perf/{scripts => }/python/parallel-perf.py (100%)tools/perf/python/exported-sql-viewer.py renamed from tools/perf/scripts/python/exported-sql-viewer.py +2 -2
@@ -10,12 +10,12 @@ # Following on from the example in the export scripts, a # call-graph can be displayed for the pt_example database like this: # -# python tools/perf/scripts/python/exported-sql-viewer.py pt_example +# python tools/perf/python/exported-sql-viewer.py pt_example # # Note that for PostgreSQL, this script supports connecting to remote databases # by setting hostname, port, username, password, and dbname e.g. # -# python tools/perf/scripts/python/exported-sql-viewer.py "hostname=myhost username=myuser password=mypassword dbname=pt_example" +# python tools/perf/python/exported-sql-viewer.py "hostname=myhost username=myuser password=mypassword dbname=pt_example" # # The result is a GUI window with a tree representing a context-sensitive # call-graph. Expanding a couple of levels of the tree and adjusting column
tools/perf/python/parallel-perf.py renamed from tools/perf/scripts/python/parallel-perf.py +0 -0
tools/perf/tests/shell/script.sh +1 -1
@@ -76,7 +76,7 @@ test_parallel_perf() err=2 return fi - pp=$(dirname "$0")/../../scripts/python/parallel-perf.py + pp=$(dirname "$0")/../../python/parallel-perf.py if [ ! -f "${pp}" ] ; then echo "SKIP: parallel-perf.py script not found " err=2
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 25/58 perf stat-cpi: Port stat-cpi to use python module
In reply to Ian RogersPort stat-cpi.py from the legacy framework to a standalone script. Support both file processing mode (using perf.session) and live mode (reading counters directly via perf.parse_events and evsel.read). Use argparse for command line options handling. Calculate and display CPI (Cycles Per Instruction) per interval per CPU/thread.
---
v2:
1. Accurate CPI Calculation (Multiplexing Support):
- Before: The get() method returned the raw counter value directly, ignoring whether the counter ran for the full interval.
- After: The get() method now scales the raw value by the ratio of enabled time to running time ( val * (ena / float(run)) ) when run > 0 . This handles cases where PMU counters are overcommitted and multiplexed.
2. Per-Interval CPI in File Mode:
- Before: store() saved absolute counter values as read from PERF_RECORD_STAT . Since these are cumulative from the start of the trace, and data.clear() was called every round, the script computed cumulative CPI rather than per-interval CPI.
- After: store() now computes the delta between the current absolute value and the value from the previous interval. It saves this delta in self.data and retains the absolute value in self. prev_data for the next delta computation.
3. Prevention of Dummy Output (Cartesian Product Fix):
- Before: self.cpus and self.threads lists accumulated all unique CPUs and threads seen independently. The nested loops in print_interval() then created a Cartesian product of all seen CPUs and threads, querying data for combinations that might never have occurred.
- After: Replaced lists with a self.recorded_pairs set that stores (cpu, thread) tuples only when a sample actually records them. The output loop now iterates strictly over these verified pairs.
--- tools/perf/python/stat-cpi.py | 151 ++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100755 tools/perf/python/stat-cpi.py
tools/perf/python/stat-cpi.py new file +151 -0
@@ -0,0 +1,151 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 +"""Calculate CPI from perf stat data or live.""" + +import argparse +import sys +import time +from typing import Any, Optional +import perf + +class StatCpiAnalyzer: + """Accumulates cycles and instructions and calculates CPI.""" + + def __init__(self, args: argparse.Namespace) -> None: + self.args = args + self.data: dict[str, tuple[int, int, int]] = {} + self.prev_data: dict[str, tuple[int, int, int]] = {} + self.recorded_pairs: set[tuple[int, int]] = set() + + def get_key(self, event: str, cpu: int, thread: int) -> str: + """Get key for data dictionary.""" + return f"{event}-{cpu}-{thread}" + + def store_key(self, cpu: int, thread: int) -> None: + """Store CPU and thread IDs.""" + self.recorded_pairs.add((cpu, thread)) + + def store(self, event: str, cpu: int, thread: int, counts: tuple[int, int, int]) -> None: + """Store counter values, computing difference from previous absolute values.""" + self.store_key(cpu, thread) + key = self.get_key(event, cpu, thread) + + val, ena, run = counts + if key in self.prev_data: + prev_val, prev_ena, prev_run = self.prev_data[key] + cur_val = val - prev_val + cur_ena = ena - prev_ena + cur_run = run - prev_run + else: + cur_val = val + cur_ena = ena + cur_run = run + + self.data[key] = (cur_val, cur_ena, cur_run) + self.prev_data[key] = counts # Store absolute value for next time + + def get(self, event: str, cpu: int, thread: int) -> float: + """Get scaled counter value.""" + key = self.get_key(event, cpu, thread) + if key not in self.data: + return 0.0 + val, ena, run = self.data[key] + if run > 0: + return val * (ena / float(run)) + return float(val) + + def process_stat_event(self, event: Any, name: Optional[str] = None) -> None: + """Process PERF_RECORD_STAT and PERF_RECORD_STAT_ROUND events.""" + if event.type == perf.RECORD_STAT: + if name: + if "cycles" in name: + event_name = "cycles" + elif "instructions" in name: + event_name = "instructions" + else: + return + self.store(event_name, event.cpu, event.thread, (event.val, event.ena, event.run)) + elif event.type == perf.RECORD_STAT_ROUND: + timestamp = getattr(event, "time", 0) + self.print_interval(timestamp) + self.data.clear() + self.recorded_pairs.clear() + + def print_interval(self, timestamp: int) -> None: + """Print CPI for the current interval.""" + for cpu, thread in sorted(self.recorded_pairs): + cyc = self.get("cycles", cpu, thread) + ins = self.get("instructions", cpu, thread) + cpi = 0.0 + if ins != 0: + cpi = cyc / float(ins) + t_sec = timestamp / 1000000000.0 + print(f"{t_sec:15f}: cpu {cpu}, thread {thread} -> cpi {cpi:f} ({cyc:.0f}/{ins:.0f})") + + def read_counters(self, evlist: Any) -> None: + """Read counters live.""" + for evsel in evlist: + name = str(evsel) + if "cycles" in name: + event_name = "cycles" + elif "instructions" in name: + event_name = "instructions" + else: + continue + + for cpu in evsel.cpus(): + for thread in evsel.threads(): + try: + counts = evsel.read(cpu, thread) + self.store(event_name, cpu, thread, + (counts.val, counts.ena, counts.run)) + except OSError: + pass + + def run_file(self) -> None: + """Process events from file.""" + session = perf.session(perf.data(self.args.input), stat=self.process_stat_event) + session.process_events() + + def run_live(self) -> None: + """Read counters live.""" + evlist = perf.parse_events("cycles,instructions") + if not evlist: + print("Failed to parse events", file=sys.stderr) + return + try: + evlist.open() + except OSError as e: + print(f"Failed to open events: {e}", file=sys.stderr) + return + + print("Live mode started. Press Ctrl+C to stop.") + try: + while True: + time.sleep(self.args.interval) + timestamp = time.time_ns() + self.read_counters(evlist) + self.print_interval(timestamp) + self.data.clear() + self.recorded_pairs.clear() + except KeyboardInterrupt: + print("\nStopped.") + finally: + evlist.close() + +def main() -> None: + """Main function.""" + ap = argparse.ArgumentParser(description="Calculate CPI from perf stat data or live") + ap.add_argument("-i", "--input", help="Input file name (enables file mode)") + ap.add_argument("-I", "--interval", type=float, default=1.0, + help="Interval in seconds for live mode") + args = ap.parse_args() + + analyzer = StatCpiAnalyzer(args) + if args.input: + analyzer.run_file() + else: + analyzer.run_live() + +if __name__ == "__main__": + main()
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 26/58 perf mem-phys-addr: Port mem-phys-addr to use python module
In reply to Ian RogersGive an example of using the perf python session API to load a perf.data file and perform the behavior of tools/perf/scripts/python/mem-phys-addr.py.
---
v2: Added command line '-i' option and cleaned up pylint issues.
--- tools/perf/python/mem-phys-addr.py | 117 +++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100755 tools/perf/python/mem-phys-addr.py
tools/perf/python/mem-phys-addr.py new file +117 -0
@@ -0,0 +1,117 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 +"""mem-phys-addr.py: Resolve physical address samples""" +import argparse +import bisect +import collections +from dataclasses import dataclass +import re +from typing import (Dict, Optional) + +import perf + +@dataclass(frozen=True) +class IomemEntry: + """Read from a line in /proc/iomem""" + begin: int + end: int + indent: int + label: str + +# Physical memory layout from /proc/iomem. Key is the indent and then +# a list of ranges. +iomem: Dict[int, list[IomemEntry]] = collections.defaultdict(list) +# Child nodes from the iomem parent. +children: Dict[IomemEntry, set[IomemEntry]] = collections.defaultdict(set) +# Maximum indent seen before an entry in the iomem file. +max_indent: int = 0 +# Count for each range of memory. +load_mem_type_cnt: Dict[IomemEntry, int] = collections.Counter() +# Perf event name set from the first sample in the data. +event_name: Optional[str] = None + +def parse_iomem(iomem_path: str): + """Populate iomem from iomem file""" + global max_indent + with open(iomem_path, 'r', encoding='ascii') as f: + for line in f: + indent = 0 + while line[indent] == ' ': + indent += 1 + max_indent = max(max_indent, indent) + m = re.split('-|:', line, maxsplit=2) + begin = int(m[0], 16) + end = int(m[1], 16) + label = m[2].strip() + entry = IomemEntry(begin, end, indent, label) + # Before adding entry, search for a parent node using its begin. + if indent > 0: + parent = find_memory_type(begin) + assert parent, f"Given indent expected a parent for {label}" + children[parent].add(entry) + iomem[indent].append(entry) + +def find_memory_type(phys_addr) -> Optional[IomemEntry]: + """Search iomem for the range containing phys_addr with the maximum indent""" + for i in range(max_indent, -1, -1): + if i not in iomem: + continue + position = bisect.bisect_right(iomem[i], phys_addr, + key=lambda entry: entry.begin) + if position is None: + continue + iomem_entry = iomem[i][position-1] + if iomem_entry.begin <= phys_addr <= iomem_entry.end: + return iomem_entry + print(f"Didn't find {phys_addr}") + return None + +def print_memory_type(): + """Print the resolved memory types and their counts.""" + print(f"Event: {event_name}") + print(f"{'Memory type':<40} {'count':>10} {'percentage':>10}") + print(f"{'-' * 40:<40} {'-' * 10:>10} {'-' * 10:>10}") + total = sum(load_mem_type_cnt.values()) + # Add count from children into the parent. + for i in range(max_indent, -1, -1): + if i not in iomem: + continue + for entry in iomem[i]: + for child in children[entry]: + if load_mem_type_cnt[child] > 0: + load_mem_type_cnt[entry] += load_mem_type_cnt[child] + + def print_entries(entries): + """Print counts from parents down to their children""" + for entry in sorted(entries, + key = lambda entry: load_mem_type_cnt[entry], + reverse = True): + count = load_mem_type_cnt[entry] + if count > 0: + mem_type = ' ' * entry.indent + f"{entry.begin:x}-{entry.end:x} : {entry.label}" + percent = 100 * count / total + print(f"{mem_type:<40} {count:>10} {percent:>10.1f}") + print_entries(children[entry]) + + print_entries(iomem[0]) + +if __name__ == "__main__": + ap = argparse.ArgumentParser(description="Resolve physical address samples") + ap.add_argument("-i", "--input", default="perf.data", help="Input file name") + ap.add_argument("--iomem", default="/proc/iomem", help="Path to iomem file") + args = ap.parse_args() + + def process_event(sample): + """Process a single sample event.""" + phys_addr = sample.sample_phys_addr + entry = find_memory_type(phys_addr) + if entry: + load_mem_type_cnt[entry] += 1 + + global event_name + if event_name is None: + event_name = str(sample.evsel) + + parse_iomem(args.iomem) + perf.session(perf.data(args.input), sample=process_event).process_events() + print_memory_type()
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerPATCH v4 27/58 perf syscall-counts: Port syscall-counts to use python module
In reply to Ian RogersRewrite tools/perf/scripts/python/syscall-counts.py to use the python module and various style changes. By avoiding the overheads in the perf script execution the performance improves by more than 4x as shown in the following (with PYTHON_PATH and PERF_EXEC_PATH set as necessary):
``` $ perf record -e raw_syscalls:sys_enter -a sleep 1 ... $ time perf script tools/perf/scripts/python/syscall-counts.py perf Install the python-audit package to get syscall names. For example: # apt-get install python3-audit (Ubuntu) # yum install python3-audit (Fedora) etc. Press control+C to stop and show the summary Warning: 1 out of order events recorded. syscall events for perf: event count -------------------------------------- ------------ 1 538989 16 32 203 17 3 2 257 1 204 1 15 1 7 1 0 1 real 0m3.887s user 0m3.578s sys 0m0.308s $ time python3 tools/perf/python/syscall-counts.py perf Warning: 1 out of order events recorded. syscall events for perf: event count -------------------------------------- ------------ write 538989 ioctl 32 sched_setaffinity 17 close 2 openat 1 sched_getaffinity 1 rt_sigreturn 1 poll 1 read 1 real 0m0.953s user 0m0.905s sys 0m0.048s ```
---
v2:
1. Fallback for Unknown Syscalls: If perf.syscall_name() returns None for an unmapped ID, the script now falls back to using the numeric ID string. This prevents a TypeError when applying string alignment formatting.
2. Fallback for Syscall Number Attribute: The script now checks for __syscall_nr first, and if not present (as on some older kernels), falls back to checking for nr .
3. Robust Process Resolution: Added a try-except block around session.process(sample.pid).comm() . If the process lookup fails (returning NULL/None), it falls back to "unknown" instead of letting a TypeError crash the script.
4. Support for Custom Input Files: Added a -i / --input command-line argument to allow processing arbitrarily named trace files, removing the hardcoded "perf.data" restriction.
--- tools/perf/python/syscall-counts.py | 72 +++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100755 tools/perf/python/syscall-counts.py
tools/perf/python/syscall-counts.py new file +72 -0
@@ -0,0 +1,72 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 +""" +Displays system-wide system call totals, broken down by syscall. + +If a [comm] arg is specified, only syscalls called by [comm] are displayed. +""" + +import argparse +from collections import defaultdict +from typing import DefaultDict +import perf + +syscalls: DefaultDict[int, int] = defaultdict(int) +for_comm = None +session = None + + +def print_syscall_totals(): + """Print aggregated statistics.""" + if for_comm is not None: + print(f"\nsyscall events for {for_comm}:\n") + else: + print("\nsyscall events:\n") + + print(f"{'event':<40} {'count':>10}") + print("---------------------------------------- -----------") + + for sc_id, val in sorted(syscalls.items(), + key=lambda kv: (kv[1], kv[0]), reverse=True): + name = perf.syscall_name(sc_id) or str(sc_id) + print(f"{name:<40} {val:>10}") + + +def process_event(sample): + """Process a single sample event.""" + event_name = str(sample.evsel) + if event_name == "evsel(raw_syscalls:sys_enter)": + sc_id = getattr(sample, "id", -1) + elif event_name.startswith("evsel(syscalls:sys_enter_"): + sc_id = getattr(sample, "__syscall_nr", None) + if sc_id is None: + sc_id = getattr(sample, "nr", -1) + else: + return + + if sc_id == -1: + return + + comm = "unknown" + try: + if session: + proc = session.process(sample.sample_pid) + if proc: + comm = proc.comm() + except (TypeError, AttributeError): + pass + + if for_comm and comm != for_comm: + return + syscalls[sc_id] += 1 + + +if __name__ == "__main__": + ap = argparse.ArgumentParser() + ap.add_argument("comm", nargs="?", help="Only report syscalls for comm") + ap.add_argument("-i", "--input", default="perf.data", help="Input file name") + args = ap.parse_args() + for_comm = args.comm + session = perf.session(perf.data(args.input), sample=process_event) + session.process_events() + print_syscall_totals()
Signature · 1 line
2.54.0.rc2.533.g4f5dca5207-goog
Ian Rogers
reviewerQuoted 5 lines · Ian Rogers
---
v4 Changes
----------Sorry for the churn resending v3 plus one fix!
Sorry I hit a quota limit so I'll wait to send the remaining patches.
Thanks,
Ian
Ian Rogers
reviewerv5 cover perf: Reorganize scripting support
In reply to Ian RogersThe perf script command has long supported running Python and Perl scripts by embedding libpython and libperl. This approach has several drawbacks:
- overhead by creating Python dictionaries for every event (whether used or not),
- complex build dependencies on specific Python/Perl versions,
- complications with threading due to perf being the interpreter,
- no clear way to run standalone scripts like ilist.py.
This series takes a different approach with some initial implementation posted as an RFC last October:
https://lore.kernel.org/linux-perf-users/[email protected]/
with the motivation coming up on the mailing list earlier:
https://lore.kernel.org/lkml/CAP-5=fWDqE8SYfOLZkg_0=4Ayx6E7O+h7uUp4NDeCFkiN4b7-w@mail.gmail.com/
The changes remove the embedded libpython and libperl support from perf entirely. Instead, they expand the existing perf Python module to provide full access to perf data files and events, allowing scripts to be run as standalone Python applications.
To demonstrate the benefits, we ported all existing Python and Perl scripts to use the new Python session API. The performance improvement is dramatic. For example, porting mem-phys-addr.py:
Before (using embedded libpython in perf script):
``` $ perf mem record a sleep 1 $ time perf script tools/perf/scripts/python/mem-phys-addr.py Event: cpu_core/mem-loads-aux/ Memory type count percentage --------------------------------------- ---------- ---------- 0-fff : Reserved 3217 100.0 real 0m3.754s user 0m0.023s sys 0m0.018s ```
After (using standalone Python script with perf module):
``` $ PYTHONPATH=/tmp/perf/python time python3 tools/perf/python/mem-phys-addr.py Event: evsel(cpu_core/mem-loads-aux/) Memory type count percentage --------------------------------------- ---------- ---------- 0-fff : Reserved 3217 100.0 real 0m0.106s user 0m0.021s sys 0m0.020s ```
This is a roughly 35x speedup!
The change is large (11291 insertions, 15964 deletions, net 4673 deletions) due to porting all existing perl and python code to the new API. Gemini was used to achieve this and to improve the code quality. Removing support may be controversial, however, the first 52 patches are additive and merging those would allow us to focus on the remaining 6 patches that finalize the new perf script behavior.
---
v5 Changes
----------
Resending due to partial send of v4 due to a quota limit.
---
v4 Changes
----------
1. Git Fixup Cleanups
- Squashed the lingering fixup! commit remaining from the previous session back into perf check-perf-trace: Port check-perf-trace to use python module.
---
v3 Changes
----------
1. Memory Safety & Reference Counting Fixes
- Stored transient mmap event data inside the Python object's permanent pevent->event and invoked evsel__parse_sample() to safely point attributes into it, resolving Use-After-Free vulnerabilities.
- Nullified sample->evsel after calling evsel__put() in perf_sample__exit() to protect against potential refcount double-put crashes in error paths.
- Reordered operations inside evlist__remove() to invoke perf_evlist__remove() before reference release.
- Patched an evsel reference leak inside evlist__deliver_deferred_callchain().
2. Sashiko AI Review Cleanups
- Corrected the broken event name equality check in gecko.py to search for a substring match within the parsed event string.
- Fixed a latent AttributeError crash in task-analyzer.py by properly assigning the session instance.
- Safeguarded thread reporting in check-perf-trace.py by utilizing sample_tid instead of sample_pid, and wrapping the session thread resolution in a try-except block.
3. Omitted Minor Issues
- The minor review comments (such as permanent iterator exhaustion on brstack, or dead-code in failed-syscalls-by-pid.py) have been omitted because they do not affect correctness, lead to crashes, or require significant architectural rework.
---
v2 Changes
----------
1. String Match and Event Name Accuracy
- Replaced loose substring event matching across the script suite with exact matches or specific prefix constraints (syscalls:sys_exit_, evsel(skb:kfree_skb), etc.).
- Added getattr() safety checks to prevent script failures caused by unresolved attributes from older kernel traces.
2. OOM and Memory Protections
- Refactored netdev-times.py to compute and process network statistics chronologically on-the-fly, eliminating an unbounded in-memory list that caused Out-Of-Memory crashes on large files.
- Implemented threshold limits on intel-pt-events.py to cap memory allocation during event interleaving.
- Optimized export-to-sqlite.py to periodically commit database transactions (every 10,000 samples) to reduce temporary SQLite journal sizes.
3. Portability & Environment Independence
- Re-keyed internal tracking dictionaries in scripts like powerpc-hcalls.py to use thread PIDs instead of CPUs, ensuring correctness when threads migrate.
- Switched net_dropmonitor.py from host-specific /proc/kallsyms parsing to perf's built-in symbol resolution API.
- Added the --iomem parameter to mem-phys-addr.py to support offline analysis of data collected on different architectures.
4. Standalone Scripting Improvements
- Patched builtin-script.c to ensure --input parameters are successfully passed down to standalone execution pipelines via execvp().
- Guarded against string buffer overflows during .py extension path resolving.
5. Code Cleanups
- Removed stale perl subdirectories from being detected by the TUI script browser.
- Ran the entire script suite through mypy and pylint to achieve strict static type checking and resolve unreferenced variables.
Ian Rogers (58):
perf inject: Fix itrace branch stack synthesis
perf arch arm: Sort includes and add missed explicit dependencies perf arch x86: Sort includes and add missed explicit dependencies perf tests: Sort includes and add missed explicit dependencies perf script: Sort includes and add missed explicit dependencies perf util: Sort includes and add missed explicit dependencies perf python: Add missed explicit dependencies
perf evsel/evlist: Avoid unnecessary #includes
perf data: Add open flag
perf evlist: Add reference count
perf evsel: Add reference count
perf evlist: Add reference count checking
perf python: Use evsel in sample in pyrf_event
perf python: Add wrapper for perf_data file abstraction perf python: Add python session abstraction wrapping perf's session perf python: Add syscall name/id to convert syscall number and name perf python: Refactor and add accessors to sample event perf python: Add callchain support
perf python: Add config file access
perf python: Extend API for stat events in python.c
perf python: Expose brstack in sample event
perf python: Add perf.pyi stubs file
perf python: Add LiveSession helper
perf python: Move exported-sql-viewer.py and parallel-perf.py to
tools/perf/python/
perf stat-cpi: Port stat-cpi to use python module
perf mem-phys-addr: Port mem-phys-addr to use python module perf syscall-counts: Port syscall-counts to use python module perf syscall-counts-by-pid: Port syscall-counts-by-pid to use python
module
perf futex-contention: Port futex-contention to use python module perf flamegraph: Port flamegraph to use python module
perf gecko: Port gecko to use python module
perf arm-cs-trace-disasm: Port arm-cs-trace-disasm to use python
module
perf check-perf-trace: Port check-perf-trace to use python module perf compaction-times: Port compaction-times to use python module perf event_analyzing_sample: Port event_analyzing_sample to use python
module
perf export-to-sqlite: Port export-to-sqlite to use python module perf export-to-postgresql: Port export-to-postgresql to use python
module
perf failed-syscalls-by-pid: Port failed-syscalls-by-pid to use python
module
perf intel-pt-events: Port intel-pt-events/libxed to use python module perf net_dropmonitor: Port net_dropmonitor to use python module perf netdev-times: Port netdev-times to use python module perf powerpc-hcalls: Port powerpc-hcalls to use python module perf sched-migration: Port sched-migration/SchedGui to use python
module
perf sctop: Port sctop to use python module
perf stackcollapse: Port stackcollapse to use python module perf task-analyzer: Port task-analyzer to use python module perf failed-syscalls: Port failed-syscalls to use python module perf rw-by-file: Port rw-by-file to use python module
perf rw-by-pid: Port rw-by-pid to use python module
perf rwtop: Port rwtop to use python module
perf wakeup-latency: Port wakeup-latency to use python module perf test: Migrate Intel PT virtual LBR test to use Python API
perf: Remove libperl support, legacy Perl scripts and tests
perf: Remove libpython support and legacy Python scripts perf Makefile: Update Python script installation path
perf script: Refactor to support standalone scripts and remove legacy
features
perf Documentation: Update for standalone Python scripts and remove
obsolete data
perf python: Improve perf script -l descriptions
tools/build/Makefile.feature | 5 +-
tools/build/feature/Makefile | 23 +-
tools/build/feature/test-all.c | 6 +-
tools/build/feature/test-libperl.c | 10 -
tools/build/feature/test-libpython.c | 10 -
tools/build/feature/test-python-module.c | 12 +
tools/perf/Documentation/perf-check.txt | 2 -
tools/perf/Documentation/perf-script-perl.txt | 216 --
.../perf/Documentation/perf-script-python.txt | 702 +-----
tools/perf/Documentation/perf-script.txt | 70 +-
tools/perf/Makefile.config | 37 +-
tools/perf/Makefile.perf | 22 +-
tools/perf/arch/arm/util/cs-etm.c | 36 +-
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 | 22 +-
tools/perf/arch/x86/tests/topdown.c | 2 +-
tools/perf/arch/x86/util/auxtrace.c | 2 +-
tools/perf/arch/x86/util/intel-bts.c | 26 +-
tools/perf/arch/x86/util/intel-pt.c | 38 +-
tools/perf/arch/x86/util/iostat.c | 8 +-
tools/perf/bench/evlist-open-close.c | 29 +-
tools/perf/bench/inject-buildid.c | 9 +-
tools/perf/builtin-annotate.c | 2 +-
tools/perf/builtin-check.c | 3 +-
tools/perf/builtin-ftrace.c | 14 +-
tools/perf/builtin-inject.c | 81 +-
tools/perf/builtin-kvm.c | 14 +-
tools/perf/builtin-kwork.c | 8 +-
tools/perf/builtin-lock.c | 2 +-
tools/perf/builtin-record.c | 95 +-
tools/perf/builtin-report.c | 6 +-
tools/perf/builtin-sched.c | 26 +-
tools/perf/builtin-script.c | 895 +++----
tools/perf/builtin-stat.c | 81 +-
tools/perf/builtin-top.c | 104 +-
tools/perf/builtin-trace.c | 60 +-
tools/perf/python/SchedGui.py | 219 ++
tools/perf/python/arm-cs-trace-disasm.py | 338 +++
tools/perf/python/check-perf-trace.py | 113 +
tools/perf/python/compaction-times.py | 326 +++
tools/perf/python/counting.py | 1 +
tools/perf/python/event_analyzing_sample.py | 296 +++
tools/perf/python/export-to-postgresql.py | 697 ++++++
tools/perf/python/export-to-sqlite.py | 380 +++
.../python/exported-sql-viewer.py | 6 +-
tools/perf/python/failed-syscalls-by-pid.py | 119 +
tools/perf/python/failed-syscalls.py | 78 +
tools/perf/python/flamegraph.py | 250 ++
tools/perf/python/futex-contention.py | 87 +
tools/perf/python/gecko.py | 380 +++
tools/perf/python/intel-pt-events.py | 435 ++++
tools/perf/python/libxed.py | 122 +
.../{scripts => }/python/mem-phys-addr.py | 66 +-
tools/perf/python/net_dropmonitor.py | 58 +
tools/perf/python/netdev-times.py | 472 ++++
.../{scripts => }/python/parallel-perf.py | 0
tools/perf/python/perf.pyi | 579 +++++
tools/perf/python/perf_live.py | 48 +
tools/perf/python/powerpc-hcalls.py | 211 ++
tools/perf/python/rw-by-file.py | 103 +
tools/perf/python/rw-by-pid.py | 158 ++
tools/perf/python/rwtop.py | 219 ++
tools/perf/python/sched-migration.py | 469 ++++
tools/perf/python/sctop.py | 174 ++
tools/perf/python/stackcollapse.py | 126 +
tools/perf/python/stat-cpi.py | 151 ++
tools/perf/python/syscall-counts-by-pid.py | 88 +
tools/perf/python/syscall-counts.py | 72 +
tools/perf/python/task-analyzer.py | 547 ++++
tools/perf/python/tracepoint.py | 1 +
tools/perf/python/twatch.py | 1 +
tools/perf/python/wakeup-latency.py | 88 +
tools/perf/scripts/Build | 4 -
tools/perf/scripts/perl/Perf-Trace-Util/Build | 9 -
.../scripts/perl/Perf-Trace-Util/Context.c | 122 -
.../scripts/perl/Perf-Trace-Util/Context.xs | 42 -
.../scripts/perl/Perf-Trace-Util/Makefile.PL | 18 -
.../perf/scripts/perl/Perf-Trace-Util/README | 59 -
.../Perf-Trace-Util/lib/Perf/Trace/Context.pm | 55 -
.../Perf-Trace-Util/lib/Perf/Trace/Core.pm | 192 --
.../Perf-Trace-Util/lib/Perf/Trace/Util.pm | 94 -
.../perf/scripts/perl/Perf-Trace-Util/typemap | 1 -
.../scripts/perl/bin/check-perf-trace-record | 2 -
.../scripts/perl/bin/failed-syscalls-record | 3 -
.../scripts/perl/bin/failed-syscalls-report | 10 -
tools/perf/scripts/perl/bin/rw-by-file-record | 3 -
tools/perf/scripts/perl/bin/rw-by-file-report | 10 -
tools/perf/scripts/perl/bin/rw-by-pid-record | 2 -
tools/perf/scripts/perl/bin/rw-by-pid-report | 3 -
tools/perf/scripts/perl/bin/rwtop-record | 2 -
tools/perf/scripts/perl/bin/rwtop-report | 20 -
.../scripts/perl/bin/wakeup-latency-record | 6 -
.../scripts/perl/bin/wakeup-latency-report | 3 -
tools/perf/scripts/perl/check-perf-trace.pl | 106 -
tools/perf/scripts/perl/failed-syscalls.pl | 47 -
tools/perf/scripts/perl/rw-by-file.pl | 106 -
tools/perf/scripts/perl/rw-by-pid.pl | 184 --
tools/perf/scripts/perl/rwtop.pl | 203 --
tools/perf/scripts/perl/wakeup-latency.pl | 107 -
.../perf/scripts/python/Perf-Trace-Util/Build | 4 -
.../scripts/python/Perf-Trace-Util/Context.c | 225 --
.../Perf-Trace-Util/lib/Perf/Trace/Core.py | 116 -
.../lib/Perf/Trace/EventClass.py | 97 -
.../lib/Perf/Trace/SchedGui.py | 184 --
.../Perf-Trace-Util/lib/Perf/Trace/Util.py | 92 -
.../scripts/python/arm-cs-trace-disasm.py | 355 ---
.../python/bin/compaction-times-record | 2 -
.../python/bin/compaction-times-report | 4 -
.../python/bin/event_analyzing_sample-record | 8 -
.../python/bin/event_analyzing_sample-report | 3 -
.../python/bin/export-to-postgresql-record | 8 -
.../python/bin/export-to-postgresql-report | 29 -
.../python/bin/export-to-sqlite-record | 8 -
.../python/bin/export-to-sqlite-report | 29 -
.../python/bin/failed-syscalls-by-pid-record | 3 -
.../python/bin/failed-syscalls-by-pid-report | 10 -
.../perf/scripts/python/bin/flamegraph-record | 2 -
.../perf/scripts/python/bin/flamegraph-report | 3 -
.../python/bin/futex-contention-record | 2 -
.../python/bin/futex-contention-report | 4 -
tools/perf/scripts/python/bin/gecko-record | 2 -
tools/perf/scripts/python/bin/gecko-report | 7 -
.../scripts/python/bin/intel-pt-events-record | 13 -
.../scripts/python/bin/intel-pt-events-report | 3 -
.../scripts/python/bin/mem-phys-addr-record | 19 -
.../scripts/python/bin/mem-phys-addr-report | 3 -
.../scripts/python/bin/net_dropmonitor-record | 2 -
.../scripts/python/bin/net_dropmonitor-report | 4 -
.../scripts/python/bin/netdev-times-record | 8 -
.../scripts/python/bin/netdev-times-report | 5 -
.../scripts/python/bin/powerpc-hcalls-record | 2 -
.../scripts/python/bin/powerpc-hcalls-report | 2 -
.../scripts/python/bin/sched-migration-record | 2 -
.../scripts/python/bin/sched-migration-report | 3 -
tools/perf/scripts/python/bin/sctop-record | 3 -
tools/perf/scripts/python/bin/sctop-report | 24 -
.../scripts/python/bin/stackcollapse-record | 8 -
.../scripts/python/bin/stackcollapse-report | 3 -
.../python/bin/syscall-counts-by-pid-record | 3 -
.../python/bin/syscall-counts-by-pid-report | 10 -
.../scripts/python/bin/syscall-counts-record | 3 -
.../scripts/python/bin/syscall-counts-report | 10 -
.../scripts/python/bin/task-analyzer-record | 2 -
.../scripts/python/bin/task-analyzer-report | 3 -
tools/perf/scripts/python/check-perf-trace.py | 84 -
tools/perf/scripts/python/compaction-times.py | 311 ---
.../scripts/python/event_analyzing_sample.py | 192 --
.../scripts/python/export-to-postgresql.py | 1114 ---------
tools/perf/scripts/python/export-to-sqlite.py | 799 ------
.../scripts/python/failed-syscalls-by-pid.py | 79 -
tools/perf/scripts/python/flamegraph.py | 267 --
tools/perf/scripts/python/futex-contention.py | 57 -
tools/perf/scripts/python/gecko.py | 395 ---
tools/perf/scripts/python/intel-pt-events.py | 494 ----
tools/perf/scripts/python/libxed.py | 107 -
tools/perf/scripts/python/net_dropmonitor.py | 78 -
tools/perf/scripts/python/netdev-times.py | 473 ----
tools/perf/scripts/python/powerpc-hcalls.py | 202 --
tools/perf/scripts/python/sched-migration.py | 462 ----
tools/perf/scripts/python/sctop.py | 89 -
tools/perf/scripts/python/stackcollapse.py | 127 -
tools/perf/scripts/python/stat-cpi.py | 79 -
.../scripts/python/syscall-counts-by-pid.py | 75 -
tools/perf/scripts/python/syscall-counts.py | 65 -
tools/perf/scripts/python/task-analyzer.py | 934 -------
tools/perf/tests/backward-ring-buffer.c | 26 +-
tools/perf/tests/code-reading.c | 14 +-
tools/perf/tests/dlfilter-test.c | 8 +-
tools/perf/tests/event-times.c | 6 +-
tools/perf/tests/event_update.c | 4 +-
tools/perf/tests/evsel-roundtrip-name.c | 8 +-
tools/perf/tests/evsel-tp-sched.c | 4 +-
tools/perf/tests/expand-cgroup.c | 12 +-
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 | 21 +-
tools/perf/tests/keep-tracking.c | 10 +-
tools/perf/tests/make | 9 +-
tools/perf/tests/mmap-basic.c | 42 +-
tools/perf/tests/openat-syscall-all-cpus.c | 6 +-
tools/perf/tests/openat-syscall-tp-fields.c | 26 +-
tools/perf/tests/openat-syscall.c | 6 +-
tools/perf/tests/parse-events.c | 139 +-
tools/perf/tests/parse-metric.c | 8 +-
tools/perf/tests/parse-no-sample-id-all.c | 2 +-
tools/perf/tests/perf-record.c | 38 +-
tools/perf/tests/perf-time-to-tsc.c | 12 +-
tools/perf/tests/pfm.c | 12 +-
tools/perf/tests/pmu-events.c | 11 +-
tools/perf/tests/pmu.c | 4 +-
tools/perf/tests/sample-parsing.c | 39 +-
.../perf/tests/shell/lib/perf_brstack_max.py | 43 +
tools/perf/tests/shell/script.sh | 2 +-
tools/perf/tests/shell/script_perl.sh | 102 -
tools/perf/tests/shell/script_python.sh | 113 -
.../tests/shell/test_arm_coresight_disasm.sh | 12 +-
tools/perf/tests/shell/test_intel_pt.sh | 35 +-
tools/perf/tests/shell/test_task_analyzer.sh | 79 +-
tools/perf/tests/sw-clock.c | 20 +-
tools/perf/tests/switch-tracking.c | 10 +-
tools/perf/tests/task-exit.c | 20 +-
tools/perf/tests/time-utils-test.c | 14 +-
tools/perf/tests/tool_pmu.c | 7 +-
tools/perf/tests/topology.c | 4 +-
tools/perf/ui/browsers/annotate.c | 2 +-
tools/perf/ui/browsers/hists.c | 22 +-
tools/perf/ui/browsers/scripts.c | 7 +-
tools/perf/util/Build | 1 -
tools/perf/util/amd-sample-raw.c | 2 +-
tools/perf/util/annotate-data.c | 2 +-
tools/perf/util/annotate.c | 10 +-
tools/perf/util/arm-spe.c | 7 +-
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 | 10 +-
tools/perf/util/bpf_ftrace.c | 9 +-
tools/perf/util/bpf_lock_contention.c | 12 +-
tools/perf/util/bpf_off_cpu.c | 44 +-
tools/perf/util/bpf_trace_augment.c | 8 +-
tools/perf/util/cgroup.c | 26 +-
tools/perf/util/cs-etm.c | 6 +-
tools/perf/util/data-convert-bt.c | 2 +-
tools/perf/util/data.c | 26 +-
tools/perf/util/data.h | 4 +-
tools/perf/util/evlist.c | 487 ++--
tools/perf/util/evlist.h | 273 +-
tools/perf/util/evsel.c | 109 +-
tools/perf/util/evsel.h | 35 +-
tools/perf/util/expr.c | 2 +-
tools/perf/util/header.c | 51 +-
tools/perf/util/header.h | 2 +-
tools/perf/util/intel-bts.c | 3 +-
tools/perf/util/intel-pt.c | 13 +-
tools/perf/util/intel-tpebs.c | 7 +-
tools/perf/util/map.h | 9 +-
tools/perf/util/metricgroup.c | 12 +-
tools/perf/util/parse-events.c | 10 +-
tools/perf/util/parse-events.y | 2 +-
tools/perf/util/perf_api_probe.c | 20 +-
tools/perf/util/pfm.c | 4 +-
tools/perf/util/print-events.c | 2 +-
tools/perf/util/print_insn.h | 5 +-
tools/perf/util/python.c | 1854 ++++++++++++--
tools/perf/util/record.c | 11 +-
tools/perf/util/s390-sample-raw.c | 19 +-
tools/perf/util/sample-raw.c | 4 +-
tools/perf/util/sample.c | 17 +-
tools/perf/util/scripting-engines/Build | 9 -
.../util/scripting-engines/trace-event-perl.c | 773 ------
.../scripting-engines/trace-event-python.c | 2209 -----------------
tools/perf/util/session.c | 59 +-
tools/perf/util/sideband_evlist.c | 40 +-
tools/perf/util/sort.c | 2 +-
tools/perf/util/stat-display.c | 6 +-
tools/perf/util/stat-shadow.c | 24 +-
tools/perf/util/stat.c | 20 +-
tools/perf/util/stream.c | 4 +-
tools/perf/util/synthetic-events.c | 36 +-
tools/perf/util/synthetic-events.h | 6 +-
tools/perf/util/time-utils.c | 12 +-
tools/perf/util/top.c | 4 +-
tools/perf/util/trace-event-parse.c | 65 -
tools/perf/util/trace-event-scripting.c | 410 ---
tools/perf/util/trace-event.h | 75 +-
268 files changed, 11291 insertions(+), 15964 deletions(-)
delete mode 100644 tools/build/feature/test-libperl.c
delete mode 100644 tools/build/feature/test-libpython.c
create mode 100644 tools/build/feature/test-python-module.c
delete mode 100644 tools/perf/Documentation/perf-script-perl.txt
create mode 100755 tools/perf/python/SchedGui.py
create mode 100755 tools/perf/python/arm-cs-trace-disasm.py
create mode 100755 tools/perf/python/check-perf-trace.py
create mode 100755 tools/perf/python/compaction-times.py
create mode 100755 tools/perf/python/event_analyzing_sample.py
create mode 100755 tools/perf/python/export-to-postgresql.py
create mode 100755 tools/perf/python/export-to-sqlite.py
rename tools/perf/{scripts => }/python/exported-sql-viewer.py (99%)
create mode 100755 tools/perf/python/failed-syscalls-by-pid.py
create mode 100755 tools/perf/python/failed-syscalls.py
create mode 100755 tools/perf/python/flamegraph.py
create mode 100755 tools/perf/python/futex-contention.py
create mode 100755 tools/perf/python/gecko.py
create mode 100755 tools/perf/python/intel-pt-events.py
create mode 100755 tools/perf/python/libxed.py
rename tools/perf/{scripts => }/python/mem-phys-addr.py (73%)
mode change 100644 => 100755
create mode 100755 tools/perf/python/net_dropmonitor.py
create mode 100755 tools/perf/python/netdev-times.py
rename tools/perf/{scripts => }/python/parallel-perf.py (100%)
create mode 100644 tools/perf/python/perf.pyi
create mode 100755 tools/perf/python/perf_live.py
create mode 100755 tools/perf/python/powerpc-hcalls.py
create mode 100755 tools/perf/python/rw-by-file.py
create mode 100755 tools/perf/python/rw-by-pid.py
create mode 100755 tools/perf/python/rwtop.py
create mode 100755 tools/perf/python/sched-migration.py
create mode 100755 tools/perf/python/sctop.py
create mode 100755 tools/perf/python/stackcollapse.py
create mode 100755 tools/perf/python/stat-cpi.py
create mode 100755 tools/perf/python/syscall-counts-by-pid.py
create mode 100755 tools/perf/python/syscall-counts.py
create mode 100755 tools/perf/python/task-analyzer.py
create mode 100755 tools/perf/python/wakeup-latency.py
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.c
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/README
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm
delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/typemap
delete mode 100644 tools/perf/scripts/perl/bin/check-perf-trace-record
delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-record
delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-report
delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-record
delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-report
delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-record
delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-report
delete mode 100644 tools/perf/scripts/perl/bin/rwtop-record
delete mode 100644 tools/perf/scripts/perl/bin/rwtop-report
delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-record
delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-report
delete mode 100644 tools/perf/scripts/perl/check-perf-trace.pl
delete mode 100644 tools/perf/scripts/perl/failed-syscalls.pl
delete mode 100644 tools/perf/scripts/perl/rw-by-file.pl
delete mode 100644 tools/perf/scripts/perl/rw-by-pid.pl
delete mode 100644 tools/perf/scripts/perl/rwtop.pl
delete mode 100644 tools/perf/scripts/perl/wakeup-latency.pl
delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build
delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Context.c
delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
delete mode 100755 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py
delete mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py
delete mode 100644 tools/perf/scripts/python/bin/compaction-times-record
delete mode 100644 tools/perf/scripts/python/bin/compaction-times-report
delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-record
delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-report
delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record
delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report
delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-record
delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-report
delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-record
delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
delete mode 100755 tools/perf/scripts/python/bin/flamegraph-record
delete mode 100755 tools/perf/scripts/python/bin/flamegraph-report
delete mode 100644 tools/perf/scripts/python/bin/futex-contention-record
delete mode 100644 tools/perf/scripts/python/bin/futex-contention-report
delete mode 100644 tools/perf/scripts/python/bin/gecko-record
delete mode 100755 tools/perf/scripts/python/bin/gecko-report
delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-record
delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-report
delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-record
delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-report
delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record
delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report
delete mode 100644 tools/perf/scripts/python/bin/netdev-times-record
delete mode 100644 tools/perf/scripts/python/bin/netdev-times-report
delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-record
delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-report
delete mode 100644 tools/perf/scripts/python/bin/sched-migration-record
delete mode 100644 tools/perf/scripts/python/bin/sched-migration-report
delete mode 100644 tools/perf/scripts/python/bin/sctop-record
delete mode 100644 tools/perf/scripts/python/bin/sctop-report
delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-record
delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-report
delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-record
delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-report
delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-record
delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-report
delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-record
delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-report
delete mode 100644 tools/perf/scripts/python/check-perf-trace.py
delete mode 100644 tools/perf/scripts/python/compaction-times.py
delete mode 100644 tools/perf/scripts/python/event_analyzing_sample.py
delete mode 100644 tools/perf/scripts/python/export-to-postgresql.py
delete mode 100644 tools/perf/scripts/python/export-to-sqlite.py
delete mode 100644 tools/perf/scripts/python/failed-syscalls-by-pid.py
delete mode 100755 tools/perf/scripts/python/flamegraph.py
delete mode 100644 tools/perf/scripts/python/futex-contention.py
delete mode 100644 tools/perf/scripts/python/gecko.py
delete mode 100644 tools/perf/scripts/python/intel-pt-events.py
delete mode 100644 tools/perf/scripts/python/libxed.py
delete mode 100755 tools/perf/scripts/python/net_dropmonitor.py
delete mode 100644 tools/perf/scripts/python/netdev-times.py
delete mode 100644 tools/perf/scripts/python/powerpc-hcalls.py
delete mode 100644 tools/perf/scripts/python/sched-migration.py
delete mode 100644 tools/perf/scripts/python/sctop.py
delete mode 100755 tools/perf/scripts/python/stackcollapse.py
delete mode 100644 tools/perf/scripts/python/stat-cpi.py
delete mode 100644 tools/perf/scripts/python/syscall-counts-by-pid.py
delete mode 100644 tools/perf/scripts/python/syscall-counts.py
delete mode 100755 tools/perf/scripts/python/task-analyzer.py
create mode 100644 tools/perf/tests/shell/lib/perf_brstack_max.py
delete mode 100755 tools/perf/tests/shell/script_perl.sh
delete mode 100755 tools/perf/tests/shell/script_python.sh
delete mode 100644 tools/perf/util/scripting-engines/Build
delete mode 100644 tools/perf/util/scripting-engines/trace-event-perl.c
delete mode 100644 tools/perf/util/scripting-engines/trace-event-python.c
delete mode 100644 tools/perf/util/trace-event-scripting.cSignature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 1/58 perf inject: Fix itrace branch stack synthesis
When using "perf inject --itrace=L" to synthesize branch stacks from AUX data, several issues caused failures:
1. The synthesized samples were delivered without the PERF_SAMPLE_BRANCH_STACK flag if it was not in the original event's sample_type. Fixed by using sample_type | evsel->synth_sample_type in intel_pt_deliver_synth_event.
2. The record layout was misaligned because of inconsistent handling of PERF_SAMPLE_BRANCH_HW_INDEX. Fixed by explicitly writing nr and hw_idx in perf_event__synthesize_sample.
3. Modifying evsel->core.attr.sample_type early in __cmd_inject caused parse failures for subsequent records in the input file. Fixed by moving this modification to just before writing the header.
4. perf_event__repipe_sample was narrowed to only synthesize samples when branch stack injection was requested, and restored the use of perf_inject__cut_auxtrace_sample as a fallback to preserve functionality.
---
Issues fixed in v2:
1. Potential Heap Overflow in perf_event__repipe_sample : Addressed by adding a check that prints an error and returns -EFAULT if the calculated event size exceeds PERF_SAMPLE_MAX_SIZE , as you requested.
2. Header vs Payload Mismatch in __cmd_inject : Addressed by narrowing the condition so that HEADER_BRANCH_STACK is only set in the file header if add_last_branch was true.
3. NULL Pointer Dereference in intel-pt.c : Addressed by updating the condition in intel_pt_do_synth_pebs_sample to fill sample. branch_stack if it was synthesized, even if not in the original sample_type .
4. Unsafe Reads for events lacking HW_INDEX in synthetic-events.c :
Addressed by using the perf_sample__branch_entries() macro and checking sample->no_hw_idx .
5. Size mismatch in perf_event__sample_event_size : Addressed by passing branch_sample_type to it and conditioning the hw_idx size on PERF_SAMPLE_BRANCH_HW_INDEX .
--- tools/perf/bench/inject-buildid.c | 9 ++-- tools/perf/builtin-inject.c | 77 ++++++++++++++++++++++++++++-- tools/perf/tests/dlfilter-test.c | 8 +++- tools/perf/tests/sample-parsing.c | 5 +- tools/perf/util/arm-spe.c | 7 ++- tools/perf/util/cs-etm.c | 6 ++- tools/perf/util/intel-bts.c | 3 +- tools/perf/util/intel-pt.c | 13 +++-- tools/perf/util/synthetic-events.c | 25 +++++++--- tools/perf/util/synthetic-events.h | 6 ++- 10 files changed, 129 insertions(+), 30 deletions(-)
tools/perf/bench/inject-buildid.c +6 -3
@@ -228,9 +228,12 @@ static ssize_t synthesize_sample(struct bench_data *data, struct bench_dso *dso, event.header.type =PERF_RECORD_SAMPLE ; event.header.misc =PERF_RECORD_MISC_USER ; - event.header.size =perf_event__sample_event_size (&sample, bench_sample_type,0 ); - -perf_event__synthesize_sample (&event, bench_sample_type,0 , &sample); + event.header.size =perf_event__sample_event_size (&sample, bench_sample_type, +/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); +perf_event__synthesize_sample (&event, bench_sample_type, +/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , &sample);return writen (data->input_pipe[1 ], &event, event.header.size); }
tools/perf/builtin-inject.c +72 -5
105 lines not on this page · raw message
tools/perf/tests/dlfilter-test.c +6 -2
@@ -188,8 +188,12 @@ static int write_sample(struct test_data *td, u64 sample_type, u64 id, pid_t pid event->header.type =PERF_RECORD_SAMPLE ; event->header.misc =PERF_RECORD_MISC_USER ; - event->header.size =perf_event__sample_event_size (&sample, sample_type,0 ); - err =perf_event__synthesize_sample (event, sample_type,0 , &sample); + event->header.size =perf_event__sample_event_size (&sample, sample_type, +/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); + err =perf_event__synthesize_sample (event, sample_type, +/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , &sample);if (err)return test_result ("perf_event__synthesize_sample() failed" ,TEST_FAIL );
tools/perf/tests/sample-parsing.c +3 -2
@@ -310,7 +310,8 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) sample.read.one.lost =1 ; } - sz =perf_event__sample_event_size (&sample, sample_type, read_format); + sz =perf_event__sample_event_size (&sample, sample_type, read_format, + evsel.core.attr.branch_sample_type); bufsz = sz +4096 ;/* Add a bit for overrun checking */ event =malloc (bufsz);if (!event) {
@@ -324,7 +325,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) event->header.size = sz; err =perf_event__synthesize_sample (event, sample_type, read_format, - &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);
tools/perf/util/arm-spe.c +5 -2
@@ -484,8 +484,11 @@ static void arm_spe__prep_branch_stack(struct arm_spe_queue *speq)static int arm_spe__inject_event (union perf_event *event,struct perf_sample *sample,u64 type) { - event->header.size =perf_event__sample_event_size (sample, type,0 ); -return perf_event__synthesize_sample (event, type,0 , sample); + event->header.type =PERF_RECORD_SAMPLE ; + event->header.size =perf_event__sample_event_size (sample, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); +return perf_event__synthesize_sample (event, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , sample); } static inline int
tools/perf/util/cs-etm.c +4 -2
@@ -1425,8 +1425,10 @@ static void cs_etm__update_last_branch_rb(struct cs_etm_queue *etmq,static int cs_etm__inject_event (union perf_event *event,struct perf_sample *sample,u64 type) { - event->header.size =perf_event__sample_event_size (sample, type,0 ); -return perf_event__synthesize_sample (event, type,0 , sample); + event->header.size =perf_event__sample_event_size (sample, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); +return perf_event__synthesize_sample (event, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , sample); }
tools/perf/util/intel-bts.c +2 -1
@@ -303,7 +303,8 @@ static int intel_bts_synth_branch_sample(struct intel_bts_queue *btsq, event.sample.header.size = bts->branches_event_size; ret =perf_event__synthesize_sample (&event, bts->branches_sample_type, -0 , &sample); +/*read_format=*/ 0 ,/*branch_sample_type=*/ 0 , + &sample);if (ret)return ret; }
tools/perf/util/intel-pt.c +9 -4
@@ -1731,8 +1731,12 @@ static void intel_pt_prep_b_sample(struct intel_pt *pt,static int intel_pt_inject_event (union perf_event *event,struct perf_sample *sample,u64 type) { - event->header.size =perf_event__sample_event_size (sample, type,0 ); -return perf_event__synthesize_sample (event, type,0 , sample); + event->header.type =PERF_RECORD_SAMPLE ; + event->header.size =perf_event__sample_event_size (sample, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); + +return perf_event__synthesize_sample (event, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , sample); } static inline int intel_pt_opt_inject(struct intel_pt *pt,
@@ -2486,7 +2490,7 @@ static int intel_pt_do_synth_pebs_sample(struct intel_pt_queue *ptq, struct evseintel_pt_add_xmm (intr_regs, pos, items, regs_mask); } -if (sample_type &PERF_SAMPLE_BRANCH_STACK ) { +if ((sample_type | evsel->synth_sample_type) &PERF_SAMPLE_BRANCH_STACK ) {if (items->mask[INTEL_PT_LBR_0_POS ] || items->mask[INTEL_PT_LBR_1_POS ] || items->mask[INTEL_PT_LBR_2_POS ]) {
@@ -2557,7 +2561,8 @@ static int intel_pt_do_synth_pebs_sample(struct intel_pt_queue *ptq, struct evse sample.transaction = txn; } - ret =intel_pt_deliver_synth_event (pt, event, &sample, sample_type); + ret =intel_pt_deliver_synth_event (pt, event, &sample, + sample_type | evsel->synth_sample_type);perf_sample__exit (&sample);return ret; }
tools/perf/util/synthetic-events.c +18 -7
@@ -1455,7 +1455,8 @@ int perf_event__synthesize_stat_round(const struct perf_tool *tool,return process (tool, (union perf_event *) &event,NULL , machine); } -size_t perf_event__sample_event_size (const struct perf_sample *sample,u64 type,u64 read_format) +size_t perf_event__sample_event_size (const struct perf_sample *sample,u64 type,u64 read_format, +u64 branch_sample_type) {size_t sz, result =sizeof (struct perf_record_sample );
@@ -1515,8 +1516,10 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,if (type &PERF_SAMPLE_BRANCH_STACK ) { sz = sample->branch_stack->nr *sizeof (struct branch_entry ); -/* nr, hw_idx */ - sz +=2 *sizeof (u64); +/* nr */ + sz +=sizeof (u64); +if (branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX ) + sz +=sizeof (u64); result += sz; }
@@ -1605,7 +1608,7 @@ static __u64 *copy_read_group_values(__u64 *array, __u64 read_format, }int perf_event__synthesize_sample (union perf_event *event,u64 type,u64 read_format, -const struct perf_sample *sample) +u64 branch_sample_type,const struct perf_sample *sample) {__u64 *array;size_t sz;
@@ -1719,9 +1722,17 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u64 read_foif (type &PERF_SAMPLE_BRANCH_STACK ) { sz = sample->branch_stack->nr *sizeof (struct branch_entry ); -/* nr, hw_idx */ - sz +=2 *sizeof (u64); -memcpy (array, sample->branch_stack, sz); + + *array++ = sample->branch_stack->nr; + +if (branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX ) { +if (sample->no_hw_idx) + *array++ =0 ; +else + *array++ = sample->branch_stack->hw_idx; + } + +memcpy (array,perf_sample__branch_entries ((struct perf_sample *)sample), sz); array = (void *)array + sz; }
tools/perf/util/synthetic-events.h +4 -2
@@ -81,7 +81,8 @@ int perf_event__synthesize_mmap_events(const struct perf_tool *tool, union perf_int perf_event__synthesize_modules (const struct perf_tool *tool,perf_event__handler_t process,struct machine *machine);int perf_event__synthesize_namespaces (const struct perf_tool *tool,union perf_event *event,pid_t pid,pid_t tgid,perf_event__handler_t process,struct machine *machine);int perf_event__synthesize_cgroups (const struct perf_tool *tool,perf_event__handler_t process,struct machine *machine); -int perf_event__synthesize_sample (union perf_event *event,u64 type,u64 read_format,const struct perf_sample *sample); +int perf_event__synthesize_sample (union perf_event *event,u64 type,u64 read_format, +u64 branch_sample_type,const struct perf_sample *sample);int perf_event__synthesize_stat_config (const struct perf_tool *tool,struct perf_stat_config *config,perf_event__handler_t process,struct machine *machine);int perf_event__synthesize_stat_events (struct perf_stat_config *config,const struct perf_tool *tool,struct evlist *evlist,perf_event__handler_t process,bool attrs);int perf_event__synthesize_stat_round (const struct perf_tool *tool,u64 time,u64 type,perf_event__handler_t process,struct machine *machine);
@@ -97,7 +98,8 @@ void perf_event__synthesize_final_bpf_metadata(struct perf_session *session,int perf_tool__process_synth_event (const struct perf_tool *tool,union perf_event *event,struct machine *machine,perf_event__handler_t process); -size_t perf_event__sample_event_size (const struct perf_sample *sample,u64 type,u64 read_format); +size_t perf_event__sample_event_size (const struct perf_sample *sample,u64 type, +u64 read_format,u64 branch_sample_type); int __machine__synthesize_threads(struct machine *machine, const struct perf_tool *tool, struct target *target, struct perf_thread_map *threads,
Signature · 1 line
2.54.0.545.g6539524ca2-goog
[email protected]
AI reviewRe: [PATCH v5 01/58] perf inject: Fix itrace branch stack synthesis
Sashiko AI review found 5 potential issue(s): - [High] Uninitialized `header.misc` field causes heap memory leak and data corruption. - [High] The `last_branch` condition bypasses…
Sashiko AI review found 5 potential issue(s):
- [High] Uninitialized header.misc field causes heap memory leak and data corruption.
- [High] The last_branch condition bypasses cut_auxtrace_sample, leaking AUX data and corrupting the perf.data format.
- [High] Hardcoded branch_sample_type=0 in injection callbacks omits hw_idx, misaligning synthetic event layouts.
- [High] Integer truncation of event size at PERF_SAMPLE_MAX_SIZE causes 0-size records and parser DoS.
- [High] Double-counting callchain size leaks uninitialized heap data into output file.
--
commit 0c5343f3bce36f601578ac2b8dba4f4ff1d2039e
Author: Ian Rogers <[email protected]>
perf inject: Fix itrace branch stack synthesis
When using "perf inject --itrace=L" to synthesize branch stacks from AUX data, several issues caused failures:
1. The synthesized samples were delivered without the PERF_SAMPLE_BRANCH_STACK flag if it was not in the original event's sample_type. Fixed by using sample_type | evsel->synth_sample_type in intel_pt_deliver_synth_event.
2. The record layout was misaligned because of inconsistent handling of PERF_SAMPLE_BRANCH_HW_INDEX. Fixed by explicitly writing nr and hw_idx in perf_event__synthesize_sample.
3. Modifying evsel->core.attr.sample_type early in __cmd_inject caused parse failures for subsequent records in the input file. Fixed by moving this modification to just before writing the header.
4. perf_event__repipe_sample was narrowed to only synthesize samples when branch stack injection was requested, and restored the use of perf_inject__cut_auxtrace_sample as a fallback to preserve functionality.
tools/perf/builtin-inject.c static int perf_event__repipe_sample(const struct perf_tool *tool, · line 380
Quoted 12 lines
tools/perf/builtin-inject.c +3
-1@@ -375,7 +375,59 @@ static int perf_event__repipe_sample(const struct perf_tool *tool,build_id__mark_dso_hit (tool, event, sample, evsel, machine); -if (inject->itrace_synth_opts.set && sample->aux_sample.size) { +if (inject->itrace_synth_opts.set && + (inject->itrace_synth_opts.last_branch || + inject->itrace_synth_opts.add_last_branch)) {
Can this bypass the perf_inject__cut_auxtrace_sample() call and corrupt the perf.data format?
If an event has AUX data and last_branch is true but add_last_branch is false, it skips the block that temporarily clears PERF_SAMPLE_AUX.
The event is then synthesized with its full AUX payload, bypassing the else if block intended to cut the AUX data.
Later, __cmd_inject() unconditionally strips PERF_SAMPLE_AUX from the file's global header. Does this leave unadvertised AUX payloads inside sample records, causing parsers to miscalculate boundaries?
Quoted 3 lines
tools/perf/builtin-inject.c +3
-0+union perf_event *event_copy = (void *)inject->event_copy; +struct branch_stack dummy_bs = { .nr =0 }; +int err;
[ ... ]
tools/perf/builtin-inject.c static int perf_event__repipe_sample(const struct perf_tool *tool, · line 413
Quoted 4 lines
tools/perf/builtin-inject.c +4
-0+if (sz >PERF_SAMPLE_MAX_SIZE ) { +pr_err ("Sample size %zu exceeds max size %d\n" , sz,PERF_SAMPLE_MAX_SIZE ); +return -EFAULT ; + }
Does this allow integer truncation leading to zero-sized records?
If sz evaluates to exactly 65536 (PERF_SAMPLE_MAX_SIZE), the condition passes. Since event_copy->header.size is a __u16, assigning 65536 silently truncates it to 0.
Could this cause downstream parsers relying on event->header.size to enter an infinite loop?
tools/perf/builtin-inject.c static int perf_event__repipe_sample(const struct perf_tool *tool, · line 416
Quoted 3 lines
tools/perf/builtin-inject.c +3
-0+ + event_copy->header.type =PERF_RECORD_SAMPLE ; + event_copy->header.size = sz;
Does this leak uninitialized heap memory and corrupt metadata?
The event_copy buffer is allocated via malloc() which does not zero out memory.
The header.type and header.size fields are set here, but the header.misc field is omitted. perf_event__synthesize_sample() writes the payload but does not touch the header.
Could this cause the output perf.data file to contain garbage for critical flags like the CPU mode (PERF_RECORD_MISC_USER or KERNEL) and exact IP flags?
Quoted 6 lines
tools/perf/builtin-inject.c +6
-0+ + err =perf_event__synthesize_sample (event_copy, evsel->core.attr.sample_type, + evsel->core.attr.read_format, + evsel->core.attr.branch_sample_type, sample); + + evsel->core.attr.sample_type = orig_type;
[ ... ]
tools/perf/builtin-inject.c static int perf_event__convert_sample_callchain(const struct perf_tool *tool, · line 522
Quoted 9 lines
tools/perf/builtin-inject.c +2
-1@@ -464,7 +516,8 @@ static int perf_event__convert_sample_callchain(const struct perf_tool *tool, sample_type &= ~(PERF_SAMPLE_STACK_USER |PERF_SAMPLE_REGS_USER );perf_event__synthesize_sample (event_copy, sample_type, - evsel->core.attr.read_format, sample); + evsel->core.attr.read_format, + evsel->core.attr.branch_sample_type, sample);return perf_event__repipe_synth (tool, event_copy); }
This isn't a regression from this commit, but does perf_event__convert_sample_callchain() double-count the callchain size?
It calculates the new sample_size by taking the original event->header.size, subtracting stack and regs sizes, and adding the new callchain size, but it never subtracts the old callchain size.
Does this cause event_copy->header.size to be larger than the actual synthesized payload, leaking uninitialized heap memory into the output file?
Quoted 7 lines
tools/perf/util/intel-pt.c +0
-0@@ -1731,8 +1731,12 @@ static void intel_pt_prep_b_sample(struct intel_pt *pt,static int intel_pt_inject_event (union perf_event *event,struct perf_sample *sample,u64 type)
tools/perf/util/intel-pt.c static void intel_pt_prep_b_sample(struct intel_pt *pt, · line 1740
Quoted 10 lines
tools/perf/util/intel-pt.c +6
-2{ - event->header.size =perf_event__sample_event_size (sample, type,0 ); -return perf_event__synthesize_sample (event, type,0 , sample); + event->header.type =PERF_RECORD_SAMPLE ; + event->header.size =perf_event__sample_event_size (sample, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 ); + +return perf_event__synthesize_sample (event, type,/*read_format=*/ 0 , +/*branch_sample_type=*/ 0 , sample); }
Does passing 0 for branch_sample_type misalign the synthetic event layouts?
If the corresponding synthetic evsel header natively has PERF_SAMPLE_BRANCH_HW_INDEX set, the output file will contain an evsel claiming hw_idx exists.
However, because the payload is synthesized here with 0, it will lack the 8-byte hw_idx field. Could this misalign the reading of branch entries and subsequent fields?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Ian Rogers
reviewerPATCH v5 2/58 perf arch arm: Sort includes and add missed explicit dependencies
In reply to Ian RogersFix missing #includes found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code.
--- tools/perf/arch/arm/util/cs-etm.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +14 -12
@@ -3,10 +3,13 @@* Copyright(C) 2015 Linaro Limited. All rights reserved. * Author: Mathieu Poirier <[email protected]> */ +#include "../../../util/cs-etm.h" + +#include <errno.h> +#include <stdlib.h> -#include <api/fs/fs.h> -#include <linux/bits.h> #include <linux/bitops.h> +#include <linux/bits.h> #include <linux/compiler.h> #include <linux/coresight-pmu.h> #include <linux/kernel.h>
@@ -14,25 +17,24 @@#include <linux/string.h> #include <linux/types.h> #include <linux/zalloc.h> +#include <sys/stat.h> + +#include <api/fs/fs.h> +#include <internal/lib.h> // page_size -#include "cs-etm.h" -#include "../../../util/debug.h" -#include "../../../util/record.h" #include "../../../util/auxtrace.h" #include "../../../util/cpumap.h" +#include "../../../util/debug.h" #include "../../../util/event.h" #include "../../../util/evlist.h" #include "../../../util/evsel.h" -#include "../../../util/perf_api_probe.h" #include "../../../util/evsel_config.h" +#include "../../../util/perf_api_probe.h" +#include "../../../util/pmu.h" #include "../../../util/pmus.h" -#include "../../../util/cs-etm.h" -#include <internal/lib.h> // page_size +#include "../../../util/record.h" #include "../../../util/session.h" - -#include <errno.h> -#include <stdlib.h> -#include <sys/stat.h> +#include "cs-etm.h" struct cs_etm_recording {struct auxtrace_record itr;
Signature · 1 line
2.54.0.545.g6539524ca2-goog
[email protected]
AI reviewRe: [PATCH v5 02/58] perf arch arm: Sort includes and add missed explicit dependencies
Sashiko AI review found 1 potential issue(s): - [Low] The generic utility header `../../../util/cs-etm.h` is mistakenly placed at the very top of the file, while the actual local primary header…
Sashiko AI review found 1 potential issue(s):
- [Low] The generic utility header ../../../util/cs-etm.h is mistakenly placed at the very top of the file, while the actual local primary header "cs-etm.h" is relegated to the bottom. --
commit 9e010dab2620eb3c40fc54789365c1d0f47e3438
Author: Ian Rogers <[email protected]>
perf arch arm: Sort includes and add missed explicit dependencies
This commit fixes missing includes found while cleaning header files and sorts the remaining headers for consistency.
tools/perf/arch/arm/util/cs-etm.c line 6
Quoted 9 lines
tools/perf/arch/arm/util/cs-etm.c +1
-0@@ -3,10 +3,13 @@* Copyright(C) 2015 Linaro Limited. All rights reserved. * Author: Mathieu Poirier <[email protected]> */ +#include "../../../util/cs-etm.h"
This isn't a bug, but standard practice dictates that a source file should include its corresponding local header file first to guarantee that the header is self-contained.
Was the generic utility header ../../../util/cs-etm.h mistakenly placed here at the top instead of the local primary header "cs-etm.h" due to a name collision?
[ ... ]
tools/perf/arch/arm/util/cs-etm.c line 37
Quoted 6 lines
tools/perf/arch/arm/util/cs-etm.c +1
-4#include "../../../util/session.h" - -#include <errno.h> -#include <stdlib.h> -#include <sys/stat.h> +#include "cs-etm.h"
The local primary header is relegated to the bottom here. Should "cs-etm.h" be the one included at the very top instead?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Ian Rogers
reviewerPATCH v5 3/58 perf arch x86: Sort includes and add missed explicit dependencies
In reply to Ian RogersFix missing #includes found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code.
--- tools/perf/arch/x86/util/intel-bts.c | 20 +++++++++++-------- tools/perf/arch/x86/util/intel-pt.c | 29 +++++++++++++++------------- 2 files changed, 28 insertions(+), 21 deletions(-)
tools/perf/arch/x86/util/intel-bts.c +12 -8
@@ -4,26 +4,30 @@* Copyright (c) 2013-2015, Intel Corporation. */ +#include "../../../util/intel-bts.h" +#include <errno.h> -#include <linux/kernel.h> -#include <linux/types.h> +#include <linux/bitops.h> +#include <linux/kernel.h> #include <linux/log2.h> +#include <linux/types.h> #include <linux/zalloc.h> +#include <internal/lib.h> // page_size + +#include "../../../util/auxtrace.h" #include "../../../util/cpumap.h" +#include "../../../util/debug.h" #include "../../../util/event.h" -#include "../../../util/evsel.h" #include "../../../util/evlist.h" +#include "../../../util/evsel.h" #include "../../../util/mmap.h" -#include "../../../util/session.h" +#include "../../../util/pmu.h" #include "../../../util/pmus.h" -#include "../../../util/debug.h" #include "../../../util/record.h" +#include "../../../util/session.h" #include "../../../util/tsc.h" -#include "../../../util/auxtrace.h" -#include "../../../util/intel-bts.h" -#include <internal/lib.h> // page_size #define KiB (x) ((x) * 1024)#define MiB (x) ((x) * 1024 * 1024)
tools/perf/arch/x86/util/intel-pt.c +16 -13
@@ -3,36 +3,39 @@* intel_pt.c: Intel Processor Trace support * Copyright (c) 2013-2015, Intel Corporation. */ +#include "../../../util/intel-pt.h" #include <errno.h> #include <stdbool.h> -#include <linux/kernel.h> -#include <linux/types.h> +#include <linux/bitops.h> +#include <linux/err.h> +#include <linux/kernel.h> #include <linux/log2.h> +#include <linux/types.h> #include <linux/zalloc.h> -#include <linux/err.h> -#include "../../../util/session.h" +#include <api/fs/fs.h> +#include <internal/lib.h> // page_size +#include <subcmd/parse-options.h> + +#include "../../../util/auxtrace.h" +#include "../../../util/config.h" +#include "../../../util/cpumap.h" +#include "../../../util/debug.h" #include "../../../util/event.h" #include "../../../util/evlist.h" #include "../../../util/evsel.h" #include "../../../util/evsel_config.h" -#include "../../../util/config.h" -#include "../../../util/cpumap.h" #include "../../../util/mmap.h" -#include <subcmd/parse-options.h> #include "../../../util/parse-events.h" -#include "../../../util/pmus.h" -#include "../../../util/debug.h" -#include "../../../util/auxtrace.h" #include "../../../util/perf_api_probe.h" +#include "../../../util/pmu.h" +#include "../../../util/pmus.h" #include "../../../util/record.h" +#include "../../../util/session.h" #include "../../../util/target.h" #include "../../../util/tsc.h" -#include <internal/lib.h> // page_size -#include "../../../util/intel-pt.h" -#include <api/fs/fs.h> #include "cpuid.h" #define KiB (x) ((x) * 1024)
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 4/58 perf tests: Sort includes and add missed explicit dependencies
In reply to Ian RogersFix missing #includes found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code.
--- tools/perf/tests/hwmon_pmu.c | 14 +++++++++----- tools/perf/tests/mmap-basic.c | 18 +++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-)
tools/perf/tests/hwmon_pmu.c +9 -5
@@ -1,15 +1,19 @@// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) -#include "debug.h" -#include "evlist.h" #include "hwmon_pmu.h" -#include "parse-events.h" -#include "tests.h" +#include <errno.h> +#include <fcntl.h> -#include <sys/stat.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/string.h> +#include <sys/stat.h> + +#include "debug.h" +#include "evlist.h" +#include "parse-events.h" +#include "pmus.h" +#include "tests.h" static const struct test_event { const char *name;
tools/perf/tests/mmap-basic.c +11 -7
@@ -1,25 +1,29 @@// SPDX-License-Identifier: GPL-2.0 #include <errno.h> -#include <fcntl.h> #include <inttypes.h> #include <stdlib.h> + +#include <fcntl.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/string.h> +#include <perf/cpumap.h> +#include <perf/evlist.h> +#include <perf/mmap.h> #include "cpumap.h" #include "debug.h" #include "event.h" #include "evlist.h" #include "evsel.h" -#include "thread_map.h" +#include "pmu.h" +#include "pmus.h" #include "tests.h" +#include "thread_map.h" #include "util/affinity.h" #include "util/mmap.h" #include "util/sample.h" -#include <linux/err.h> -#include <linux/kernel.h> -#include <linux/string.h> -#include <perf/evlist.h> -#include <perf/mmap.h> /* * This test will generate random numbers of calls to some getpid syscalls,
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 5/58 perf script: Sort includes and add missed explicit dependencies
In reply to Ian RogersFix missing #include of pmu.h found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code. Doing this exposed a missing forward declaration of addr_location in print_insn.h, add this and sort the forward declarations.
--- tools/perf/builtin-script.c | 111 ++++++++++++++++++----------------- tools/perf/util/print_insn.h | 5 +- 2 files changed, 60 insertions(+), 56 deletions(-)
tools/perf/builtin-script.c +57 -54
@@ -1,74 +1,77 @@// SPDX-License-Identifier: GPL-2.0 -#include "builtin.h" +#include <errno.h> +#include <inttypes.h> +#include <signal.h> +#include <stdio.h> + +#include <dirent.h> +#include <fcntl.h> +#include <linux/bitmap.h> +#include <linux/compiler.h> +#include <linux/ctype.h> +#include <linux/err.h> +#include <linux/kernel.h> +#include <linux/stringify.h> +#include <linux/time64.h> +#include <linux/unaligned.h> +#include <linux/zalloc.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/utsname.h> +#include <unistd.h> +#include <perf/evlist.h> +#include <subcmd/exec-cmd.h> +#include <subcmd/pager.h> +#include <subcmd/parse-options.h> + +#include "asm/bug.h" +#include "builtin.h" +#include "perf.h" +#include "print_binary.h" +#include "print_insn.h" +#include "ui/ui.h" +#include "util/annotate.h" +#include "util/auxtrace.h" +#include "util/cgroup.h" +#include "util/color.h" #include "util/counts.h" +#include "util/cpumap.h" +#include "util/data.h" #include "util/debug.h" +#include "util/dlfilter.h" #include "util/dso.h" -#include <subcmd/exec-cmd.h> -#include "util/header.h" -#include <subcmd/parse-options.h> -#include "util/perf_regs.h" -#include "util/session.h" -#include "util/tool.h" -#include "util/map.h" -#include "util/srcline.h" -#include "util/symbol.h" -#include "util/thread.h" -#include "util/trace-event.h" +#include "util/dump-insn.h" #include "util/env.h" +#include "util/event.h" #include "util/evlist.h" #include "util/evsel.h" #include "util/evsel_fprintf.h" #include "util/evswitch.h" +#include "util/header.h" +#include "util/map.h" +#include "util/mem-events.h" +#include "util/mem-info.h" +#include "util/metricgroup.h" +#include "util/path.h" +#include "util/perf_regs.h" +#include "util/pmu.h" +#include "util/record.h" +#include "util/session.h" #include "util/sort.h" -#include "util/data.h" -#include "util/auxtrace.h" -#include "util/cpumap.h" -#include "util/thread_map.h" +#include "util/srcline.h" #include "util/stat.h" -#include "util/color.h" #include "util/string2.h" +#include "util/symbol.h" #include "util/thread-stack.h" +#include "util/thread.h" +#include "util/thread_map.h" #include "util/time-utils.h" -#include "util/path.h" -#include "util/event.h" -#include "util/mem-info.h" -#include "util/metricgroup.h" -#include "ui/ui.h" -#include "print_binary.h" -#include "print_insn.h" -#include <linux/bitmap.h> -#include <linux/compiler.h> -#include <linux/kernel.h> -#include <linux/stringify.h> -#include <linux/time64.h> -#include <linux/zalloc.h> -#include <linux/unaligned.h> -#include <sys/utsname.h> -#include "asm/bug.h" -#include "util/mem-events.h" -#include "util/dump-insn.h" -#include <dirent.h> -#include <errno.h> -#include <inttypes.h> -#include <signal.h> -#include <stdio.h> -#include <sys/param.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include <subcmd/pager.h> -#include <perf/evlist.h> -#include <linux/err.h> -#include "util/dlfilter.h" -#include "util/record.h" +#include "util/tool.h" +#include "util/trace-event.h" #include "util/util.h" -#include "util/cgroup.h" -#include "util/annotate.h" -#include "perf.h" -#include <linux/ctype.h> #ifdef HAVE_LIBTRACEEVENT #include <event-parse.h> #endif
tools/perf/util/print_insn.h +3 -2
@@ -5,10 +5,11 @@#include <stddef.h> #include <stdio.h> -struct perf_sample ; -struct thread ; +struct addr_location ;struct machine ;struct perf_insn ; +struct perf_sample ; +struct thread ;#define PRINT_INSN_IMM_HEX (1<<0)
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 6/58 perf util: Sort includes and add missed explicit dependencies
In reply to Ian RogersFix missing includes found while cleaning the evsel/evlist header files. Sort the remaining header files for consistency with the rest of the code.
--- 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/evsel.c | 75 ++++++++++++------------ 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 +++-- 9 files changed, 152 insertions(+), 134 deletions(-)
tools/perf/util/bpf_off_cpu.c +16 -14
@@ -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 <linux/time64.h> +#include <bpf/bpf.h> #include <bpf/btf.h> #include <internal/xyarray.h> -#include <linux/time64.h> +#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" #define MAX_STACKS 32#define MAX_PROC 4096
tools/perf/util/bpf_trace_augment.c +4 -4
@@ -1,11 +1,11 @@#include <bpf/libbpf.h> #include <internal/xyarray.h> -#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" static struct augmented_raw_syscalls_bpf *skel;static struct evsel *bpf_output;
tools/perf/util/evlist.c +46 -45
113 lines not on this page · raw message
tools/perf/util/evsel.c +39 -36
107 lines not on this page · raw message
tools/perf/util/map.h +4 -5
@@ -2,14 +2,13 @@#ifndef __PERF_MAP_H#define __PERF_MAP_H -#include <linux/refcount.h> -#include <linux/compiler.h> -#include <linux/list.h> -#include <linux/rbtree.h> +#include <stdbool.h> #include <stdio.h> #include <string.h> -#include <stdbool.h> + +#include <linux/refcount.h> #include <linux/types.h> +#include <internal/rc_check.h> struct dso ;
tools/perf/util/perf_api_probe.c +11 -7
@@ -1,14 +1,18 @@/* SPDX-License-Identifier: GPL-2.0 */ +#include "perf_api_probe.h" -#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 <perf/cpumap.h> #include <errno.h> +#include <perf/cpumap.h> + +#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);static int perf_do_probe_api (setup_probe_fn_t fn,struct perf_cpu cpu,const char *str)
tools/perf/util/s390-sample-raw.c +10 -9
@@ -12,25 +12,26 @@* sample was taken from. */ -#include <unistd.h> +#include <inttypes.h> #include <stdio.h> #include <string.h> -#include <inttypes.h> -#include <sys/stat.h> +#include <asm/byteorder.h> #include <linux/compiler.h> #include <linux/err.h> -#include <asm/byteorder.h> +#include <sys/stat.h> +#include <unistd.h> +#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" static size_t ctrset_size (struct cf_ctrset_entry *set) {
tools/perf/util/stat-shadow.c +12 -8
@@ -2,20 +2,24 @@#include <errno.h> #include <math.h> #include <stdio.h> -#include "evsel.h" -#include "stat.h" + +#include <linux/zalloc.h> + +#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" static bool tool_pmu__is_time_event (const struct perf_stat_config *config,const struct evsel *evsel,int *tool_aggr_idx)
tools/perf/util/stat.c +10 -6
@@ -1,21 +1,25 @@// SPDX-License-Identifier: GPL-2.0 +#include "stat.h" +#include <errno.h> -#include <linux/err.h> #include <inttypes.h> #include <math.h> #include <string.h> + +#include <linux/err.h> +#include <linux/zalloc.h> +#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 <linux/zalloc.h> void update_stats (struct stats *stats,u64 val) {
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 7/58 perf python: Add missed explicit dependencies
In reply to Ian RogersFix missing #include of pmus.h found while cleaning the evsel/evlist header files.
--- tools/perf/util/python.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
tools/perf/util/python.c +10 -7
@@ -5,26 +5,29 @@#include <poll.h> #include <linux/err.h> #include <perf/cpumap.h> -#ifdef HAVE_LIBTRACEEVENT -#include <event-parse.h> -#endif +#include <internal/lib.h> #include <perf/mmap.h> +#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 <internal/lib.h> + +#ifdef HAVE_LIBTRACEEVENT +#include <event-parse.h> +#endif PyMODINIT_FUNC PyInit_perf (void );
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 8/58 perf evsel/evlist: Avoid unnecessary #includes
In reply to Ian RogersUse forward declarations and remove unnecessary #includes in evsel.h. Sort the forward declarations in evsel.h and evlist.h.
--- tools/perf/util/evlist.h | 15 +++++++++------ tools/perf/util/evsel.h | 20 +++++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-)
tools/perf/util/evlist.h +9 -6
@@ -2,29 +2,32 @@#ifndef __PERF_EVLIST_H#define __PERF_EVLIST_H 1 +#include <signal.h> +#include <linux/compiler.h> #include <linux/kernel.h> -#include <linux/refcount.h> #include <linux/list.h> +#include <linux/refcount.h> +#include <pthread.h> +#include <unistd.h> +#include <api/fd/array.h> #include <internal/evlist.h> #include <internal/evsel.h> #include <perf/evlist.h> +#include "affinity.h" #include "events_stats.h" #include "evsel.h" #include "rblist.h" -#include <pthread.h> -#include <signal.h> -#include <unistd.h> -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 ;/* * State machine of bkw_mmap_state:
tools/perf/util/evsel.h +11 -9
@@ -2,28 +2,30 @@#ifndef __PERF_EVSEL_H#define __PERF_EVSEL_H 1 -#include <linux/list.h> #include <stdbool.h> -#include <sys/types.h> + +#include <linux/list.h> #include <linux/perf_event.h> #include <linux/types.h> +#include <sys/types.h> +#include <internal/evsel.h> #include <perf/evsel.h> +#include "symbol_conf.h" -#include "pmus.h" -#include "pmu.h" +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 ;typedef int (evsel__sb_cb_t )(union perf_event *event,void *data);
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 9/58 perf data: Add open flag
In reply to Ian RogersAvoid 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.
---
Changes in v2:
1. Fixed File Rotation: In perf_data__switch() , I added data->open = 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 | 26 ++++++++++++++++++++++---- tools/perf/util/data.h | 4 +++- 2 files changed, 25 insertions(+), 5 deletions(-)
tools/perf/util/data.c +22 -4
@@ -346,8 +346,10 @@ static int open_dir(struct perf_data *data)return -1 ;if (perf_data__is_write (data) && -mkdir (data->path,S_IRWXU ) <0 ) +mkdir (data->path,S_IRWXU ) <0 ) { +zfree (&data->file.path);return -1 ; + } ret =open_file (data);
@@ -360,9 +362,16 @@ static int open_dir(struct perf_data *data)int perf_data__open (struct perf_data *data) { -if (check_pipe (data)) +int ret; + +if (data->open)return 0 ; +if (check_pipe (data)) { + data->open = true; +return 0 ; + } +/* currently it allows stdio for pipe only */ data->file.use_stdio = false;
@@ -375,16 +384,24 @@ int perf_data__open(struct perf_data *data)if (perf_data__is_read (data)) data->is_dir =is_dir (data); -return perf_data__is_dir (data) ? -open_dir (data) :open_file_dup (data); + ret =perf_data__is_dir (data) ?open_dir (data) :open_file_dup (data); + +if (!ret) + data->open = true; + +return ret; }void perf_data__close (struct perf_data *data) { +if (!data->open) +return ; +if (perf_data__is_dir (data))perf_data__close_dir (data);perf_data_file__close (&data->file); + data->open = false; }static ssize_t perf_data_file__read (struct perf_data_file *file,void *buf,size_t size)
@@ -457,6 +474,7 @@ int perf_data__switch(struct perf_data *data,if (!at_exit) {perf_data_file__close (&data->file); + data->open = false; ret =perf_data__open (data);if (ret <0 ) goto out;
tools/perf/util/data.h +3 -1
@@ -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;struct {/** @version: perf_dir_version. */
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Ian Rogers
reviewerPATCH v5 10/58 perf evlist: Add reference count
In reply to Ian RogersThis 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.
---
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.
---
tools/perf/arch/x86/tests/hybrid.c | 2 +-
tools/perf/arch/x86/tests/topdown.c | 2 +-
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/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 | 12 +-
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 | 200 +++++++-------------
tools/perf/util/record.c | 2 +-
tools/perf/util/session.c | 2 +-
tools/perf/util/sideband_evlist.c | 16 +-
53 files changed, 268 insertions(+), 319 deletions(-)tools/perf/arch/x86/tests/hybrid.c +1 -1
@@ -268,7 +268,7 @@ static int test_event(const struct evlist_test *e) ret = e->check (evlist); }parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
tools/perf/arch/x86/tests/topdown.c +1 -1
@@ -56,7 +56,7 @@ static int event_cb(void *state, struct pmu_event_info *info) *ret =TEST_FAIL ; } } -evlist__delete (evlist); +evlist__put (evlist);return 0 ; }
tools/perf/arch/x86/util/iostat.c +1 -1
@@ -337,7 +337,7 @@ int iostat_prepare(struct evlist *evlist, struct perf_stat_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 =evlist__new ();if (!evlist)return -ENOMEM ;
tools/perf/bench/evlist-open-close.c +9 -9
@@ -76,7 +76,7 @@ static struct evlist *bench__create_evlist(char *evstr, const char *uid_str)parse_events_error__exit (&err);pr_err ("Run 'perf list' for a list of valid events\n" ); ret =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 ==UINT_MAX ) {pr_err ("Invalid User: %s" , uid_str); ret = -EINVAL ; - goto out_delete_evlist; + goto out_put_evlist; } ret =parse_uid_filter (evlist, uid);if (ret) - goto out_delete_evlist; + goto out_put_evlist; } ret =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; }evlist__config (evlist, &opts,NULL );return evlist; -out_delete_evlist: -evlist__delete (evlist); +out_put_evlist: +evlist__put (evlist);return NULL ; }
@@ -151,7 +151,7 @@ static int bench_evlist_open_close__run(char *evstr, const char *uid_str) evlist->core.nr_entries, evlist__count_evsel_fds(evlist));printf (" Number of iterations:\t%d\n" , iterations); -evlist__delete (evlist); +evlist__put (evlist);for (i =0 ; i < iterations; i++) {pr_debug ("Started iteration %d\n" , i);
@@ -162,7 +162,7 @@ static int bench_evlist_open_close__run(char *evstr, const char *uid_str)gettimeofday (&start,NULL ); err =bench__do_evlist_open_close (evlist);if (err) { -evlist__delete (evlist); +evlist__put (evlist);return err; }
@@ -171,7 +171,7 @@ static int bench_evlist_open_close__run(char *evstr, const char *uid_str) runtime_us =timeval2usec (&diff);update_stats (&time_stats, runtime_us); -evlist__delete (evlist); +evlist__put (evlist);pr_debug ("Iteration %d took:\t%" PRIu64"us\n" , i, runtime_us); }
tools/perf/builtin-ftrace.c +4 -4
@@ -1999,20 +1999,20 @@ int cmd_ftrace(int argc, const char **argv) ret =evlist__create_maps (ftrace.evlist, &ftrace.target);if (ret <0 ) - goto out_delete_evlist; + goto out_put_evlist;if (argc) { ret =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; } ret =cmd_func (&ftrace); -out_delete_evlist: -evlist__delete (ftrace.evlist); +out_put_evlist: +evlist__put (ftrace.evlist); out_delete_filters:delete_filter_func (&ftrace.filters);
tools/perf/builtin-kvm.c +2 -2
@@ -1811,7 +1811,7 @@ static struct evlist *kvm_live_event_list(void) out:if (err) { -evlist__delete (evlist); +evlist__put (evlist); evlist =NULL ; }
@@ -1942,7 +1942,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, out:perf_session__delete (kvm->session); kvm->session =NULL ; -evlist__delete (kvm->evlist); +evlist__put (kvm->evlist);return err; }
tools/perf/builtin-lock.c +1 -1
@@ -2145,7 +2145,7 @@ static int __cmd_contention(int argc, const char **argv) 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);
tools/perf/builtin-record.c +2 -2
@@ -4289,7 +4289,7 @@ int cmd_record(int argc, const char **argv) goto out;evlist__splice_list_tail (rec->evlist, &def_evlist->core.entries); -evlist__delete (def_evlist); +evlist__put (def_evlist); }if (rec->opts.target.tid && !rec->opts.no_inherit_set)
@@ -4397,7 +4397,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; }
tools/perf/builtin-sched.c +3 -3
@@ -3829,7 +3829,7 @@ static int perf_sched__schedstat_record(struct perf_sched *sched, session =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); }
@@ -3925,7 +3925,7 @@ static int perf_sched__schedstat_record(struct perf_sched *sched,else fprintf (stderr,"[ perf sched stats: Failed !! ]\n" ); -evlist__delete (evlist); +evlist__put (evlist);close (fd);return err; }
@@ -4724,7 +4724,7 @@ static int perf_sched__schedstat_live(struct perf_sched *sched,free_cpu_domain_info (cd_map, sv, nr); out:free_schedstat (&cpu_head); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/builtin-script.c +1 -1
@@ -2269,7 +2269,7 @@ static int script_find_metrics(const struct pmu_metric *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 ; }
tools/perf/builtin-stat.c +5 -5
@@ -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 =-1 ;break ; }
@@ -2125,7 +2125,7 @@ static int add_default_events(void)metricgroup__copy_metric_events (evlist,/*cgrp=*/ NULL , &evlist->metric_events, &metric_evlist->metric_events); -evlist__delete (metric_evlist); +evlist__put (metric_evlist); }list_sort (/*priv=*/ NULL , &evlist->core.entries, default_evlist_evsel_cmp);
@@ -2146,7 +2146,7 @@ static int add_default_events(void)metricgroup__copy_metric_events (evsel_list,/*cgrp=*/ NULL , &evsel_list->metric_events, &evlist->metric_events); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -2381,7 +2381,7 @@ static int __cmd_report(int argc, const char **argv) perf_stat.session = session; stat_config.output = stderr; -evlist__delete (evsel_list); +evlist__put (evsel_list); evsel_list = session->evlist; ret =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 ); -evlist__delete (evsel_list); +evlist__put (evsel_list);evlist__close_control (stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close);
tools/perf/builtin-top.c +26 -26
184 lines not on this page · raw message
tools/perf/builtin-trace.c +13 -13
@@ -4388,7 +4388,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (trace->summary_bpf) {if (trace_prepare_bpf_summary (trace->summary_mode) <0 ) - goto out_delete_evlist; + goto out_put_evlist;if (trace->summary_only) goto create_maps;
@@ -4456,19 +4456,19 @@ static int trace__run(struct trace *trace, int argc, const char **argv) err =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; } err =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; }if (trace->summary_mode ==SUMMARY__BY_TOTAL && !trace->summary_bpf) { trace->syscall_stats =alloc_syscall_stats ();if (!trace->syscall_stats) - goto out_delete_evlist; + goto out_put_evlist; }evlist__config (evlist, &trace->opts, &callchain_param);
@@ -4477,7 +4477,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) err =evlist__prepare_workload (evlist, &trace->opts.target, argv, false,NULL );if (err <0 ) {fprintf (trace->output,"Couldn't run the workload!\n" ); - goto out_delete_evlist; + goto out_put_evlist; } workload_pid = evlist->workload.pid; }
@@ -4525,7 +4525,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) err =trace__expand_filters (trace, &evsel);if (err) - goto out_delete_evlist; + goto out_put_evlist; err =evlist__apply_filters (evlist, &evsel, &trace->opts.target);if (err <0 ) goto out_error_apply_filters;
@@ -4642,12 +4642,12 @@ static int trace__run(struct trace *trace, int argc, const char **argv) } } -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 =NULL ; trace->live = false;
@@ -4672,21 +4672,21 @@ static int trace__run(struct trace *trace, int argc, const char **argv) out_error:fprintf (trace->output,"%s\n" , errbuf); - goto out_delete_evlist; + goto out_put_evlist; 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; out_errno:fprintf (trace->output,"%m\n" ); - goto out_delete_evlist; + goto out_put_evlist; }static int trace__replay (struct trace *trace)
@@ -5364,7 +5364,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 =NULL ;ordered_events__free (&trace->oe.data);#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/tests/backward-ring-buffer.c +9 -9
@@ -111,7 +111,7 @@ static int test__backward_ring_buffer(struct test_suite *test __maybe_unused, in err =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; }parse_events_error__init (&parse_error);
@@ -124,7 +124,7 @@ static int test__backward_ring_buffer(struct test_suite *test __maybe_unused, inif (err) {pr_debug ("Failed to parse tracepoint event, try use root\n" ); ret =TEST_SKIP ; - goto out_delete_evlist; + goto out_put_evlist; }evlist__config (evlist, &opts,NULL );
@@ -133,19 +133,19 @@ static int test__backward_ring_buffer(struct test_suite *test __maybe_unused, inif (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } ret =TEST_FAIL ; err =do_test (evlist, opts.mmap_pages, &sample_count, &comm_count);if (err !=TEST_OK ) - goto out_delete_evlist; + goto out_put_evlist;if ((sample_count !=NR_ITERS ) || (comm_count !=NR_ITERS )) {pr_err ("Unexpected counter: sample_count=%d, comm_count=%d\n" , sample_count, comm_count); - goto out_delete_evlist; + goto out_put_evlist; }evlist__close (evlist);
@@ -154,16 +154,16 @@ static int test__backward_ring_buffer(struct test_suite *test __maybe_unused, inif (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } err =do_test (evlist,1 , &sample_count, &comm_count);if (err !=TEST_OK ) - goto out_delete_evlist; + goto out_put_evlist; ret =TEST_OK ; -out_delete_evlist: -evlist__delete (evlist); +out_put_evlist: +evlist__put (evlist);return ret; }
tools/perf/tests/code-reading.c +2 -2
@@ -807,7 +807,7 @@ static int do_test_code_reading(bool try_kcore) }perf_evlist__set_maps (&evlist->core,NULL ,NULL ); -evlist__delete (evlist); +evlist__put (evlist); evlist =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);
tools/perf/tests/event-times.c +2 -2
@@ -186,7 +186,7 @@ static int test_times(int (attach)(struct evlist *), err =attach (evlist);if (err ==TEST_SKIP ) {pr_debug (" SKIP : not enough rights\n" ); -evlist__delete (evlist); +evlist__put (evlist);return err; }
@@ -205,7 +205,7 @@ static int test_times(int (attach)(struct evlist *), count.ena, count.run); out_err: -evlist__delete (evlist); +evlist__put (evlist);return !err ?TEST_OK :TEST_FAIL ; }
tools/perf/tests/event_update.c +1 -1
@@ -117,7 +117,7 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtesTEST_ASSERT_VAL ("failed to synthesize attr update cpus" , !perf_event__synthesize_event_update_cpus (&tmp.tool, evsel, process_event_cpus)); -evlist__delete (evlist); +evlist__put (evlist);return 0 ; }
tools/perf/tests/evsel-roundtrip-name.c +4 -4
@@ -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 support 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 =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 =TEST_FAIL ;continue ; }
@@ -76,7 +76,7 @@ static int perf_evsel__name_array_test(const char *const names[], int nr_names) ret =TEST_FAIL ; } } -evlist__delete (evlist); +evlist__put (evlist); }return ret; }
tools/perf/tests/expand-cgroup.c +4 -4
@@ -106,7 +106,7 @@ static int expand_default_events(void)TEST_ASSERT_VAL ("failed to get evlist" , evlist); ret =test_expand_events (evlist); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -133,7 +133,7 @@ static int expand_group_events(void) ret =test_expand_events (evlist); out:parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -164,7 +164,7 @@ static int expand_libpfm_events(void) ret =test_expand_events (evlist); out: -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -188,7 +188,7 @@ static int expand_metric_events(void) ret =test_expand_events (evlist); out: -evlist__delete (evlist); +evlist__put (evlist);return ret; }
tools/perf/tests/hists_cumulate.c +1 -1
@@ -744,7 +744,7 @@ static int test__hists_cumulate(struct test_suite *test __maybe_unused, int subt out:/* tear down everything */ -evlist__delete (evlist); +evlist__put (evlist);machines__exit (&machines);put_fake_samples ();
tools/perf/tests/hists_filter.c +1 -1
@@ -332,7 +332,7 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subtes out:/* tear down everything */ -evlist__delete (evlist); +evlist__put (evlist);reset_output_field ();machines__exit (&machines);put_fake_samples ();
tools/perf/tests/hists_link.c +1 -1
@@ -352,7 +352,7 @@ static int test__hists_link(struct test_suite *test __maybe_unused, int subtest out:/* tear down everything */ -evlist__delete (evlist); +evlist__put (evlist);reset_output_field ();machines__exit (&machines);put_fake_samples ();
tools/perf/tests/hists_output.c +1 -1
@@ -631,7 +631,7 @@ static int test__hists_output(struct test_suite *test __maybe_unused, int subtes out:/* tear down everything */ -evlist__delete (evlist); +evlist__put (evlist);machines__exit (&machines);put_fake_samples ();
tools/perf/tests/hwmon_pmu.c +1 -1
@@ -214,7 +214,7 @@ static int do_test(size_t i, bool with_pmu, bool with_alias) out:parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
tools/perf/tests/keep-tracking.c +1 -1
@@ -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);
tools/perf/tests/mmap-basic.c +9 -9
@@ -94,7 +94,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtest/* Permissions failure, flag the failure as a skip. */ err =TEST_SKIP ; } - goto out_delete_evlist; + goto out_put_evlist; } evsels[i]->core.attr.wakeup_events =1 ;
@@ -106,7 +106,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtestpr_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; } nr_events[i] =0 ;
@@ -116,7 +116,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtestif (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; }for (i =0 ; i < nsyscalls; ++i)
@@ -134,7 +134,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtestif (event->header.type !=PERF_RECORD_SAMPLE ) {pr_debug ("unexpected %s event\n" ,perf_event__name (event->header.type)); - goto out_delete_evlist; + goto out_put_evlist; }perf_sample__init (&sample,/*all=*/ false);
@@ -142,7 +142,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtestif (err) {pr_err ("Can't parse sample, err = %d\n" , err);perf_sample__exit (&sample); - goto out_delete_evlist; + goto out_put_evlist; } err =-1 ;
@@ -151,7 +151,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtestif (evsel ==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);
@@ -166,12 +166,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 =-1 ; - goto out_delete_evlist; + goto out_put_evlist; } } -out_delete_evlist: -evlist__delete (evlist); +out_put_evlist: +evlist__put (evlist); out_free_cpus:perf_cpu_map__put (cpus); out_free_threads:
tools/perf/tests/openat-syscall-tp-fields.c +9 -9
@@ -51,7 +51,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedif (IS_ERR (evsel)) {pr_debug ("%s: evsel__newtp\n" , __func__); ret =PTR_ERR (evsel) == -EACCES ?TEST_SKIP :TEST_FAIL ; - goto out_delete_evlist; + goto out_put_evlist; }evlist__add (evlist, evsel);
@@ -59,7 +59,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unused err =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; }evsel__config (evsel, &opts,NULL );
@@ -70,14 +70,14 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedif (err <0 ) {pr_debug ("perf_evlist__open: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf))); - goto out_delete_evlist; + goto out_put_evlist; } err =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; }evlist__enable (evlist);
@@ -115,7 +115,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedif (err) {pr_debug ("Can't parse sample, err = %d\n" , err);perf_sample__exit (&sample); - goto out_delete_evlist; + goto out_put_evlist; } tp_flags =evsel__intval (evsel, &sample,"flags" );
@@ -123,7 +123,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedif (flags != tp_flags) {pr_debug ("%s: Expected flags=%#x, got %#x\n" , __func__, flags, tp_flags); - goto out_delete_evlist; + goto out_put_evlist; } goto out_ok;
@@ -136,13 +136,13 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedif (++nr_polls >5 ) {pr_debug ("%s: no events!\n" , __func__); - goto out_delete_evlist; + goto out_put_evlist; } } out_ok: ret =TEST_OK ; -out_delete_evlist: -evlist__delete (evlist); +out_put_evlist: +evlist__put (evlist); out:return ret; }
tools/perf/tests/parse-events.c +2 -2
@@ -2568,7 +2568,7 @@ static int test_event(const struct evlist_test *e) ret = e->check (evlist); }parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -2594,7 +2594,7 @@ static int test_event_fake_pmu(const char *str) }parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
tools/perf/tests/parse-metric.c +2 -2
@@ -84,7 +84,7 @@ static int __compute_metric(const char *name, struct value *vals, cpus =perf_cpu_map__new ("0" );if (!cpus) { -evlist__delete (evlist); +evlist__put (evlist);return -ENOMEM ; }
@@ -113,7 +113,7 @@ static int __compute_metric(const char *name, struct value *vals,/* ... cleanup. */ evlist__free_stats (evlist);perf_cpu_map__put (cpus); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/tests/parse-no-sample-id-all.c +1 -1
@@ -49,7 +49,7 @@ static int process_events(union perf_event **events, size_t count)for (i =0 ; i < count && !err; i++) err =process_event (&evlist, events[i]); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/tests/perf-record.c +9 -9
@@ -105,7 +105,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest err =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; }/*
@@ -117,7 +117,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest err =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; }/*
@@ -134,7 +134,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestpr_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; } cpu = err;
@@ -146,7 +146,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestpr_debug ("sched_setaffinity: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));evlist__cancel_workload (evlist); - goto out_delete_evlist; + goto out_put_evlist; }/*
@@ -158,7 +158,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestpr_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; }/*
@@ -171,7 +171,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestpr_debug ("evlist__mmap: %s\n" ,str_error_r (errno, sbuf,sizeof (sbuf)));evlist__cancel_workload (evlist); - goto out_delete_evlist; + goto out_put_evlist; }/*
@@ -209,7 +209,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestif (verbose >0 )perf_event__fprintf (event,NULL , stderr);pr_debug ("Couldn't parse sample\n" ); - goto out_delete_evlist; + goto out_put_evlist; }if (verbose >0 ) {
@@ -350,9 +350,9 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestpr_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 == -EACCES )
tools/perf/tests/perf-time-to-tsc.c +1 -1
@@ -201,7 +201,7 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su err =TEST_OK ; out_err: -evlist__delete (evlist); +evlist__put (evlist);perf_cpu_map__put (cpus);perf_thread_map__put (threads);return err;
tools/perf/tests/pfm.c +2 -2
@@ -80,7 +80,7 @@ static int test__pfm_events(struct test_suite *test __maybe_unused,evlist__nr_groups (evlist), 0); -evlist__delete (evlist); +evlist__put (evlist); }return 0 ; }
@@ -165,7 +165,7 @@ static int test__pfm_group(struct test_suite *test __maybe_unused,evlist__nr_groups (evlist), table[i].nr_groups); -evlist__delete (evlist); +evlist__put (evlist); }return 0 ; }
tools/perf/tests/pmu-events.c +3 -3
@@ -797,7 +797,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error) /*warn_if_reordered=*/true, /*fake_tp=*/false);free (dup); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
@@ -844,7 +844,7 @@ static int test__parsing_callback(const struct pmu_metric *pm, cpus =perf_cpu_map__new ("0" );if (!cpus) { -evlist__delete (evlist); +evlist__put (evlist);return -ENOMEM ; }
@@ -899,7 +899,7 @@ static int test__parsing_callback(const struct pmu_metric *pm,/* ... cleanup. */ evlist__free_stats (evlist);perf_cpu_map__put (cpus); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/tests/pmu.c +2 -2
@@ -287,7 +287,7 @@ static int test__pmu_usr_chgs(struct test_suite *test __maybe_unused, int subtes ret =TEST_OK ; err_out:parse_events_terms__exit (&terms); -evlist__delete (evlist); +evlist__put (evlist);test_pmu_put (dir, pmu);return ret; }
@@ -339,7 +339,7 @@ static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest ret =TEST_OK ; err_out:parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);test_pmu_put (dir, pmu);return ret; }
tools/perf/tests/sw-clock.c +7 -7
@@ -59,7 +59,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) evsel =evsel__new (&attr);if (evsel ==NULL ) {pr_debug ("evsel__new\n" ); - goto out_delete_evlist; + goto out_put_evlist; }evlist__add (evlist, evsel);
@@ -68,7 +68,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_put_evlist; }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; } err =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; }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; } total_periods += sample.period;
@@ -131,10 +131,10 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) err =-1 ; } -out_delete_evlist: +out_put_evlist:perf_cpu_map__put (cpus);perf_thread_map__put (threads); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/tests/switch-tracking.c +1 -1
@@ -579,7 +579,7 @@ static int test__switch_tracking(struct test_suite *test __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);
tools/perf/tests/task-exit.c +7 -7
@@ -74,7 +74,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_put_evlist; }perf_evlist__set_maps (&evlist->core, cpus, threads);
@@ -82,7 +82,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ err =evlist__prepare_workload (evlist, &target, argv, false, workload_exec_failed_signal);if (err <0 ) {pr_debug ("Couldn't run the workload!\n" ); - goto out_delete_evlist; + goto out_put_evlist; } evsel =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; }if (evlist__mmap (evlist,128 ) <0 ) {pr_debug ("failed to mmap events: %d (%s)\n" , errno,str_error_r (errno, sbuf,sizeof (sbuf))); err =-1 ; - goto out_delete_evlist; + goto out_put_evlist; }evlist__start_workload (evlist);
@@ -133,7 +133,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _if (retry_count++ >1000 ) {pr_debug ("Failed after retrying 1000 times\n" ); err =-1 ; - goto out_delete_evlist; + goto out_put_evlist; } goto retry;
@@ -144,10 +144,10 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ err =-1 ; } -out_delete_evlist: +out_put_evlist:perf_cpu_map__put (cpus);perf_thread_map__put (threads); -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/tests/tool_pmu.c +1 -1
@@ -67,7 +67,7 @@ static int do_test(enum tool_pmu_event ev, bool with_pmu) out:parse_events_error__exit (&err); -evlist__delete (evlist); +evlist__put (evlist);return ret; }
tools/perf/tests/topology.c +1 -1
@@ -57,7 +57,7 @@ static int session_write_header(char *path) !perf_session__write_header (session, session->evlist, perf_data__fd(&data), true)); -evlist__delete (session->evlist); +evlist__put (session->evlist);perf_session__delete (session);return 0 ;
tools/perf/util/cgroup.c +2 -2
@@ -520,8 +520,8 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro cgrp_event_expanded = true; 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 ();
tools/perf/util/data-convert-bt.c +1 -1
@@ -1363,7 +1363,7 @@ static void cleanup_events(struct perf_session *session)zfree (&evsel->priv); } -evlist__delete (evlist); +evlist__put (evlist); session->evlist =NULL ; }
tools/perf/util/evlist.c +15 -5
@@ -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) -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 =-1 ;metricgroup__rblist_init (&evlist->metric_events);INIT_LIST_HEAD (&evlist->deferred_samples); +refcount_set (&evlist->refcnt,1 ); }struct evlist *evlist__new (void )
@@ -139,7 +140,7 @@ struct evlist *evlist__new_default(const struct target *target, bool sample_callreturn evlist; out_err: -evlist__delete (evlist); +evlist__put (evlist);return NULL ; }
@@ -148,13 +149,19 @@ struct evlist *evlist__new_dummy(void)struct evlist *evlist =evlist__new ();if (evlist &&evlist__add_dummy (evlist)) { -evlist__delete (evlist); +evlist__put (evlist); evlist =NULL ; }return evlist; } +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 =0 ; } -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); } -void evlist__delete (struct evlist *evlist) +void evlist__put (struct evlist *evlist) {if (evlist ==NULL )return ; +if (!refcount_dec_and_test (&evlist->refcnt)) +return ; +evlist__free_stats (evlist);evlist__munmap (evlist);evlist__close (evlist);
tools/perf/util/evlist.h +3 -4
@@ -61,6 +61,7 @@ struct event_enable_timer;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 sample_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);void evlist__add (struct evlist *evlist,struct evsel *entry);void evlist__remove (struct evlist *evlist,struct evsel *evsel);
tools/perf/util/expr.c +1 -1
@@ -450,7 +450,7 @@ double expr__has_event(const struct expr_parse_ctx *ctx, bool compute_ids, const ret =parse_event (tmp, id) ?0 :1 ; } out: -evlist__delete (tmp); +evlist__put (tmp);return ret; }
tools/perf/util/header.c +6 -6
@@ -4909,12 +4909,12 @@ int perf_session__read_header(struct perf_session *session) evsel =evsel__new (&f_attr.attr);if (evsel ==NULL ) - goto out_delete_evlist; + goto out_put_evlist; evsel->needs_swap = 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);
@@ -4925,7 +4925,7 @@ int perf_session__read_header(struct perf_session *session)* hattr->ids threads. */ if (perf_evsel__alloc_id (&evsel->core,1 , nr_ids)) - goto out_delete_evlist; + goto out_put_evlist;lseek (fd, f_attr.ids.offset,SEEK_SET );
@@ -4944,7 +4944,7 @@ int perf_session__read_header(struct perf_session *session) perf_file_section__process);if (evlist__prepare_tracepoint_events (session->evlist, session->tevent.pevent)) - goto out_delete_evlist; + goto out_put_evlist;#else perf_header__process_sections (header, fd,NULL , perf_file_section__process);#endif
@@ -4953,8 +4953,8 @@ int perf_session__read_header(struct perf_session *session) out_errno:return -errno; -out_delete_evlist: -evlist__delete (session->evlist); +out_put_evlist: +evlist__put (session->evlist); session->evlist =NULL ;return -ENOMEM ; }
tools/perf/util/metricgroup.c +3 -3
@@ -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); }
@@ -1335,7 +1335,7 @@ static int parse_ids(bool metric_no_merge, bool fake_pmu, parsed_evlist =NULL ; err_out:parse_events_error__exit (&parse_error); -evlist__delete (parsed_evlist); +evlist__put (parsed_evlist);strbuf_release (&events);return ret; }
@@ -1546,7 +1546,7 @@ static int parse_groups(struct evlist *perf_evlist,if (combined_evlist) {evlist__splice_list_tail (perf_evlist, &combined_evlist->core.entries); -evlist__delete (combined_evlist); +evlist__put (combined_evlist); }list_for_each_entry (m, &metric_list, nd) {
tools/perf/util/parse-events.c +2 -2
@@ -2316,7 +2316,7 @@ int __parse_events(struct evlist *evlist, const char *str, const char *pmu_filte/* * 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;
@@ -2519,7 +2519,7 @@ int parse_events_option_new_evlist(const struct option *opt, const char *str, in } ret =parse_events_option (opt, str, unset);if (ret) { -evlist__delete (*args->evlistp); +evlist__put (*args->evlistp); *args->evlistp =NULL ; }
tools/perf/util/perf_api_probe.c +1 -1
@@ -57,7 +57,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, struct perf_cpu cpu, const cha err =0 ; out_delete: -evlist__delete (evlist); +evlist__put (evlist);return err; }
tools/perf/util/python.c +70 -130
390 lines not on this page · raw message
tools/perf/util/record.c +1 -1
@@ -264,7 +264,7 @@ bool evlist__can_select_event(struct evlist *evlist, const char *str) ret = true; out_delete: -evlist__delete (temp_evlist); +evlist__put (temp_evlist);return ret; }
tools/perf/util/session.c +1 -1
@@ -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
tools/perf/util/sideband_evlist.c +8 -8
@@ -102,7 +102,7 @@ int evlist__start_sb_thread(struct evlist *evlist, struct target *target)return 0 ;if (evlist__create_maps (evlist, target)) - goto out_delete_evlist; + goto out_put_evlist;if (evlist->core.nr_entries >1 ) {bool can_sample_identifier =perf_can_sample_identifier ();
@@ -116,25 +116,25 @@ int evlist__start_sb_thread(struct evlist *evlist, struct 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; }if (evlist__mmap (evlist,UINT_MAX )) - goto out_delete_evlist; + goto out_put_evlist;evlist__for_each_entry (evlist, counter) {if (evsel__enable (counter)) - goto out_delete_evlist; + goto out_put_evlist; } evlist->thread.done =0 ;if (pthread_create (&evlist->thread.th,NULL , perf_evlist__poll_thread, evlist)) - goto out_delete_evlist; + goto out_put_evlist;return 0 ; -out_delete_evlist: -evlist__delete (evlist); +out_put_evlist: +evlist__put (evlist); evlist =NULL ;return -1 ; }
@@ -145,5 +145,5 @@ void evlist__stop_sb_thread(struct evlist *evlist)return ; evlist->thread.done =1 ;pthread_join (evlist->thread.th,NULL ); -evlist__delete (evlist); +evlist__put (evlist); }
Signature · 1 line
2.54.0.545.g6539524ca2-goog
[email protected]
AI reviewRe: [PATCH v5 10/58] perf evlist: Add reference count
Sashiko AI review found 2 potential issue(s): - [High] Python API crash (BUG_ON) and semantic breakage in `evlist[i]` due to dynamic cloning. - [High] Heap corruption due to invalid `free()` of an…
Sashiko AI review found 2 potential issue(s):
- [High] Python API crash (BUG_ON) and semantic breakage in evlist[i] due to dynamic cloning.
- [High] Heap corruption due to invalid free() of an interior Python object pointer during evlist destruction. --
commit f86d4772779db7dfab01f3dc1c165176b797dc57
Author: Ian Rogers <[email protected]>
perf evlist: Add reference count
This commit introduces a reference count for the evlist to prevent issues with cloning in the python code. It switches from evlist__delete() to a refcounted evlist__put() approach.
Quoted 3 lines
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.
Does this intentionally break bisectability? Even though the fix is introduced in the next patch ("perf evsel: Add reference count"), leaving intermediate commits broken makes bisection difficult.
Quoted 3 lines
tools/perf/util/python.c +0
-0
[ ... ]
Quoted 1 line
tools/perf/util/python.c +0
-0@@ -1285,15 +1285,22 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist,
[ ... ]
tools/perf/util/python.c static int pyrf_evlist__init(struct pyrf_evlist *pevlist, · line 1305
Quoted 6 lines
static void
pyrf_evlist__delete(struct pyrf_evlist *pevlist){tools/perf/util/python.c +1
-1-evlist__exit (&pevlist->evlist); +evlist__put (pevlist->evlist);Py_TYPE (pevlist)->tp_free ((PyObject *)pevlist); }
Does this trigger an invalid free when destroying the evlist? Calling evlist__put() will drop the refcount and eventually call evlist__purge(), which iterates over elements and calls evsel__delete() (which calls free).
However, when an evsel is added from Python via pyrf_evlist__add():
tools/perf/util/python.c:pyrf_evlist__add() {
...
evsel = &((struct pyrf_evsel *)pevsel)->evsel;
evlist__add(evlist, evsel);
...
}The evsel is an interior pointer embedded within a Python-allocated pyrf_evsel object. Passing this interior pointer to free() will corrupt the heap.
[ ... ]
Quoted 1 line
tools/perf/util/python.c +0
-0@@ -1794,17 +1817,16 @@ static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i)
[ ... ]
tools/perf/util/python.c static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i) · line 1830
Quoted 3 lines
tools/perf/util/python.c +1
-1- return Py_BuildValue("O", container_of(pos, struct pyrf_evsel, evsel)); +return pyrf_evsel__from_evsel (pos); }
Can this cause crashes and semantic changes for python scripts? The new pyrf_evsel__from_evsel() dynamically clones the evsel using evsel__clone().
If a script calls evlist.open() before iterating, the underlying evsel__clone() hits a BUG_ON(orig->core.fd) and crashes. Also, returning a detached clone means any modifications made to the event by the Python script are discarded and do not affect the actual event in the list.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Ian Rogers
reviewerPATCH v5 11/58 perf evsel: Add reference count
In reply to Ian RogersAs 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.
---
v2:
1. Fixed Potential Crash in pyrf_event__new : Initialized pevent->evsel = 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 .
--- 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 | 231 +++++++++++++++++---- tools/perf/util/session.c | 1 + 14 files changed, 237 insertions(+), 72 deletions(-)
tools/perf/builtin-trace.c +6 -6
@@ -448,10 +448,10 @@ static int evsel__init_tp_ptr_field(struct evsel *evsel, struct tp_field *field, ({ struct syscall_tp *sc = __evsel__syscall_tp(evsel);\ evsel__init_tp_ptr_field(evsel, &sc->name, #name); }) -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); } static int evsel__init_syscall_tp(struct evsel *evsel)
@@ -531,7 +531,7 @@ static struct evsel *perf_evsel__raw_syscall_newtp(const char *direction, void *return evsel; out_delete: -evsel__delete_priv (evsel); +evsel__put_and_free_priv (evsel);return NULL ; }
@@ -3584,7 +3584,7 @@ static bool evlist__add_vfs_getname(struct evlist *evlist)list_del_init (&evsel->core.node); evsel->evlist =NULL ; -evsel__delete (evsel); +evsel__put (evsel); }return found;
@@ -3698,9 +3698,9 @@ static int trace__add_syscall_newtp(struct trace *trace)return ret; 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; }
tools/perf/tests/evsel-tp-sched.c +2 -2
@@ -64,7 +64,7 @@ static int test__perf_evsel__tp_sched_test(struct test_suite *test __maybe_unuseif (evsel__test_field (evsel,"next_prio" ,4 , true)) ret =TEST_FAIL ; -evsel__delete (evsel); +evsel__put (evsel); evsel =evsel__newtp ("sched" ,"sched_wakeup" );
@@ -85,7 +85,7 @@ static int test__perf_evsel__tp_sched_test(struct test_suite *test __maybe_unuseif (evsel__test_field (evsel,"target_cpu" ,4 , true)) ret =TEST_FAIL ; -evsel__delete (evsel); +evsel__put (evsel);return ret; }
tools/perf/tests/openat-syscall-all-cpus.c +3 -3
@@ -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 =TEST_SKIP ; - goto out_evsel_delete; + goto out_evsel_put; }perf_cpu_map__for_each_cpu (cpu, idx, cpus) {
@@ -116,8 +116,8 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __maybevsel__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:
tools/perf/tests/openat-syscall.c +3 -3
@@ -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 =TEST_SKIP ; - goto out_evsel_delete; + goto out_evsel_put; }for (i =0 ; i < nr_openat_calls; ++i) {
@@ -64,8 +64,8 @@ static int test__openat_syscall_event(struct test_suite *test __maybe_unused, err =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;
tools/perf/util/bpf_counter_cgroup.c +1 -1
@@ -316,7 +316,7 @@ static int bperf_cgrp__destroy(struct evsel *evsel)return 0 ;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 return 0 ; }
tools/perf/util/cgroup.c +1 -1
@@ -469,7 +469,7 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro/* copy the list and set to the new cgroup. */ evlist__for_each_entry (orig_list, pos) { -struct evsel *evsel =evsel__clone (/*dest=*/ NULL , pos); +struct evsel *evsel =evsel__clone (pos);if (evsel ==NULL ) goto out_err;
tools/perf/util/evlist.c +1 -1
@@ -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 =NULL ; -evsel__delete (pos); +evsel__put (pos); } evlist->core.nr_entries =0 ;
tools/perf/util/evsel.c +16 -10
@@ -388,10 +388,11 @@ bool evsel__is_function_event(struct evsel *evsel)#undef FUNCTION_EVENT } -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 = !idx; evsel->unit =strdup ("" ); evsel->scale =1.0 ;
@@ -472,7 +473,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;
@@ -485,11 +486,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig)if (orig->bpf_obj)return NULL ; -if (dest) - evsel = dest; -else - evsel =evsel__new (&orig->core.attr); - + evsel =evsel__new (&orig->core.attr);if (evsel ==NULL )return NULL ;
@@ -574,7 +571,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig)return evsel; out_err: -evsel__delete (evsel); +evsel__put (evsel);return NULL ; }
@@ -633,6 +630,12 @@ struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx, boolreturn ERR_PTR (err); } +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) {
@@ -1857,7 +1860,7 @@ void evsel__set_priv_destructor(void (*destructor)(void *priv)) evsel__priv_destructor = destructor; } -void evsel__exit (struct evsel *evsel) +static void evsel__exit (struct evsel *evsel) {assert (list_empty (&evsel->core.node));assert (evsel->evlist ==NULL );
@@ -1892,11 +1895,14 @@ void evsel__exit(struct evsel *evsel)xyarray__delete (evsel->start_times); } -void evsel__delete (struct evsel *evsel) +void evsel__put (struct evsel *evsel) {if (!evsel)return ; +if (!refcount_dec_and_test (&evsel->refcnt)) +return ; +evsel__exit (evsel);free (evsel); }
tools/perf/util/evsel.h +6 -5
@@ -6,6 +6,7 @@#include <linux/list.h> #include <linux/perf_event.h> +#include <linux/refcount.h> #include <linux/types.h> #include <sys/types.h>
@@ -47,6 +48,7 @@ typedef int (evsel__sb_cb_t)(union perf_event *event, void *data);struct evsel {struct perf_evsel core;struct evlist *evlist; +refcount_t refcnt;off_t id_offset;int id_pos;int is_pos;
@@ -262,7 +264,7 @@ static inline struct evsel *evsel__new(struct perf_event_attr *attr)return evsel__new_idx (attr,0 ); } -struct evsel *evsel__clone (struct evsel *dest,struct evsel *orig); +struct evsel *evsel__clone (struct evsel *orig);int copy_config_terms (struct list_head *dst,struct list_head *src);void free_config_terms (struct list_head *config_terms);
@@ -277,14 +279,13 @@ static inline struct evsel *evsel__newtp(const char *sys, const char *name)return evsel__newtp_idx (sys, name,0 , true); } +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 -void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx); -void evsel__exit (struct evsel *evsel); -void evsel__delete (struct evsel *evsel); -void evsel__set_priv_destructor (void (*destructor)(void *priv));struct callchain_param ;
tools/perf/util/parse-events.y +1 -1
@@ -47,7 +47,7 @@ static void free_list_evsel(struct list_head* list_evsel) 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); }
tools/perf/util/pfm.c +1 -1
@@ -159,7 +159,7 @@ static bool is_libpfm_event_supported(const char *name, struct perf_cpu_map *cpu result = false;evsel__close (evsel); -evsel__delete (evsel); +evsel__put (evsel);return result; }
tools/perf/util/print-events.c +1 -1
@@ -174,7 +174,7 @@ bool is_event_supported(u8 type, u64 config) }evsel__close (evsel); -evsel__delete (evsel); +evsel__put (evsel); }perf_thread_map__put (tmap);
tools/perf/util/python.c +194 -37
332 lines not on this page · raw message
tools/perf/util/session.c +1 -0
@@ -1373,6 +1373,7 @@ static int evlist__deliver_deferred_callchain(struct evlist *evlist, sample->evsel =evlist__id2evsel (evlist, sample->id); ret = tool->callchain_deferred (tool, event, sample, sample->evsel, machine); +evsel__put (sample->evsel); sample->evsel = saved_evsel;return ret; }
Signature · 1 line
2.54.0.545.g6539524ca2-goog
[email protected]
AI reviewRe: [PATCH v5 11/58] perf evsel: Add reference count
Sashiko AI review found 4 potential issue(s): - [High] Missing `tp_setattro` handler for the `perf.evsel` Python object causes interpreter crashes on uninitialized attribute assignments. - [High]…
Sashiko AI review found 4 potential issue(s):
- [High] Missing tp_setattro handler for the perf.evsel Python object causes interpreter crashes on uninitialized attribute assignments.
- [High] Type confusion and arbitrary memory write in pyrf_evlist__add due to evsel pointer dereference.
- [High] Calling str() or repr() on an uninitialized perf.evsel Python object crashes due to a NULL pointer dereference.
- [Medium] The pyrf_evlist__add function unconditionally leaks the pevsel Python wrapper object every time an event is added. --
commit df48f1c2356d36f06e78d49a06cfbee6ba9eaa0f
Author: Ian Rogers <[email protected]>
perf evsel: Add reference count
This commit introduces a reference count to struct evsel to better handle its lifecycle, particularly in the Python bindings, where events were previously cloned and caused assertion failures. Get and set functions are added for Python evsel members to maintain the API.
Quoted 4 lines
tools/perf/util/python.c +0
-0
[ ... ]
tools/perf/util/python.c static PyObject *pyrf_evsel__read(struct pyrf_evsel *pevsel, · line 1206
Quoted 9 lines
tools/perf/util/python.c +1
-1@@ -1192,7 +1200,7 @@ static PyObject *pyrf_evsel__read(struct pyrf_evsel *pevsel,static PyObject *pyrf_evsel__str (PyObject *self) {struct pyrf_evsel *pevsel = (void *)self; -struct evsel *evsel = &pevsel->evsel; +struct evsel *evsel = pevsel->evsel;return PyUnicode_FromFormat ("evsel(%s/%s/)" ,evsel__pmu_name (evsel),evsel__name (evsel)); }
Since pevsel->evsel is now a dynamically allocated pointer, it can be NULL if the Python object is instantiated without a successful initialization.
Could this lead to a NULL pointer dereference when str() or repr() is called on an uninitialized perf.evsel object, since evsel__pmu_name(evsel) will attempt to access the NULL pointer?
[ ... ]
Quoted 3 lines
tools/perf/util/python.c +0
-0@@ -1225,30 +1233,183 @@ static PyMethodDef pyrf_evsel__methods[] = { { .ml_name = NULL, } };
[ ... ]
Quoted 14 lines
tools/perf/util/python.c +9
-0+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 PyTypeObject pyrf_evsel__type = {PyVarObject_HEAD_INIT (NULL ,0 ) .tp_name ="perf.evsel" ,@@ -1256,11 +1417,12 @@ static PyTypeObject pyrf_evsel__type = { .tp_dealloc = (destructor)pyrf_evsel__delete,
tools/perf/util/python.c static PyTypeObject pyrf_evsel__type = { · line 1426
Quoted 10 lines
tools/perf/util/python.c +2
-1.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, .tp_doc = pyrf_evsel__doc, - .tp_members = pyrf_evsel__members, + .tp_getset = pyrf_evsel__getset, .tp_methods = pyrf_evsel__methods, .tp_init = (initproc)pyrf_evsel__init, .tp_str = pyrf_evsel__str, .tp_repr = pyrf_evsel__str, + .tp_getattro = (getattrofunc) pyrf_evsel__getattro, };
While tp_getattro is provided to protect property reads on uninitialized objects, tp_setattro is not defined.
Does this mean Python falls back to PyObject_GenericSetAttr, which will execute C setters like pyrf_evsel__set_tracking directly?
If so, could this cause a segmentation fault in the Python interpreter if properties are written to an uninitialized perf.evsel object, since the setters unconditionally dereference pevsel->evsel?
[ ... ]
tools/perf/util/python.c static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist, · line 1736
Quoted 12 lines
tools/perf/util/python.c +2
-2@@ -1566,9 +1728,9 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,return NULL ;Py_INCREF (pevsel); - evsel = &((struct pyrf_evsel *)pevsel)->evsel; + evsel = ((struct pyrf_evsel *)pevsel)->evsel; evsel->core.idx = evlist->core.nr_entries; -evlist__add (evlist, evsel); +evlist__add (evlist,evsel__get (evsel));return Py_BuildValue ("i" , evlist->core.nr_entries); }
Because pevsel->evsel is now a pointer instead of an embedded struct, does the assignment to evsel->core.idx introduce a potential arbitrary memory write if pevsel is passed as a different object type, given that PyArg_ParseTuple uses the "O" format without type validation?
Additionally, if an uninitialized perf.evsel object is passed, evsel will be NULL. Could this lead to an immediate NULL pointer dereference when writing to evsel->core.idx?
Finally, since evlist now manages the evsel lifecycle via evsel__get(evsel) and the evsel struct is separated from the Python wrapper, is the Py_INCREF(pevsel) call still necessary?
Because the Python wrapper object is no longer stored in the C structures, will leaving Py_INCREF(pevsel) cause a memory leak of the Python object each time an event is added?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Ian Rogers
reviewerPATCH v5 12/58 perf evlist: Add reference count checking
In reply to Ian RogersNow 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.
---
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 = evlist; to entry->evlist = 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.
--- 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 | 6 +- tools/perf/bench/evlist-open-close.c | 11 +- tools/perf/builtin-annotate.c | 2 +- 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-record.c | 91 ++--- tools/perf/builtin-report.c | 6 +- tools/perf/builtin-sched.c | 20 +- tools/perf/builtin-script.c | 13 +- tools/perf/builtin-stat.c | 71 ++-- 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 | 38 +- 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/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 | 8 +- 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/evlist.c | 386 ++++++++++++-------- tools/perf/util/evlist.h | 251 ++++++++++++- tools/perf/util/evsel.c | 6 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 39 +- tools/perf/util/header.h | 2 +- tools/perf/util/intel-tpebs.c | 7 +- tools/perf/util/metricgroup.c | 6 +- tools/perf/util/parse-events.c | 6 +- tools/perf/util/pfm.c | 2 +- tools/perf/util/python.c | 30 +- tools/perf/util/record.c | 9 +- tools/perf/util/sample-raw.c | 4 +- tools/perf/util/session.c | 56 +-- 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 +- 79 files changed, 1004 insertions(+), 689 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +5 -5
@@ -201,7 +201,7 @@ static int cs_etm_validate_config(struct perf_pmu *cs_etm_pmu, {unsigned int idx;int err =0 ; -struct perf_cpu_map *event_cpus = evsel->evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evsel->evlist)->user_requested_cpus;struct perf_cpu_map *intersect_cpus;struct perf_cpu cpu;
@@ -325,7 +325,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, container_of(itr, struct cs_etm_recording, itr);struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;struct evsel *evsel, *cs_etm_evsel =NULL ; -struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );int err =0 ;
@@ -551,7 +551,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr, {unsigned int idx;int etmv3 =0 , etmv4 =0 , ete =0 ; -struct perf_cpu_map *event_cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evlist)->user_requested_cpus;struct perf_cpu_map *intersect_cpus;struct perf_cpu cpu;struct perf_pmu *cs_etm_pmu =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 = session->evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (session->evlist)->user_requested_cpus;struct perf_cpu_map *online_cpus =perf_cpu_map__new_online_cpus ();struct cs_etm_recording *ptr = 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 !=cs_etm_info_priv_size (itr, session->evlist))return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ;/* If the cpu_map has the "any" CPU all online CPUs are involved */
tools/perf/arch/arm64/util/arm-spe.c +4 -4
@@ -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 = evlist->core.user_requested_cpus; +struct perf_cpu_map *event_cpus =evlist__core (evlist)->user_requested_cpus;struct perf_cpu_map *online_cpus =perf_cpu_map__new_online_cpus ();struct perf_cpu_map *intersect_cpus;
@@ -157,7 +157,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr,if (priv_size !=arm_spe_info_priv_size (itr, session->evlist))return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; cpu_map =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 = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;/* Add dummy event to keep tracking */ err =parse_event (evlist,"dummy:u" );
@@ -396,7 +396,7 @@ static int arm_spe_recording_options(struct auxtrace_record *itr,struct arm_spe_recording *sper = container_of(itr, struct arm_spe_recording, itr);struct evsel *evsel, *tmp; -struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool discard = false;int err;u64 discard_bit;
tools/perf/arch/arm64/util/hisi-ptt.c +1 -1
@@ -53,7 +53,7 @@ static int hisi_ptt_info_fill(struct auxtrace_record *itr,if (priv_size !=HISI_PTT_AUXTRACE_PRIV_SIZE )return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; auxtrace_info->type =PERF_AUXTRACE_HISI_PTT ;
tools/perf/arch/x86/tests/hybrid.c +10 -10
@@ -26,7 +26,7 @@ static int test__hybrid_hw_event_with_pmu(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -38,7 +38,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -57,7 +57,7 @@ static int test__hybrid_sw_hw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));
@@ -74,7 +74,7 @@ static int test__hybrid_hw_sw_group_event(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -91,7 +91,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
@@ -113,7 +113,7 @@ static int test__hybrid_raw1(struct evlist *evlist) {struct perf_evsel *evsel; -perf_evlist__for_each_evsel (&evlist->core, evsel) { +perf_evlist__for_each_evsel (evlist__core (evlist), evsel) {struct perf_pmu *pmu =perf_pmus__find_by_type (evsel->attr.type);TEST_ASSERT_VAL ("missing pmu" , pmu);
@@ -127,7 +127,7 @@ static int test__hybrid_raw2(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == 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 *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HW_CACHE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,0x2 == (evsel->core.attr.config &0xffffffff ));return TEST_OK ;
@@ -148,7 +148,7 @@ static int test__checkevent_pmu(struct evlist *evlist)struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,1 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,10 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong config1" ,1 == evsel->core.attr.config1);
@@ -168,7 +168,7 @@ static int test__hybrid_hw_group_event_2(struct evlist *evlist)struct evsel *evsel, *leader; evsel = leader =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong number of entries" ,2 ==evlist__nr_entries (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW ));TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES ));
tools/perf/arch/x86/util/auxtrace.c +1 -1
@@ -55,7 +55,7 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist, int *err) {char buffer[64 ]; -struct perf_cpu cpu =perf_cpu_map__min (evlist->core.all_cpus); +struct perf_cpu cpu =perf_cpu_map__min (evlist__core (evlist)->all_cpus);int ret; *err =0 ;
tools/perf/arch/x86/util/intel-bts.c +3 -3
@@ -79,10 +79,10 @@ static int intel_bts_info_fill(struct auxtrace_record *itr,if (priv_size !=INTEL_BTS_AUXTRACE_PRIV_SIZE )return -EINVAL ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; - pc = session->evlist->mmap[0 ].core.base; + pc =evlist__mmap (session->evlist)[0 ].core.base;if (pc) { err =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 = btsr->intel_bts_pmu;struct evsel *evsel, *intel_bts_evsel =NULL ; -const struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +const struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );if (opts->auxtrace_sample_mode) {
tools/perf/arch/x86/util/intel-pt.c +5 -4
@@ -360,10 +360,10 @@ static int intel_pt_info_fill(struct auxtrace_record *itr, filter =intel_pt_find_filter (session->evlist, ptr->intel_pt_pmu); filter_str_len = filter ?strlen (filter) :0 ; -if (!session->evlist->core.nr_mmaps) +if (!evlist__core (session->evlist)->nr_mmaps)return -EINVAL ; - pc = session->evlist->mmap[0 ].core.base; + pc =evlist__mmap (session->evlist)[0 ].core.base;if (pc) { err =perf_read_tsc_conversion (pc, &tc);if (err) {
@@ -376,7 +376,8 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,ui__warning ("Intel Processor Trace: TSC not available\n" ); } - per_cpu_mmaps = !perf_cpu_map__is_any_cpu_or_is_empty (session->evlist->core.user_requested_cpus); + per_cpu_mmaps = !perf_cpu_map__is_any_cpu_or_is_empty ( +evlist__core (session->evlist)->user_requested_cpus); auxtrace_info->type =PERF_AUXTRACE_INTEL_PT ; auxtrace_info->priv[INTEL_PT_PMU_TYPE ] = intel_pt_pmu->type;
@@ -621,7 +622,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,struct perf_pmu *intel_pt_pmu = ptr->intel_pt_pmu;bool have_timing_info, need_immediate = false;struct evsel *evsel, *intel_pt_evsel =NULL ; -const struct perf_cpu_map *cpus = evlist->core.user_requested_cpus; +const struct perf_cpu_map *cpus =evlist__core (evlist)->user_requested_cpus;bool privileged =perf_event_paranoid_check (-1 );u64 tsc_bit;int err;
tools/perf/arch/x86/util/iostat.c +3 -3
@@ -334,7 +334,7 @@ static int iostat_event_group(struct evlist *evl,int iostat_prepare (struct evlist *evlist,struct perf_stat_config *config) { -if (evlist->core.nr_entries >0 ) { +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);
@@ -400,7 +400,7 @@ void iostat_prefix(struct evlist *evlist,struct perf_stat_config *config, char *prefix, struct timespec *ts) { - struct iio_root_port *rp = evlist->selected->priv; + struct iio_root_port *rp = evlist__selected(evlist)->priv;if (rp) {/*
@@ -463,7 +463,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 = evlist->selected->priv; + perf_device =evlist__selected (evlist)->priv;if (perf_device && perf_device != counter->priv) {evlist__set_selected (evlist, counter);iostat_prefix (evlist, config, prefix, ts);
tools/perf/bench/evlist-open-close.c +6 -5
@@ -116,7 +116,7 @@ static int bench__do_evlist_open_close(struct evlist *evlist)return err; } - err =evlist__mmap (evlist, opts.mmap_pages); + err =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 *evlist)evlist__enable (evlist);evlist__disable (evlist); -evlist__munmap (evlist); +evlist__do_munmap (evlist);evlist__close (evlist);return 0 ;
@@ -145,10 +145,11 @@ static int bench_evlist_open_close__run(char *evstr, const char *uid_str)init_stats (&time_stats); -printf (" Number of cpus:\t%d\n" ,perf_cpu_map__nr (evlist->core.user_requested_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);evlist__put (evlist);
tools/perf/builtin-annotate.c +1 -1
@@ -928,7 +928,7 @@ int cmd_annotate(int argc, const char **argv)*/ if ((use_browser ==1 || annotate.use_stdio2) && annotate.has_br_stack) { sort__mode =SORT_MODE__BRANCH ; -if (annotate.session->evlist->nr_br_cntr >0 ) +if (evlist__nr_br_cntr (annotate.session->evlist) >0 ) annotate_opts.show_br_cntr = true; }
tools/perf/builtin-ftrace.c +3 -3
@@ -377,9 +377,9 @@ static int set_tracing_pid(struct perf_ftrace *ftrace)if (target__has_cpu (&ftrace->target))return 0 ; -for (i =0 ; i <perf_thread_map__nr (ftrace->evlist->core.threads); i++) { +for (i =0 ; i <perf_thread_map__nr (evlist__core (ftrace->evlist)->threads); 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 *cpumap)static int set_tracing_cpu (struct perf_ftrace *ftrace) { -struct perf_cpu_map *cpumap = ftrace->evlist->core.user_requested_cpus; +struct perf_cpu_map *cpumap =evlist__core (ftrace->evlist)->user_requested_cpus;if (!target__has_cpu (&ftrace->target))return 0 ;
tools/perf/builtin-inject.c +2 -2
@@ -1427,7 +1427,7 @@ static int synthesize_id_index(struct perf_inject *inject, size_t new_cnt)struct perf_session *session = inject->session;struct evlist *evlist = session->evlist;struct machine *machine = &session->machines.host; -size_t from = evlist->core.nr_entries - new_cnt; +size_t from =evlist__nr_entries (evlist) - new_cnt;return __perf_event__synthesize_id_index (&inject->tool, perf_event__repipe, evlist, machine, from);
@@ -1962,7 +1962,7 @@ static int host__finished_init(const struct perf_tool *tool, struct perf_sessionif (ret)return ret; - ret =synthesize_id_index (inject, gs->session->evlist->core.nr_entries); + ret =synthesize_id_index (inject,evlist__nr_entries (gs->session->evlist));if (ret) {pr_err ("Failed to synthesize id_index\n" );return ret;
tools/perf/builtin-kvm.c +5 -5
@@ -1222,7 +1222,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,int err; *mmap_time =ULLONG_MAX ; - md = &evlist->mmap[idx]; + md = &evlist__mmap (evlist)[idx]; err =perf_mmap__read_init (&md->core);if (err <0 )return (err == -EAGAIN ) ?0 :-1 ;
@@ -1267,7 +1267,7 @@ static int perf_kvm__mmap_read(struct perf_kvm_stat *kvm)s64 n, ntotal =0 ;u64 flush_time =ULLONG_MAX , mmap_time; -for (i =0 ; i < kvm->evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (kvm->evlist)->nr_mmaps; i++) { n =perf_kvm__mmap_read_idx (kvm, i, &mmap_time);if (n <0 )return -1 ;
@@ -1450,7 +1450,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm)evlist__enable (kvm->evlist);while (!done) { -struct fdarray *fda = &kvm->evlist->core.pollfd; +struct fdarray *fda = &evlist__core (kvm->evlist)->pollfd;int rc; rc =perf_kvm__mmap_read (kvm);
@@ -1532,7 +1532,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) goto out; } -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);
@@ -1932,7 +1932,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.target, - kvm->evlist->core.threads, true, false,1 ); +evlist__core (kvm->evlist)->threads, true, false,1 ); err =kvm_live_open_events (kvm);if (err) goto out;
tools/perf/builtin-kwork.c +4 -4
@@ -1776,7 +1776,7 @@ static int perf_kwork__check_config(struct perf_kwork *kwork, } } -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 =0 ;
@@ -1826,9 +1826,9 @@ static int perf_kwork__read_events(struct perf_kwork *kwork) goto out_delete; } - kwork->nr_events = session->evlist->stats.nr_events[0 ]; - kwork->nr_lost_events = session->evlist->stats.total_lost; - kwork->nr_lost_chunks = session->evlist->stats.nr_events[PERF_RECORD_LOST ]; + kwork->nr_events =evlist__stats (session->evlist)->nr_events[0 ]; + kwork->nr_lost_events =evlist__stats (session->evlist)->total_lost; + kwork->nr_lost_chunks =evlist__stats (session->evlist)->nr_events[PERF_RECORD_LOST ]; out_delete:perf_session__delete (session);
tools/perf/builtin-record.c +46 -45
268 lines not on this page · raw message
tools/perf/builtin-report.c +3 -3
@@ -561,7 +561,7 @@ static int evlist__tty_browse_hists(struct evlist *evlist, struct report *rep, cif (!quiet) {fprintf (stdout,"#\n# Total Lost Samples: %" PRIu64"\n#\n" , - evlist->stats.total_lost_samples); +evlist__stats (evlist)->total_lost_samples); }evlist__for_each_entry (evlist, pos) {
@@ -1155,7 +1155,7 @@ static int __cmd_report(struct report *rep) PERF_HPP_REPORT__BLOCK_AVG_CYCLES, }; -if (session->evlist->nr_br_cntr >0 ) +if (evlist__nr_br_cntr (session->evlist) >0 ) block_hpps[nr_hpps++] =PERF_HPP_REPORT__BLOCK_BRANCH_COUNTER ; block_hpps[nr_hpps++] =PERF_HPP_REPORT__BLOCK_RANGE ;
@@ -1290,7 +1290,7 @@ static int process_attr(const struct perf_tool *tool __maybe_unused,* on events sample_type. */ sample_type =evlist__combined_sample_type (*pevlist); - session = (*pevlist)->session; + session =evlist__session (*pevlist);callchain_param_setup (sample_type,perf_session__e_machine (session,/*e_flags=*/ NULL ));return 0 ; }
tools/perf/builtin-sched.c +10 -10
@@ -1951,9 +1951,9 @@ static int perf_sched__read_events(struct perf_sched *sched) goto out_delete; } - sched->nr_events = session->evlist->stats.nr_events[0 ]; - sched->nr_lost_events = session->evlist->stats.total_lost; - sched->nr_lost_chunks = session->evlist->stats.nr_events[PERF_RECORD_LOST ]; + sched->nr_events =evlist__stats (session->evlist)->nr_events[0 ]; + sched->nr_lost_events =evlist__stats (session->evlist)->total_lost; + sched->nr_lost_chunks =evlist__stats (session->evlist)->nr_events[PERF_RECORD_LOST ]; } rc =0 ;
@@ -3211,7 +3211,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->core.entries, core.node) { +list_for_each_entry (evsel, &evlist__core (evlist)->entries, core.node) { er =evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
@@ -3382,9 +3382,9 @@ static int perf_sched__timehist(struct perf_sched *sched) goto out; } - sched->nr_events = evlist->stats.nr_events[0 ]; - sched->nr_lost_events = evlist->stats.total_lost; - sched->nr_lost_chunks = evlist->stats.nr_events[PERF_RECORD_LOST ]; + sched->nr_events =evlist__stats (evlist)->nr_events[0 ]; + sched->nr_lost_events =evlist__stats (evlist)->total_lost; + sched->nr_lost_chunks =evlist__stats (evlist)->nr_events[PERF_RECORD_LOST ];if (sched->summary)timehist_print_summary (sched, session);
@@ -3887,7 +3887,7 @@ static int perf_sched__schedstat_record(struct perf_sched *sched,if (err <0 ) goto out; - user_requested_cpus = evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (evlist)->user_requested_cpus; err = perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_schedstat_event,
@@ -4509,7 +4509,7 @@ static int perf_sched__schedstat_report(struct perf_sched *sched)if (err <0 ) goto out; - user_requested_cpus = session->evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (session->evlist)->user_requested_cpus; err =perf_session__process_events (session);
@@ -4675,7 +4675,7 @@ static int perf_sched__schedstat_live(struct perf_sched *sched,if (err <0 ) goto out; - user_requested_cpus = evlist->core.user_requested_cpus; + user_requested_cpus =evlist__core (evlist)->user_requested_cpus; err = perf_event__synthesize_schedstat(&(sched->tool), process_synthesized_event_live,
tools/perf/builtin-script.c +7 -6
@@ -2224,9 +2224,10 @@ static int script_find_metrics(const struct pmu_metric *pm,evlist__for_each_entry (metric_evlist, metric_evsel) {struct evsel *script_evsel =map_metric_evsel_to_script_evsel (script_evlist, metric_evsel); -struct metric_event *metric_me =metricgroup__lookup (&metric_evlist->metric_events, - metric_evsel, -/*create=*/ false); +struct metric_event *metric_me = +metricgroup__lookup (evlist__metric_events (metric_evlist), + metric_evsel, +/*create=*/ false);if (script_evsel->metric_id ==NULL ) { script_evsel->metric_id = metric_evsel->metric_id;
@@ -2246,7 +2247,7 @@ static int script_find_metrics(const struct pmu_metric *pm,if (metric_me) {struct metric_expr *expr;struct metric_event *script_me = -metricgroup__lookup (&script_evlist->metric_events, +metricgroup__lookup (evlist__metric_events (script_evlist), script_evsel,/*create=*/ true);
@@ -2316,7 +2317,7 @@ static void perf_sample__fprint_metric(struct thread *thread,assert (stat_config.aggr_mode ==AGGR_GLOBAL ); stat_config.aggr_get_id = script_aggr_cpu_id_get; stat_config.aggr_map = -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=*/ NULL ,/*needs_sort=*/ false); }
@@ -3898,7 +3899,7 @@ static int set_maps(struct perf_script *script)if (WARN_ONCE (script->allocated,"stats double allocation\n" ))return -EINVAL ; -perf_evlist__set_maps (&evlist->core, script->cpus, script->threads); +perf_evlist__set_maps (evlist__core (evlist), script->cpus, script->threads);if (evlist__alloc_stats (&stat_config, evlist,/*alloc_raw=*/ true))return -ENOMEM ;
tools/perf/builtin-stat.c +38 -33
198 lines not on this page · raw message
tools/perf/builtin-top.c +26 -26
175 lines not on this page · raw message
tools/perf/builtin-trace.c +11 -11
@@ -2008,7 +2008,7 @@ static int trace__symbols_init(struct trace *trace, int argc, const char **argv, goto out; err = __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=*/callchain_param.enabled && !trace->summary_only, /*mmap_data=*/false,
@@ -4165,7 +4165,7 @@ static int trace__set_filter_pids(struct trace *trace) err =augmented_syscalls__set_filter_pids (trace->filter_pids.nr, trace->filter_pids.entries); } - }else if (perf_thread_map__pid (trace->evlist->core.threads,0 ) ==-1 ) { + }else if (perf_thread_map__pid (evlist__core (trace->evlist)->threads,0 ) ==-1 ) { err =trace__set_filter_loop_pids (trace); }
@@ -4479,7 +4479,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 = evlist->workload.pid; + workload_pid =evlist__workload_pid (evlist); } err =evlist__open (evlist);
@@ -4531,7 +4531,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_error_apply_filters;if (!trace->summary_only || !trace->summary_bpf) { - err =evlist__mmap (evlist, trace->opts.mmap_pages); + err =evlist__do_mmap (evlist, trace->opts.mmap_pages);if (err <0 ) goto out_error_mmap; }
@@ -4550,8 +4550,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv)if (trace->summary_bpf)trace_start_bpf_summary (); - trace->multiple_threads =perf_thread_map__pid (evlist->core.threads,0 ) ==-1 || -perf_thread_map__nr (evlist->core.threads) >1 || + trace->multiple_threads =perf_thread_map__pid (evlist__core (evlist)->threads,0 ) ==-1 || +perf_thread_map__nr (evlist__core (evlist)->threads) >1 ||evlist__first (evlist)->core.attr.inherit;/*
@@ -4568,11 +4568,11 @@ static int trace__run(struct trace *trace, int argc, const char **argv) again: before = trace->nr_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -5272,7 +5272,7 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u {struct trace *trace = opt->value; -if (!list_empty (&trace->evlist->core.entries)) { +if (!list_empty (&evlist__core (trace->evlist)->entries)) {struct option o = { .value = &trace->evlist, };
@@ -5545,7 +5545,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 ==0 /* Was --events used? */ ) { +evlist__nr_entries (trace.evlist) ==0 /* Was --events used? */ ) { trace.trace_syscalls = true; }/*
@@ -5628,7 +5628,7 @@ int cmd_trace(int argc, const char **argv) symbol_conf.use_callchain = true; } -if (trace.evlist->core.nr_entries >0 ) { +if (evlist__nr_entries (trace.evlist) >0 ) {bool use_btf = false;evlist__set_default_evsel_handler (trace.evlist, trace__event_handler);
tools/perf/tests/backward-ring-buffer.c +4 -4
@@ -34,8 +34,8 @@ static int count_samples(struct evlist *evlist, int *sample_count, {int i; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { -struct mmap *map = &evlist->overwrite_mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { +struct mmap *map = &evlist__overwrite_mmap (evlist)[i];union perf_event *event;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 ]; - err =evlist__mmap (evlist, mmap_pages); + err =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); err =count_samples (evlist, sample_count, comm_count); -evlist__munmap (evlist); +evlist__do_munmap (evlist);return err; }
tools/perf/tests/code-reading.c +5 -5
@@ -589,8 +589,8 @@ static int process_events(struct machine *machine, struct evlist *evlist,struct mmap *md;int i, ret; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -778,7 +778,7 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads); str = 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); } -perf_evlist__set_maps (&evlist->core,NULL ,NULL ); +perf_evlist__set_maps (evlist__core (evlist),NULL ,NULL );evlist__put (evlist); evlist =NULL ;continue ;
@@ -817,7 +817,7 @@ static int do_test_code_reading(bool try_kcore)if (events[evidx] ==NULL ) goto out_put; - ret =evlist__mmap (evlist,UINT_MAX ); + ret =evlist__do_mmap (evlist,UINT_MAX );if (ret <0 ) {pr_debug ("evlist__mmap failed\n" ); goto out_put;
tools/perf/tests/event-times.c +1 -1
@@ -50,7 +50,7 @@ static int attach__enable_on_exec(struct evlist *evlist)static int detach__enable_on_exec (struct evlist *evlist) { -waitpid (evlist->workload.pid,NULL ,0 ); +waitpid (evlist__workload_pid (evlist),NULL ,0 );return 0 ; }
tools/perf/tests/event_update.c +1 -1
@@ -92,7 +92,7 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtesTEST_ASSERT_VAL ("failed to allocate ids" , !perf_evsel__alloc_id (&evsel->core,1 ,1 )); -perf_evlist__id_add (&evlist->core, &evsel->core,0 ,0 ,123 ); +perf_evlist__id_add (evlist__core (evlist), &evsel->core,0 ,0 ,123 );free ((char *)evsel->unit); evsel->unit =strdup ("KRAVA" );
tools/perf/tests/expand-cgroup.c +2 -2
@@ -28,7 +28,7 @@ static int test_expand_events(struct evlist *evlist)TEST_ASSERT_VAL ("evlist is empty" , !evlist__empty (evlist)); - nr_events = evlist->core.nr_entries; + nr_events =evlist__nr_entries (evlist); ev_name =calloc (nr_events,sizeof (*ev_name));if (ev_name ==NULL ) {pr_debug ("memory allocation failure\n" );
@@ -54,7 +54,7 @@ static int test_expand_events(struct evlist *evlist) } ret =TEST_FAIL ; -if (evlist->core.nr_entries != nr_events * nr_cgrps) { +if (evlist__nr_entries (evlist) != nr_events * nr_cgrps) {pr_debug ("event count doesn't match\n" ); goto out; }
tools/perf/tests/hwmon_pmu.c +3 -2
@@ -183,9 +183,10 @@ static int do_test(size_t i, bool with_pmu, bool with_alias) } ret =TEST_OK ; -if (with_pmu ? (evlist->core.nr_entries !=1 ) : (evlist->core.nr_entries <1 )) { +if (with_pmu ? (evlist__nr_entries (evlist) !=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 =TEST_FAIL ; goto out; }
tools/perf/tests/keep-tracking.c +4 -4
@@ -37,8 +37,8 @@ static int find_comm(struct evlist *evlist, const char *comm)int i, found; found =0 ; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;while ((event =perf_mmap__read_event (&md->core)) !=NULL ) {
@@ -87,7 +87,7 @@ static int test__keep_tracking(struct test_suite *test __maybe_unused, int subte evlist =evlist__new ();CHECK_NOT_NULL__ (evlist); -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);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; } -CHECK__ (evlist__mmap (evlist,UINT_MAX )); +CHECK__ (evlist__do_mmap (evlist,UINT_MAX ));/* * First, test that a 'comm' event can be found when the event is
tools/perf/tests/mmap-basic.c +3 -3
@@ -81,7 +81,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtest goto out_free_cpus; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);for (i =0 ; i < nsyscalls; ++i) {char name[64 ];
@@ -113,7 +113,7 @@ static int test__basic_mmap(struct test_suite *test __maybe_unused, int subtest expected_nr_events[i] =1 +rand () %127 ; } -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 __maybe_unused, int subtest syscalls[i](); } - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/openat-syscall-tp-fields.c +4 -4
@@ -64,7 +64,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unusedevsel__config (evsel, &opts,NULL ); -perf_thread_map__set_pid (evlist->core.threads,0 ,getpid ()); +perf_thread_map__set_pid (evlist__core (evlist)->threads,0 ,getpid ()); err =evlist__open (evlist);if (err <0 ) {
@@ -73,7 +73,7 @@ static int test__syscall_openat_tp_fields(struct test_suite *test __maybe_unused goto out_put_evlist; } - err =evlist__mmap (evlist,UINT_MAX ); + err =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_suite *test __maybe_unusedwhile (1 ) {int before = nr_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
tools/perf/tests/parse-events.c +70 -65
519 lines not on this page · raw message
tools/perf/tests/parse-metric.c +2 -2
@@ -53,7 +53,7 @@ static double compute_single(struct evlist *evlist, const char *name)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { - me =metricgroup__lookup (&evlist->metric_events, evsel, false); + me =metricgroup__lookup (evlist__metric_events (evlist), evsel, false);if (me !=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 value *vals,return -ENOMEM ; } -perf_evlist__set_maps (&evlist->core, cpus,NULL ); +perf_evlist__set_maps (evlist__core (evlist), cpus,NULL );/* Parse the metric into metric_events list. */ pme_test =find_core_metrics_table ("testarch" ,"testcpu" );
tools/perf/tests/perf-record.c +10 -10
@@ -129,7 +129,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtestevsel__set_sample_bit (evsel,TIME );evlist__config (evlist, &opts,NULL ); - err =sched__get_first_possible_cpu (evlist->workload.pid, cpu_mask); + err =sched__get_first_possible_cpu (evlist__workload_pid (evlist), cpu_mask);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_mask) <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 =evlist__mmap (evlist, opts.mmap_pages); + err =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 subtestwhile (1 ) {int before = total_events; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) {union perf_event *event;struct mmap *md; - md = &evlist->mmap[i]; + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -231,15 +231,15 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest ++errs; } -if ((pid_t )sample.pid != evlist->workload.pid) { +if ((pid_t )sample.pid !=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; } -if ((pid_t )sample.tid != evlist->workload.pid) { +if ((pid_t )sample.tid !=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; }
@@ -248,7 +248,7 @@ static int test__PERF_RECORD(struct test_suite *test __maybe_unused, int subtest type == PERF_RECORD_MMAP2 || type == PERF_RECORD_FORK || type == PERF_RECORD_EXIT) && - (pid_t)event->comm.pid != evlist->workload.pid) { + (pid_t)event->comm.pid != evlist__workload_pid(evlist)) {pr_debug ("%s with unexpected pid/tid\n" , name); ++errs; }
tools/perf/tests/perf-time-to-tsc.c +5 -5
@@ -99,7 +99,7 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su evlist =evlist__new ();CHECK_NOT_NULL__ (evlist); -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);CHECK__ (parse_event (evlist,"cpu-cycles:u" ));
@@ -121,9 +121,9 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int su goto out_err; } -CHECK__ (evlist__mmap (evlist,UINT_MAX )); +CHECK__ (evlist__do_mmap (evlist,UINT_MAX )); - pc = evlist->mmap[0 ].core.base; + pc =evlist__mmap (evlist)[0 ].core.base; ret =perf_read_tsc_conversion (pc, &tc);if (ret) {if (ret == -EOPNOTSUPP ) {
@@ -145,8 +145,8 @@ static int test__perf_time_to_tsc(struct test_suite *test __maybe_unused, int suevlist__disable (evlist); -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
tools/perf/tests/pfm.c +4 -4
@@ -69,12 +69,12 @@ static int test__pfm_events(struct test_suite *test __maybe_unused,if (evlist ==NULL )return -ENOMEM ; - opt.value = evlist; + opt.value = &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 ==NULL )return -ENOMEM ; - opt.value = evlist; + opt.value = &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),
tools/perf/tests/pmu-events.c +3 -2
@@ -848,7 +848,7 @@ static int test__parsing_callback(const struct pmu_metric *pm,return -ENOMEM ; } -perf_evlist__set_maps (&evlist->core, cpus,NULL ); +perf_evlist__set_maps (evlist__core (evlist), cpus,NULL ); err =metricgroup__parse_groups_test (evlist, table, pm->metric_name);if (err) {
@@ -875,7 +875,8 @@ static int test__parsing_callback(const struct pmu_metric *pm, k++; }evlist__for_each_entry (evlist, evsel) { -struct metric_event *me =metricgroup__lookup (&evlist->metric_events, evsel, false); +struct metric_event *me =metricgroup__lookup (evlist__metric_events (evlist), + evsel, false);if (me !=NULL ) {struct metric_expr *mexp;
tools/perf/tests/sample-parsing.c +18 -20
@@ -205,15 +205,11 @@ static bool samples_same(struct perf_sample *s1,static int do_test (u64 sample_type,u64 sample_regs,u64 read_format) { -struct evsel evsel = { - .needs_swap = false, - .core = { - . attr = { - .sample_type = sample_type, - .read_format = read_format, - }, - }, +struct perf_event_attr attr ={ + .sample_type = sample_type, + .read_format = read_format, }; +struct evsel *evsel;union perf_event *event;union {struct ip_callchain callchain;
@@ -287,16 +283,17 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)size_t i, sz, bufsz;int err, ret =-1 ; + evsel =evsel__new (&attr);perf_sample__init (&sample_out,/*all=*/ false);perf_sample__init (&sample_out_endian,/*all=*/ false);if (sample_type &PERF_SAMPLE_REGS_USER ) - evsel.core.attr.sample_regs_user = sample_regs; + evsel->core.attr.sample_regs_user = sample_regs;if (sample_type &PERF_SAMPLE_REGS_INTR ) - evsel.core.attr.sample_regs_intr = sample_regs; + evsel->core.attr.sample_regs_intr = sample_regs;if (sample_type &PERF_SAMPLE_BRANCH_STACK ) - evsel.core.attr.branch_sample_type |=PERF_SAMPLE_BRANCH_HW_INDEX ; + evsel->core.attr.branch_sample_type |=PERF_SAMPLE_BRANCH_HW_INDEX ;for (i =0 ; i <sizeof (regs); i++) *(i + (u8 *)regs) = i &0xfe ;
@@ -311,7 +308,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) } sz =perf_event__sample_event_size (&sample, sample_type, read_format, - evsel.core.attr.branch_sample_type); + evsel->core.attr.branch_sample_type); bufsz = sz +4096 ;/* Add a bit for overrun checking */ event =malloc (bufsz);if (!event) {
@@ -325,7 +322,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) event->header.size = sz; err =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 +340,32 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) goto out_free; } - evsel.sample_size =__evsel__sample_size (sample_type); + evsel->sample_size =__evsel__sample_size (sample_type); - err =evsel__parse_sample (&evsel, event, &sample_out); + err =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; } -if (!samples_same (&sample, &sample_out, sample_type, read_format, evsel.needs_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; }if (sample_type ==PERF_SAMPLE_BRANCH_STACK ) { - evsel.needs_swap = true; - evsel.sample_size =__evsel__sample_size (sample_type); - err =evsel__parse_sample (&evsel, event, &sample_out_endian); + evsel->needs_swap = true; + evsel->sample_size =__evsel__sample_size (sample_type); + err =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; } -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 +377,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 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;
tools/perf/tests/sw-clock.c +3 -3
@@ -71,7 +71,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_put_evlist; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);if (evlist__open (evlist)) {const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ;
@@ -83,7 +83,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) goto out_put_evlist; } - err =evlist__mmap (evlist,128 ); + err =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_id)evlist__disable (evlist); - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/switch-tracking.c +4 -4
@@ -279,8 +279,8 @@ static int process_events(struct evlist *evlist,struct mmap *md;int i, ret; -for (i =0 ; i < evlist->core.nr_mmaps; i++) { - md = &evlist->mmap[i]; +for (i =0 ; i <evlist__core (evlist)->nr_mmaps; i++) { + md = &evlist__mmap (evlist)[i];if (perf_mmap__read_init (&md->core) <0 )continue ;
@@ -371,7 +371,7 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub goto out_err; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads);/* First event */ err =parse_event (evlist,"cpu-clock:u" );
@@ -468,7 +468,7 @@ static int test__switch_tracking(struct test_suite *test __maybe_unused, int sub goto out; } - err =evlist__mmap (evlist,UINT_MAX ); + err =evlist__do_mmap (evlist,UINT_MAX );if (err) {pr_debug ("evlist__mmap failed!\n" ); goto out_err;
tools/perf/tests/task-exit.c +3 -3
@@ -77,7 +77,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ goto out_put_evlist; } -perf_evlist__set_maps (&evlist->core, cpus, threads); +perf_evlist__set_maps (evlist__core (evlist), cpus, threads); err =evlist__prepare_workload (evlist, &target, argv, false, workload_exec_failed_signal);if (err <0 ) {
@@ -104,7 +104,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _ goto out_put_evlist; } -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 =-1 ;
@@ -114,7 +114,7 @@ static int test__task_exit(struct test_suite *test __maybe_unused, int subtest _evlist__start_workload (evlist); retry: - md = &evlist->mmap[0 ]; + md = &evlist__mmap (evlist)[0 ];if (perf_mmap__read_init (&md->core) <0 ) goto out_init;
tools/perf/tests/time-utils-test.c +9 -5
@@ -69,16 +69,19 @@ struct test_data {static bool test__perf_time__parse_for_ranges (struct test_data *d) { -struct evlist evlist = { - .first_sample_time = d->first, - .last_sample_time = d->last, - }; -struct perf_session session = { .evlist = &evlist }; +struct evlist *evlist =evlist__new (); +struct perf_session session = { .evlist = evlist };struct perf_time_interval *ptime =NULL ;int range_size, range_num;bool pass = false;int i, err; +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);if (strchr (d->str,'%' ))
@@ -127,6 +130,7 @@ static bool test__perf_time__parse_for_ranges(struct test_data *d) pass = true; out: +evlist__put (evlist);free (ptime);return pass; }
tools/perf/tests/tool_pmu.c +3 -2
@@ -40,9 +40,10 @@ static int do_test(enum tool_pmu_event ev, bool with_pmu) } ret =TEST_OK ; -if (with_pmu ? (evlist->core.nr_entries !=1 ) : (evlist->core.nr_entries <1 )) { +if (with_pmu ? (evlist__nr_entries (evlist) !=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 =TEST_FAIL ; goto out; }
tools/perf/tests/topology.c +1 -1
@@ -45,7 +45,7 @@ static int session_write_header(char *path) session->evlist =evlist__new_default (&target,/*sample_callchains=*/ false);TEST_ASSERT_VAL ("can't get evlist" , session->evlist); - session->evlist->session = session; +evlist__set_session (session->evlist, session);perf_header__set_feat (&session->header,HEADER_CPU_TOPOLOGY );perf_header__set_feat (&session->header,HEADER_NRCPUS );
tools/perf/ui/browsers/annotate.c +1 -1
@@ -594,7 +594,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, notes =symbol__annotation (dl->ops.target.sym);annotation__lock (notes); -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);
tools/perf/ui/browsers/hists.c +11 -11
@@ -688,10 +688,10 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_lui_browser__update_nr_entries (&browser->b, nr_entries);if (warn_lost_event && - (evsel->evlist->stats.nr_lost_warned != - evsel->evlist->stats.nr_events[PERF_RECORD_LOST ])) { - evsel->evlist->stats.nr_lost_warned = - evsel->evlist->stats.nr_events[PERF_RECORD_LOST ]; + (evlist__stats (evsel->evlist)->nr_lost_warned != +evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ])) { +evlist__stats (evsel->evlist)->nr_lost_warned = +evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ];ui_browser__warn_lost_events (&browser->b); }
@@ -3321,7 +3321,7 @@ static int evsel__hists_browse(struct evsel *evsel, int 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 ="Press 'f' to disable the events or 'h' to see other hotkeys" ; hbt->refresh = delay_secs; }else {
@@ -3493,7 +3493,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, unit, unit == ' ' ? "" : " ", ev_name);ui_browser__printf (browser,"%s" , bf); - nr_events = evsel->evlist->stats.nr_events[PERF_RECORD_LOST ]; + nr_events =evlist__stats (evsel->evlist)->nr_events[PERF_RECORD_LOST ];if (nr_events !=0 ) { menu->lost_events = 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 == &evlist->core.entries) +if (pos->core.node.next == &evlist__core (evlist)->entries) pos =evlist__first (evlist);else pos =evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->core.node.prev == &evlist->core.entries) +if (pos->core.node.prev == &evlist__core (evlist)->entries) pos =evlist__last (evlist);else pos =evsel__prev (pos);
@@ -3618,7 +3618,7 @@ static int __evlist__tui_browse_hists(struct evlist *evlist, int nr_entries, construct evsel *pos;struct evsel_menu menu = { .b = { - .entries = &evlist->core.entries, + .entries = &evlist__core (evlist)->entries, .refresh = ui_browser__list_head_refresh, .seek = ui_browser__list_head_seek, .write = perf_evsel_menu__write,
@@ -3646,7 +3646,7 @@ static int __evlist__tui_browse_hists(struct evlist *evlist, int nr_entries, constatic bool evlist__single_entry (struct evlist *evlist) { -int nr_entries = evlist->core.nr_entries; +int nr_entries =evlist__nr_entries (evlist);if (nr_entries ==1 )return true;
@@ -3664,7 +3664,7 @@ static bool evlist__single_entry(struct evlist *evlist)int evlist__tui_browse_hists (struct evlist *evlist,const char *help,struct hist_browser_timer *hbt,float min_pcnt,struct perf_env *env,bool warn_lost_event) { -int nr_entries = evlist->core.nr_entries; +int nr_entries =evlist__nr_entries (evlist);if (evlist__single_entry (evlist)) { single_entry: {
tools/perf/util/amd-sample-raw.c +1 -1
@@ -354,7 +354,7 @@ static void parse_cpuid(struct perf_env *env)*/ bool evlist__has_amd_ibs (struct evlist *evlist) { -struct perf_env *env =perf_session__env (evlist->session); +struct perf_env *env =perf_session__env (evlist__session (evlist));int ret, nr_pmu_mappings =perf_env__nr_pmu_mappings (env);const char *pmu_mapping =perf_env__pmu_mappings (env);char name[sizeof ("ibs_fetch" )];
tools/perf/util/annotate-data.c +1 -1
@@ -1822,7 +1822,7 @@ int annotated_data_type__update_samples(struct annotated_data_type *adt,return 0 ;if (adt->histograms ==NULL ) { -int nr = evsel->evlist->core.nr_entries; +int nr =evlist__nr_entries (evsel->evlist);if (alloc_data_type_histograms (adt, nr) <0 )return -1 ;
tools/perf/util/annotate.c +5 -5
@@ -326,7 +326,7 @@ static int symbol__inc_addr_samples(struct map_symbol *ms,if (sym ==NULL )return 0 ; - src =symbol__hists (sym, evsel->evlist->core.nr_entries); + src =symbol__hists (sym,evlist__nr_entries (evsel->evlist));return src ?__symbol__inc_addr_samples (ms, src, evsel, addr, sample) :0 ; }
@@ -337,7 +337,7 @@ static int symbol__account_br_cntr(struct annotated_branch *branch, {unsigned int br_cntr_nr =evsel__leader (evsel)->br_cntr_nr;unsigned int base =evsel__leader (evsel)->br_cntr_idx; -unsigned int off = offset * evsel->evlist->nr_br_cntr; +unsigned int off = offset *evlist__nr_br_cntr (evsel->evlist);u64 *branch_br_cntr = branch->br_cntr;unsigned int i, mask, width;
@@ -367,7 +367,7 @@ static int symbol__account_cycles(u64 addr, u64 start, struct symbol *sym,if (sym ==NULL )return 0 ; - branch =symbol__find_branch_hist (sym, evsel->evlist->nr_br_cntr); + branch =symbol__find_branch_hist (sym,evlist__nr_br_cntr (evsel->evlist));if (!branch)return -ENOMEM ;if (addr < sym->start || addr >= sym->end)
@@ -509,7 +509,7 @@ static void annotation__count_and_fill(struct annotation *notes, u64 start, u64static int annotation__compute_ipc (struct annotation *notes,size_t size,struct evsel *evsel) { -unsigned int br_cntr_nr = evsel->evlist->nr_br_cntr; +unsigned int br_cntr_nr =evlist__nr_br_cntr (evsel->evlist);int err =0 ;s64 offset;
@@ -1813,7 +1813,7 @@ int annotation_br_cntr_abbr_list(char **str, struct evsel *evsel, bool header)struct evsel *pos;struct strbuf sb; -if (evsel->evlist->nr_br_cntr <=0 ) +if (evlist__nr_br_cntr (evsel->evlist) <=0 )return -ENOTSUP ;strbuf_init (&sb,/*hint=*/ 0 );
tools/perf/util/auxtrace.c +7 -7
@@ -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 = !perf_cpu_map__has_any_cpu(evlist->core.user_requested_cpus); + bool per_cpu = !perf_cpu_map__has_any_cpu(evlist__core(evlist)->user_requested_cpus); mp->mmap_needed = evsel->needs_auxtrace_mmap;
@@ -201,11 +201,11 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp, mp->idx = idx;if (per_cpu) { - mp->cpu =perf_cpu_map__cpu (evlist->core.all_cpus, idx); - mp->tid =perf_thread_map__pid (evlist->core.threads,0 ); + mp->cpu =perf_cpu_map__cpu (evlist__core (evlist)->all_cpus, idx); + mp->tid =perf_thread_map__pid (evlist__core (evlist)->threads,0 ); }else { mp->cpu.cpu =-1 ; - mp->tid =perf_thread_map__pid (evlist->core.threads, idx); + mp->tid =perf_thread_map__pid (evlist__core (evlist)->threads, idx); } }
@@ -667,10 +667,10 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,static int evlist__enable_event_idx (struct evlist *evlist,struct evsel *evsel,int idx) { -bool per_cpu_mmaps = !perf_cpu_map__has_any_cpu (evlist->core.user_requested_cpus); +bool per_cpu_mmaps = !perf_cpu_map__has_any_cpu (evlist__core (evlist)->user_requested_cpus);if (per_cpu_mmaps) { -struct perf_cpu evlist_cpu =perf_cpu_map__cpu (evlist->core.all_cpus, idx); +struct perf_cpu evlist_cpu =perf_cpu_map__cpu (evlist__core (evlist)->all_cpus, idx);int cpu_map_idx =perf_cpu_map__idx (evsel->core.cpus, evlist_cpu);if (cpu_map_idx ==-1 )
@@ -1806,7 +1806,7 @@ void perf_session__auxtrace_error_inc(struct perf_session *session,struct perf_record_auxtrace_error *e = &event->auxtrace_error;if (e->type <PERF_AUXTRACE_ERROR_MAX ) - session->evlist->stats.nr_auxtrace_errors[e->type] +=1 ; +evlist__stats (session->evlist)->nr_auxtrace_errors[e->type] +=1 ; }void events_stats__auxtrace_error_warn (const struct events_stats *stats)
tools/perf/util/block-info.c +2 -2
@@ -472,7 +472,7 @@ struct block_report *block_info__create_report(struct evlist *evlist, int *nr_reps) {struct block_report *block_reports; -int nr_hists = evlist->core.nr_entries, i =0 ; +int nr_hists =evlist__nr_entries (evlist), i =0 ;struct evsel *pos; block_reports =calloc (nr_hists,sizeof (struct block_report ));
@@ -483,7 +483,7 @@ struct block_report *block_info__create_report(struct evlist *evlist,struct hists *hists =evsel__hists (pos);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++; }
tools/perf/util/bpf_counter.c +1 -1
@@ -443,7 +443,7 @@ static int bperf_check_target(struct evsel *evsel, }else if (target->tid) { *filter_type =BPERF_FILTER_PID ; *filter_entry_cnt =perf_thread_map__nr (evsel->core.threads); - }else if (target->pid || evsel->evlist->workload.pid !=-1 ) { + }else if (target->pid ||evlist__workload_pid (evsel->evlist) !=-1 ) { *filter_type =BPERF_FILTER_TGID ; *filter_entry_cnt =perf_thread_map__nr (evsel->core.threads); }else {
tools/perf/util/bpf_counter_cgroup.c +4 -4
@@ -111,7 +111,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)); err =bperf_cgroup_bpf__load (skel);if (err) {
@@ -122,12 +122,12 @@ static int bperf_load_program(struct evlist *evlist) err =-1 ; cgrp_switch =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; } -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 =bpf_program__attach_perf_event (skel->progs.on_cgrp_switch,FD (cgrp_switch, i));if (IS_ERR (link)) {
@@ -238,7 +238,7 @@ static int bperf_cgrp__sync_counters(struct evlist *evlist)unsigned int idx;int prog_fd =bpf_program__fd (skel->progs.trigger_read); -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);return 0 ;
tools/perf/util/bpf_ftrace.c +5 -4
@@ -59,13 +59,13 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace)/* don't need to set cpu filter for system-wide mode */ if (ftrace->target.cpu_list) { - ncpus =perf_cpu_map__nr (ftrace->evlist->core.user_requested_cpus); + ncpus =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 =1 ; }if (target__has_task (&ftrace->target) ||target__none (&ftrace->target)) { - ntasks =perf_thread_map__nr (ftrace->evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (ftrace->evlist)->threads);bpf_map__set_max_entries (skel->maps.task_filter, ntasks); skel->rodata->has_task =1 ; }
@@ -87,7 +87,8 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (ftrace->evlist->core.user_requested_cpus, i).cpu; + cpu =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 =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (ftrace->evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (ftrace->evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } }
tools/perf/util/bpf_lock_contention.c +6 -6
@@ -222,11 +222,11 @@ int lock_contention_prepare(struct lock_contention *con)if (target__has_cpu (target)) { skel->rodata->has_cpu =1 ; - ncpus =perf_cpu_map__nr (evlist->core.user_requested_cpus); + ncpus =perf_cpu_map__nr (evlist__core (evlist)->user_requested_cpus); }if (target__has_task (target)) { skel->rodata->has_task =1 ; - ntasks =perf_thread_map__nr (evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (evlist)->threads); }if (con->filters->nr_types) { skel->rodata->has_type =1 ;
@@ -327,7 +327,7 @@ int lock_contention_prepare(struct lock_contention *con) fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (evlist->core.user_requested_cpus, i).cpu; + cpu =perf_cpu_map__cpu (evlist__core (evlist)->user_requested_cpus, i).cpu;bpf_map_update_elem (fd, &cpu, &val,BPF_ANY ); } }
@@ -339,13 +339,13 @@ int lock_contention_prepare(struct lock_contention *con) fd =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } } -if (target__none (target) && evlist->workload.pid >0 ) { -u32 pid = evlist->workload.pid; +if (target__none (target) &&evlist__workload_pid (evlist) >0 ) { +u32 pid =evlist__workload_pid (evlist);u8 val =1 ; fd =bpf_map__fd (skel->maps.task_filter);
tools/perf/util/bpf_off_cpu.c +7 -7
@@ -73,13 +73,13 @@ static void off_cpu_start(void *arg)/* update task filter for the given workload */ if (skel->rodata->has_task && skel->rodata->uses_tgid && -perf_thread_map__pid (evlist->core.threads,0 ) !=-1 ) { +perf_thread_map__pid (evlist__core (evlist)->threads,0 ) !=-1 ) {int fd;u32 pid;u8 val =1 ; fd =bpf_map__fd (skel->maps.task_filter); - pid =perf_thread_map__pid (evlist->core.threads,0 ); + pid =perf_thread_map__pid (evlist__core (evlist)->threads,0 );bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); }
@@ -168,7 +168,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target,/* don't need to set cpu filter for system-wide mode */ if (target->cpu_list) { - ncpus =perf_cpu_map__nr (evlist->core.user_requested_cpus); + ncpus =perf_cpu_map__nr (evlist__core (evlist)->user_requested_cpus);bpf_map__set_max_entries (skel->maps.cpu_filter, ncpus); skel->rodata->has_cpu =1 ; }
@@ -199,7 +199,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, skel->rodata->has_task =1 ; skel->rodata->uses_tgid =1 ; }else if (target__has_task (target)) { - ntasks =perf_thread_map__nr (evlist->core.threads); + ntasks =perf_thread_map__nr (evlist__core (evlist)->threads);bpf_map__set_max_entries (skel->maps.task_filter, ntasks); skel->rodata->has_task =1 ; }else if (target__none (target)) {
@@ -209,7 +209,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, }if (evlist__first (evlist)->cgrp) { - ncgrps = evlist->core.nr_entries -1 ;/* excluding a dummy */ + ncgrps =evlist__nr_entries (evlist) -1 ;/* excluding a dummy */ bpf_map__set_max_entries (skel->maps.cgroup_filter, ncgrps);if (!cgroup_is_v2 ("perf_event" ))
@@ -240,7 +240,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, fd =bpf_map__fd (skel->maps.cpu_filter);for (i =0 ; i < ncpus; i++) { - cpu =perf_cpu_map__cpu (evlist->core.user_requested_cpus, i).cpu; + cpu =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 target *target, fd =bpf_map__fd (skel->maps.task_filter);for (i =0 ; i < ntasks; i++) { - pid =perf_thread_map__pid (evlist->core.threads, i); + pid =perf_thread_map__pid (evlist__core (evlist)->threads, i);bpf_map_update_elem (fd, &pid, &val,BPF_ANY ); } }
tools/perf/util/cgroup.c +10 -10
@@ -367,7 +367,7 @@ int parse_cgroups(const struct option *opt, const char *str,char *s;int ret, i; -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_cgroint ret =-1 ;int prefix_len; -if (evlist->core.nr_entries ==0 ) { +if (evlist__nr_entries (evlist) ==0 ) {fprintf (stderr,"must define events before cgroups\n" );return -EINVAL ; }
@@ -436,11 +436,11 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro }/* save original events and init evlist */ -evlist__splice_list_tail (orig_list, &evlist->core.entries); - evlist->core.nr_entries =0 ; +evlist__splice_list_tail (orig_list, &evlist__core (evlist)->entries); +evlist__core (evlist)->nr_entries =0 ; - orig_metric_events = evlist->metric_events; -metricgroup__rblist_init (&evlist->metric_events); + orig_metric_events = *evlist__metric_events (evlist); +metricgroup__rblist_init (evlist__metric_events (evlist));if (has_pattern_string (str)) prefix_len =match_cgroups (str);
@@ -503,15 +503,15 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, bool open_cgro nr_cgroups++;if (metricgroup__copy_metric_events (tmp_list, cgrp, - &evlist->metric_events, +evlist__metric_events (evlist), &orig_metric_events) <0 ) goto out_err; -evlist__splice_list_tail (evlist, &tmp_list->core.entries); - tmp_list->core.nr_entries =0 ; +evlist__splice_list_tail (evlist, &evlist__core (tmp_list)->entries); +evlist__core (tmp_list)->nr_entries =0 ; } -if (list_empty (&evlist->core.entries)) { +if (list_empty (&evlist__core (evlist)->entries)) {fprintf (stderr,"no cgroup matched: %s\n" , str); goto out_err; }
tools/perf/util/evlist.c +224 -162
304 lines not on this page · raw message
tools/perf/util/evlist.h +235 -16
251 lines not on this page · raw message
tools/perf/util/session.c +32 -24
56 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Part of the diff is not shown here. View the raw message.
[email protected]
AI reviewRe: [PATCH v5 12/58] perf evlist: Add reference count checking
Sashiko AI review found 3 potential issue(s): - [High] Time-Of-Check to Time-Of-Use (TOCTOU) race condition in `evlist__put()` breaks atomic reference counting, leading to Double Free or…
Sashiko AI review found 3 potential issue(s):
- [High] Time-Of-Check to Time-Of-Use (TOCTOU) race condition in evlist__put() breaks atomic reference counting, leading to Double Free or Use-After-Free.
- [High] Reassigning the local parameter evlist in iostat_prepare() causes a Use-After-Free crash in cmd_stat(). (Pre-existing issue)
- [Medium] Leaked evlist reference when removing probe:vfs_getname events due to bypassing evlist__remove().
--
commit 277a4b5e346eb6e74fad04ad6b9e88d0d32aa103
Author: Ian Rogers <[email protected]>
perf evlist: Add reference count checking
This patch adds reference count checking to the perf evlist object so that gets and puts are paired and easy to debug. It also introduces accessors to evlist functions and updates the codebase to use them.
Quoted 4 lines
tools/perf/util/evlist.c +0
-0
[ ... ]
Quoted 19 lines
tools/perf/util/evlist.c +9
-2@@ -215,16 +225,32 @@ static void evlist__exit(struct evlist *evlist)void evlist__put (struct evlist *evlist) { +struct evsel *evsel; +unsigned int count; +if (evlist ==NULL )return ; -if (!refcount_dec_and_test (&evlist->refcnt)) -return ; +if (refcount_dec_and_test (evlist__refcnt (evlist))) + goto out_delete; + count =refcount_read (evlist__refcnt (evlist)); +evlist__for_each_entry (evlist, evsel) { +if (RC_CHK_EQUAL (evsel->evlist, evlist) && count) + count--;
tools/perf/util/evlist.c static void evlist__exit(struct evlist *evlist) · line 250
Quoted 10 lines
tools/perf/util/evlist.c +10
-0+ } +if (count !=0 ) { +/* +* Not the last reference except for back references from +* evsels. +*/ +RC_CHK_PUT (evlist); +return ; + } +out_delete:
Can this sequence result in a race condition that breaks atomic reference counting?
Because the decrement via refcount_dec_and_test() and the subsequent read are not atomic, concurrent calls to evlist__put() could both decrement the refcount before either reads it. Both threads would then read the same count, subtract the back-references, see a count of zero, and proceed to out_delete, causing a double free.
Similarly, a concurrent evlist__get() could increment the refcount after the count is read, leaving the other thread with a dangling pointer since the first thread proceeds to free the evlist.
[ ... ]
tools/perf/util/evlist.c void evlist__put(struct evlist *evlist) · line 263
Quoted 10 lines
tools/perf/util/evlist.c +3
-2@@ -235,10 +257,11 @@ void evlist__put(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { -perf_evlist__add (&evlist->core, &entry->core); - entry->evlist = evlist; +perf_evlist__add (evlist__core (evlist), &entry->core); +evlist__put (entry->evlist); + entry->evlist =evlist__get (evlist); entry->tracking = !entry->core.idx;
Does this change leak the evlist reference when probe:vfs_getname events are removed in evlist__add_vfs_getname()?
With the new reference counting semantics, adding an evsel to an evlist acquires a reference to the evlist. In evlist__add_vfs_getname(), unmatched evsels are manually removed from the list by explicitly setting evsel->evlist = NULL and calling evsel__put(evsel).
By bypassing evlist__remove() and setting evsel->evlist = NULL without calling evlist__put(), the reference to the evlist acquired during insertion is permanently leaked.
Because the event is removed from the linked list, the cycle-breaking loop in evlist__put() will not traverse it. The evlist reference count will never reach 0, leaking the entire list and its resources upon exit.
Quoted 4 lines
tools/perf/arch/x86/util/iostat.c +0
-0
[ ... ]
Quoted 10 lines
tools/perf/arch/x86/util/iostat.c +1
-1@@ -334,7 +334,7 @@ static int iostat_event_group(struct evlist *evl,int iostat_prepare (struct evlist *evlist,struct perf_stat_config *config) { -if (evlist->core.nr_entries >0 ) { +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 =
evlist__new();
This isn't a bug introduced by this patch, but does this code cause a use-after-free when reassigning the evlist?
Since evlist is passed by value, reassigning evlist = evlist__new() only updates the local parameter. If the user passes unsupported arguments, evlist__nr_entries(evlist) > 0 evaluates to true, and evlist__put(evlist) frees the original list.
The caller retains its original pointer, which now points to freed memory, potentially causing a crash when it iterates over it later.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=12