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

Commit 2fe85427 authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf: Add PERF_RECORD_MISC_MMAP_DATA to RECORD_MMAP 



Type of mapping was lost and made it hard for a tool
to distinguish code vs. data mmaps. Perf has the ability
to distinguish the two.

Use a bit in the header->misc bitmask to keep track of
the mmap type. If PERF_RECORD_MISC_MMAP_DATA is set then
the mapping is not executable (!VM_EXEC). If not set, then
the mapping is executable.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Cc: peterz@infradead.org
Cc: ak@linux.intel.com
Cc: acme@redhat.com
Cc: jolsa@redhat.com
Cc: namhyung.kim@lge.com
Link: http://lkml.kernel.org/r/1359040242-8269-16-git-send-email-eranian@google.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9ad64c0f

include/uapi/linux/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ struct perf_event_mmap_page { 
#define PERF_RECORD_MISC_GUEST_KERNEL		(4 << 0)

#define PERF_RECORD_MISC_GUEST_USER		(5 << 0)



#define PERF_RECORD_MISC_MMAP_DATA		(1 << 13)

/*

 * Indicates that the content of PERF_SAMPLE_IP points to

 * the actual instruction that triggered the event. See also

kernel/events/core.c

+3 −0
Original line number Diff line number Diff line
@@ -4791,6 +4791,9 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) 
	mmap_event->file_name = name;

	mmap_event->file_size = size;



	if (!(vma->vm_flags & VM_EXEC))

		mmap_event->event_id.header.misc |= PERF_RECORD_MISC_MMAP_DATA;



	mmap_event->event_id.header.size = sizeof(mmap_event->event_id) + size;



	rcu_read_lock();