[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 27/73] cputlb: introduce get_page_addr_code_hostp
From: |
Alex Bennée |
Subject: |
[PULL v2 27/73] cputlb: introduce get_page_addr_code_hostp |
Date: |
Fri, 25 Oct 2019 07:36:27 +0100 |
From: "Emilio G. Cota" <address@hidden>
This will be used by plugins to get the host address
of instructions.
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index a8f90695823..82a5783a2bc 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1051,7 +1051,8 @@ static bool victim_tlb_hit(CPUArchState *env, size_t
mmu_idx, size_t index,
* NOTE: This function will trigger an exception if the page is
* not executable.
*/
-tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)
+tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr,
+ void **hostp)
{
uintptr_t mmu_idx = cpu_mmu_index(env, true);
uintptr_t index = tlb_index(env, mmu_idx, addr);
@@ -1077,13 +1078,24 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env,
target_ulong addr)
if (unlikely(entry->addr_code & TLB_MMIO)) {
/* The region is not backed by RAM. */
+ if (hostp) {
+ *hostp = NULL;
+ }
return -1;
}
p = (void *)((uintptr_t)addr + entry->addend);
+ if (hostp) {
+ *hostp = p;
+ }
return qemu_ram_addr_from_host_nofail(p);
}
+tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr)
+{
+ return get_page_addr_code_hostp(env, addr, NULL);
+}
+
static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size,
CPUIOTLBEntry *iotlbentry, uintptr_t retaddr)
{
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index e4206cb1735..eadcf29d0c4 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -22,6 +22,7 @@
#include "cpu.h"
#include "exec/tb-context.h"
+#include "exec/cpu_ldst.h"
#include "sysemu/cpus.h"
/* allow to see translation results - the slowdown should be negligible, so we
leave it */
@@ -516,6 +517,26 @@ static inline tb_page_addr_t
get_page_addr_code(CPUArchState *env,
{
return addr;
}
+
+/**
+ * get_page_addr_code_hostp() - user-mode version
+ * @env: CPUArchState
+ * @addr: guest virtual address of guest code
+ *
+ * Returns @addr.
+ *
+ * If @hostp is non-NULL, sets *@hostp to the host address where @addr's
content
+ * is kept.
+ */
+static inline tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env,
+ target_ulong addr,
+ void **hostp)
+{
+ if (hostp) {
+ *hostp = g2h(addr);
+ }
+ return addr;
+}
#else
static inline void mmap_lock(void) {}
static inline void mmap_unlock(void) {}
@@ -533,6 +554,23 @@ static inline void mmap_unlock(void) {}
*/
tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr);
+/**
+ * get_page_addr_code_hostp() - full-system version
+ * @env: CPUArchState
+ * @addr: guest virtual address of guest code
+ *
+ * See get_page_addr_code() (full-system version) for documentation on the
+ * return value.
+ *
+ * Sets *@hostp (when @hostp is non-NULL) as follows.
+ * If the return value is -1, sets *@hostp to NULL. Otherwise, sets *@hostp
+ * to the host address where @addr's content is kept.
+ *
+ * Note: this function can trigger an exception.
+ */
+tb_page_addr_t get_page_addr_code_hostp(CPUArchState *env, target_ulong addr,
+ void **hostp);
+
void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length);
void tlb_set_dirty(CPUState *cpu, target_ulong vaddr);
--
2.20.1
- [PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH, (continued)
- [PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH, Alex Bennée, 2019/10/25
- [PULL v2 46/73] target/alpha: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 35/73] *-user: plugin syscalls, Alex Bennée, 2019/10/25
- [PULL v2 67/73] tests/plugin: add hotpages to analyse memory access patterns, Alex Bennée, 2019/10/25
- [PULL v2 34/73] *-user: notify plugin of exit, Alex Bennée, 2019/10/25
- [PULL v2 45/73] target/m68k: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 48/73] target/sparc: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 32/73] plugins: implement helpers for resolving hwaddr, Alex Bennée, 2019/10/25
- [PULL v2 41/73] target/ppc: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 37/73] plugin-gen: add plugin_insn_append, Alex Bennée, 2019/10/25
- [PULL v2 27/73] cputlb: introduce get_page_addr_code_hostp,
Alex Bennée <=
- [PULL v2 70/73] .travis.yml: add --enable-plugins tests, Alex Bennée, 2019/10/25
- [PULL v2 63/73] tests/tcg: drop test-i386-fprem from TESTS when not SLOW, Alex Bennée, 2019/10/25
- [PULL v2 31/73] tcg: let plugins instrument virtual memory accesses, Alex Bennée, 2019/10/25
- [PULL v2 43/73] target/i386: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 42/73] target/sh4: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 44/73] target/hppa: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 64/73] tests/tcg: enable plugin testing, Alex Bennée, 2019/10/25
- [PULL v2 14/73] travis.yml: --enable-debug-tcg to check-tcg, Alex Bennée, 2019/10/25
- [PULL v2 33/73] translate-all: notify plugin code of tb_flush, Alex Bennée, 2019/10/25
- [PULL v2 66/73] tests/plugin: add instruction execution breakdown, Alex Bennée, 2019/10/25