diff mbox series

[v2,13/33] plugins: Use DisasContextBase for qemu_plugin_insn_haddr

Message ID 20240424233131.988727-14-richard.henderson@linaro.org (mailing list archive)
State New, archived
Headers show
Series accel/tcg: Improve disassembly for target and plugin | expand

Commit Message

Richard Henderson April 24, 2024, 11:31 p.m. UTC
We can delay the computation of haddr until the plugin
actually requests it.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 include/qemu/plugin.h  |  4 ----
 accel/tcg/plugin-gen.c | 20 --------------------
 plugins/api.c          | 25 ++++++++++++++++++++++++-
 3 files changed, 24 insertions(+), 25 deletions(-)

Comments

Philippe Mathieu-Daudé May 13, 2024, 2:18 p.m. UTC | #1
Cc'ing Pierrick & Alex on this last one :)

On 25/4/24 01:31, Richard Henderson wrote:
> We can delay the computation of haddr until the plugin
> actually requests it.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/qemu/plugin.h  |  4 ----
>   accel/tcg/plugin-gen.c | 20 --------------------
>   plugins/api.c          | 25 ++++++++++++++++++++++++-
>   3 files changed, 24 insertions(+), 25 deletions(-)
> 
> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
> index 03081be543..3db0e75d16 100644
> --- a/include/qemu/plugin.h
> +++ b/include/qemu/plugin.h
> @@ -98,7 +98,6 @@ struct qemu_plugin_dyn_cb {
>   /* Internal context for instrumenting an instruction */
>   struct qemu_plugin_insn {
>       uint64_t vaddr;
> -    void *haddr;
>       GArray *insn_cbs;
>       GArray *mem_cbs;
>       uint8_t len;
> @@ -119,9 +118,6 @@ struct qemu_plugin_tb {
>       GPtrArray *insns;
>       size_t n;
>       uint64_t vaddr;
> -    uint64_t vaddr2;
> -    void *haddr1;
> -    void *haddr2;
>   
>       /* if set, the TB calls helpers that might access guest memory */
>       bool mem_helper;
> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
> index a4656859c6..b036773d3c 100644
> --- a/accel/tcg/plugin-gen.c
> +++ b/accel/tcg/plugin-gen.c
> @@ -319,9 +319,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db)
>           ret = true;
>   
>           ptb->vaddr = db->pc_first;
> -        ptb->vaddr2 = -1;
> -        ptb->haddr1 = db->host_addr[0];
> -        ptb->haddr2 = NULL;
>           ptb->mem_helper = false;
>   
>           tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB);
> @@ -363,23 +360,6 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db)
>       pc = db->pc_next;
>       insn->vaddr = pc;
>   
> -    /*
> -     * Detect page crossing to get the new host address.
> -     * Note that we skip this when haddr1 == NULL, e.g. when we're
> -     * fetching instructions from a region not backed by RAM.
> -     */
> -    if (ptb->haddr1 == NULL) {
> -        insn->haddr = NULL;
> -    } else if (is_same_page(db, db->pc_next)) {
> -        insn->haddr = ptb->haddr1 + pc - ptb->vaddr;
> -    } else {
> -        if (ptb->vaddr2 == -1) {
> -            ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first);
> -            get_page_addr_code_hostp(cpu_env(cpu), ptb->vaddr2, &ptb->haddr2);
> -        }
> -        insn->haddr = ptb->haddr2 + pc - ptb->vaddr2;
> -    }
> -
>       tcg_gen_plugin_cb(PLUGIN_GEN_FROM_INSN);
>   }
>   
> diff --git a/plugins/api.c b/plugins/api.c
> index 39895a1cb1..4b6690c7d6 100644
> --- a/plugins/api.c
> +++ b/plugins/api.c
> @@ -242,7 +242,30 @@ uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn)
>   
>   void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn)
>   {
> -    return insn->haddr;
> +    const DisasContextBase *db = tcg_ctx->plugin_db;
> +    vaddr page0_last = db->pc_first | ~TARGET_PAGE_MASK;
> +
> +    if (db->fake_insn) {
> +        return NULL;
> +    }
> +
> +    /*
> +     * ??? The return value is not intended for use of host memory,
> +     * but as a proxy for address space and physical address.
> +     * Thus we are only interested in the first byte and do not
> +     * care about spanning pages.
> +     */
> +    if (insn->vaddr <= page0_last) {
> +        if (db->host_addr[0] == NULL) {
> +            return NULL;
> +        }
> +        return db->host_addr[0] + insn->vaddr - db->pc_first;
> +    } else {
> +        if (db->host_addr[1] == NULL) {
> +            return NULL;
> +        }
> +        return db->host_addr[1] + insn->vaddr - (page0_last + 1);
> +    }
>   }
>   
>   char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn)
Pierrick Bouvier May 13, 2024, 6:16 p.m. UTC | #2
On 4/24/24 16:31, Richard Henderson wrote:
> We can delay the computation of haddr until the plugin
> actually requests it.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/qemu/plugin.h  |  4 ----
>   accel/tcg/plugin-gen.c | 20 --------------------
>   plugins/api.c          | 25 ++++++++++++++++++++++++-
>   3 files changed, 24 insertions(+), 25 deletions(-)
> 
> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
> index 03081be543..3db0e75d16 100644
> --- a/include/qemu/plugin.h
> +++ b/include/qemu/plugin.h
> @@ -98,7 +98,6 @@ struct qemu_plugin_dyn_cb {
>   /* Internal context for instrumenting an instruction */
>   struct qemu_plugin_insn {
>       uint64_t vaddr;
> -    void *haddr;
>       GArray *insn_cbs;
>       GArray *mem_cbs;
>       uint8_t len;
> @@ -119,9 +118,6 @@ struct qemu_plugin_tb {
>       GPtrArray *insns;
>       size_t n;
>       uint64_t vaddr;
> -    uint64_t vaddr2;
> -    void *haddr1;
> -    void *haddr2;
>   
>       /* if set, the TB calls helpers that might access guest memory */
>       bool mem_helper;
> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
> index a4656859c6..b036773d3c 100644
> --- a/accel/tcg/plugin-gen.c
> +++ b/accel/tcg/plugin-gen.c
> @@ -319,9 +319,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db)
>           ret = true;
>   
>           ptb->vaddr = db->pc_first;
> -        ptb->vaddr2 = -1;
> -        ptb->haddr1 = db->host_addr[0];
> -        ptb->haddr2 = NULL;
>           ptb->mem_helper = false;
>   
>           tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB);
> @@ -363,23 +360,6 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db)
>       pc = db->pc_next;
>       insn->vaddr = pc;
>   
> -    /*
> -     * Detect page crossing to get the new host address.
> -     * Note that we skip this when haddr1 == NULL, e.g. when we're
> -     * fetching instructions from a region not backed by RAM.
> -     */
> -    if (ptb->haddr1 == NULL) {
> -        insn->haddr = NULL;
> -    } else if (is_same_page(db, db->pc_next)) {
> -        insn->haddr = ptb->haddr1 + pc - ptb->vaddr;
> -    } else {
> -        if (ptb->vaddr2 == -1) {
> -            ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first);
> -            get_page_addr_code_hostp(cpu_env(cpu), ptb->vaddr2, &ptb->haddr2);
> -        }
> -        insn->haddr = ptb->haddr2 + pc - ptb->vaddr2;
> -    }
> -
>       tcg_gen_plugin_cb(PLUGIN_GEN_FROM_INSN);
>   }
>   
> diff --git a/plugins/api.c b/plugins/api.c
> index 39895a1cb1..4b6690c7d6 100644
> --- a/plugins/api.c
> +++ b/plugins/api.c
> @@ -242,7 +242,30 @@ uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn)
>   
>   void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn)
>   {
> -    return insn->haddr;
> +    const DisasContextBase *db = tcg_ctx->plugin_db;
> +    vaddr page0_last = db->pc_first | ~TARGET_PAGE_MASK;
> +
> +    if (db->fake_insn) {
> +        return NULL;
> +    }
> +
> +    /*
> +     * ??? The return value is not intended for use of host memory,
> +     * but as a proxy for address space and physical address.
> +     * Thus we are only interested in the first byte and do not
> +     * care about spanning pages.
> +     */
> +    if (insn->vaddr <= page0_last) {
> +        if (db->host_addr[0] == NULL) {
> +            return NULL;
> +        }
> +        return db->host_addr[0] + insn->vaddr - db->pc_first;
> +    } else {
> +        if (db->host_addr[1] == NULL) {
> +            return NULL;
> +        }
> +        return db->host_addr[1] + insn->vaddr - (page0_last + 1);
> +    }
>   }
>   
>   char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn)

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff mbox series

Patch

diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index 03081be543..3db0e75d16 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -98,7 +98,6 @@  struct qemu_plugin_dyn_cb {
 /* Internal context for instrumenting an instruction */
 struct qemu_plugin_insn {
     uint64_t vaddr;
-    void *haddr;
     GArray *insn_cbs;
     GArray *mem_cbs;
     uint8_t len;
@@ -119,9 +118,6 @@  struct qemu_plugin_tb {
     GPtrArray *insns;
     size_t n;
     uint64_t vaddr;
-    uint64_t vaddr2;
-    void *haddr1;
-    void *haddr2;
 
     /* if set, the TB calls helpers that might access guest memory */
     bool mem_helper;
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index a4656859c6..b036773d3c 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -319,9 +319,6 @@  bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db)
         ret = true;
 
         ptb->vaddr = db->pc_first;
-        ptb->vaddr2 = -1;
-        ptb->haddr1 = db->host_addr[0];
-        ptb->haddr2 = NULL;
         ptb->mem_helper = false;
 
         tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB);
@@ -363,23 +360,6 @@  void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db)
     pc = db->pc_next;
     insn->vaddr = pc;
 
-    /*
-     * Detect page crossing to get the new host address.
-     * Note that we skip this when haddr1 == NULL, e.g. when we're
-     * fetching instructions from a region not backed by RAM.
-     */
-    if (ptb->haddr1 == NULL) {
-        insn->haddr = NULL;
-    } else if (is_same_page(db, db->pc_next)) {
-        insn->haddr = ptb->haddr1 + pc - ptb->vaddr;
-    } else {
-        if (ptb->vaddr2 == -1) {
-            ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first);
-            get_page_addr_code_hostp(cpu_env(cpu), ptb->vaddr2, &ptb->haddr2);
-        }
-        insn->haddr = ptb->haddr2 + pc - ptb->vaddr2;
-    }
-
     tcg_gen_plugin_cb(PLUGIN_GEN_FROM_INSN);
 }
 
diff --git a/plugins/api.c b/plugins/api.c
index 39895a1cb1..4b6690c7d6 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -242,7 +242,30 @@  uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn)
 
 void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn)
 {
-    return insn->haddr;
+    const DisasContextBase *db = tcg_ctx->plugin_db;
+    vaddr page0_last = db->pc_first | ~TARGET_PAGE_MASK;
+
+    if (db->fake_insn) {
+        return NULL;
+    }
+
+    /*
+     * ??? The return value is not intended for use of host memory,
+     * but as a proxy for address space and physical address.
+     * Thus we are only interested in the first byte and do not
+     * care about spanning pages.
+     */
+    if (insn->vaddr <= page0_last) {
+        if (db->host_addr[0] == NULL) {
+            return NULL;
+        }
+        return db->host_addr[0] + insn->vaddr - db->pc_first;
+    } else {
+        if (db->host_addr[1] == NULL) {
+            return NULL;
+        }
+        return db->host_addr[1] + insn->vaddr - (page0_last + 1);
+    }
 }
 
 char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn)