Commit bc105a89 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

Revert "perf tool_pmu: More accurately set the cpus for tool events" 

This reverts commit d8d8a0b3.

The setting of a user CPU map can cause an empty intersection when
combined with CPU 0 and the event removed. This later triggers a segv in
the stat-shadow logic. Let's put back a full online CPU map for now by
reverting this patch.

Closes: https://lore.kernel.org/linux-perf-users/cgja46br2smmznxs7kbeabs6zgv3b4olfqgh2fdp5mxk2yom4v@w6jjgov6hdi6/


Reported-by: default avatarAndres Freund <andres@anarazel.de>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yang Li <yang.lee@linux.alibaba.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1f12fb13

tools/perf/util/parse-events.c

+2 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "util/event.h"

#include "util/bpf-filter.h"

#include "util/stat.h"

#include "util/tool_pmu.h"

#include "util/util.h"

#include "tracepoint.h"

#include <api/fs/tracing_path.h>
@@ -230,12 +229,8 @@ __add_event(struct list_head *list, int *idx, 
	if (pmu) {

		is_pmu_core = pmu->is_core;

		pmu_cpus = perf_cpu_map__get(pmu->cpus);

		if (perf_cpu_map__is_empty(pmu_cpus)) {

			if (perf_pmu__is_tool(pmu))

				pmu_cpus = tool_pmu__cpus(attr);

			else

		if (perf_cpu_map__is_empty(pmu_cpus))

			pmu_cpus = cpu_map__online();

		}

	} else {

		is_pmu_core = (attr->type == PERF_TYPE_HARDWARE ||

			       attr->type == PERF_TYPE_HW_CACHE);

tools/perf/util/tool_pmu.c

+0 −19
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include "cgroup.h"

#include "counts.h"

#include "cputopo.h"

#include "debug.h"

#include "evsel.h"

#include "pmu.h"

#include "print-events.h"
@@ -14,7 +13,6 @@ 
#include <api/fs/fs.h>

#include <api/io.h>

#include <internal/threadmap.h>

#include <perf/cpumap.h>

#include <perf/threadmap.h>

#include <fcntl.h>

#include <strings.h>
@@ -111,23 +109,6 @@ const char *evsel__tool_pmu_event_name(const struct evsel *evsel) 
	return tool_pmu__event_to_str(evsel->core.attr.config);

}



struct perf_cpu_map *tool_pmu__cpus(struct perf_event_attr *attr)

{

	static struct perf_cpu_map *cpu0_map;

	enum tool_pmu_event event = (enum tool_pmu_event)attr->config;



	if (event <= TOOL_PMU__EVENT_NONE || event >= TOOL_PMU__EVENT_MAX) {

		pr_err("Invalid tool PMU event config %llx\n", attr->config);

		return NULL;

	}

	if (event == TOOL_PMU__EVENT_USER_TIME || event == TOOL_PMU__EVENT_SYSTEM_TIME)

		return cpu_map__online();



	if (!cpu0_map)

		cpu0_map = perf_cpu_map__new_int(0);

	return perf_cpu_map__get(cpu0_map);

}



static bool read_until_char(struct io *io, char e)

{

	int c;

tools/perf/util/tool_pmu.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ bool tool_pmu__read_event(enum tool_pmu_event ev, 
u64 tool_pmu__cpu_slots_per_cycle(void);



bool perf_pmu__is_tool(const struct perf_pmu *pmu);

struct perf_cpu_map *tool_pmu__cpus(struct perf_event_attr *attr);



bool evsel__is_tool(const struct evsel *evsel);

enum tool_pmu_event evsel__tool_event(const struct evsel *evsel);