Commit-ID: 59e1a00ac0e4d33ffc46814a3509b5cc2c94c56f Gitweb: http://git.kernel.org/tip/59e1a00ac0e4d33ffc46814a3509b5cc2c94c56f Author: Stephane Eranian <eran...@google.com> AuthorDate: Thu, 24 Jan 2013 16:10:39 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 25 Jan 2013 10:19:05 +0100
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: Stephane Eranian <eran...@google.com> Cc: pet...@infradead.org Cc: a...@linux.intel.com Cc: a...@redhat.com Cc: jo...@redhat.com Cc: namhyung....@lge.com Link: http://lkml.kernel.org/r/1359040242-8269-16-git-send-email-eran...@google.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- include/uapi/linux/perf_event.h | 1 + kernel/events/core.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 0c46659..62e9f25 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -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 diff --git a/kernel/events/core.c b/kernel/events/core.c index 4661009..dd1c130 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4764,6 +4764,9 @@ got_name: 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(); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
