diff options
Diffstat (limited to 'accel')
| -rw-r--r-- | accel/tcg/cpu-exec.c | 213 | ||||
| -rw-r--r-- | accel/tcg/debuginfo.c | 96 | ||||
| -rw-r--r-- | accel/tcg/debuginfo.h | 79 | ||||
| -rw-r--r-- | accel/tcg/meson.build | 16 | ||||
| -rw-r--r-- | accel/tcg/perf.c | 386 | ||||
| -rw-r--r-- | accel/tcg/perf.h | 49 | ||||
| -rw-r--r-- | accel/tcg/tb-jmp-cache.h | 8 | ||||
| -rw-r--r-- | accel/tcg/tcg-accel-ops-mttcg.c | 4 | ||||
| -rw-r--r-- | accel/tcg/tcg-accel-ops-rr.c | 4 | ||||
| -rw-r--r-- | accel/tcg/tcg-accel-ops.c | 4 | ||||
| -rw-r--r-- | accel/tcg/tcg-accel-ops.h | 4 | ||||
| -rw-r--r-- | accel/tcg/translate-all.c | 2 |
12 files changed, 110 insertions, 755 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 67eda9865e..977576ca14 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -30,9 +30,6 @@ #include "qemu/rcu.h" #include "exec/log.h" #include "qemu/main-loop.h" -#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY) -#include "hw/i386/apic.h" -#endif #include "sysemu/cpus.h" #include "exec/cpu-all.h" #include "sysemu/cpu-timers.h" @@ -253,43 +250,29 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu, vaddr pc, hash = tb_jmp_cache_hash_func(pc); jc = cpu->tb_jmp_cache; - if (cflags & CF_PCREL) { - /* Use acquire to ensure current load of pc from jc. */ - tb = qatomic_load_acquire(&jc->array[hash].tb); + tb = qatomic_read(&jc->array[hash].tb); + if (likely(tb && + jc->array[hash].pc == pc && + tb->cs_base == cs_base && + tb->flags == flags && + tb_cflags(tb) == cflags)) { + goto hit; + } - if (likely(tb && - jc->array[hash].pc == pc && - tb->cs_base == cs_base && - tb->flags == flags && - tb_cflags(tb) == cflags)) { - return tb; - } - tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags); - if (tb == NULL) { - return NULL; - } - jc->array[hash].pc = pc; - /* Ensure pc is written first. */ - qatomic_store_release(&jc->array[hash].tb, tb); - } else { - /* Use rcu_read to ensure current load of pc from *tb. */ - tb = qatomic_rcu_read(&jc->array[hash].tb); - - if (likely(tb && - tb->pc == pc && - tb->cs_base == cs_base && - tb->flags == flags && - tb_cflags(tb) == cflags)) { - return tb; - } - tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags); - if (tb == NULL) { - return NULL; - } - /* Use the pc value already stored in tb->pc. */ - qatomic_set(&jc->array[hash].tb, tb); + tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags); + if (tb == NULL) { + return NULL; } + jc->array[hash].pc = pc; + qatomic_set(&jc->array[hash].tb, tb); + +hit: + /* + * As long as tb is not NULL, the contents are consistent. Therefore, + * the virtual PC has to match for non-CF_PCREL translations. + */ + assert((tb_cflags(tb) & CF_PCREL) || tb->pc == pc); return tb; } @@ -357,9 +340,9 @@ static bool check_for_breakpoints_slow(CPUState *cpu, vaddr pc, #ifdef CONFIG_USER_ONLY g_assert_not_reached(); #else - CPUClass *cc = CPU_GET_CLASS(cpu); - assert(cc->tcg_ops->debug_check_breakpoint); - match_bp = cc->tcg_ops->debug_check_breakpoint(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; + assert(tcg_ops->debug_check_breakpoint); + match_bp = tcg_ops->debug_check_breakpoint(cpu); #endif } @@ -476,10 +459,11 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit) * counter hit zero); we must restore the guest PC to the address * of the start of the TB. */ - CPUClass *cc = CPU_GET_CLASS(cpu); + CPUClass *cc = cpu->cc; + const TCGCPUOps *tcg_ops = cc->tcg_ops; - if (cc->tcg_ops->synchronize_from_tb) { - cc->tcg_ops->synchronize_from_tb(cpu, last_tb); + if (tcg_ops->synchronize_from_tb) { + tcg_ops->synchronize_from_tb(cpu, last_tb); } else { tcg_debug_assert(!(tb_cflags(last_tb) & CF_PCREL)); assert(cc->set_pc); @@ -511,19 +495,19 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit) static void cpu_exec_enter(CPUState *cpu) { - CPUClass *cc = CPU_GET_CLASS(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; - if (cc->tcg_ops->cpu_exec_enter) { - cc->tcg_ops->cpu_exec_enter(cpu); + if (tcg_ops->cpu_exec_enter) { + tcg_ops->cpu_exec_enter(cpu); } } static void cpu_exec_exit(CPUState *cpu) { - CPUClass *cc = CPU_GET_CLASS(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; - if (cc->tcg_ops->cpu_exec_exit) { - cc->tcg_ops->cpu_exec_exit(cpu); + if (tcg_ops->cpu_exec_exit) { + tcg_ops->cpu_exec_exit(cpu); } } @@ -677,15 +661,11 @@ static inline bool cpu_handle_halt(CPUState *cpu) { #ifndef CONFIG_USER_ONLY if (cpu->halted) { -#if defined(TARGET_I386) - if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { - X86CPU *x86_cpu = X86_CPU(cpu); - bql_lock(); - apic_poll_irq(x86_cpu->apic_state); - cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL); - bql_unlock(); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; + + if (tcg_ops->cpu_exec_halt) { + tcg_ops->cpu_exec_halt(cpu); } -#endif /* TARGET_I386 */ if (!cpu_has_work(cpu)) { return true; } @@ -699,7 +679,7 @@ static inline bool cpu_handle_halt(CPUState *cpu) static inline void cpu_handle_debug_exception(CPUState *cpu) { - CPUClass *cc = CPU_GET_CLASS(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; CPUWatchpoint *wp; if (!cpu->watchpoint_hit) { @@ -708,8 +688,8 @@ static inline void cpu_handle_debug_exception(CPUState *cpu) } } - if (cc->tcg_ops->debug_excp_handler) { - cc->tcg_ops->debug_excp_handler(cpu); + if (tcg_ops->debug_excp_handler) { + tcg_ops->debug_excp_handler(cpu); } } @@ -726,6 +706,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) #endif return false; } + if (cpu->exception_index >= EXCP_INTERRUPT) { /* exit request from the cpu execution loop */ *ret = cpu->exception_index; @@ -734,62 +715,59 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) } cpu->exception_index = -1; return true; - } else { + } + #if defined(CONFIG_USER_ONLY) - /* if user mode only, we simulate a fake exception - which will be handled outside the cpu execution - loop */ + /* + * If user mode only, we simulate a fake exception which will be + * handled outside the cpu execution loop. + */ #if defined(TARGET_I386) - CPUClass *cc = CPU_GET_CLASS(cpu); - cc->tcg_ops->fake_user_interrupt(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; + tcg_ops->fake_user_interrupt(cpu); #endif /* TARGET_I386 */ - *ret = cpu->exception_index; - cpu->exception_index = -1; - return true; + *ret = cpu->exception_index; + cpu->exception_index = -1; + return true; #else - if (replay_exception()) { - CPUClass *cc = CPU_GET_CLASS(cpu); - bql_lock(); - cc->tcg_ops->do_interrupt(cpu); - bql_unlock(); - cpu->exception_index = -1; + if (replay_exception()) { + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; - if (unlikely(cpu->singlestep_enabled)) { - /* - * After processing the exception, ensure an EXCP_DEBUG is - * raised when single-stepping so that GDB doesn't miss the - * next instruction. - */ - *ret = EXCP_DEBUG; - cpu_handle_debug_exception(cpu); - return true; - } - } else if (!replay_has_interrupt()) { - /* give a chance to iothread in replay mode */ - *ret = EXCP_INTERRUPT; + bql_lock(); + tcg_ops->do_interrupt(cpu); + bql_unlock(); + cpu->exception_index = -1; + + if (unlikely(cpu->singlestep_enabled)) { + /* + * After processing the exception, ensure an EXCP_DEBUG is + * raised when single-stepping so that GDB doesn't miss the + * next instruction. + */ + *ret = EXCP_DEBUG; + cpu_handle_debug_exception(cpu); return true; } -#endif + } else if (!replay_has_interrupt()) { + /* give a chance to iothread in replay mode */ + *ret = EXCP_INTERRUPT; + return true; } +#endif return false; } -#ifndef CONFIG_USER_ONLY -/* - * CPU_INTERRUPT_POLL is a virtual event which gets converted into a - * "real" interrupt event later. It does not need to be recorded for - * replay purposes. - */ -static inline bool need_replay_interrupt(int interrupt_request) +static inline bool icount_exit_request(CPUState *cpu) { -#if defined(TARGET_I386) - return !(interrupt_request & CPU_INTERRUPT_POLL); -#else - return true; -#endif + if (!icount_enabled()) { + return false; + } + if (cpu->cflags_next_tb != -1 && !(cpu->cflags_next_tb & CF_USE_ICOUNT)) { + return false; + } + return cpu->neg.icount_decr.u16.low + cpu->icount_extra == 0; } -#endif /* !CONFIG_USER_ONLY */ static inline bool cpu_handle_interrupt(CPUState *cpu, TranslationBlock **last_tb) @@ -859,11 +837,12 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, True when it is, and we should restart on a new TB, and via longjmp via cpu_loop_exit. */ else { - CPUClass *cc = CPU_GET_CLASS(cpu); + const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops; - if (cc->tcg_ops->cpu_exec_interrupt && - cc->tcg_ops->cpu_exec_interrupt(cpu, interrupt_request)) { - if (need_replay_interrupt(interrupt_request)) { + if (tcg_ops->cpu_exec_interrupt && + tcg_ops->cpu_exec_interrupt(cpu, interrupt_request)) { + if (!tcg_ops->need_replay_interrupt || + tcg_ops->need_replay_interrupt(interrupt_request)) { replay_interrupt(); } /* @@ -896,10 +875,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, } /* Finally, check if we need to exit to the main loop. */ - if (unlikely(qatomic_read(&cpu->exit_request)) - || (icount_enabled() - && (cpu->cflags_next_tb == -1 || cpu->cflags_next_tb & CF_USE_ICOUNT) - && cpu->neg.icount_decr.u16.low + cpu->icount_extra == 0)) { + if (unlikely(qatomic_read(&cpu->exit_request)) || icount_exit_request(cpu)) { qatomic_set(&cpu->exit_request, 0); if (cpu->exception_index == -1) { cpu->exception_index = EXCP_INTERRUPT; @@ -1012,14 +988,8 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) */ h = tb_jmp_cache_hash_func(pc); jc = cpu->tb_jmp_cache; - if (cflags & CF_PCREL) { - jc->array[h].pc = pc; - /* Ensure pc is written first. */ - qatomic_store_release(&jc->array[h].tb, tb); - } else { - /* Use the pc value already stored in tb->pc. */ - qatomic_set(&jc->array[h].tb, tb); - } + jc->array[h].pc = pc; + qatomic_set(&jc->array[h].tb, tb); } #ifndef CONFIG_USER_ONLY @@ -1070,7 +1040,7 @@ int cpu_exec(CPUState *cpu) return EXCP_HALTED; } - rcu_read_lock(); + RCU_READ_LOCK_GUARD(); cpu_exec_enter(cpu); /* @@ -1084,18 +1054,15 @@ int cpu_exec(CPUState *cpu) ret = cpu_exec_setjmp(cpu, &sc); cpu_exec_exit(cpu); - rcu_read_unlock(); - return ret; } bool tcg_exec_realizefn(CPUState *cpu, Error **errp) { static bool tcg_target_initialized; - CPUClass *cc = CPU_GET_CLASS(cpu); if (!tcg_target_initialized) { - cc->tcg_ops->initialize(); + cpu->cc->tcg_ops->initialize(); tcg_target_initialized = true; } diff --git a/accel/tcg/debuginfo.c b/accel/tcg/debuginfo.c deleted file mode 100644 index 71c66d04d1..0000000000 --- a/accel/tcg/debuginfo.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Debug information support. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "qemu/lockable.h" - -#include <elfutils/libdwfl.h> - -#include "debuginfo.h" - -static QemuMutex lock; -static Dwfl *dwfl; -static const Dwfl_Callbacks dwfl_callbacks = { - .find_elf = NULL, - .find_debuginfo = dwfl_standard_find_debuginfo, - .section_address = NULL, - .debuginfo_path = NULL, -}; - -__attribute__((constructor)) -static void debuginfo_init(void) -{ - qemu_mutex_init(&lock); -} - -void debuginfo_report_elf(const char *name, int fd, uint64_t bias) -{ - QEMU_LOCK_GUARD(&lock); - - if (dwfl) { - dwfl_report_begin_add(dwfl); - } else { - dwfl = dwfl_begin(&dwfl_callbacks); - } - - if (dwfl) { - dwfl_report_elf(dwfl, name, name, fd, bias, true); - dwfl_report_end(dwfl, NULL, NULL); - } -} - -void debuginfo_lock(void) -{ - qemu_mutex_lock(&lock); -} - -void debuginfo_query(struct debuginfo_query *q, size_t n) -{ - const char *symbol, *file; - Dwfl_Module *dwfl_module; - Dwfl_Line *dwfl_line; - GElf_Off dwfl_offset; - GElf_Sym dwfl_sym; - size_t i; - int line; - - if (!dwfl) { - return; - } - - for (i = 0; i < n; i++) { - dwfl_module = dwfl_addrmodule(dwfl, q[i].address); - if (!dwfl_module) { - continue; - } - - if (q[i].flags & DEBUGINFO_SYMBOL) { - symbol = dwfl_module_addrinfo(dwfl_module, q[i].address, - &dwfl_offset, &dwfl_sym, - NULL, NULL, NULL); - if (symbol) { - q[i].symbol = symbol; - q[i].offset = dwfl_offset; - } - } - - if (q[i].flags & DEBUGINFO_LINE) { - dwfl_line = dwfl_module_getsrc(dwfl_module, q[i].address); - if (dwfl_line) { - file = dwfl_lineinfo(dwfl_line, NULL, &line, 0, NULL, NULL); - if (file) { - q[i].file = file; - q[i].line = line; - } - } - } - } -} - -void debuginfo_unlock(void) -{ - qemu_mutex_unlock(&lock); -} diff --git a/accel/tcg/debuginfo.h b/accel/tcg/debuginfo.h deleted file mode 100644 index f064e1c144..0000000000 --- a/accel/tcg/debuginfo.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Debug information support. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef ACCEL_TCG_DEBUGINFO_H -#define ACCEL_TCG_DEBUGINFO_H - -#include "qemu/bitops.h" - -/* - * Debuginfo describing a certain address. - */ -struct debuginfo_query { - uint64_t address; /* Input: address. */ - int flags; /* Input: debuginfo subset. */ - const char *symbol; /* Symbol that the address is part of. */ - uint64_t offset; /* Offset from the symbol. */ - const char *file; /* Source file associated with the address. */ - int line; /* Line number in the source file. */ -}; - -/* - * Debuginfo subsets. - */ -#define DEBUGINFO_SYMBOL BIT(1) -#define DEBUGINFO_LINE BIT(2) - -#if defined(CONFIG_TCG) && defined(CONFIG_LIBDW) -/* - * Load debuginfo for the specified guest ELF image. - * Return true on success, false on failure. - */ -void debuginfo_report_elf(const char *name, int fd, uint64_t bias); - -/* - * Take the debuginfo lock. - */ -void debuginfo_lock(void); - -/* - * Fill each on N Qs with the debuginfo about Q->ADDRESS as specified by - * Q->FLAGS: - * - * - DEBUGINFO_SYMBOL: update Q->SYMBOL and Q->OFFSET. If symbol debuginfo is - * missing, then leave them as is. - * - DEBUINFO_LINE: update Q->FILE and Q->LINE. If line debuginfo is missing, - * then leave them as is. - * - * This function must be called under the debuginfo lock. The results can be - * accessed only until the debuginfo lock is released. - */ -void debuginfo_query(struct debuginfo_query *q, size_t n); - -/* - * Release the debuginfo lock. - */ -void debuginfo_unlock(void); -#else -static inline void debuginfo_report_elf(const char *image_name, int image_fd, - uint64_t load_bias) -{ -} - -static inline void debuginfo_lock(void) -{ -} - -static inline void debuginfo_query(struct debuginfo_query *q, size_t n) -{ -} - -static inline void debuginfo_unlock(void) -{ -} -#endif - -#endif diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index c15ac9ac8f..aef80de967 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -1,8 +1,8 @@ -tcg_ss = ss.source_set() common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cpu-exec-common.c', )) -tcg_ss.add(files( +tcg_specific_ss = ss.source_set() +tcg_specific_ss.add(files( 'tcg-all.c', 'cpu-exec.c', 'tb-maint.c', @@ -11,16 +11,12 @@ tcg_ss.add(files( 'translate-all.c', 'translator.c', )) -tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) -tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) +tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) +tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) if get_option('plugins') - tcg_ss.add(files('plugin-gen.c')) + tcg_specific_ss.add(files('plugin-gen.c')) endif -tcg_ss.add(when: libdw, if_true: files('debuginfo.c')) -if host_os == 'linux' - tcg_ss.add(files('perf.c')) -endif -specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) +specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( 'cputlb.c', diff --git a/accel/tcg/perf.c b/accel/tcg/perf.c deleted file mode 100644 index cd1aa99a7e..0000000000 --- a/accel/tcg/perf.c +++ /dev/null @@ -1,386 +0,0 @@ -/* - * Linux perf perf-<pid>.map and jit-<pid>.dump integration. - * - * The jitdump spec can be found at [1]. - * - * [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/tools/perf/Documentation/jitdump-specification.txt - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "elf.h" -#include "exec/exec-all.h" -#include "qemu/timer.h" -#include "tcg/tcg.h" - -#include "debuginfo.h" -#include "perf.h" - -static FILE *safe_fopen_w(const char *path) -{ - int saved_errno; - FILE *f; - int fd; - - /* Delete the old file, if any. */ - unlink(path); - - /* Avoid symlink attacks by using O_CREAT | O_EXCL. */ - fd = open(path, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - if (fd == -1) { - return NULL; - } - - /* Convert fd to FILE*. */ - f = fdopen(fd, "w"); - if (f == NULL) { - saved_errno = errno; - close(fd); - errno = saved_errno; - return NULL; - } - - return f; -} - -static FILE *perfmap; - -void perf_enable_perfmap(void) -{ - char map_file[32]; - - snprintf(map_file, sizeof(map_file), "/tmp/perf-%d.map", getpid()); - perfmap = safe_fopen_w(map_file); - if (perfmap == NULL) { - warn_report("Could not open %s: %s, proceeding without perfmap", - map_file, strerror(errno)); - } -} - -/* Get PC and size of code JITed for guest instruction #INSN. */ -static void get_host_pc_size(uintptr_t *host_pc, uint16_t *host_size, - const void *start, size_t insn) -{ - uint16_t start_off = insn ? tcg_ctx->gen_insn_end_off[insn - 1] : 0; - - if (host_pc) { - *host_pc = (uintptr_t)start + start_off; - } - if (host_size) { - *host_size = tcg_ctx->gen_insn_end_off[insn] - start_off; - } -} - -static const char *pretty_symbol(const struct debuginfo_query *q, size_t *len) -{ - static __thread char buf[64]; - int tmp; - - if (!q->symbol) { - tmp = snprintf(buf, sizeof(buf), "guest-0x%"PRIx64, q->address); - if (len) { - *len = MIN(tmp + 1, sizeof(buf)); - } - return buf; - } - - if (!q->offset) { - if (len) { - *len = strlen(q->symbol) + 1; - } - return q->symbol; - } - - tmp = snprintf(buf, sizeof(buf), "%s+0x%"PRIx64, q->symbol, q->offset); - if (len) { - *len = MIN(tmp + 1, sizeof(buf)); - } - return buf; -} - -static void write_perfmap_entry(const void *start, size_t insn, - const struct debuginfo_query *q) -{ - uint16_t host_size; - uintptr_t host_pc; - - get_host_pc_size(&host_pc, &host_size, start, insn); - fprintf(perfmap, "%"PRIxPTR" %"PRIx16" %s\n", - host_pc, host_size, pretty_symbol(q, NULL)); -} - -static FILE *jitdump; -static size_t perf_marker_size; -static void *perf_marker = MAP_FAILED; - -#define JITHEADER_MAGIC 0x4A695444 -#define JITHEADER_VERSION 1 - -struct jitheader { - uint32_t magic; - uint32_t version; - uint32_t total_size; - uint32_t elf_mach; - uint32_t pad1; - uint32_t pid; - uint64_t timestamp; - uint64_t flags; -}; - -enum jit_record_type { - JIT_CODE_LOAD = 0, - JIT_CODE_DEBUG_INFO = 2, -}; - -struct jr_prefix { - uint32_t id; - uint32_t total_size; - uint64_t timestamp; -}; - -struct jr_code_load { - struct jr_prefix p; - - uint32_t pid; - uint32_t tid; - uint64_t vma; - uint64_t code_addr; - uint64_t code_size; - uint64_t code_index; -}; - -struct debug_entry { - uint64_t addr; - int lineno; - int discrim; - const char name[]; -}; - -struct jr_code_debug_info { - struct jr_prefix p; - - uint64_t code_addr; - uint64_t nr_entry; - struct debug_entry entries[]; -}; - -static uint32_t get_e_machine(void) -{ - Elf64_Ehdr elf_header; - FILE *exe; - size_t n; - - QEMU_BUILD_BUG_ON(offsetof(Elf32_Ehdr, e_machine) != - offsetof(Elf64_Ehdr, e_machine)); - - exe = fopen("/proc/self/exe", "r"); - if (exe == NULL) { - return EM_NONE; - } - - n = fread(&elf_header, sizeof(elf_header), 1, exe); - fclose(exe); - if (n != 1) { - return EM_NONE; - } - - return elf_header.e_machine; -} - -void perf_enable_jitdump(void) -{ - struct jitheader header; - char jitdump_file[32]; - - if (!use_rt_clock) { - warn_report("CLOCK_MONOTONIC is not available, proceeding without jitdump"); - return; - } - - snprintf(jitdump_file, sizeof(jitdump_file), "jit-%d.dump", getpid()); - jitdump = safe_fopen_w(jitdump_file); - if (jitdump == NULL) { - warn_report("Could not open %s: %s, proceeding without jitdump", - jitdump_file, strerror(errno)); - return; - } - - /* - * `perf inject` will see that the mapped file name in the corresponding - * PERF_RECORD_MMAP or PERF_RECORD_MMAP2 event is of the form jit-%d.dump - * and will process it as a jitdump file. - */ - perf_marker_size = qemu_real_host_page_size(); - perf_marker = mmap(NULL, perf_marker_size, PROT_READ | PROT_EXEC, - MAP_PRIVATE, fileno(jitdump), 0); - if (perf_marker == MAP_FAILED) { - warn_report("Could not map %s: %s, proceeding without jitdump", - jitdump_file, strerror(errno)); - fclose(jitdump); - jitdump = NULL; - return; - } - - header.magic = JITHEADER_MAGIC; - header.version = JITHEADER_VERSION; - header.total_size = sizeof(header); - header.elf_mach = get_e_machine(); - header.pad1 = 0; - header.pid = getpid(); - header.timestamp = get_clock(); - header.flags = 0; - fwrite(&header, sizeof(header), 1, jitdump); -} - -void perf_report_prologue(const void *start, size_t size) -{ - if (perfmap) { - fprintf(perfmap, "%"PRIxPTR" %zx tcg-prologue-buffer\n", - (uintptr_t)start, size); - } -} - -/* Write a JIT_CODE_DEBUG_INFO jitdump entry. */ -static void write_jr_code_debug_info(const void *start, - const struct debuginfo_query *q, - size_t icount) -{ - struct jr_code_debug_info rec; - struct debug_entry ent; - uintptr_t host_pc; - int insn; - - /* Write the header. */ - rec.p.id = JIT_CODE_DEBUG_INFO; - rec.p.total_size = sizeof(rec) + sizeof(ent) + 1; - rec.p.timestamp = get_clock(); - rec.code_addr = (uintptr_t)start; - rec.nr_entry = 1; - for (insn = 0; insn < icount; insn++) { - if (q[insn].file) { - rec.p.total_size += sizeof(ent) + strlen(q[insn].file) + 1; - rec.nr_entry++; - } - } - fwrite(&rec, sizeof(rec), 1, jitdump); - - /* Write the main debug entries. */ - for (insn = 0; insn < icount; insn++) { - if (q[insn].file) { - get_host_pc_size(&host_pc, NULL, start, insn); - ent.addr = host_pc; - ent.lineno = q[insn].line; - ent.discrim = 0; - fwrite(&ent, sizeof(ent), 1, jitdump); - fwrite(q[insn].file, strlen(q[insn].file) + 1, 1, jitdump); - } - } - - /* Write the trailing debug_entry. */ - ent.addr = (uintptr_t)start + tcg_ctx->gen_insn_end_off[icount - 1]; - ent.lineno = 0; - ent.discrim = 0; - fwrite(&ent, sizeof(ent), 1, jitdump); - fwrite("", 1, 1, jitdump); -} - -/* Write a JIT_CODE_LOAD jitdump entry. */ -static void write_jr_code_load(const void *start, uint16_t host_size, - const struct debuginfo_query *q) -{ - static uint64_t code_index; - struct jr_code_load rec; - const char *symbol; - size_t symbol_size; - - symbol = pretty_symbol(q, &symbol_size); - rec.p.id = JIT_CODE_LOAD; - rec.p.total_size = sizeof(rec) + symbol_size + host_size; - rec.p.timestamp = get_clock(); - rec.pid = getpid(); - rec.tid = qemu_get_thread_id(); - rec.vma = (uintptr_t)start; - rec.code_addr = (uintptr_t)start; - rec.code_size = host_size; - rec.code_index = code_index++; - fwrite(&rec, sizeof(rec), 1, jitdump); - fwrite(symbol, symbol_size, 1, jitdump); - fwrite(start, host_size, 1, jitdump); -} - -void perf_report_code(uint64_t guest_pc, TranslationBlock *tb, - const void *start) -{ - struct debuginfo_query *q; - size_t insn, start_words; - uint64_t *gen_insn_data; - - if (!perfmap && !jitdump) { - return; - } - - q = g_try_malloc0_n(tb->icount, sizeof(*q)); - if (!q) { - return; - } - - debuginfo_lock(); - - /* Query debuginfo for each guest instruction. */ - gen_insn_data = tcg_ctx->gen_insn_data; - start_words = tcg_ctx->insn_start_words; - - for (insn = 0; insn < tb->icount; insn++) { - /* FIXME: This replicates the restore_state_to_opc() logic. */ - q[insn].address = gen_insn_data[insn * start_words + 0]; - if (tb_cflags(tb) & CF_PCREL) { - q[insn].address |= (guest_pc & TARGET_PAGE_MASK); - } else { -#if defined(TARGET_I386) - q[insn].address -= tb->cs_base; -#endif - } - q[insn].flags = DEBUGINFO_SYMBOL | (jitdump ? DEBUGINFO_LINE : 0); - } - debuginfo_query(q, tb->icount); - - /* Emit perfmap entries if needed. */ - if (perfmap) { - flockfile(perfmap); - for (insn = 0; insn < tb->icount; insn++) { - write_perfmap_entry(start, insn, &q[insn]); - } - funlockfile(perfmap); - } - - /* Emit jitdump entries if needed. */ - if (jitdump) { - flockfile(jitdump); - write_jr_code_debug_info(start, q, tb->icount); - write_jr_code_load(start, tcg_ctx->gen_insn_end_off[tb->icount - 1], - q); - funlockfile(jitdump); - } - - debuginfo_unlock(); - g_free(q); -} - -void perf_exit(void) -{ - if (perfmap) { - fclose(perfmap); - perfmap = NULL; - } - - if (perf_marker != MAP_FAILED) { - munmap(perf_marker, perf_marker_size); - perf_marker = MAP_FAILED; - } - - if (jitdump) { - fclose(jitdump); - jitdump = NULL; - } -} diff --git a/accel/tcg/perf.h b/accel/tcg/perf.h deleted file mode 100644 index f92dd52c69..0000000000 --- a/accel/tcg/perf.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Linux perf perf-<pid>.map and jit-<pid>.dump integration. - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef ACCEL_TCG_PERF_H -#define ACCEL_TCG_PERF_H - -#if defined(CONFIG_TCG) && defined(CONFIG_LINUX) -/* Start writing perf-<pid>.map. */ -void perf_enable_perfmap(void); - -/* Start writing jit-<pid>.dump. */ -void perf_enable_jitdump(void); - -/* Add information about TCG prologue to profiler maps. */ -void perf_report_prologue(const void *start, size_t size); - -/* Add information about JITted guest code to profiler maps. */ -void perf_report_code(uint64_t guest_pc, TranslationBlock *tb, - const void *start); - -/* Stop writing perf-<pid>.map and/or jit-<pid>.dump. */ -void perf_exit(void); -#else -static inline void perf_enable_perfmap(void) -{ -} - -static inline void perf_enable_jitdump(void) -{ -} - -static inline void perf_report_prologue(const void *start, size_t size) -{ -} - -static inline void perf_report_code(uint64_t guest_pc, TranslationBlock *tb, - const void *start) -{ -} - -static inline void perf_exit(void) -{ -} -#endif - -#endif diff --git a/accel/tcg/tb-jmp-cache.h b/accel/tcg/tb-jmp-cache.h index bb424c8a05..4ab8553afc 100644 --- a/accel/tcg/tb-jmp-cache.h +++ b/accel/tcg/tb-jmp-cache.h @@ -13,9 +13,11 @@ #define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS) /* - * Accessed in parallel; all accesses to 'tb' must be atomic. - * For CF_PCREL, accesses to 'pc' must be protected by a - * load_acquire/store_release to 'tb'. + * Invalidated in parallel; all accesses to 'tb' must be atomic. + * A valid entry is read/written by a single CPU, therefore there is + * no need for qatomic_rcu_read() and pc is always consistent with a + * non-NULL value of 'tb'. Strictly speaking pc is only needed for + * CF_PCREL, but it's used always for simplicity. */ struct CPUJumpCache { struct rcu_head rcu; diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c index af7307013a..c552b45b8e 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -92,7 +92,7 @@ static void *mttcg_cpu_thread_fn(void *arg) if (cpu_can_run(cpu)) { int r; bql_unlock(); - r = tcg_cpus_exec(cpu); + r = tcg_cpu_exec(cpu); bql_lock(); switch (r) { case EXCP_DEBUG: @@ -118,7 +118,7 @@ static void *mttcg_cpu_thread_fn(void *arg) qemu_wait_io_event(cpu); } while (!cpu->unplug || cpu_can_run(cpu)); - tcg_cpus_destroy(cpu); + tcg_cpu_destroy(cpu); bql_unlock(); rcu_remove_force_rcu_notifier(&force_rcu.notifier); rcu_unregister_thread(); diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index 3208035d85..894e73e52c 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -131,7 +131,7 @@ static void rr_deal_with_unplugged_cpus(void) CPU_FOREACH(cpu) { if (cpu->unplug && !cpu_can_run(cpu)) { - tcg_cpus_destroy(cpu); + tcg_cpu_destroy(cpu); break; } } @@ -258,7 +258,7 @@ static void *rr_cpu_thread_fn(void *arg) if (icount_enabled()) { icount_prepare_for_run(cpu, cpu_budget); } - r = tcg_cpus_exec(cpu); + r = tcg_cpu_exec(cpu); if (icount_enabled()) { icount_process_data(cpu); } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 813065c0ec..9c957f421c 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -63,12 +63,12 @@ void tcg_cpu_init_cflags(CPUState *cpu, bool parallel) cpu->tcg_cflags |= cflags; } -void tcg_cpus_destroy(CPUState *cpu) +void tcg_cpu_destroy(CPUState *cpu) { cpu_thread_signal_destroyed(cpu); } -int tcg_cpus_exec(CPUState *cpu) +int tcg_cpu_exec(CPUState *cpu) { int ret; assert(tcg_enabled()); diff --git a/accel/tcg/tcg-accel-ops.h b/accel/tcg/tcg-accel-ops.h index f9bc6330e2..44c4079972 100644 --- a/accel/tcg/tcg-accel-ops.h +++ b/accel/tcg/tcg-accel-ops.h @@ -14,8 +14,8 @@ #include "sysemu/cpus.h" -void tcg_cpus_destroy(CPUState *cpu); -int tcg_cpus_exec(CPUState *cpu); +void tcg_cpu_destroy(CPUState *cpu); +int tcg_cpu_exec(CPUState *cpu); void tcg_handle_interrupt(CPUState *cpu, int mask); void tcg_cpu_init_cflags(CPUState *cpu, bool parallel); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 1737bb3da5..1c695efe02 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -63,7 +63,7 @@ #include "tb-context.h" #include "internal-common.h" #include "internal-target.h" -#include "perf.h" +#include "tcg/perf.h" #include "tcg/insn-start-words.h" TBContext tb_ctx; |