mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [GIT PULL 0/1] perf/urgent fixes
@ 2010-07-16 18:07 Arnaldo Carvalho de Melo
  2010-07-16 18:07 ` [PATCH 1/1] perf symbols: Fix directory descriptor leaking Arnaldo Carvalho de Melo
  2010-07-16 19:18 ` [GIT PULL 0/1] perf/urgent fixes Ingo Molnar
  0 siblings, 2 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-07-16 18:07 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-kernel, Arnaldo Carvalho de Melo, Arnaldo Carvalho de Melo,
	Gui Jianfeng, Ingo Molnar, Paul Mackerras, Peter Zijlstra

Hi Ingo,

        Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Gui Jianfeng (1):
  perf symbols: Fix directory descriptor leaking

 tools/perf/util/symbol.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)


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

* [PATCH 1/1] perf symbols: Fix directory descriptor leaking
  2010-07-16 18:07 [GIT PULL 0/1] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2010-07-16 18:07 ` Arnaldo Carvalho de Melo
  2010-07-16 19:18 ` [GIT PULL 0/1] perf/urgent fixes Ingo Molnar
  1 sibling, 0 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-07-16 18:07 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-kernel, Gui Jianfeng, Ingo Molnar, Paul Mackerras,
	Peter Zijlstra, Arnaldo Carvalho de Melo

From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>

When I ran "perf kvm ... top", I encountered the following error output.

  Error: perfcounter syscall returned with -1 (Too many open files)

  Fatal: No CONFIG_PERF_EVENTS=y kernel support configured?

Looking into perf, I found perf opens too many directories at
initialization time, but forgets to close them. Here is the fix.

LKML-Reference: <4C230362.5080704@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index b63e571..5b27683 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1443,6 +1443,7 @@ static int map_groups__set_modules_path_dir(struct map_groups *self,
 {
 	struct dirent *dent;
 	DIR *dir = opendir(dir_name);
+	int ret = 0;
 
 	if (!dir) {
 		pr_debug("%s: cannot open %s dir\n", __func__, dir_name);
@@ -1465,8 +1466,9 @@ static int map_groups__set_modules_path_dir(struct map_groups *self,
 
 			snprintf(path, sizeof(path), "%s/%s",
 				 dir_name, dent->d_name);
-			if (map_groups__set_modules_path_dir(self, path) < 0)
-				goto failure;
+			ret = map_groups__set_modules_path_dir(self, path);
+			if (ret < 0)
+				goto out;
 		} else {
 			char *dot = strrchr(dent->d_name, '.'),
 			     dso_name[PATH_MAX];
@@ -1487,17 +1489,18 @@ static int map_groups__set_modules_path_dir(struct map_groups *self,
 				 dir_name, dent->d_name);
 
 			long_name = strdup(path);
-			if (long_name == NULL)
-				goto failure;
+			if (long_name == NULL) {
+				ret = -1;
+				goto out;
+			}
 			dso__set_long_name(map->dso, long_name);
 			dso__kernel_module_get_build_id(map->dso, "");
 		}
 	}
 
-	return 0;
-failure:
+out:
 	closedir(dir);
-	return -1;
+	return ret;
 }
 
 static char *get_kernel_version(const char *root_dir)
-- 
1.6.2.5


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

* Re: [GIT PULL 0/1] perf/urgent fixes
  2010-07-16 18:07 [GIT PULL 0/1] perf/urgent fixes Arnaldo Carvalho de Melo
  2010-07-16 18:07 ` [PATCH 1/1] perf symbols: Fix directory descriptor leaking Arnaldo Carvalho de Melo
@ 2010-07-16 19:18 ` Ingo Molnar
  1 sibling, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2010-07-16 19:18 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: linux-kernel, Arnaldo Carvalho de Melo, Gui Jianfeng,
	Paul Mackerras, Peter Zijlstra


* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please pull from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
> 
> Regards,
> 
> - Arnaldo
> 
> Gui Jianfeng (1):
>   perf symbols: Fix directory descriptor leaking
> 
>  tools/perf/util/symbol.c |   17 ++++++++++-------
>  1 files changed, 10 insertions(+), 7 deletions(-)

Pulled, thanks Arnaldo!

	Ingo

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

* Re: [GIT PULL 0/1] perf/urgent fixes
  2010-08-17 21:52 Arnaldo Carvalho de Melo
@ 2010-08-18  8:45 ` Ingo Molnar
  0 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2010-08-18  8:45 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: linux-kernel, Bernd Petrovitsch, Kusanagi Kouichi,
	Paul Mackerras, Peter Zijlstra


* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please pull from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
> 
> Regards,
> 
> - Arnaldo
> 
> Bernd Petrovitsch (1):
>   perf tools: Fix build on POSIX shells
> 
>  tools/perf/Makefile |   16 ++++++++++------
>  1 files changed, 10 insertions(+), 6 deletions(-)

Pulled, thanks Arnaldo!

	Ingo

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

* [GIT PULL 0/1] perf/urgent fixes
@ 2010-08-17 21:52 Arnaldo Carvalho de Melo
  2010-08-18  8:45 ` Ingo Molnar
  0 siblings, 1 reply; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-17 21:52 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-kernel, Arnaldo Carvalho de Melo, Bernd Petrovitsch,
	Ingo Molnar, Kusanagi Kouichi, Paul Mackerras, Peter Zijlstra

Hi Ingo,

        Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Bernd Petrovitsch (1):
  perf tools: Fix build on POSIX shells

 tools/perf/Makefile |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


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

* Re: [GIT PULL 0/1] perf/urgent fixes
  2010-07-02 12:48 Arnaldo Carvalho de Melo
@ 2010-07-03 13:00 ` Ingo Molnar
  0 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2010-07-03 13:00 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: linux-kernel, Gui Jianfeng, Peter Zijlstra, Paul Mackerras,
	Thomas Gleixner, Fr??d??ric Weisbecker


* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please pull from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
> 
> Regards,
> 
> - Arnaldo
> 
> Gui Jianfeng (1):
>   perf tools: Fix find tids routine by excluding "." and ".."
> 
>  tools/perf/util/thread.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)

Pulled, thanks Arnaldo!

	Ingo

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

* [GIT PULL 0/1] perf/urgent fixes
@ 2010-07-02 12:48 Arnaldo Carvalho de Melo
  2010-07-03 13:00 ` Ingo Molnar
  0 siblings, 1 reply; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-07-02 12:48 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: linux-kernel, Arnaldo Carvalho de Melo, Gui Jianfeng

Hi Ingo,

        Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Gui Jianfeng (1):
  perf tools: Fix find tids routine by excluding "." and ".."

 tools/perf/util/thread.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


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

* Re: [GIT PULL 0/1] perf/urgent fixes
  2010-06-10 16:05 Arnaldo Carvalho de Melo
@ 2010-06-10 16:21 ` Ingo Molnar
  0 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2010-06-10 16:21 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: linux-kernel, Ananth N Mavinakayanahalli,
	Arnaldo Carvalho de Melo, Fr??d??ric Weisbecker,
	Masami Hiramatsu, Peter Zijlstra, Srikar Dronamraju,
	Stephane Eranian, Tom Zanussi


* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> Hi Ingo,
> 
>         Please pull from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
> 
> Regards,
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (1):
>   perf record: Don't call newt functions when not initialized
> 
>  tools/perf/util/newt.c |   15 +++++++++++++--
>  1 files changed, 13 insertions(+), 2 deletions(-)

Pulled, thanks!

	Ingo

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

* [GIT PULL 0/1] perf/urgent fixes
@ 2010-06-10 16:05 Arnaldo Carvalho de Melo
  2010-06-10 16:21 ` Ingo Molnar
  0 siblings, 1 reply; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-06-10 16:05 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: linux-kernel, Arnaldo Carvalho de Melo,
	Ananth N Mavinakayanahalli, Arnaldo Carvalho de Melo,
	Frédéric Weisbecker, Masami Hiramatsu, Peter Zijlstra,
	Srikar Dronamraju, Stephane Eranian, Tom Zanussi

Hi Ingo,

        Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (1):
  perf record: Don't call newt functions when not initialized

 tools/perf/util/newt.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)


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

end of thread, other threads:[~2010-08-18  8:45 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-16 18:07 [GIT PULL 0/1] perf/urgent fixes Arnaldo Carvalho de Melo
2010-07-16 18:07 ` [PATCH 1/1] perf symbols: Fix directory descriptor leaking Arnaldo Carvalho de Melo
2010-07-16 19:18 ` [GIT PULL 0/1] perf/urgent fixes Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2010-08-17 21:52 Arnaldo Carvalho de Melo
2010-08-18  8:45 ` Ingo Molnar
2010-07-02 12:48 Arnaldo Carvalho de Melo
2010-07-03 13:00 ` Ingo Molnar
2010-06-10 16:05 Arnaldo Carvalho de Melo
2010-06-10 16:21 ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®