From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, paulus@samba.org, hpa@zytor.com,
mingo@kernel.org, jolsa@kernel.org, a.p.zijlstra@chello.nl,
jean.pihet@linaro.org, acme@kernel.org, namhyung@kernel.org,
fweisbec@gmail.com, dsahern@gmail.com, tglx@linutronix.de,
cjashfor@linux.vnet.ibm.com
Subject: [tip:perf/core] perf tools: Allow to close dso fd in case of open failure
Date: Thu, 12 Jun 2014 23:26:22 -0700 [thread overview]
Message-ID: <tip-a08cae03f430b971afa508a32662dc476d42d8cb@git.kernel.org> (raw)
In-Reply-To: <1401892622-30848-9-git-send-email-jolsa@kernel.org>
Commit-ID: a08cae03f430b971afa508a32662dc476d42d8cb
Gitweb: http://git.kernel.org/tip/a08cae03f430b971afa508a32662dc476d42d8cb
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 7 May 2014 21:35:02 +0200
Committer: Jiri Olsa <jolsa@kernel.org>
CommitDate: Thu, 12 Jun 2014 16:53:21 +0200
perf tools: Allow to close dso fd in case of open failure
Adding do_open function that tries to close opened
dso objects in case we fail to open the dso due to
to crossing the allowed RLIMIT_NOFILE limit.
Acked-by: Namhyung Kim <namhyung@kernel.org>
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: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1401892622-30848-9-git-send-email-jolsa@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/dso.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index db63438..c30752c 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -159,6 +159,27 @@ static void dso__list_del(struct dso *dso)
dso__data_open_cnt--;
}
+static void close_first_dso(void);
+
+static int do_open(char *name)
+{
+ int fd;
+
+ do {
+ fd = open(name, O_RDONLY);
+ if (fd >= 0)
+ return fd;
+
+ pr_debug("dso open failed, mmap: %s\n", strerror(errno));
+ if (!dso__data_open_cnt || errno != EMFILE)
+ break;
+
+ close_first_dso();
+ } while (1);
+
+ return -1;
+}
+
static int __open_dso(struct dso *dso, struct machine *machine)
{
int fd;
@@ -177,7 +198,7 @@ static int __open_dso(struct dso *dso, struct machine *machine)
return -EINVAL;
}
- fd = open(name, O_RDONLY);
+ fd = do_open(name);
free(name);
return fd;
}
next prev parent reply other threads:[~2014-06-13 6:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 14:36 [PATCHv4 00/13] perf tools: Speedup DWARF unwind Jiri Olsa
2014-06-04 14:36 ` [PATCH 01/13] perf tools: Cache register accesses for unwind processing Jiri Olsa
2014-06-13 6:24 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 02/13] perf tools: Separate dso data related variables Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 03/13] perf tools: Add data_fd into dso object Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 04/13] perf tools: Add global list of opened dso objects Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 05/13] perf tools: Add global count " Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 06/13] perf tools: Cache dso data file descriptor Jiri Olsa
2014-06-13 6:25 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 07/13] perf tools: Add file size check and factor dso__data_read_offset Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 08/13] perf tools: Allow to close dso fd in case of open failure Jiri Olsa
2014-06-13 6:26 ` tip-bot for Jiri Olsa [this message]
2014-06-04 14:36 ` [PATCH 09/13] perf tools: Add dso__data_* interface descriptons Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:36 ` [PATCH 10/13] perf tests: Spawn child for each test Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 11/13] perf tests: Allow reuse of test_file function Jiri Olsa
2014-06-13 6:26 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 12/13] perf tests: Add test for caching dso file descriptors Jiri Olsa
2014-06-13 6:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-04 14:37 ` [PATCH 13/13] perf tests: Add test for closing dso objects on EMFILE error Jiri Olsa
2014-06-13 6:27 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-06-10 5:01 ` [PATCHv4 00/13] perf tools: Speedup DWARF unwind Namhyung Kim
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=tip-a08cae03f430b971afa508a32662dc476d42d8cb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jean.pihet@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/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).