From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Kim Phillips <kim.phillips@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Thomas Richter <tmricht@linux.ibm.com>,
linux-kernel@vger.kernel.org (open list),
rmk+kernel@armlinux.org.uk, l.stach@pengutronix.de
Subject: [PATCH 1/2] perf tools: Make find_vdso_map() more modular
Date: Wed, 24 Oct 2018 17:09:04 -0700 [thread overview]
Message-ID: <20181025000905.6095-2-f.fainelli@gmail.com> (raw)
In-Reply-To: <20181025000905.6095-1-f.fainelli@gmail.com>
In preparation for checking that the vectors page on the ARM
architecture, refactor the find_vdso_map() function to accept finding an
arbitrary string and create a dedicated helper function for that under
util/find-map.c and update find_vdso_map() to use it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
tools/perf/util/find-map.c | 31 +++++++++++++++++++++++++++++++
tools/perf/util/find-vdso-map.c | 30 +++---------------------------
2 files changed, 34 insertions(+), 27 deletions(-)
create mode 100644 tools/perf/util/find-map.c
diff --git a/tools/perf/util/find-map.c b/tools/perf/util/find-map.c
new file mode 100644
index 000000000000..42533fc21108
--- /dev/null
+++ b/tools/perf/util/find-map.c
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0
+static int find_map(void **start, void **end, const char *name)
+{
+ FILE *maps;
+ char line[128];
+ int found = 0;
+
+ maps = fopen("/proc/self/maps", "r");
+ if (!maps) {
+ fprintf(stderr, "vdso: cannot open maps\n");
+ return -1;
+ }
+
+ while (!found && fgets(line, sizeof(line), maps)) {
+ int m = -1;
+
+ /* We care only about private r-x mappings. */
+ if (2 != sscanf(line, "%p-%p r-xp %*x %*x:%*x %*u %n",
+ start, end, &m))
+ continue;
+ if (m < 0)
+ continue;
+
+ if (!strncmp(&line[m], name, sizeof(name) - 1))
+ found = 1;
+ }
+
+ fclose(maps);
+ return !found;
+}
+
diff --git a/tools/perf/util/find-vdso-map.c b/tools/perf/util/find-vdso-map.c
index d7823e3508fc..840d7d6e29e2 100644
--- a/tools/perf/util/find-vdso-map.c
+++ b/tools/perf/util/find-vdso-map.c
@@ -1,31 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
+#include "find-map.c"
+
static int find_vdso_map(void **start, void **end)
{
- FILE *maps;
- char line[128];
- int found = 0;
-
- maps = fopen("/proc/self/maps", "r");
- if (!maps) {
- fprintf(stderr, "vdso: cannot open maps\n");
- return -1;
- }
-
- while (!found && fgets(line, sizeof(line), maps)) {
- int m = -1;
-
- /* We care only about private r-x mappings. */
- if (2 != sscanf(line, "%p-%p r-xp %*x %*x:%*x %*u %n",
- start, end, &m))
- continue;
- if (m < 0)
- continue;
-
- if (!strncmp(&line[m], VDSO__MAP_NAME,
- sizeof(VDSO__MAP_NAME) - 1))
- found = 1;
- }
-
- fclose(maps);
- return !found;
+ return find_map(start, end, VDSO__MAP_NAME);
}
--
2.17.1
next prev parent reply other threads:[~2018-10-25 0:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-25 0:09 [PATCH 0/2] perf tests: Check for ARM [vectors] page Florian Fainelli
2018-10-25 0:09 ` Florian Fainelli [this message]
2018-10-25 0:14 ` [PATCH 1/2] perf tools: Make find_vdso_map() more modular Florian Fainelli
2018-10-25 0:09 ` [PATCH 2/2] perf tests: Add a test for the ARM 32-bit [vectors] page Florian Fainelli
2018-10-25 2:10 ` Andrew Lunn
2018-10-25 17:19 ` Florian Fainelli
2018-10-25 17:32 ` Russell King - ARM Linux
2018-10-25 17:53 ` Florian Fainelli
2018-10-25 18:03 ` Russell King - ARM Linux
2018-10-31 22:21 ` [PATCH 0/2] perf tests: Check for ARM " Florian Fainelli
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=20181025000905.6095-2-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jolsa@redhat.com \
--cc=kim.phillips@arm.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@linux.ibm.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=tglx@linutronix.de \
--cc=tmricht@linux.ibm.com \
/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).