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

Commit b3cef7f6 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Record the reason for filtering an address_location 



By turning the addr_location->filtered member from a boolean to a u8
bitmap, reusing (and extending) the hist_filter enum for that.

This patch doesn't change the logic at all, as it keeps the meaning of
al->filtered !0 to mean that the entry _was_ filtered, so no change in
how this value is interpreted needs to be done at this point.

This will be soon used in upcoming patches.

Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-89hmfgtr9t22sky1lyg7nw7l@git.kernel.org


[ yanked this out of a previous patch ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 80790e0b

tools/perf/builtin-timechart.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -494,7 +494,7 @@ static const char *cat_backtrace(union perf_event *event, 
			continue;

			continue;

		}

		}





		tal.filtered = false;

		tal.filtered = 0;

		thread__find_addr_location(al.thread, machine, cpumode,

		thread__find_addr_location(al.thread, machine, cpumode,

					   MAP__FUNCTION, ip, &tal);

					   MAP__FUNCTION, ip, &tal);

tools/perf/util/event.c

+13 −7
Original line number Original line Diff line number Diff line 
#include <linux/types.h>

#include <linux/types.h>

#include "event.h"

#include "event.h"

#include "debug.h"

#include "debug.h"

#include "hist.h"

#include "machine.h"

#include "machine.h"

#include "sort.h"

#include "sort.h"

#include "string.h"

#include "string.h"
@@ -705,7 +706,7 @@ void thread__find_addr_map(struct thread *thread, 
	al->thread = thread;

	al->thread = thread;

	al->addr = addr;

	al->addr = addr;

	al->cpumode = cpumode;

	al->cpumode = cpumode;

	al->filtered = false;

	al->filtered = 0;





	if (machine == NULL) {

	if (machine == NULL) {

		al->map = NULL;

		al->map = NULL;
@@ -731,11 +732,11 @@ void thread__find_addr_map(struct thread *thread, 
		if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||

		if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||

			cpumode == PERF_RECORD_MISC_GUEST_KERNEL) &&

			cpumode == PERF_RECORD_MISC_GUEST_KERNEL) &&

			!perf_guest)

			!perf_guest)

			al->filtered = true;

			al->filtered |= (1 << HIST_FILTER__GUEST);

		if ((cpumode == PERF_RECORD_MISC_USER ||

		if ((cpumode == PERF_RECORD_MISC_USER ||

			cpumode == PERF_RECORD_MISC_KERNEL) &&

			cpumode == PERF_RECORD_MISC_KERNEL) &&

			!perf_host)

			!perf_host)

			al->filtered = true;

			al->filtered |= (1 << HIST_FILTER__HOST);





		return;

		return;

	}

	}
@@ -792,8 +793,10 @@ int perf_event__preprocess_sample(const union perf_event *event, 
	if (thread == NULL)

	if (thread == NULL)

		return -1;

		return -1;





	if (thread__is_filtered(thread))

	if (thread__is_filtered(thread)) {

		al->filtered |= (1 << HIST_FILTER__THREAD);

		goto out_filtered;

		goto out_filtered;

	}





	dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);

	dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);

	/*

	/*
@@ -823,8 +826,10 @@ int perf_event__preprocess_sample(const union perf_event *event, 
						  dso->short_name) ||

						  dso->short_name) ||

			       (dso->short_name != dso->long_name &&

			       (dso->short_name != dso->long_name &&

				strlist__has_entry(symbol_conf.dso_list,

				strlist__has_entry(symbol_conf.dso_list,

						   dso->long_name)))))

						   dso->long_name))))) {

			al->filtered |= (1 << HIST_FILTER__DSO);

			goto out_filtered;

			goto out_filtered;

		}





		al->sym = map__find_symbol(al->map, al->addr,

		al->sym = map__find_symbol(al->map, al->addr,

					   machine->symbol_filter);

					   machine->symbol_filter);
@@ -832,12 +837,13 @@ int perf_event__preprocess_sample(const union perf_event *event, 




	if (symbol_conf.sym_list &&

	if (symbol_conf.sym_list &&

		(!al->sym || !strlist__has_entry(symbol_conf.sym_list,

		(!al->sym || !strlist__has_entry(symbol_conf.sym_list,

						al->sym->name)))

						al->sym->name))) {

		al->filtered |= (1 << HIST_FILTER__SYMBOL);

		goto out_filtered;

		goto out_filtered;

	}





	return 0;

	return 0;





out_filtered:

out_filtered:

	al->filtered = true;

	return 0;

	return 0;

}
 
}

tools/perf/util/hist.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -13,13 +13,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists, 
static bool hists__filter_entry_by_symbol(struct hists *hists,

static bool hists__filter_entry_by_symbol(struct hists *hists,

					  struct hist_entry *he);

					  struct hist_entry *he);





enum hist_filter {

	HIST_FILTER__DSO,

	HIST_FILTER__THREAD,

	HIST_FILTER__PARENT,

	HIST_FILTER__SYMBOL,

};



struct callchain_param	callchain_param = {

struct callchain_param	callchain_param = {

	.mode	= CHAIN_GRAPH_REL,

	.mode	= CHAIN_GRAPH_REL,

	.min_percent = 0.5,

	.min_percent = 0.5,

tools/perf/util/hist.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,15 @@ struct hist_entry; 
struct addr_location;

struct addr_location;

struct symbol;

struct symbol;





enum hist_filter {

	HIST_FILTER__DSO,

	HIST_FILTER__THREAD,

	HIST_FILTER__PARENT,

	HIST_FILTER__SYMBOL,

	HIST_FILTER__GUEST,

	HIST_FILTER__HOST,

};



/*

/*

 * The kernel collects the number of events it couldn't send in a stretch and

 * The kernel collects the number of events it couldn't send in a stretch and

 * when possible sends this number in a PERF_RECORD_LOST event. The number of

 * when possible sends this number in a PERF_RECORD_LOST event. The number of

tools/perf/util/machine.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1312,7 +1312,7 @@ static int machine__resolve_callchain_sample(struct machine *machine, 
			continue;

			continue;

		}

		}





		al.filtered = false;

		al.filtered = 0;

		thread__find_addr_location(thread, machine, cpumode,

		thread__find_addr_location(thread, machine, cpumode,

					   MAP__FUNCTION, ip, &al);

					   MAP__FUNCTION, ip, &al);

		if (al.sym != NULL) {

		if (al.sym != NULL) {