linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps
@ 2016-01-01  3:03 Marcin Ślusarz
  2016-01-04  1:25 ` Namhyung Kim
  0 siblings, 1 reply; 8+ messages in thread
From: Marcin Ślusarz @ 2016-01-01  3:03 UTC (permalink / raw)
  To: LKML; +Cc: Arnaldo Carvalho de Melo, Namhyung Kim

Steam frequently puts game binaries in folders with spaces.

Note: "(deleted)" markers are now treated as part of the file name.

It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
("perf tools: Use sscanf for parsing /proc/pid/maps").

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 8b10621..ff17fe6 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
 		strcpy(execname, "");
 
 		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
+		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]s\n",
 		       &event->mmap2.start, &event->mmap2.len, prot,
 		       &event->mmap2.pgoff, &event->mmap2.maj,
 		       &event->mmap2.min,
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-01  3:03 [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps Marcin Ślusarz
@ 2016-01-04  1:25 ` Namhyung Kim
  2016-01-07 23:16   ` Marcin Ślusarz
  0 siblings, 1 reply; 8+ messages in thread
From: Namhyung Kim @ 2016-01-04  1:25 UTC (permalink / raw)
  To: Marcin Ślusarz; +Cc: LKML, Arnaldo Carvalho de Melo

Hi Marcin,

On Fri, Jan 01, 2016 at 04:03:21AM +0100, Marcin Ślusarz wrote:
> Steam frequently puts game binaries in folders with spaces.
> 
> Note: "(deleted)" markers are now treated as part of the file name.
> 
> It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
> ("perf tools: Use sscanf for parsing /proc/pid/maps").
> 
> Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/util/event.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index 8b10621..ff17fe6 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
>  		strcpy(execname, "");
>  
>  		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
> -		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
> +		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]s\n",

Is the last 's' necessary?

Thanks,
Namhyung


>  		       &event->mmap2.start, &event->mmap2.len, prot,
>  		       &event->mmap2.pgoff, &event->mmap2.maj,
>  		       &event->mmap2.min,
> -- 
> 2.1.4
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-04  1:25 ` Namhyung Kim
@ 2016-01-07 23:16   ` Marcin Ślusarz
  2016-01-09  9:42     ` Namhyung Kim
  0 siblings, 1 reply; 8+ messages in thread
From: Marcin Ślusarz @ 2016-01-07 23:16 UTC (permalink / raw)
  To: Namhyung Kim; +Cc: LKML, Arnaldo Carvalho de Melo

On Mon, Jan 04, 2016 at 10:25:28AM +0900, Namhyung Kim wrote:
> Hi Marcin,
> 
> On Fri, Jan 01, 2016 at 04:03:21AM +0100, Marcin Ślusarz wrote:
> > Steam frequently puts game binaries in folders with spaces.
> > 
> > Note: "(deleted)" markers are now treated as part of the file name.
> > 
> > It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
> > ("perf tools: Use sscanf for parsing /proc/pid/maps").
> > 
> > Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> > ---
> >  tools/perf/util/event.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> > index 8b10621..ff17fe6 100644
> > --- a/tools/perf/util/event.c
> > +++ b/tools/perf/util/event.c
> > @@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> >  		strcpy(execname, "");
> >  
> >  		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
> > -		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
> > +		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]s\n",
> 
> Is the last 's' necessary?

Nope. It should not be there.

---
From: Marcin Ślusarz <marcin.slusarz@gmail.com>
Subject: [PATCH v2] perf tools: handle spaces in file names obtained from /proc/pid/maps

Steam frequently puts game binaries in folders with spaces.

Note: "(deleted)" markers are now treated as part of the file name.

It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
("perf tools: Use sscanf for parsing /proc/pid/maps").

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 8b10621..956187b 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
 		strcpy(execname, "");
 
 		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
+		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
 		       &event->mmap2.start, &event->mmap2.len, prot,
 		       &event->mmap2.pgoff, &event->mmap2.maj,
 		       &event->mmap2.min,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-07 23:16   ` Marcin Ślusarz
@ 2016-01-09  9:42     ` Namhyung Kim
  2016-01-19 19:03       ` [PATCH v2] " Marcin Ślusarz
  0 siblings, 1 reply; 8+ messages in thread
From: Namhyung Kim @ 2016-01-09  9:42 UTC (permalink / raw)
  To: Marcin Ślusarz; +Cc: LKML, Arnaldo Carvalho de Melo

> From: Marcin Ślusarz <marcin.slusarz@gmail.com>
> Subject: [PATCH v2] perf tools: handle spaces in file names obtained from /proc/pid/maps
> 
> Steam frequently puts game binaries in folders with spaces.
> 
> Note: "(deleted)" markers are now treated as part of the file name.
> 
> It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
> ("perf tools: Use sscanf for parsing /proc/pid/maps").
> 
> Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  tools/perf/util/event.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index 8b10621..956187b 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
>  		strcpy(execname, "");
>  
>  		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
> -		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
> +		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
>  		       &event->mmap2.start, &event->mmap2.len, prot,
>  		       &event->mmap2.pgoff, &event->mmap2.maj,
>  		       &event->mmap2.min,
> -- 
> 2.1.4
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-09  9:42     ` Namhyung Kim
@ 2016-01-19 19:03       ` Marcin Ślusarz
  2016-02-04 22:39         ` Marcin Ślusarz
  2016-02-09 12:14         ` [tip:perf/core] " tip-bot for Marcin Ślusarz
  0 siblings, 2 replies; 8+ messages in thread
From: Marcin Ślusarz @ 2016-01-19 19:03 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo; +Cc: LKML, Namhyung Kim

Steam frequently puts game binaries in folders with spaces.

Note: "(deleted)" markers are now treated as part of the file name.

It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
("perf tools: Use sscanf for parsing /proc/pid/maps").

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 8b10621..956187b 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
 		strcpy(execname, "");
 
 		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
+		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
 		       &event->mmap2.start, &event->mmap2.len, prot,
 		       &event->mmap2.pgoff, &event->mmap2.maj,
 		       &event->mmap2.min,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-19 19:03       ` [PATCH v2] " Marcin Ślusarz
@ 2016-02-04 22:39         ` Marcin Ślusarz
  2016-02-05 12:42           ` Arnaldo Carvalho de Melo
  2016-02-09 12:14         ` [tip:perf/core] " tip-bot for Marcin Ślusarz
  1 sibling, 1 reply; 8+ messages in thread
From: Marcin Ślusarz @ 2016-02-04 22:39 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo; +Cc: LKML, Namhyung Kim

On Tue, Jan 19, 2016 at 08:03:03PM +0100, Marcin Ślusarz wrote:
> Steam frequently puts game binaries in folders with spaces.
> 
> Note: "(deleted)" markers are now treated as part of the file name.
> 
> It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
> ("perf tools: Use sscanf for parsing /proc/pid/maps").
> 
> Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>

Gentle ping ;)

> ---
>  tools/perf/util/event.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index 8b10621..956187b 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
>  		strcpy(execname, "");
>  
>  		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
> -		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
> +		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
>  		       &event->mmap2.start, &event->mmap2.len, prot,
>  		       &event->mmap2.pgoff, &event->mmap2.maj,
>  		       &event->mmap2.min,
> -- 
> 2.1.4
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-02-04 22:39         ` Marcin Ślusarz
@ 2016-02-05 12:42           ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 8+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-02-05 12:42 UTC (permalink / raw)
  To: Marcin Ślusarz; +Cc: LKML, Namhyung Kim

Em Thu, Feb 04, 2016 at 11:39:25PM +0100, Marcin Ślusarz escreveu:
> On Tue, Jan 19, 2016 at 08:03:03PM +0100, Marcin Ślusarz wrote:
> > Steam frequently puts game binaries in folders with spaces.
> > 
> > Note: "(deleted)" markers are now treated as part of the file name.
> > 
> > It probably worked before 6064803313bad9ae4cae233a9d56678adb2b6e7c
> > ("perf tools: Use sscanf for parsing /proc/pid/maps").
> > 
> > Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Gentle ping ;)

Thanks for being gentle, appreciated ;-)

Applied to perf/core,

- Arnaldo
 
> > ---
> >  tools/perf/util/event.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> > index 8b10621..956187b 100644
> > --- a/tools/perf/util/event.c
> > +++ b/tools/perf/util/event.c
> > @@ -274,7 +274,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> >  		strcpy(execname, "");
> >  
> >  		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
> > -		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
> > +		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
> >  		       &event->mmap2.start, &event->mmap2.len, prot,
> >  		       &event->mmap2.pgoff, &event->mmap2.maj,
> >  		       &event->mmap2.min,
> > -- 
> > 2.1.4
> > 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [tip:perf/core] perf tools: handle spaces in file names obtained from /proc/pid/maps
  2016-01-19 19:03       ` [PATCH v2] " Marcin Ślusarz
  2016-02-04 22:39         ` Marcin Ślusarz
@ 2016-02-09 12:14         ` tip-bot for Marcin Ślusarz
  1 sibling, 0 replies; 8+ messages in thread
From: tip-bot for Marcin Ślusarz @ 2016-02-09 12:14 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, hpa, linux-kernel, acme, mingo, namhyung, marcin.slusarz

Commit-ID:  89fee59b504f86925894fcc9ba79d5c933842f93
Gitweb:     http://git.kernel.org/tip/89fee59b504f86925894fcc9ba79d5c933842f93
Author:     Marcin Ślusarz <marcin.slusarz@gmail.com>
AuthorDate: Tue, 19 Jan 2016 20:03:03 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 5 Feb 2016 09:39:56 -0300

perf tools: handle spaces in file names obtained from /proc/pid/maps

Steam frequently puts game binaries in folders with spaces.

Note: "(deleted)" markers are now treated as part of the file name.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Fixes: 6064803313ba ("perf tools: Use sscanf for parsing /proc/pid/maps")
Link: http://lkml.kernel.org/r/20160119190303.GA17579@marcin-Inspiron-7720
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 85155e9..7bad5c3 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -282,7 +282,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
 		strcpy(execname, "");
 
 		/* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
+		n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %[^\n]\n",
 		       &event->mmap2.start, &event->mmap2.len, prot,
 		       &event->mmap2.pgoff, &event->mmap2.maj,
 		       &event->mmap2.min,

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-02-09 12:14 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-01  3:03 [PATCH] perf tools: handle spaces in file names obtained from /proc/pid/maps Marcin Ślusarz
2016-01-04  1:25 ` Namhyung Kim
2016-01-07 23:16   ` Marcin Ślusarz
2016-01-09  9:42     ` Namhyung Kim
2016-01-19 19:03       ` [PATCH v2] " Marcin Ślusarz
2016-02-04 22:39         ` Marcin Ślusarz
2016-02-05 12:42           ` Arnaldo Carvalho de Melo
2016-02-09 12:14         ` [tip:perf/core] " tip-bot for Marcin Ślusarz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).