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

Commit 2d2e7ac1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/urgent

Pull perf/urgent tooling fix from Arnaldo Carvalho de Melo:

  User visible changes:

    - Fix 'perf list' segfault due to lack of support for PERF_CONF_SW_BPF_OUTPUT
      in an array used just for printing available events, robustify the code
      involved (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 03fba21a fb202539

tools/perf/util/parse-events.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -124,6 +124,10 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { 
		.symbol = "dummy",

		.symbol = "dummy",

		.alias  = "",

		.alias  = "",

	},

	},

	[PERF_COUNT_SW_BPF_OUTPUT] = {

		.symbol = "bpf-output",

		.alias  = "",

	},

};

};





#define __PERF_EVENT_FIELD(config, name) \

#define __PERF_EVENT_FIELD(config, name) \
@@ -1879,7 +1883,7 @@ void print_symbol_events(const char *event_glob, unsigned type, 




	for (i = 0; i < max; i++, syms++) {

	for (i = 0; i < max; i++, syms++) {





		if (event_glob != NULL &&

		if (event_glob != NULL && syms->symbol != NULL &&

		    !(strglobmatch(syms->symbol, event_glob) ||

		    !(strglobmatch(syms->symbol, event_glob) ||

		      (syms->alias && strglobmatch(syms->alias, event_glob))))

		      (syms->alias && strglobmatch(syms->alias, event_glob))))

			continue;

			continue;