Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-Data: A9a23:HIEeJKPbMrzccQPvrR11l8FynXyQoLVcMsEvi/4bfWQNrUoj0zBRm
 2IaXmHSbqmOMGP0fd1wPo/joEpSupHUm4BjGXM5pCpnJ55oRWUpJjg4wmPYZX76whjrFRo/h
 ykmh1qpwPkcFhcwnD/1WlTahSQ6hfvgqobUUraeY3gsH1Y8EU/NtDo68wIHqt8w6TSGK1vlV
 ePa+6Uz73f8hlaYmkpNg06ygEsHUMba4Vv0jXRiDRx/h2IyolFOZH4pyQ5dGFOjKmVcNrbSq
 +8uV9hV9EuBl/smIovNfroW7iTmT5aKVTVihEa6VICmpCQTiwgjg51qE90aUGBTtjKzgttun
 YAlWZyYEW/FP4XFnOAbFhJfCSw7YOtN+aTMJj60tsn7I0/uKiS3ha4wShhte9RDqo6bAkkWn
 RAcADwfZx+Enf+36Lm6UeJrwM8kKaEHOatA4y85lGuIVa1OrZbrHrjG9PlJ7TUL3+dnPOqDW
 MsUWwd+RUGVC/FIEg5HVM1h9AuyvVH7cjtFuBeWqLAx7mz70gN8yv7uPcDTd9jMQt9a9m6dp
 2TJ+EzjDx0aPcDZwj2AmlqugevUlAvhVY4SHaH+/flv6HWawmEDARsaWEH9uvm4kU69WtR3L
 00S5zporK4u+UjtRd74NzW+qXuErwMaVPJTHvc85QXLzbDbiy6QDW0JZj1MctorsIkxXzNC/
 keEg97zFxRutrOPQH6Q/7vSqim9UQAQJHUBIzUZUQ8M5dXLqZs2yBnIS75e/LWdh9nxH3T7x
 CqH6XV4jLQIhslN3KK+lbzav96yjpzvcl8YwhSGZTOCyQVAQ4qYYLa14keOuJ6sM72lokm9U
 GkswpbEtb1eU8nSyURhU81WR+n4vabt3Cn0xA8xQcV8q1xB7lb+JehtDCdCyFCF2yruURbtZ
 ELV0e+6zMAOZCPwBUObjn7YNijH5aHkEdKgXffOY58TCnSQSONl1Hw1DaJz9zmw+KTJrU3ZE
 cvDGSpLJS1HYZmLNBLsG48gPUYDn0jSP18/oKwXKTz5j9Jyg1bLEN843KemNYjVEYvd+lyOq
 oYDXyd040sBD4USnRU7AaZKfQxVchDX9Ljdqtdccaa4MxF6FWQ6Y8I9MptwJtM/wfU9qws8x
 VngCh4w4Aeu3hXvdFTVAk2PnZuyBP6TW1pgZndyVbtpslB+CbuSAFA3J8pvIeZ/rLQ9pRO2J
 tFcE/i97j10Ymyv01wggVPV9eSOqDzDadqyAheY
IronPort-HdrOrdr: A9a23:6JmmyK6QPIZttu9PigPXwMnXdLJyesId70hD6qkXc20wTiX2ra
 6TdZgguCMczQxhO03I+urwXZVoP0m8yXcd2+B4Vt2ftUvdyQmVxepZgrcKrQeNJ8SHzI5gPW
 MKSdkZNDU2ZmIK6vrH3A==
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 v6 2/3] perf tests: avoid storing an absolute path in perf binary
Date:   Fri, 21 May 2021 10:27:52 -0700
Message-Id: <20210521172753.55399-2-dzagorui@cisco.com>
In-Reply-To: <20210521172753.55399-1-dzagorui@cisco.com>
References: <20210521172753.55399-1-dzagorui@cisco.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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 | 21 +++++++++++++++++++--
 tools/perf/util/util.c        | 12 ++++++++++++
 tools/perf/util/util.h        |  1 +
 4 files changed, 33 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..4a6ff7db2bf1 100644
--- a/tools/perf/tests/python-use.c
+++ b/tools/perf/tests/python-use.c
@@ -8,18 +8,35 @@
 #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;
 
-	if (asprintf(&cmd, "echo \"import sys ; sys.path.append('%s'); import perf\" | %s %s",
-		     PYTHONPATH, PYTHON, verbose > 0 ? "" : "2> /dev/null") < 0)
+	exec_path = perf_exe_path();
+
+	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) {
+		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..53f3dbf02f58 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,14 @@ char *perf_exe(char *buf, int len)
 	}
 	return strcpy(buf, "perf");
 }
+
+char *perf_exe_path(void)
+{
+	char buf[PATH_MAX];
+	char *dname;
+
+	perf_exe(buf, PATH_MAX);
+	dname = dirname(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