From: Denys Zagorui <dzagorui@cisco.com>
To: jolsa@redhat.com, linux-kernel@vger.kernel.org,
peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
namhyung@kernel.org
Subject: [PATCH v5 2/3] perf tests: avoid storing an absolute path in perf binary
Date: Mon, 17 May 2021 01:46:03 -0700 [thread overview]
Message-ID: <20210517084604.2895-2-dzagorui@cisco.com> (raw)
In-Reply-To: <20210517084604.2895-1-dzagorui@cisco.com>
python binding test uses PYTHONPATH definition to find python/perf.so
library. This definition is an absolute path that makes perf binary
unreproducible. This path can be found during runtime execution.
Signed-off-by: Denys Zagorui <dzagorui@cisco.com>
---
tools/perf/tests/Build | 2 +-
tools/perf/tests/python-use.c | 23 +++++++++++++++++++++--
tools/perf/util/util.c | 18 ++++++++++++++++++
tools/perf/util/util.h | 1 +
4 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 650aec19d490..a20098dcdbc4 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -98,5 +98,5 @@ perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
endif
CFLAGS_attr.o += -DBINDIR="BUILD_STR($(bindir_SQ))" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
-CFLAGS_python-use.o += -DPYTHONPATH="BUILD_STR($(OUTPUT)python)" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
+CFLAGS_python-use.o += -DPYTHON="BUILD_STR($(PYTHON_WORD))"
CFLAGS_dwarf-unwind.o += -fno-optimize-sibling-calls
diff --git a/tools/perf/tests/python-use.c b/tools/perf/tests/python-use.c
index 98c6d474aa6f..37c3c774180e 100644
--- a/tools/perf/tests/python-use.c
+++ b/tools/perf/tests/python-use.c
@@ -8,18 +8,37 @@
#include <linux/compiler.h>
#include "tests.h"
#include "util/debug.h"
+#include "util/util.h"
+#include <sys/stat.h>
int test__python_use(struct test *test __maybe_unused, int subtest __maybe_unused)
{
char *cmd;
int ret;
+ char *exec_path;
+ char *pythonpath;
+ struct stat sb;
+
+ exec_path = perf_exe_path();
+ if (exec_path == NULL)
+ return -1;
+
+ if (asprintf(&pythonpath, "%s/python", exec_path) < 0)
+ return -1;
+
+ if (stat(pythonpath, &sb) || !S_ISDIR(sb.st_mode))
+ pythonpath[0] = 0;
if (asprintf(&cmd, "echo \"import sys ; sys.path.append('%s'); import perf\" | %s %s",
- PYTHONPATH, PYTHON, verbose > 0 ? "" : "2> /dev/null") < 0)
- return -1;
+ pythonpath, PYTHON, verbose > 0 ? "" : "2> /dev/null") < 0) {
+ ret = -1;
+ goto out;
+ }
pr_debug("python usage test: \"%s\"\n", cmd);
ret = system(cmd) ? -1 : 0;
free(cmd);
+out:
+ free(pythonpath);
return ret;
}
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 3bba74e431ed..79ec528827a2 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -22,6 +22,7 @@
#include "cap.h"
#include "strlist.h"
#include "string2.h"
+#include <libgen.h>
/*
* XXX We need to find a better place for these things...
@@ -388,3 +389,20 @@ char *perf_exe(char *buf, int len)
}
return strcpy(buf, "perf");
}
+
+char *perf_exe_path(void)
+{
+ char *buf;
+ char *dname;
+
+ buf = malloc(PATH_MAX);
+ if (buf == NULL)
+ return NULL;
+
+ buf = perf_exe(buf, PATH_MAX);
+
+ dname = dirname(buf);
+
+ free(buf);
+ return dname;
+}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 80b194ee6c7d..4b506df4e8b9 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -49,6 +49,7 @@ void perf_set_singlethreaded(void);
void perf_set_multithreaded(void);
char *perf_exe(char *buf, int len);
+char *perf_exe_path(void);
#ifndef O_CLOEXEC
#ifdef __sparc__
--
2.26.2.Cisco
next prev parent reply other threads:[~2021-05-17 8:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 8:46 [PATCH v5 1/3] perf report: compile tips.txt in perf binary Denys Zagorui
2021-05-17 8:46 ` Denys Zagorui [this message]
2021-05-21 6:59 ` [PATCH v5 2/3] perf tests: avoid storing an absolute path " Namhyung Kim
2021-05-17 8:46 ` [PATCH v5 3/3] perf parse-events: add bison --file-prefix-map option Denys Zagorui
2021-05-19 13:24 ` [PATCH v5 1/3] perf report: compile tips.txt in perf binary Jiri Olsa
2021-05-21 10:24 ` Denys Zagorui -X (dzagorui - GLOBALLOGIC INC at Cisco)
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=20210517084604.2895-2-dzagorui@cisco.com \
--to=dzagorui@cisco.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).