From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by sourceware.org (Postfix) with ESMTPS id 4EC48386F830 for ; Tue, 21 Apr 2020 13:30:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4EC48386F830 IronPort-SDR: Ommx8HxahUIGU/q9tbokXpET0Gny8KSAxMlny8252n1Jd1Wm5LrM+voJA5oJORkVnySexYVF0T 3L5YYWTXIWag== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 06:30:02 -0700 IronPort-SDR: UyN1MpzG/mu5g4A9vY8wXfXkc4dZDhLRXUh7zlSi8nq9L/7r70TXwApzcFDpo0ZgfMDy1kj19P 3HlX42GyAheQ== X-IronPort-AV: E=Sophos;i="5.72,410,1580803200"; d="scan'208";a="247173636" Received: from labpc7920x-08.iul.intel.com (HELO localhost) ([172.28.49.151]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 06:30:01 -0700 From: Mihails Strasuns To: gdb-patches@sourceware.org Subject: [PATCH v4 5/5] [gdb/testsuite] add jit-elf-util.h and run jit function Date: Tue, 21 Apr 2020 15:31:23 +0200 Message-Id: <20200421133123.21284-6-mihails.strasuns@intel.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200421133123.21284-1-mihails.strasuns@intel.com> References: <167748> <20200421133123.21284-1-mihails.strasuns@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-23.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2020 13:30:05 -0000 Splits ELF related symbols into a separate jit-elf-util.h header and enhances it with a few more. Intention is to make adding new JIT tests possible without repeating most of the common boilerplate. As a test enhancement, jit-elf-main.c now calls the renamed function after registering the jit object and ensures it returns an expected result. gdb/testsuite/ChangeLog: 2020-02-18 Mihails Strasuns * gdb.base/jit-elf-util.h: New header file. * gdb.base/jit-elf-main.c: Use jit-elf-util.h, add a call to the renamed JIT function to verify its result. --- gdb/testsuite/gdb.base/jit-elf-main.c | 56 ++++-------- gdb/testsuite/gdb.base/jit-elf-util.h | 117 ++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 40 deletions(-) create mode 100644 gdb/testsuite/gdb.base/jit-elf-util.h diff --git a/gdb/testsuite/gdb.base/jit-elf-main.c b/gdb/testsuite/gdb.base/jit-elf-main.c index b74212dbf5..b812cb91e5 100644 --- a/gdb/testsuite/gdb.base/jit-elf-main.c +++ b/gdb/testsuite/gdb.base/jit-elf-main.c @@ -30,19 +30,7 @@ #include #include "jit-protocol.h" - -/* ElfW is coming from linux. On other platforms it does not exist. - Let us define it here. */ -#ifndef ElfW -# if (defined (_LP64) || defined (__LP64__)) -# define WORDSIZE 64 -# else -# define WORDSIZE 32 -# endif /* _LP64 || __LP64__ */ -#define ElfW(type) _ElfW (Elf, WORDSIZE, type) -#define _ElfW(e,w,t) _ElfW_1 (e, w, _##t) -#define _ElfW_1(e,w,t) e##w##t -#endif /* !ElfW */ +#include "jit-elf-util.h" static void usage (void) @@ -95,37 +83,19 @@ MAIN (int argc, char *argv[]) for (i = 1; i < argc; ++i) { - struct stat st; - int fd; - - printf ("%s:%d: libname = %s, i = %d\n", __FILE__, __LINE__, argv[i], i); - if ((fd = open (argv[i], O_RDONLY)) == -1) - { - fprintf (stderr, "open (\"%s\", O_RDONLY): %s\n", argv[i], - strerror (errno)); - exit (1); - } + size_t obj_size; + ElfW (Addr) load_addr = LOAD_ADDRESS + (i-1) * LOAD_INCREMENT; + printf("Loading %s as JIT at %p\n", argv[i], (void*) load_addr); + ElfW (Addr) addr = load_elf (argv[i], &obj_size, load_addr); - if (fstat (fd, &st) != 0) - { - fprintf (stderr, "fstat (\"%d\"): %s\n", fd, strerror (errno)); - exit (1); - } - - void* load_addr = (void*) (size_t) (LOAD_ADDRESS + (i - 1) * LOAD_INCREMENT); - const void *const addr = mmap (load_addr, st.st_size, PROT_READ|PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0); - struct jit_code_entry *const entry = calloc (1, sizeof (*entry)); - - if (addr == MAP_FAILED) - { - fprintf (stderr, "mmap: %s\n", strerror (errno)); - exit (1); - } + char name[32]; + sprintf (name, "jit_function_%04d", i); + int (*jit_function) () = (int (*) ()) load_symbol (addr, name); /* Link entry at the end of the list. */ + struct jit_code_entry *const entry = calloc (1, sizeof (*entry)); entry->symfile_addr = (const char *)addr; - entry->symfile_size = st.st_size; + entry->symfile_size = obj_size; entry->prev_entry = __jit_debug_descriptor.relevant_entry; __jit_debug_descriptor.relevant_entry = entry; @@ -137,6 +107,12 @@ MAIN (int argc, char *argv[]) /* Notify GDB. */ __jit_debug_descriptor.action_flag = JIT_REGISTER; __jit_debug_register_code (); + + if (jit_function () != 42) + { + fprintf (stderr, "unexpected return value\n"); + exit (1); + } } WAIT_FOR_GDB; i = 0; /* gdb break here 1 */ diff --git a/gdb/testsuite/gdb.base/jit-elf-util.h b/gdb/testsuite/gdb.base/jit-elf-util.h new file mode 100644 index 0000000000..e48d99f098 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-elf-util.h @@ -0,0 +1,117 @@ +/* This test program is part of GDB, the GNU debugger. + + Copyright 2020 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Simulates loading of JIT code by memory mapping a compiled + shared library binary and doing minimal post-processing. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* ElfW is coming from linux. On other platforms it does not exist. + Let us define it here. */ +#ifndef ElfW +#if (defined(_LP64) || defined(__LP64__)) +#define WORDSIZE 64 +#else +#define WORDSIZE 32 +#endif /* _LP64 || __LP64__ */ +#define ElfW(type) _ElfW (Elf, WORDSIZE, type) +#define _ElfW(e, w, t) _ElfW_1 (e, w, _##t) +#define _ElfW_1(e, w, t) e##w##t +#endif /* !ElfW */ + +/* Find symbol with the name `sym_name`. */ +static ElfW (Addr) +load_symbol (ElfW (Addr) addr, const char *sym_name) +{ + const ElfW (Ehdr) *const ehdr = (ElfW (Ehdr) *) addr; + ElfW (Shdr) *const shdr = (ElfW (Shdr) *) ((char *) addr + ehdr->e_shoff); + + ElfW (Addr) sym_old_addr = 0; + ElfW (Addr) sym_new_addr = 0; + + /* Find `func_name` in symbol_table and adjust it from the addr. */ + + for (int i = 0; i < ehdr->e_shnum; ++i) + { + if (shdr[i].sh_type == SHT_SYMTAB) + { + ElfW (Sym) *symtab = (ElfW (Sym) *) (addr + shdr[i].sh_offset); + ElfW (Sym) *symtab_end + = (ElfW (Sym) *) (addr + shdr[i].sh_offset + shdr[i].sh_size); + char *const strtab + = (char *) (addr + shdr[shdr[i].sh_link].sh_offset); + + for (ElfW (Sym) *p = symtab; p < symtab_end; ++p) + { + const char *s = strtab + p->st_name; + if (strcmp (s, sym_name) == 0) + return p->st_value; + } + } + } + + fprintf (stderr, "symbol '%s' not found\n", sym_name); + exit (1); + return 0; +} + +/* Open an elf binary file and memory map it with execution flag enabled. */ +static ElfW (Addr) +load_elf (const char *libname, size_t *size, ElfW (Addr) load_addr) +{ + int fd; + struct stat st; + + if ((fd = open (libname, O_RDONLY)) == -1) + { + fprintf (stderr, "open (\"%s\", O_RDONLY): %s\n", libname, + strerror (errno)); + exit (1); + } + + if (fstat (fd, &st) != 0) + { + fprintf (stderr, "fstat (\"%d\"): %s\n", fd, strerror (errno)); + exit (1); + } + + void *addr = mmap ((void *) load_addr, st.st_size, + PROT_READ | PROT_WRITE | PROT_EXEC, + load_addr ? MAP_PRIVATE | MAP_FIXED : MAP_PRIVATE, fd, 0); + close (fd); + + if (addr == MAP_FAILED) + { + fprintf (stderr, "mmap: %s\n", strerror (errno)); + exit (1); + } + + if (size != NULL) + *size = st.st_size; + + return (ElfW (Addr)) addr; +} -- 2.26.1 Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Gary Kershaw Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928