[PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Jiri Olsa]

Following patch added another way to get mmap name:
  78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name

The vdso vma mapping already switch to this and we no longer
get vdso name via arch_vma_name function. Adding this way to
the perf mmap event name retrieval code.

Caught this via perf test:

  $ sudo ./perf test -v 7
   7: Validate PERF_RECORD_* events & perf_sample fields     :
  --- start ---

SNIP

  PERF_RECORD_MMAP for [vdso] missing!
  test child finished with 255
  ---- end ----
  Validate PERF_RECORD_* events & perf_sample fields: FAILED!

Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 kernel/events/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 67e3b9c..4799676 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5266,6 +5266,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
 
 		goto got_name;
 	} else {
+		if (vma->vm_ops && vma->vm_ops->name) {
+			name = (char *) vma->vm_ops->name(vma);
+			if (name)
+				goto cpy_name;
+		}
+
 		name = (char *)arch_vma_name(vma);
 		if (name)
 			goto cpy_name;
-- 
1.8.3.1

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]

On Mon, Jul 14, 2014 at 05:57:19PM +0200, Jiri Olsa wrote:
> Following patch added another way to get mmap name:
>   78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name

Please add to your .gitconfig:

[core]
        abbrev = 12

Also, you failed to CC the two people involved in that.

> The vdso vma mapping already switch to this and we no longer
> get vdso name via arch_vma_name function. Adding this way to
> the perf mmap event name retrieval code.
> 
> Caught this via perf test:
> 
>   $ sudo ./perf test -v 7
>    7: Validate PERF_RECORD_* events & perf_sample fields     :
>   --- start ---
> 
> SNIP
> 
>   PERF_RECORD_MMAP for [vdso] missing!
>   test child finished with 255
>   ---- end ----
>   Validate PERF_RECORD_* events & perf_sample fields: FAILED!
> 
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  kernel/events/core.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 67e3b9c..4799676 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -5266,6 +5266,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
>  
>  		goto got_name;
>  	} else {
> +		if (vma->vm_ops && vma->vm_ops->name) {
> +			name = (char *) vma->vm_ops->name(vma);
> +			if (name)
> +				goto cpy_name;
> +		}
> +
>  		name = (char *)arch_vma_name(vma);
>  		if (name)
>  			goto cpy_name;
> -- 
> 1.8.3.1
> 

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

On Mon, Jul 14, 2014 at 06:09:47PM +0200, Peter Zijlstra wrote:
> On Mon, Jul 14, 2014 at 05:57:19PM +0200, Jiri Olsa wrote:
> > Following patch added another way to get mmap name:
> >   78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name
> 
> Please add to your .gitconfig:
> 
> [core]
>         abbrev = 12
> 
> Also, you failed to CC the two people involved in that.

In any case, this patch appears to be tip only for now, so I'll queue it
in perf/core.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Andy Lutomirski]

On Mon, Jul 14, 2014 at 9:09 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> On Mon, Jul 14, 2014 at 05:57:19PM +0200, Jiri Olsa wrote:
>> Following patch added another way to get mmap name:
>>   78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name
>
> Please add to your .gitconfig:
>
> [core]
>         abbrev = 12
>
> Also, you failed to CC the two people involved in that.
>
>> The vdso vma mapping already switch to this and we no longer
>> get vdso name via arch_vma_name function. Adding this way to
>> the perf mmap event name retrieval code.
>>
>> Caught this via perf test:
>>
>>   $ sudo ./perf test -v 7
>>    7: Validate PERF_RECORD_* events & perf_sample fields     :
>>   --- start ---
>>
>> SNIP
>>
>>   PERF_RECORD_MMAP for [vdso] missing!
>>   test child finished with 255
>>   ---- end ----
>>   Validate PERF_RECORD_* events & perf_sample fields: FAILED!
>>
>> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
>> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
>> Cc: David Ahern <dsahern@gmail.com>
>> Cc: Frederic Weisbecker <fweisbec@gmail.com>
>> Cc: Ingo Molnar <mingo@kernel.org>
>> Cc: Namhyung Kim <namhyung@kernel.org>
>> Cc: Paul Mackerras <paulus@samba.org>
>> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
>> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>> ---
>>  kernel/events/core.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/kernel/events/core.c b/kernel/events/core.c
>> index 67e3b9c..4799676 100644
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -5266,6 +5266,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
>>
>>               goto got_name;
>>       } else {
>> +             if (vma->vm_ops && vma->vm_ops->name) {
>> +                     name = (char *) vma->vm_ops->name(vma);
>> +                     if (name)
>> +                             goto cpy_name;
>> +             }
>> +

Looks good to me.  Sorry I missed that.

--Andy



>>               name = (char *)arch_vma_name(vma);
>>               if (name)
>>                       goto cpy_name;
>> --
>> 1.8.3.1
>>



-- 
Andy Lutomirski
AMA Capital Management, LLC

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

On Mon, Jul 14, 2014 at 09:14:41AM -0700, Andy Lutomirski wrote:
> Looks good to me.  Sorry I missed that.
> 

Can I make that an Acked-by?

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Andy Lutomirski]

On Mon, Jul 14, 2014 at 9:17 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> On Mon, Jul 14, 2014 at 09:14:41AM -0700, Andy Lutomirski wrote:
>> Looks good to me.  Sorry I missed that.
>>
>
> Can I make that an Acked-by?

Acked-by: Andy Lutomirski <luto@amacapital.net>

--Andy

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

On Mon, Jul 14, 2014 at 09:29:43AM -0700, Andy Lutomirski wrote:
> On Mon, Jul 14, 2014 at 9:17 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> > On Mon, Jul 14, 2014 at 09:14:41AM -0700, Andy Lutomirski wrote:
> >> Looks good to me.  Sorry I missed that.
> >>
> >
> > Can I make that an Acked-by?
> 
> Acked-by: Andy Lutomirski <luto@amacapital.net>

Thanks!

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Jiri Olsa]

On Mon, Jul 14, 2014 at 06:09:47PM +0200, Peter Zijlstra wrote:
> On Mon, Jul 14, 2014 at 05:57:19PM +0200, Jiri Olsa wrote:
> > Following patch added another way to get mmap name:
> >   78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name
> 
> Please add to your .gitconfig:
> 
> [core]
>         abbrev = 12

hum, will check

> 
> Also, you failed to CC the two people involved in that.

ouch.. sry

jirka

Re: [PATCH] perf: Add vm_ops->name call for mmap event name retrieval

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

On Mon, Jul 14, 2014 at 07:37:55PM +0200, Jiri Olsa wrote:
> On Mon, Jul 14, 2014 at 06:09:47PM +0200, Peter Zijlstra wrote:
> > On Mon, Jul 14, 2014 at 05:57:19PM +0200, Jiri Olsa wrote:
> > > Following patch added another way to get mmap name:
> > >   78d683e mm, fs: Add vm_ops->name as an alternative to arch_vma_name
> > 
> > Please add to your .gitconfig:
> > 
> > [core]
> >         abbrev = 12
> 
> hum, will check

Mandated by Linus, also I've already had 8 char hash collisions, so it
really makes sense.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[tip:perf/core] perf: Add vm_ops-> name call for mmap event name retrieval

[tip-bot for Jiri Olsa]

Commit-ID:  fbe26abe118ee1262b4ab0d12fefd42647eaea35
Gitweb:     http://git.kernel.org/tip/fbe26abe118ee1262b4ab0d12fefd42647eaea35
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 14 Jul 2014 17:57:19 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 16 Jul 2014 13:31:22 +0200

perf: Add vm_ops->name call for mmap event name retrieval

The following patch added another way to get mmap name: 78d683e838a6
("mm, fs: Add vm_ops->name as an alternative to arch_vma_name")

The vdso vma mapping already switch to this and we no longer get vdso
name via arch_vma_name function. Adding this way to the perf mmap
event name retrieval code.

Caught this via perf test:

  $ sudo ./perf test -v 7
   7: Validate PERF_RECORD_* events & perf_sample fields     :
  --- start ---

SNIP

  PERF_RECORD_MMAP for [vdso] missing!
  test child finished with 255
  ---- end ----
  Validate PERF_RECORD_* events & perf_sample fields: FAILED!

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1405353439-14211-1-git-send-email-jolsa@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/events/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 67e3b9c..4799676 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5266,6 +5266,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
 
 		goto got_name;
 	} else {
+		if (vma->vm_ops && vma->vm_ops->name) {
+			name = (char *) vma->vm_ops->name(vma);
+			if (name)
+				goto cpy_name;
+		}
+
 		name = (char *)arch_vma_name(vma);
 		if (name)
 			goto cpy_name;