Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47a74bdc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.14-20171010' of... 

Merge tag 'perf-urgent-for-mingo-4.14-20171010' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Unbreak 'perf record' for arm/arm64 with events with explicit PMU (Mark Rutland)

- Add missing separator for "perf script -F ip,brstack" (and brstackoff) (Mark Santaniello)

- One line, comment only, sync kernel ABI header with tooling header (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 629eb703 aa7b4e02

tools/include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ union bpf_attr { 
 *     jump into another BPF program

 *     @ctx: context pointer passed to next program

 *     @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY

 *     @index: index inside array that selects specific program to run

 *     @index: 32-bit index inside array that selects specific program to run

 *     Return: 0 on success or negative error

 *

 * int bpf_clone_redirect(skb, ifindex, flags)

tools/perf/util/parse-events.c

+5 −4
Original line number Diff line number Diff line
@@ -309,10 +309,11 @@ static char *get_config_name(struct list_head *head_terms) 
static struct perf_evsel *

__add_event(struct list_head *list, int *idx,

	    struct perf_event_attr *attr,

	    char *name, struct cpu_map *cpus,

	    char *name, struct perf_pmu *pmu,

	    struct list_head *config_terms, bool auto_merge_stats)

{

	struct perf_evsel *evsel;

	struct cpu_map *cpus = pmu ? pmu->cpus : NULL;



	event_attr_init(attr);
@@ -323,7 +324,7 @@ __add_event(struct list_head *list, int *idx, 
	(*idx)++;

	evsel->cpus        = cpu_map__get(cpus);

	evsel->own_cpus    = cpu_map__get(cpus);

	evsel->system_wide = !!cpus;

	evsel->system_wide = pmu ? pmu->is_uncore : false;

	evsel->auto_merge_stats = auto_merge_stats;



	if (name)
@@ -1233,7 +1234,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, 


	if (!head_config) {

		attr.type = pmu->type;

		evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu->cpus, NULL, auto_merge_stats);

		evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu, NULL, auto_merge_stats);

		return evsel ? 0 : -ENOMEM;

	}
@@ -1254,7 +1255,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, 
		return -EINVAL;



	evsel = __add_event(list, &parse_state->idx, &attr,

			    get_config_name(head_config), pmu->cpus,

			    get_config_name(head_config), pmu,

			    &config_terms, auto_merge_stats);

	if (evsel) {

		evsel->unit = info.unit;

tools/perf/util/pmu.c

+41 −15
Original line number Diff line number Diff line
@@ -470,16 +470,35 @@ static void pmu_read_sysfs(void) 
	closedir(dir);

}



static struct cpu_map *__pmu_cpumask(const char *path)

{

	FILE *file;

	struct cpu_map *cpus;



	file = fopen(path, "r");

	if (!file)

		return NULL;



	cpus = cpu_map__read(file);

	fclose(file);

	return cpus;

}



/*

 * Uncore PMUs have a "cpumask" file under sysfs. CPU PMUs (e.g. on arm/arm64)

 * may have a "cpus" file.

 */

#define CPUS_TEMPLATE_UNCORE	"%s/bus/event_source/devices/%s/cpumask"

#define CPUS_TEMPLATE_CPU	"%s/bus/event_source/devices/%s/cpus"



static struct cpu_map *pmu_cpumask(const char *name)

{

	struct stat st;

	char path[PATH_MAX];

	FILE *file;

	struct cpu_map *cpus;

	const char *sysfs = sysfs__mountpoint();

	const char *templates[] = {

		 "%s/bus/event_source/devices/%s/cpumask",

		 "%s/bus/event_source/devices/%s/cpus",

		CPUS_TEMPLATE_UNCORE,

		CPUS_TEMPLATE_CPU,

		NULL

	};

	const char **template;
@@ -489,20 +508,25 @@ static struct cpu_map *pmu_cpumask(const char *name) 


	for (template = templates; *template; template++) {

		snprintf(path, PATH_MAX, *template, sysfs, name);

		if (stat(path, &st) == 0)

			break;

		cpus = __pmu_cpumask(path);

		if (cpus)

			return cpus;

	}



	if (!*template)

	return NULL;

}



	file = fopen(path, "r");

	if (!file)

		return NULL;

static bool pmu_is_uncore(const char *name)

{

	char path[PATH_MAX];

	struct cpu_map *cpus;

	const char *sysfs = sysfs__mountpoint();



	cpus = cpu_map__read(file);

	fclose(file);

	return cpus;

	snprintf(path, PATH_MAX, CPUS_TEMPLATE_UNCORE, sysfs, name);

	cpus = __pmu_cpumask(path);

	cpu_map__put(cpus);



	return !!cpus;

}



/*
@@ -617,6 +641,8 @@ static struct perf_pmu *pmu_lookup(const char *name) 


	pmu->cpus = pmu_cpumask(name);



	pmu->is_uncore = pmu_is_uncore(name);



	INIT_LIST_HEAD(&pmu->format);

	INIT_LIST_HEAD(&pmu->aliases);

	list_splice(&format, &pmu->format);

tools/perf/util/pmu.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct perf_pmu { 
	char *name;

	__u32 type;

	bool selectable;

	bool is_uncore;

	struct perf_event_attr *default_config;

	struct cpu_map *cpus;

	struct list_head format;  /* HEAD struct perf_pmu_format -> list */

tools/perf/builtin-script.c

+2 −2

File changed.

Contains only whitespace changes.