Skip to content

Commit 99f5bc9

Browse files
mathieupoirierIngo Molnar
authored andcommitted
perf/core: Enable mapping of the stop filters
At this time the perf_addr_filter_needs_mmap() function will _not_ return true on a user space 'stop' filter. But stop filters need exactly the same kind of mapping that range and start filters get. Signed-off-by: Mathieu Poirier <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Alexander Shishkin <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 12b40a2 commit 99f5bc9

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

kernel/events/core.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6619,15 +6619,6 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66196619
kfree(buf);
66206620
}
66216621

6622-
/*
6623-
* Whether this @filter depends on a dynamic object which is not loaded
6624-
* yet or its load addresses are not known.
6625-
*/
6626-
static bool perf_addr_filter_needs_mmap(struct perf_addr_filter *filter)
6627-
{
6628-
return filter->filter && filter->inode;
6629-
}
6630-
66316622
/*
66326623
* Check whether inode and address range match filter criteria.
66336624
*/
@@ -7848,7 +7839,11 @@ static void perf_event_addr_filters_apply(struct perf_event *event)
78487839
list_for_each_entry(filter, &ifh->list, entry) {
78497840
event->addr_filters_offs[count] = 0;
78507841

7851-
if (perf_addr_filter_needs_mmap(filter))
7842+
/*
7843+
* Adjust base offset if the filter is associated to a binary
7844+
* that needs to be mapped:
7845+
*/
7846+
if (filter->inode)
78527847
event->addr_filters_offs[count] =
78537848
perf_addr_filter_apply(filter, mm);
78547849

0 commit comments

Comments
 (0)