From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 02/21] perf tools: Try to increase the file descriptor limits on EMFILE
Date: Wed, 28 Aug 2013 11:59:18 -0300 [thread overview]
Message-ID: <1377701977-2085-3-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1377701977-2085-1-git-send-email-acme@infradead.org>
From: Andi Kleen <ak@linux.intel.com>
perf stat -a needs 10 open file descriptors per logical CPU
perf stat -a -dddd needs 20 open fds for each.
This implies that stat -a doesn't work on any system with the default
ulimit -n 1024 which has more than ~100 CPUs and stat -a -dddd doesn't
work on anything with more than 46 CPUs.
Longer term there needs to be probably some way to lower the file
descriptor requirements. This would need some changes in the kernel/user
interface.
But short term this patch just tries to increase the file descriptor
limit in perf itself, when it runs into a EMFILE.
It first sets it to the hard limit, and then tries to increase the hard
limit.
On Fedora systems the default seems to be soft limit 1024 and hard limit
4*1024. So even non root can support 409 or 186 CPUs respectively. root
can go far higher.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375670486-15480-1-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evsel.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 960394e..a29c8d0 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -13,6 +13,7 @@
#include <traceevent/event-parse.h>
#include <linux/hw_breakpoint.h>
#include <linux/perf_event.h>
+#include <sys/resource.h>
#include "asm/bug.h"
#include "evsel.h"
#include "evlist.h"
@@ -867,6 +868,7 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
int cpu, thread;
unsigned long flags = 0;
int pid = -1, err;
+ enum { NO_CHANGE, SET_TO_MAX, INCREASED_MAX } set_rlimit = NO_CHANGE;
if (evsel->fd == NULL &&
perf_evsel__alloc_fd(evsel, cpus->nr, threads->nr) < 0)
@@ -894,6 +896,7 @@ retry_sample_id:
group_fd = get_group_fd(evsel, cpu, thread);
+retry_open:
FD(evsel, cpu, thread) = sys_perf_event_open(&evsel->attr,
pid,
cpus->map[cpu],
@@ -902,12 +905,37 @@ retry_sample_id:
err = -errno;
goto try_fallback;
}
+ set_rlimit = NO_CHANGE;
}
}
return 0;
try_fallback:
+ /*
+ * perf stat needs between 5 and 22 fds per CPU. When we run out
+ * of them try to increase the limits.
+ */
+ if (err == -EMFILE && set_rlimit < INCREASED_MAX) {
+ struct rlimit l;
+ int old_errno = errno;
+
+ if (getrlimit(RLIMIT_NOFILE, &l) == 0) {
+ if (set_rlimit == NO_CHANGE)
+ l.rlim_cur = l.rlim_max;
+ else {
+ l.rlim_cur = l.rlim_max + 1000;
+ l.rlim_max = l.rlim_cur;
+ }
+ if (setrlimit(RLIMIT_NOFILE, &l) == 0) {
+ set_rlimit++;
+ errno = old_errno;
+ goto retry_open;
+ }
+ }
+ errno = old_errno;
+ }
+
if (err != -EINVAL || cpu > 0 || thread > 0)
goto out_close;
--
1.8.1.4
next prev parent reply other threads:[~2013-08-28 15:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-28 14:59 [GIT PULL 00/21] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 01/21] perf kvm: Remove force option to cmd_record Arnaldo Carvalho de Melo
2013-08-28 14:59 ` Arnaldo Carvalho de Melo [this message]
2013-08-28 14:59 ` [PATCH 03/21] perf tools: Re-implement debug print function for linking python/perf.so Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 04/21] perf tools: Add debug prints Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 05/21] perf trace: Implement -o/--output filename Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 06/21] perf trace: Make command line arguments consistent with perf-record Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 07/21] perf tools: Sample after exit loses thread correlation Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 08/21] perf tools: Don't install scripting files files when disabled Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 09/21] perf trace: Support ! in -e expressions Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 10/21] perf trace: Add --verbose option Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 11/21] perf trace: Hide sys_exit messages about syscall id = -1 Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 12/21] perf trace: Introduce syscall arg formatters Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 13/21] perf trace: Simplify sys_exit return printing Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 14/21] perf trace: Allow printing syscall return values in hex Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 15/21] perf trace: Add aliases to remaining syscalls of the sys_enter_newfoo Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 16/21] perf trace: Allow overiding the formatting of syscall fields Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 17/21] perf trace: Add beautifier for mmap prot parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 18/21] perf trace: Add beautifier for mmap flags parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 19/21] perf trace: Add beautifier for madvise behaviour/advice parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 20/21] perf tools: Add pid to struct thread Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 21/21] tools lib traceevent: Fixup jobserver setup Arnaldo Carvalho de Melo
2013-08-29 10:04 ` [GIT PULL 00/21] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377701977-2085-3-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).