Skip to contentSkip to conversation

perf jit: move test functionality in to a test

PATCH Applied Ian Rogers 3 participants 8 messages Nov 26, 2019 – Dec 4, 2019 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf jit: move test functionality in to a test

Adds a test for minimal jit_write_elf functionality.

---
 tools/perf/tests/Build          |  1 +
 tools/perf/tests/builtin-test.c |  4 +++
 tools/perf/tests/genelf.c       | 53 +++++++++++++++++++++++++++++++++
 tools/perf/tests/tests.h        |  1 +
 tools/perf/util/genelf.c        | 46 ----------------------------
 5 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 tools/perf/tests/genelf.c
tools/perf/tests/Build +1 -0
index e72accefd669..a738e4a5b301 100644
@@ -54,6 +54,7 @@ perf-y += unit_number__scnprintf.o
 perf-y += mem2node.o
 perf-y += map_groups.o
 perf-y += time-utils-test.o
+perf-y += genelf.o
 
 $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
 	$(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
index 8b286e9b7549..6ab2e2346aab 100644
@@ -300,6 +300,10 @@ static struct test generic_tests[] = {
 		.desc = "map_groups__merge_in",
 		.func = test__map_groups__merge_in,
 	},
+	{
+		.desc = "Test jit_write_elf",
+		.func = test__jit_write_elf,
+	},
 	{
 		.func = NULL,
 	},
tools/perf/tests/genelf.c new file +53 -0

53 lines not on this page · raw message

tools/perf/tests/tests.h +1 -0
index 9837b6e93023..5a53ab7294e9 100644
@@ -109,6 +109,7 @@ int test__unit_number__scnprint(struct test *test, int subtest);
 int test__mem2node(struct test *t, int subtest);
 int test__map_groups__merge_in(struct test *t, int subtest);
 int test__time_utils(struct test *t, int subtest);
+int test__jit_write_elf(struct test *test, int subtest);
 
 bool test__bp_signal_is_supported(void);
 bool test__bp_account_is_supported(void);
tools/perf/util/genelf.c +0 -46

67 lines not on this page · raw message

Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
#1 lore raw

Em Tue, Nov 26, 2019 at 03:59:13PM -0800, Ian Rogers escreveu:

Quoted 1 line

Adds a test for minimal jit_write_elf functionality.

Thanks, tested and applied.

- Arnaldo

Quoted 184 lines
---
 tools/perf/tests/Build          |  1 +
 tools/perf/tests/builtin-test.c |  4 +++
 tools/perf/tests/genelf.c       | 53 +++++++++++++++++++++++++++++++++
 tools/perf/tests/tests.h        |  1 +
 tools/perf/util/genelf.c        | 46 ----------------------------
 5 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 tools/perf/tests/genelf.c
tools/perf/tests/Build +1 -0
index e72accefd669..a738e4a5b301 100644
@@ -54,6 +54,7 @@ perf-y += unit_number__scnprintf.o
 perf-y += mem2node.o
 perf-y += map_groups.o
 perf-y += time-utils-test.o
+perf-y += genelf.o
 
 $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
 	$(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
index 8b286e9b7549..6ab2e2346aab 100644
@@ -300,6 +300,10 @@ static struct test generic_tests[] = {
 		.desc = "map_groups__merge_in",
 		.func = test__map_groups__merge_in,
 	},
+	{
+		.desc = "Test jit_write_elf",
+		.func = test__jit_write_elf,
+	},
 	{
 		.func = NULL,
 	},
tools/perf/tests/genelf.c new file +53 -0
new file mode 100644
index 000000000000..d392e9300881
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <linux/compiler.h>
+
+#include "debug.h"
+#include "tests.h"
+
+
+#ifdef HAVE_LIBELF_SUPPORT
+#include <libelf.h>
+#include "../util/genelf.h"
+#endif
+
+#define TEMPL "/tmp/perf-test-XXXXXX"
+
+static unsigned char x86_code[] = {
+	0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
+	0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
+	0xCD, 0x80            /* int $0x80 */
+};
+
+int test__jit_write_elf(struct test *test __maybe_unused,
+			int subtest __maybe_unused)
+{
+#ifdef HAVE_JITDUMP
+	char path[PATH_MAX];
+	int fd, ret;
+
+	strcpy(path, TEMPL);
+
+	fd = mkstemp(path);
+	if (fd < 0) {
+		perror("mkstemp failed");
+		return TEST_FAIL;
+	}
+
+	pr_info("Writing jit code to: %s\n", path);
+
+	ret = jit_write_elf(fd, 0, "main", x86_code, sizeof(x86_code),
+			NULL, 0, NULL, 0, 0);
+	close(fd);
+
+	unlink(path);
+
+	return ret ? TEST_FAIL : 0;
+#else
+	return TEST_SKIPPED;
+#endif
+}
tools/perf/tests/tests.h +1 -0
index 9837b6e93023..5a53ab7294e9 100644
@@ -109,6 +109,7 @@ int test__unit_number__scnprint(struct test *test, int subtest);
 int test__mem2node(struct test *t, int subtest);
 int test__map_groups__merge_in(struct test *t, int subtest);
 int test__time_utils(struct test *t, int subtest);
+int test__jit_write_elf(struct test *test, int subtest);
 
 bool test__bp_signal_is_supported(void);
 bool test__bp_account_is_supported(void);
tools/perf/util/genelf.c +0 -46
index f9f18b8b1df9..aed49806a09b 100644
@@ -8,15 +8,12 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <getopt.h>
 #include <stddef.h>
 #include <libelf.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <limits.h>
 #include <fcntl.h>
 #include <err.h>
 #ifdef HAVE_DWARF_SUPPORT
@@ -31,8 +28,6 @@
 #define NT_GNU_BUILD_ID 3
 #endif
 
-#define JVMTI
-
 #define BUILD_ID_URANDOM /* different uuid for each run */
 
 #ifdef HAVE_LIBCRYPTO
@@ -511,44 +506,3 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
 
 	return retval;
 }
-
-#ifndef JVMTI
-
-static unsigned char x86_code[] = {
-    0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
-    0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
-    0xCD, 0x80            /* int $0x80 */
-};
-
-static struct options options;
-
-int main(int argc, char **argv)
-{
-	int c, fd, ret;
-
-	while ((c = getopt(argc, argv, "o:h")) != -1) {
-		switch (c) {
-		case 'o':
-			options.output = optarg;
-			break;
-		case 'h':
-			printf("Usage: genelf -o output_file [-h]\n");
-			return 0;
-		default:
-			errx(1, "unknown option");
-		}
-	}
-
-	fd = open(options.output, O_CREAT|O_TRUNC|O_RDWR, 0666);
-	if (fd == -1)
-		err(1, "cannot create file %s", options.output);
-
-	ret = jit_write_elf(fd, "main", x86_code, sizeof(x86_code));
-	close(fd);
-
-	if (ret != 0)
-		unlink(options.output);
-
-	return ret;
-}
-#endif
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Signature · 1 line
- Arnaldo
#2 lore raw

Em Wed, Nov 27, 2019 at 12:23:28PM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 4 lines

Em Tue, Nov 26, 2019 at 03:59:13PM -0800, Ian Rogers escreveu:

Quoted 1 line

Adds a test for minimal jit_write_elf functionality.

Thanks, tested and applied.

Had to apply this to have it built in systems where HAVE_JITDUMP isn't defined:

tools/perf/tests/genelf.c +6 -7
index d392e9300881..28dfd17a6b9f 100644
@@ -17,16 +17,15 @@
 
 #define TEMPL "/tmp/perf-test-XXXXXX"
 
-static unsigned char x86_code[] = {
-	0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
-	0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
-	0xCD, 0x80            /* int $0x80 */
-};
-
 int test__jit_write_elf(struct test *test __maybe_unused,
 			int subtest __maybe_unused)
 {
 #ifdef HAVE_JITDUMP
+	static unsigned char x86_code[] = {
+		0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
+		0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
+		0xCD, 0x80            /* int $0x80 */
+	};
 	char path[PATH_MAX];
 	int fd, ret;
 
@@ -48,6 +47,6 @@ int test__jit_write_elf(struct test *test __maybe_unused,
 
 	return ret ? TEST_FAIL : 0;
 #else
-	return TEST_SKIPPED;
+	return TEST_SKIP;
 #endif
 }
author reviewer
#3 lore raw
Quoted 9 lines · Arnaldo Carvalho de Melo

Em Wed, Nov 27, 2019 at 12:23:28PM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 4 lines

Em Tue, Nov 26, 2019 at 03:59:13PM -0800, Ian Rogers escreveu:

Quoted 1 line

Adds a test for minimal jit_write_elf functionality.

Thanks, tested and applied.

Had to apply this to have it built in systems where HAVE_JITDUMP isn't defined:

Thanks for fixing this!
Ian

Quoted 36 lines
tools/perf/tests/genelf.c +6 -7
index d392e9300881..28dfd17a6b9f 100644
@@ -17,16 +17,15 @@
 
 #define TEMPL "/tmp/perf-test-XXXXXX"
 
-static unsigned char x86_code[] = {
-       0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
-       0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
-       0xCD, 0x80            /* int $0x80 */
-};
-
 int test__jit_write_elf(struct test *test __maybe_unused,
                        int subtest __maybe_unused)
 {
 #ifdef HAVE_JITDUMP
+       static unsigned char x86_code[] = {
+               0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
+               0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
+               0xCD, 0x80            /* int $0x80 */
+       };
        char path[PATH_MAX];
        int fd, ret;
 
@@ -48,6 +47,6 @@ int test__jit_write_elf(struct test *test __maybe_unused,
 
        return ret ? TEST_FAIL : 0;
 #else
-       return TEST_SKIPPED;
+       return TEST_SKIP;
 #endif
 }
#4 lore raw

Em Wed, Nov 27, 2019 at 10:49:29AM -0800, Ian Rogers escreveu:

Quoted 7 lines
Quoted 5 lines · Arnaldo Carvalho de Melo

Em Wed, Nov 27, 2019 at 12:23:28PM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 3 lines

Em Tue, Nov 26, 2019 at 03:59:13PM -0800, Ian Rogers escreveu:

Quoted 1 line

Adds a test for minimal jit_write_elf functionality.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks, tested and applied.

Had to apply this to have it built in systems where HAVE_JITDUMP isn't defined:

Thanks for fixing this!
Ian

This needs some more work, as it is failing in some of the cross build containers, for arches not supported by that genelf.h header, where it should just detect that this feature shouldn't be used, warn the user and build what is possible to build, e.g.:

CC /tmp/build/perf/util/evswitch.o
In file included from tests/genelf.c:15:
tests/../util/genelf.h:42:2: error: #error "unsupported architecture"
42 | #error "unsupported architecture"

      |  ^~~~~
tests/../util/genelf.h:51:5: error: "GEN_ELF_CLASS" is not defined, evaluates to 0 [-Werror=undef]
   51 | #if GEN_ELF_CLASS == ELFCLASS64
      |     ^~~~~~~~~~~~~

cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/tests/.genelf.o.tmp': No such file or directory make[4]: *** [/git/linux/tools/build/Makefile.build:96: /tmp/build/perf/tests/genelf.o] Error 1 make[4]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/util/find_bit.o
CC /tmp/build/perf/util/get_current_dir_name.o

There is some wiring up to do here, related to:
[acme@quaco perf]$ vim tools/perf/Makefile.config [acme@quaco perf]$ find . -type f| xargs grep PERF_HAVE_JITDUMP
grep: ./et: No such file or directory
grep: vi: No such file or directory
^Xgrep: ./perf.data: Permission denied ./tools/perf/arch/x86/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/sparc/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/arm/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/arm64/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/powerpc/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/s390/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/Makefile.config:ifdef PERF_HAVE_JITDUMP ^C
[acme@quaco perf]$

But I'll defer this for later, not to hold what I have too much, after my next pull req I'll revisit this, if you haven't found a fix by then :-)

The current patch is below, with my fixes, and looking at it again it seems its just to replace that HAVE_LIBELF_SUPPORT with HAVE_JITDUMP, will confirm that later, after sending the pull req to Ingo.

- Arnaldo

commit d006842faa9a26feb51b818e02c681f064b83b0a

Author: Ian Rogers <[email protected]>
Date:   Tue Nov 26 15:59:13 2019 -0800

perf jit: Move test functionality in to a test

Adds a test for minimal jit_write_elf functionality.

Committer testing:

# perf test jit
61: Test jit_write_elf : Ok
#

# perf test -v jit
61: Test jit_write_elf :
--- start ---
test child forked, pid 10460
Writing jit code to: /tmp/perf-test-KqxURR
test child finished with 0
---- end ----
Test jit_write_elf: Ok
#

Committer notes:

Fix up the case where HAVE_JITDUMP is no defined.

Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Alexios Zavras <[email protected]>
Cc Allison Randal <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Leo Yan <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Song Liu <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Thomas Gleixner <[email protected]>
tools/perf/tests/Build +1 -0
index a3c595fba943..1692529639b0 100644
@@ -54,6 +54,7 @@ perf-y += unit_number__scnprintf.o
 perf-y += mem2node.o
 perf-y += maps.o
 perf-y += time-utils-test.o
+perf-y += genelf.o
 
 $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
 	$(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
index 7115aa32a51e..970e2ecfb39f 100644
@@ -296,6 +296,10 @@ static struct test generic_tests[] = {
 		.desc = "time utils",
 		.func = test__time_utils,
 	},
+	{
+		.desc = "Test jit_write_elf",
+		.func = test__jit_write_elf,
+	},
 	{
 		.desc = "maps__merge_in",
 		.func = test__maps__merge_in,
tools/perf/tests/genelf.c new file +52 -0

52 lines not on this page · raw message

tools/perf/tests/tests.h +1 -0
index 25aea387e2bf..0e6d67910b0a 100644
@@ -109,6 +109,7 @@ int test__unit_number__scnprint(struct test *test, int subtest);
 int test__mem2node(struct test *t, int subtest);
 int test__maps__merge_in(struct test *t, int subtest);
 int test__time_utils(struct test *t, int subtest);
+int test__jit_write_elf(struct test *test, int subtest);
 
 bool test__bp_signal_is_supported(void);
 bool test__bp_account_is_supported(void);
tools/perf/util/genelf.c +0 -46

67 lines not on this page · raw message

author reviewer
#5 lore raw
Quoted 58 lines · Arnaldo Carvalho de Melo

Em Wed, Nov 27, 2019 at 10:49:29AM -0800, Ian Rogers escreveu:

Quoted 7 lines
Quoted 5 lines · Arnaldo Carvalho de Melo

Em Wed, Nov 27, 2019 at 12:23:28PM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 3 lines

Em Tue, Nov 26, 2019 at 03:59:13PM -0800, Ian Rogers escreveu:

Quoted 1 line

Adds a test for minimal jit_write_elf functionality.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Thanks, tested and applied.

Had to apply this to have it built in systems where HAVE_JITDUMP isn't defined:

Thanks for fixing this!
Ian

This needs some more work, as it is failing in some of the cross build containers, for arches not supported by that genelf.h header, where it should just detect that this feature shouldn't be used, warn the user and build what is possible to build, e.g.:

CC /tmp/build/perf/util/evswitch.o
In file included from tests/genelf.c:15:
tests/../util/genelf.h:42:2: error: #error "unsupported architecture"
42 | #error "unsupported architecture"

      |  ^~~~~
tests/../util/genelf.h:51:5: error: "GEN_ELF_CLASS" is not defined, evaluates to 0 [-Werror=undef]
   51 | #if GEN_ELF_CLASS == ELFCLASS64
      |     ^~~~~~~~~~~~~

cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/tests/.genelf.o.tmp': No such file or directory make[4]: *** [/git/linux/tools/build/Makefile.build:96: /tmp/build/perf/tests/genelf.o] Error 1 make[4]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/util/find_bit.o
CC /tmp/build/perf/util/get_current_dir_name.o

There is some wiring up to do here, related to:
[acme@quaco perf]$ vim tools/perf/Makefile.config [acme@quaco perf]$ find . -type f| xargs grep PERF_HAVE_JITDUMP
grep: ./et: No such file or directory
grep: vi: No such file or directory
^Xgrep: ./perf.data: Permission denied ./tools/perf/arch/x86/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/sparc/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/arm/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/arm64/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/powerpc/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/arch/s390/Makefile:PERF_HAVE_JITDUMP := 1 ./tools/perf/Makefile.config:ifdef PERF_HAVE_JITDUMP ^C
[acme@quaco perf]$

But I'll defer this for later, not to hold what I have too much, after my next pull req I'll revisit this, if you haven't found a fix by then :-)

Quoted 5 lines

The current patch is below, with my fixes, and looking at it again it seems its just to replace that HAVE_LIBELF_SUPPORT with HAVE_JITDUMP, will confirm that later, after sending the pull req to Ingo.

- Arnaldo

Your fix sounds correct, I should work on getting a build test setup. It sounds like you have it covered but if you need me to do anything let me know.

Thanks,
Ian

Quoted 220 lines

commit d006842faa9a26feb51b818e02c681f064b83b0a

Author: Ian Rogers <[email protected]>
Date:   Tue Nov 26 15:59:13 2019 -0800

perf jit: Move test functionality in to a test

Adds a test for minimal jit_write_elf functionality.

Committer testing:

# perf test jit
61: Test jit_write_elf : Ok
#

# perf test -v jit
61: Test jit_write_elf :
--- start ---
test child forked, pid 10460
Writing jit code to: /tmp/perf-test-KqxURR
test child finished with 0
---- end ----
Test jit_write_elf: Ok
#

Committer notes:

Fix up the case where HAVE_JITDUMP is no defined.

Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Alexios Zavras <[email protected]>
Cc Allison Randal <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Leo Yan <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Song Liu <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Thomas Gleixner <[email protected]>
tools/perf/tests/Build +1 -0
index a3c595fba943..1692529639b0 100644
@@ -54,6 +54,7 @@ perf-y += unit_number__scnprintf.o
 perf-y += mem2node.o
 perf-y += maps.o
 perf-y += time-utils-test.o
+perf-y += genelf.o
 
 $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
        $(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
index 7115aa32a51e..970e2ecfb39f 100644
@@ -296,6 +296,10 @@ static struct test generic_tests[] = {
                .desc = "time utils",
                .func = test__time_utils,
        },
+       {
+               .desc = "Test jit_write_elf",
+               .func = test__jit_write_elf,
+       },
        {
                .desc = "maps__merge_in",
                .func = test__maps__merge_in,
tools/perf/tests/genelf.c new file +52 -0
new file mode 100644
index 000000000000..28dfd17a6b9f
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <linux/compiler.h>
+
+#include "debug.h"
+#include "tests.h"
+
+
+#ifdef HAVE_LIBELF_SUPPORT
+#include <libelf.h>
+#include "../util/genelf.h"
+#endif
+
+#define TEMPL "/tmp/perf-test-XXXXXX"
+
+int test__jit_write_elf(struct test *test __maybe_unused,
+                       int subtest __maybe_unused)
+{
+#ifdef HAVE_JITDUMP
+       static unsigned char x86_code[] = {
+               0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
+               0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
+               0xCD, 0x80            /* int $0x80 */
+       };
+       char path[PATH_MAX];
+       int fd, ret;
+
+       strcpy(path, TEMPL);
+
+       fd = mkstemp(path);
+       if (fd < 0) {
+               perror("mkstemp failed");
+               return TEST_FAIL;
+       }
+
+       pr_info("Writing jit code to: %s\n", path);
+
+       ret = jit_write_elf(fd, 0, "main", x86_code, sizeof(x86_code),
+                       NULL, 0, NULL, 0, 0);
+       close(fd);
+
+       unlink(path);
+
+       return ret ? TEST_FAIL : 0;
+#else
+       return TEST_SKIP;
+#endif
+}
tools/perf/tests/tests.h +1 -0
index 25aea387e2bf..0e6d67910b0a 100644
@@ -109,6 +109,7 @@ int test__unit_number__scnprint(struct test *test, int subtest);
 int test__mem2node(struct test *t, int subtest);
 int test__maps__merge_in(struct test *t, int subtest);
 int test__time_utils(struct test *t, int subtest);
+int test__jit_write_elf(struct test *test, int subtest);
 
 bool test__bp_signal_is_supported(void);
 bool test__bp_account_is_supported(void);
tools/perf/util/genelf.c +0 -46
index f9f18b8b1df9..aed49806a09b 100644
@@ -8,15 +8,12 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <getopt.h>
 #include <stddef.h>
 #include <libelf.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <limits.h>
 #include <fcntl.h>
 #include <err.h>
 #ifdef HAVE_DWARF_SUPPORT
@@ -31,8 +28,6 @@
 #define NT_GNU_BUILD_ID 3
 #endif
 
-#define JVMTI
-
 #define BUILD_ID_URANDOM /* different uuid for each run */
 
 #ifdef HAVE_LIBCRYPTO
@@ -511,44 +506,3 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
 
        return retval;
 }
-
-#ifndef JVMTI
-
-static unsigned char x86_code[] = {
-    0xBB, 0x2A, 0x00, 0x00, 0x00, /* movl $42, %ebx */
-    0xB8, 0x01, 0x00, 0x00, 0x00, /* movl $1, %eax */
-    0xCD, 0x80            /* int $0x80 */
-};
-
-static struct options options;
-
-int main(int argc, char **argv)
-{
-       int c, fd, ret;
-
-       while ((c = getopt(argc, argv, "o:h")) != -1) {
-               switch (c) {
-               case 'o':
-                       options.output = optarg;
-                       break;
-               case 'h':
-                       printf("Usage: genelf -o output_file [-h]\n");
-                       return 0;
-               default:
-                       errx(1, "unknown option");
-               }
-       }
-
-       fd = open(options.output, O_CREAT|O_TRUNC|O_RDWR, 0666);
-       if (fd == -1)
-               err(1, "cannot create file %s", options.output);
-
-       ret = jit_write_elf(fd, "main", x86_code, sizeof(x86_code));
-       close(fd);
-
-       if (ret != 0)
-               unlink(options.output);
-
-       return ret;
-}
-#endif
#6 lore raw

Em Mon, Dec 02, 2019 at 09:30:19AM -0800, Ian Rogers escreveu:

Quoted 5 lines

On Thu, Nov 28, 2019 at 5:19 AM Arnaldo Carvalho de Melo

Quoted 3 lines

But I'll defer this for later, not to hold what I have too much, after my next pull req I'll revisit this, if you haven't found a fix by then :-)

Quoted 7 lines
Quoted 3 lines

The current patch is below, with my fixes, and looking at it again it seems its just to replace that HAVE_LIBELF_SUPPORT with HAVE_JITDUMP, will confirm that later, after sending the pull req to Ingo.

Your fix sounds correct, I should work on getting a build test setup. It sounds like you have it covered but if you need me to do anything let me know.

Right, everything seems to be in good shape now and should go Ingo's way soon.

- Arnaldo

merge bot Applied
#7 lore raw

[tip: perf/urgent] perf jit: Move test functionality in to a test

In reply to Ian Rogers
The following commit has been merged into the perf/urgent branch of tip:

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     fa7f7e7354957422b43ea950b672d3e731f27e68
Gitweb:        https://git.kernel.org/tip/fa7f7e7354957422b43ea950b672d3e731f27e68
Author:        Ian Rogers <[email protected]>
AuthorDate:    Tue, 26 Nov 2019 15:59:13 -08:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Fri, 29 Nov 2019 12:20:45 -03:00

perf jit: Move test functionality in to a test

Adds a test for minimal jit_write_elf functionality.

Committer testing:

  # perf test jit
  61: Test jit_write_elf                                    : Ok
  #
  # perf test -v jit
  61: Test jit_write_elf                                    :
  --- start ---
  test child forked, pid 10460
  Writing jit code to: /tmp/perf-test-KqxURR
  test child finished with 0
  ---- end ----
  Test jit_write_elf: Ok
  #

Committer notes:

Fix up the case where HAVE_JITDUMP is no defined.

Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Alexios Zavras <[email protected]>
Cc Allison Randal <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Leo Yan <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Petlan <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Song Liu <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 tools/perf/tests/Build          |  1 +-
 tools/perf/tests/builtin-test.c |  4 +++-
 tools/perf/tests/genelf.c       | 51 ++++++++++++++++++++++++++++++++-
 tools/perf/tests/tests.h        |  1 +-
 tools/perf/util/genelf.c        | 46 +-----------------------------
 5 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 tools/perf/tests/genelf.c
tools/perf/tests/Build +1 -0
index a3c595f..1692529 100644
@@ -54,6 +54,7 @@ perf-y += unit_number__scnprintf.o
 perf-y += mem2node.o
 perf-y += maps.o
 perf-y += time-utils-test.o
+perf-y += genelf.o
 
 $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build
 	$(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
index 82d19a8..5f05db7 100644
@@ -302,6 +302,10 @@ static struct test generic_tests[] = {
 		.func = test__time_utils,
 	},
 	{
+		.desc = "Test jit_write_elf",
+		.func = test__jit_write_elf,
+	},
+	{
 		.desc = "maps__merge_in",
 		.func = test__maps__merge_in,
 	},
tools/perf/tests/genelf.c new file +51 -0

51 lines not on this page · raw message

tools/perf/tests/tests.h +1 -0
index 4f9ae6a..9a160fe 100644
@@ -110,6 +110,7 @@ int test__unit_number__scnprint(struct test *test, int subtest);
 int test__mem2node(struct test *t, int subtest);
 int test__maps__merge_in(struct test *t, int subtest);
 int test__time_utils(struct test *t, int subtest);
+int test__jit_write_elf(struct test *test, int subtest);
 
 bool test__bp_signal_is_supported(void);
 bool test__bp_account_is_supported(void);
tools/perf/util/genelf.c +0 -46

67 lines not on this page · raw message