[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/50] cputlb: introduce get_page_addr_code_hostp
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v3 12/50] cputlb: introduce get_page_addr_code_hostp |
Date: |
Fri, 14 Jun 2019 18:11:22 +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>
---
accel/tcg/cputlb.c | 14 +++++++++++++-
include/exec/exec-all.h | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 3237ff4def..6a0dc438ff 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1015,7 +1015,8 @@ static bool victim_tlb_hit(CPUArchState *env, size_t
mmu_idx, size_t index,
victim_tlb_hit(env, mmu_idx, index, offsetof(CPUTLBEntry, TY), \
(ADDR) & TARGET_PAGE_MASK)
-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);
@@ -1040,13 +1041,24 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env,
target_ulong addr)
* than a target page, so we must redo the MMU check every insn
* - TLB_MMIO: 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);
+}
+
/* Probe for whether the specified guest write access is permitted.
* If it is not permitted then an exception will be taken in the same
* way as if this were a real write access (and we will not return).
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 8b1c3d5b9d..90045e77c1 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -21,6 +21,7 @@
#define EXEC_ALL_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 */
@@ -492,6 +493,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) {}
@@ -509,6 +530,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
- Re: [Qemu-devel] [PATCH v3 01/50] trace: expand mem_info:size_shift to 3 bits, (continued)
[Qemu-devel] [PATCH v3 04/50] translate-all: use cpu_in_exclusive_work_context() in tb_flush, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 06/50] configure: add --enable-plugins (MOVE TO END), Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 03/50] cpu: introduce cpu_in_exclusive_work_context(), Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 05/50] docs/devel: add plugins.rst design document, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 12/50] cputlb: introduce get_page_addr_code_hostp,
Alex Bennée <=
[Qemu-devel] [PATCH v3 14/50] tcg: add tcg_gen_st_ptr, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 10/50] queue: add QTAILQ_REMOVE_SEVERAL, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 07/50] plugin: add user-facing API, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 09/50] plugin: add implementation of the api, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 08/50] plugin: add core code, Alex Bennée, 2019/06/14
[Qemu-devel] [PATCH v3 49/50] include/exec/cpu-defs.h: fix typo, Alex Bennée, 2019/06/14