qmp: Add 'memtranslate' QMP command
PATCH 1/1 qmp: Add 'memtranslate' QMP command
This commit adds a new QMP/HMP command memtranslate, which translates a virtual address to a physical address using the guest's MMU.
This uses the same mechanism that [p]memsave does to perform the translation.
This commit also fixes a long standing issue of [p]memsave not properly handling higher-half virtual addresses correctly, namely when used over QMP/the monitor. The use and assumption of signed integers caused issues when parsing otherwise valid virtual addresses that instead caused signed integer overflow or ERANGE errors.
--- docs/devel/loads-stores.rst | 11 ++ hmp-commands.hx | 16 ++- hw/core/machine-hmp-cmds.c | 34 ++++- include/exec/cpu-common.h | 5 + include/monitor/hmp.h | 1 + include/qapi/qmp/qdict.h | 4 + monitor/hmp-expr.inc | 200 ++++++++++++++++++++++++++++++ monitor/hmp.c | 241 ++++++++---------------------------- qapi/machine.json | 42 ++++++- qobject/qdict.c | 38 ++++++ system/cpus.c | 31 ++++- system/physmem.c | 18 +++ tests/qtest/test-hmp.c | 1 + tests/unit/check-qdict.c | 39 ++++++ 14 files changed, 482 insertions(+), 199 deletions(-) create mode 100644 monitor/hmp-expr.inc
docs/devel/loads-stores.rst +11 -0
@@ -465,6 +465,17 @@ For new code they are better avoided: Regexes for git grep: - ``\<cpu_physical_memory_\(read\|write\|rw\)\>`` +``cpu_memory_translate`` +~~~~~~~~~~~~~~~~~~~~~~~~ + +Translates a virtual address to a physical address. + +This function is intended for use by QMP/HMP and similar code. +It takes a virtual address and returns the physical address +as it's seen by the MMU via a lookup, along with other attributes +of the page as well as what occurred during the lookup itself. + + ``cpu_memory_rw_debug`` ~~~~~~~~~~~~~~~~~~~~~~~
hmp-commands.hx +14 -2
@@ -796,12 +796,24 @@ SRST Stop capture with a given *index*, index can be obtained with:: info capture +ERST + + { + .name = "memtranslate", + .args_type = "val:u", + .params = "addr", + .help = "translate a guest virtual address 'addr' to a physical address", + .cmd = hmp_memtranslate, + }, +SRST +``memtranslate`` *addr* + translate a guest virtual address *val* to a physical address ERST { .name = "memsave", - .args_type = "val:l,size:i,filename:s", + .args_type = "val:u,size:u,filename:s", .params = "addr size file", .help = "save to disk virtual memory dump starting at 'addr' of size 'size'", .cmd = hmp_memsave,
@@ -814,7 +826,7 @@ ERST { .name = "pmemsave", - .args_type = "val:l,size:i,filename:s", + .args_type = "val:u,size:u,filename:s", .params = "addr size file", .help = "save to disk physical memory dump starting at 'addr' of size 'size'", .cmd = hmp_pmemsave,
hw/core/machine-hmp-cmds.c +30 -4
@@ -194,11 +194,37 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict)qmp_system_powerdown (NULL ); } +void hmp_memtranslate (Monitor *mon,const QDict *qdict) +{ +uint64_t addr =qdict_get_uint (qdict,"val" ); +Error *err =NULL ; +int cpu_index =monitor_get_cpu_index (mon); +MemTranslation *translation; + +if (cpu_index <0 ) { +monitor_printf (mon,"No CPU available\n" ); +return ; + } + + translation =qmp_memtranslate (addr, true, cpu_index, &err); + +if (err ==NULL ) { +if (translation->phys ==-1 ) { +monitor_printf (mon,"failed to translate\n" ); + }else { +monitor_printf (mon,"phys: 0x%" PRIx64"\n" , translation->phys); + } + } + +qapi_free_MemTranslation (translation); +hmp_handle_error (mon, err); +} +void hmp_memsave (Monitor *mon,const QDict *qdict) { -uint32_t size =qdict_get_int (qdict,"size" ); +uint64_t size =qdict_get_uint (qdict,"size" );const char *filename =qdict_get_str (qdict,"filename" ); -uint64_t addr =qdict_get_int (qdict,"val" ); +uint64_t addr =qdict_get_uint (qdict,"val" );Error *err =NULL ;int cpu_index =monitor_get_cpu_index (mon);
@@ -213,9 +239,9 @@ void hmp_memsave(Monitor *mon, const QDict *qdict)void hmp_pmemsave (Monitor *mon,const QDict *qdict) { -uint32_t size =qdict_get_int (qdict,"size" ); +uint64_t size =qdict_get_uint (qdict,"size" );const char *filename =qdict_get_str (qdict,"filename" ); -uint64_t addr =qdict_get_int (qdict,"val" ); +uint64_t addr =qdict_get_uint (qdict,"val" );Error *err =NULL ;qmp_pmemsave (addr, size, filename, &err);
include/exec/cpu-common.h +5 -0
@@ -178,6 +178,11 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,#endif +/* Returns: translated physical address on success, -1 on error. +* If the address is not valid, `*attrs` is left untouched. +*/ +hwaddr cpu_memory_translate (CPUState *cpu,vaddr addr,MemTxAttrs *attrs); +/* Returns: 0 on success, -1 on error */ int cpu_memory_rw_debug (CPUState *cpu,vaddr addr,void *ptr,size_t len,bool is_write);
include/monitor/hmp.h +1 -0
@@ -47,6 +47,7 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict);void hmp_exit_preconfig (Monitor *mon,const QDict *qdict);void hmp_announce_self (Monitor *mon,const QDict *qdict);void hmp_cpu (Monitor *mon,const QDict *qdict); +void hmp_memtranslate (Monitor *mon,const QDict *qdict);void hmp_memsave (Monitor *mon,const QDict *qdict);void hmp_pmemsave (Monitor *mon,const QDict *qdict);void hmp_ringbuf_write (Monitor *mon,const QDict *qdict);
include/qapi/qmp/qdict.h +4 -0
@@ -52,17 +52,21 @@ const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry);void qdict_put_bool (QDict *qdict,const char *key,bool value);void qdict_put_int (QDict *qdict,const char *key,int64_t value); +void qdict_put_uint (QDict *qdict,const char *key,uint64_t value);void qdict_put_null (QDict *qdict,const char *key);void qdict_put_str (QDict *qdict,const char *key,const char *value);double qdict_get_double (const QDict *qdict,const char *key);int64_t qdict_get_int (const QDict *qdict,const char *key); +uint64_t qdict_get_uint (const QDict *qdict,const char *key);bool qdict_get_bool (const QDict *qdict,const char *key);QList *qdict_get_qlist (const QDict *qdict,const char *key);QDict *qdict_get_qdict (const QDict *qdict,const char *key);const char *qdict_get_str (const QDict *qdict,const char *key);int64_t qdict_get_try_int (const QDict *qdict,const char *key,int64_t def_value); +uint64_t qdict_get_try_uint (const QDict *qdict,const char *key, +uint64_t def_value);bool qdict_get_try_bool (const QDict *qdict,const char *key,bool def_value);const char *qdict_get_try_str (const QDict *qdict,const char *key);
monitor/hmp-expr.inc new file +200 -0
200 lines not on this page · raw message
monitor/hmp.c +52 -189
260 lines not on this page · raw message
qapi/machine.json +40 -2
60 lines not on this page · raw message
qobject/qdict.c +38 -0
@@ -136,6 +136,11 @@ void qdict_put_int(QDict *qdict, const char *key, int64_t value)qdict_put (qdict, key,qnum_from_int (value)); } +void qdict_put_uint (QDict *qdict,const char *key,uint64_t value) +{ +qdict_put (qdict, key,qnum_from_uint (value)); +} +void qdict_put_bool (QDict *qdict,const char *key,bool value) {qdict_put (qdict, key,qbool_from_bool (value));
@@ -209,6 +214,19 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)return qnum_get_int (qobject_to (QNum,qdict_get (qdict, key))); } +/** +* qdict_get_int(): Get an unsigned integer mapped by 'key' +* +* This function assumes that 'key' exists and it stores a +* QNum representable as uint. +* +* Return integer mapped by 'key'. +*/ +uint64_t qdict_get_uint (const QDict *qdict,const char *key) +{ +return qnum_get_uint (qobject_to (QNum,qdict_get (qdict, key))); +} +/** * qdict_get_bool(): Get a bool mapped by 'key' *
@@ -272,6 +290,26 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,return val; } +/** +* qdict_get_try_uint(): Try to get unsigned integer mapped by 'key' +* +* Return integer mapped by 'key', if it is not present in the +* dictionary or if the stored object is not a QNum representing an +* unsigned integer, 'def_value' will be returned. +*/ +uint64_t qdict_get_try_uint (const QDict *qdict,const char *key, +uint64_t def_value) +{ +QNum *qnum =qobject_to (QNum,qdict_get (qdict, key)); +uint64_t val; + +if (!qnum || !qnum_get_try_uint (qnum, &val)) { +return def_value; + } + +return val; +} +/** * qdict_get_try_bool(): Try to get a bool mapped by 'key' *
system/cpus.c +29 -2
@@ -792,7 +792,34 @@ int vm_stop_force_state(RunState state) } } -void qmp_memsave (int64_t addr,int64_t size,const char *filename, +MemTranslation *qmp_memtranslate (uint64_t val,bool has_cpu_index,int64_t cpu_index,Error **errp) +{ +CPUState *cpu; +hwaddr phys_addr; +MemTxAttrs attrs; +MemTranslation *translation; + +if (!has_cpu_index) { + cpu_index =0 ; + } + + cpu =qemu_get_cpu (cpu_index); +if (cpu ==NULL ) { +error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"cpu-index" , +"a CPU number" ); +return NULL ; + } + + phys_addr =cpu_memory_translate (cpu, val, &attrs); + + translation =g_new0 (MemTranslation,1 ); + + translation->phys = phys_addr; + +return translation; +} + +void qmp_memsave (uint64_t addr,uint64_t size,const char *filename,bool has_cpu,int64_t cpu_index,Error **errp) {FILE *f;
@@ -840,7 +867,7 @@ exit:fclose (f); } -void qmp_pmemsave (int64_t addr,int64_t size,const char *filename, +void qmp_pmemsave (uint64_t addr,uint64_t size,const char *filename,Error **errp) {FILE *f;
system/physmem.c +18 -0
@@ -3524,6 +3524,24 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,#define RCU_READ_UNLOCK () ((void)0)#include "memory_ldst.c.inc" +/* virtual memory translation */ +hwaddr cpu_memory_translate (CPUState *cpu,vaddr addr,MemTxAttrs *attrs) +{ +hwaddr phys_addr, phys_addr_rel; +vaddr page; + + page = addr &TARGET_PAGE_MASK ; + phys_addr =cpu_get_phys_page_attrs_debug (cpu, page, attrs); + +if (phys_addr ==-1 ) { +return -1 ; + } + + phys_addr_rel = phys_addr + (addr & ~TARGET_PAGE_MASK ); + +return phys_addr_rel; +} +/* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug (CPUState *cpu,vaddr addr,void *ptr,size_t len,bool is_write)
tests/qtest/test-hmp.c +1 -0
@@ -44,6 +44,7 @@ static const char *hmp_cmds[] = {"i /w 0" ,"log all" ,"log none" , +"memtranslate 0" ,"memsave 0 4096 \"/dev/null\"" ,"migrate_set_parameter xbzrle-cache-size 64k" , "migrate_set_parameter downtime-limit 1",
tests/unit/check-qdict.c +39 -0
@@ -99,6 +99,21 @@ static void qdict_get_int_test(void)qobject_unref (tests_dict); } +static void qdict_get_uint_test (void ) +{ +int ret; +const unsigned int value =100 ; +const char *key ="int" ; +QDict *tests_dict =qdict_new (); + +qdict_put_uint (tests_dict, key, value); + + ret =qdict_get_uint (tests_dict, key); +g_assert (ret == value); + +qobject_unref (tests_dict); +} +static void qdict_get_try_int_test (void ) {int ret;
@@ -121,6 +136,28 @@ static void qdict_get_try_int_test(void)qobject_unref (tests_dict); } +static void qdict_get_try_uint_test (void ) +{ +int ret; +const unsigned int value =100 ; +const char *key ="int" ; +QDict *tests_dict =qdict_new (); + +qdict_put_uint (tests_dict, key, value); +qdict_put_str (tests_dict,"string" ,"test" ); + + ret =qdict_get_try_uint (tests_dict, key,0 ); +g_assert (ret == value); + + ret =qdict_get_try_uint (tests_dict,"missing" ,-42 ); + g_assert_cmpuint(ret, ==, -42); + + ret =qdict_get_try_uint (tests_dict,"string" ,-42 ); + g_assert_cmpuint(ret, ==, -42); + +qobject_unref (tests_dict); +} +static void qdict_get_str_test (void ) {const char *p;
@@ -358,7 +395,9 @@ int main(int argc, char **argv)/* Continue, but now with fixtures */ g_test_add_func ("/public/get" , qdict_get_test);g_test_add_func ("/public/get_int" , qdict_get_int_test); +g_test_add_func ("/public/get_uint" , qdict_get_uint_test);g_test_add_func ("/public/get_try_int" , qdict_get_try_int_test); +g_test_add_func ("/public/get_try_uint" , qdict_get_try_uint_test);g_test_add_func ("/public/get_str" , qdict_get_str_test);g_test_add_func ("/public/get_try_str" , qdict_get_try_str_test);g_test_add_func ("/public/haskey_not" , qdict_haskey_not_test);
Signature · 1 line
2.34.1
* Josh Junon ([email protected]) wrote:
Hi Josh,
Quoted 7 lines
This commit adds a new QMP/HMP command
memtranslate, which translates a virtual address to a physical address using the guest's MMU.This uses the same mechanism that
[p]memsavedoes to perform the translation.
Quoted 8 lines
This commit also fixes a long standing issue of
[p]memsavenot properly handling higher-half virtual addresses correctly, namely when used over QMP/the monitor. The use and assumption of signed integers caused issues when parsing otherwise valid virtual addresses that instead caused signed integer overflow or ERANGE errors.Signed-off-by Josh Junon <[email protected]>
There's a few different changes in this one patch; so the first thing is it needs splitting up; I suggest at least:
a) Fixing the signedness problems
b) The QMP implementation of the new command
c) The HMP implementation of the new command
That would make it a lot easier to review - also, it's good to get fixes in first!
Now, going back a step; how does this compare to the existing 'gva2gpa' command which HMP has?
Dave
Quoted 950 lines
--- docs/devel/loads-stores.rst | 11 ++ hmp-commands.hx | 16 ++- hw/core/machine-hmp-cmds.c | 34 ++++- include/exec/cpu-common.h | 5 + include/monitor/hmp.h | 1 + include/qapi/qmp/qdict.h | 4 + monitor/hmp-expr.inc | 200 ++++++++++++++++++++++++++++++ monitor/hmp.c | 241 ++++++++---------------------------- qapi/machine.json | 42 ++++++- qobject/qdict.c | 38 ++++++ system/cpus.c | 31 ++++- system/physmem.c | 18 +++ tests/qtest/test-hmp.c | 1 + tests/unit/check-qdict.c | 39 ++++++ 14 files changed, 482 insertions(+), 199 deletions(-) create mode 100644 monitor/hmp-expr.incdocs/devel/loads-stores.rst +11
-0@@ -465,6 +465,17 @@ For new code they are better avoided: Regexes for git grep: - ``\<cpu_physical_memory_\(read\|write\|rw\)\>`` +``cpu_memory_translate`` +~~~~~~~~~~~~~~~~~~~~~~~~ + +Translates a virtual address to a physical address. + +This function is intended for use by QMP/HMP and similar code. +It takes a virtual address and returns the physical address +as it's seen by the MMU via a lookup, along with other attributes +of the page as well as what occurred during the lookup itself. + + ``cpu_memory_rw_debug`` ~~~~~~~~~~~~~~~~~~~~~~~hmp-commands.hx +14
-2@@ -796,12 +796,24 @@ SRST Stop capture with a given *index*, index can be obtained with:: info capture +ERST + + { + .name = "memtranslate", + .args_type = "val:u", + .params = "addr", + .help = "translate a guest virtual address 'addr' to a physical address", + .cmd = hmp_memtranslate, + }, +SRST +``memtranslate`` *addr* + translate a guest virtual address *val* to a physical address ERST { .name = "memsave", - .args_type = "val:l,size:i,filename:s", + .args_type = "val:u,size:u,filename:s", .params = "addr size file", .help = "save to disk virtual memory dump starting at 'addr' of size 'size'", .cmd = hmp_memsave,@@ -814,7 +826,7 @@ ERST { .name = "pmemsave", - .args_type = "val:l,size:i,filename:s", + .args_type = "val:u,size:u,filename:s", .params = "addr size file", .help = "save to disk physical memory dump starting at 'addr' of size 'size'", .cmd = hmp_pmemsave,hw/core/machine-hmp-cmds.c +30
-4@@ -194,11 +194,37 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict)qmp_system_powerdown (NULL ); } +void hmp_memtranslate (Monitor *mon,const QDict *qdict) +{ +uint64_t addr =qdict_get_uint (qdict,"val" ); +Error *err =NULL ; +int cpu_index =monitor_get_cpu_index (mon); +MemTranslation *translation; + +if (cpu_index <0 ) { +monitor_printf (mon,"No CPU available\n" ); +return ; + } + + translation =qmp_memtranslate (addr, true, cpu_index, &err); + +if (err ==NULL ) { +if (translation->phys ==-1 ) { +monitor_printf (mon,"failed to translate\n" ); + }else { +monitor_printf (mon,"phys: 0x%" PRIx64"\n" , translation->phys); + } + } + +qapi_free_MemTranslation (translation); +hmp_handle_error (mon, err); +} +void hmp_memsave (Monitor *mon,const QDict *qdict) { -uint32_t size =qdict_get_int (qdict,"size" ); +uint64_t size =qdict_get_uint (qdict,"size" );const char *filename =qdict_get_str (qdict,"filename" ); -uint64_t addr =qdict_get_int (qdict,"val" ); +uint64_t addr =qdict_get_uint (qdict,"val" );Error *err =NULL ;int cpu_index =monitor_get_cpu_index (mon);@@ -213,9 +239,9 @@ void hmp_memsave(Monitor *mon, const QDict *qdict)void hmp_pmemsave (Monitor *mon,const QDict *qdict) { -uint32_t size =qdict_get_int (qdict,"size" ); +uint64_t size =qdict_get_uint (qdict,"size" );const char *filename =qdict_get_str (qdict,"filename" ); -uint64_t addr =qdict_get_int (qdict,"val" ); +uint64_t addr =qdict_get_uint (qdict,"val" );Error *err =NULL ;qmp_pmemsave (addr, size, filename, &err);include/exec/cpu-common.h +5
-0@@ -178,6 +178,11 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,#endif +/* Returns: translated physical address on success, -1 on error. +* If the address is not valid, `*attrs` is left untouched. +*/ +hwaddr cpu_memory_translate (CPUState *cpu,vaddr addr,MemTxAttrs *attrs); +/* Returns: 0 on success, -1 on error */ int cpu_memory_rw_debug (CPUState *cpu,vaddr addr,void *ptr,size_t len,bool is_write);include/monitor/hmp.h +1
-0@@ -47,6 +47,7 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict);void hmp_exit_preconfig (Monitor *mon,const QDict *qdict);void hmp_announce_self (Monitor *mon,const QDict *qdict);void hmp_cpu (Monitor *mon,const QDict *qdict); +void hmp_memtranslate (Monitor *mon,const QDict *qdict);void hmp_memsave (Monitor *mon,const QDict *qdict);void hmp_pmemsave (Monitor *mon,const QDict *qdict);void hmp_ringbuf_write (Monitor *mon,const QDict *qdict);include/qapi/qmp/qdict.h +4
-0@@ -52,17 +52,21 @@ const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry);void qdict_put_bool (QDict *qdict,const char *key,bool value);void qdict_put_int (QDict *qdict,const char *key,int64_t value); +void qdict_put_uint (QDict *qdict,const char *key,uint64_t value);void qdict_put_null (QDict *qdict,const char *key);void qdict_put_str (QDict *qdict,const char *key,const char *value);double qdict_get_double (const QDict *qdict,const char *key);int64_t qdict_get_int (const QDict *qdict,const char *key); +uint64_t qdict_get_uint (const QDict *qdict,const char *key);bool qdict_get_bool (const QDict *qdict,const char *key);QList *qdict_get_qlist (const QDict *qdict,const char *key);QDict *qdict_get_qdict (const QDict *qdict,const char *key);const char *qdict_get_str (const QDict *qdict,const char *key);int64_t qdict_get_try_int (const QDict *qdict,const char *key,int64_t def_value); +uint64_t qdict_get_try_uint (const QDict *qdict,const char *key, +uint64_t def_value);bool qdict_get_try_bool (const QDict *qdict,const char *key,bool def_value);const char *qdict_get_try_str (const QDict *qdict,const char *key);monitor/hmp-expr.inc new file +200
-0@@ -0,0 +1,200 @@ +#ifndef HMP_EXPR_INC_TY +#error "missing HMP_EXPR_INC_TY" +#endif + +#ifndef HMP_EXPR_INC_IDENT +#error "missing HMP_EXPR_INC_IDENT" +#endif + +static HMP_EXPR_INC_TY HMP_EXPR_INC_IDENT(expr_sum)(Monitor *mon); + +static HMP_EXPR_INC_TY HMP_EXPR_INC_IDENT(expr_unary)(Monitor *mon) +{ + HMP_EXPR_INC_TY n; + char *p; + int ret; + + switch (*pch) { + case '+': + next(); + n = HMP_EXPR_INC_IDENT(expr_unary)(mon); + break; + case '-': + next(); + n = -HMP_EXPR_INC_IDENT(expr_unary)(mon); + break; + case '~': + next(); + n = ~HMP_EXPR_INC_IDENT(expr_unary)(mon); + break; + case '(': + next(); + n = HMP_EXPR_INC_IDENT(expr_sum)(mon); + if (*pch != ')') { + expr_error(mon, "')' expected"); + } + next(); + break; + case '\'': + pch++; + if (*pch == '\0') { + expr_error(mon, "character constant expected"); + } + n = *pch; + pch++; + if (*pch != '\'') { + expr_error(mon, "missing terminating \' character"); + } + next(); + break; + case '$': + { + char buf[128], *q; + int64_t reg = 0; + + pch++; + q = buf; + while ((*pch >= 'a' && *pch <= 'z') || + (*pch >= 'A' && *pch <= 'Z') || + (*pch >= '0' && *pch <= '9') || + *pch == '_' || *pch == '.') { + if ((q - buf) < sizeof(buf) - 1) { + *q++ = *pch; + } + pch++; + } + while (qemu_isspace(*pch)) { + pch++; + } + *q = 0; + ret = get_monitor_def(mon, ®, buf); + if (ret < 0) { + expr_error(mon, "unknown register"); + } + n = (HMP_EXPR_INC_TY)reg; + } + break; + case '\0': + expr_error(mon, "unexpected end of expression"); + n = 0; + break; + default: + errno = 0; + n = strtoull(pch, &p, 0); + if (errno == ERANGE) { + expr_error(mon, "number too large"); + } + if (pch == p) { + expr_error(mon, "invalid char '%c' in expression", *p); + } + pch = p; + while (qemu_isspace(*pch)) { + pch++; + } + break; + } + return n; +} + +static HMP_EXPR_INC_TY HMP_EXPR_INC_IDENT(expr_prod)(Monitor *mon) +{ + HMP_EXPR_INC_TY val, val2; + int op; + + val = HMP_EXPR_INC_IDENT(expr_unary)(mon); + for (;;) { + op = *pch; + if (op != '*' && op != '/' && op != '%') { + break; + } + next(); + val2 = HMP_EXPR_INC_IDENT(expr_unary)(mon); + switch (op) { + default: + case '*': + val *= val2; + break; + case '/': + case '%': + if (val2 == 0) { + expr_error(mon, "division by zero"); + } + if (op == '/') { + val /= val2; + } else { + val %= val2; + } + break; + } + } + return val; +} + +static HMP_EXPR_INC_TY HMP_EXPR_INC_IDENT(expr_logic)(Monitor *mon) +{ + HMP_EXPR_INC_TY val, val2; + int op; + + val = HMP_EXPR_INC_IDENT(expr_prod)(mon); + for (;;) { + op = *pch; + if (op != '&' && op != '|' && op != '^') { + break; + } + next(); + val2 = HMP_EXPR_INC_IDENT(expr_prod)(mon); + switch (op) { + default: + case '&': + val &= val2; + break; + case '|': + val |= val2; + break; + case '^': + val ^= val2; + break; + } + } + return val; +} + +static HMP_EXPR_INC_TY HMP_EXPR_INC_IDENT(expr_sum)(Monitor *mon) +{ + HMP_EXPR_INC_TY val, val2; + int op; + + val = HMP_EXPR_INC_IDENT(expr_logic)(mon); + for (;;) { + op = *pch; + if (op != '+' && op != '-') { + break; + } + next(); + val2 = HMP_EXPR_INC_IDENT(expr_logic)(mon); + if (op == '+') { + val += val2; + } else { + val -= val2; + } + } + return val; +} + +static int HMP_EXPR_INC_IDENT(get_expr)(Monitor *mon, HMP_EXPR_INC_TY *pval, const char **pp) +{ + pch = *pp; + if (sigsetjmp(expr_env, 0)) { + *pp = pch; + return -1; + } + while (qemu_isspace(*pch)) { + pch++; + } + *pval = HMP_EXPR_INC_IDENT(expr_sum)(mon); + *pp = pch; + return 0; +} + +#undef HMP_EXPR_INC_TY +#undef HMP_EXPR_INC_IDENTmonitor/hmp.c +52
-189@@ -332,195 +332,13 @@ static void next(void) } } -static int64_t expr_sum (Monitor *mon); +#define HMP_EXPR_INC_TY int64_t +#define HMP_EXPR_INC_IDENT (name) name ## _int64 +#include "monitor/hmp-expr.inc" -static int64_t expr_unary (Monitor *mon) -{ -int64_t n; -char *p; -int ret; - -switch (*pch) { -case '+' : -next (); - n =expr_unary (mon); -break ; -case '-' : -next (); - n = -expr_unary (mon); -break ; -case '~' : -next (); - n = ~expr_unary (mon); -break ; -case '(' : -next (); - n =expr_sum (mon); -if (*pch !=')' ) { -expr_error (mon,"')' expected" ); - } -next (); -break ; -case '\'' : - pch++; -if (*pch =='\0' ) { -expr_error (mon,"character constant expected" ); - } - n = *pch; - pch++; -if (*pch !='\'' ) { -expr_error (mon,"missing terminating \' character" ); - } -next (); -break ; -case '$' : - { -char buf[128 ], *q; -int64_t reg =0 ; - - pch++; - q = buf; -while ((*pch >='a' && *pch <='z' ) || - (*pch >='A' && *pch <='Z' ) || - (*pch >='0' && *pch <='9' ) || - *pch =='_' || *pch =='.' ) { -if ((q - buf) <sizeof (buf) -1 ) { - *q++ = *pch; - } - pch++; - } -while (qemu_isspace (*pch)) { - pch++; - } - *q =0 ; - ret =get_monitor_def (mon, ®, buf); -if (ret <0 ) { -expr_error (mon,"unknown register" ); - } - n = reg; - } -break ; -case '\0' : -expr_error (mon,"unexpected end of expression" ); - n =0 ; -break ; -default : - errno =0 ; - n =strtoull (pch, &p,0 ); -if (errno ==ERANGE ) { -expr_error (mon,"number too large" ); - } -if (pch == p) { -expr_error (mon,"invalid char '%c' in expression" , *p); - } - pch = p; -while (qemu_isspace (*pch)) { - pch++; - } -break ; - } -return n; -} - -static int64_t expr_prod (Monitor *mon) -{ -int64_t val, val2; -int op; - - val =expr_unary (mon); -for (;;) { - op = *pch; -if (op !='*' && op !='/' && op !='%' ) { -break ; - } -next (); - val2 =expr_unary (mon); -switch (op) { -default : -case '*' : - val *= val2; -break ; -case '/' : -case '%' : -if (val2 ==0 ) { -expr_error (mon,"division by zero" ); - } -if (op =='/' ) { - val /= val2; - }else { - val %= val2; - } -break ; - } - } -return val; -} - -static int64_t expr_logic (Monitor *mon) -{ -int64_t val, val2; -int op; - - val =expr_prod (mon); -for (;;) { - op = *pch; -if (op !='&' && op !='|' && op !='^' ) { -break ; - } -next (); - val2 =expr_prod (mon); -switch (op) { -default : -case '&' : - val &= val2; -break ; -case '|' : - val |= val2; -break ; -case '^' : - val ^= val2; -break ; - } - } -return val; -} - -static int64_t expr_sum (Monitor *mon) -{ -int64_t val, val2; -int op; - - val =expr_logic (mon); -for (;;) { - op = *pch; -if (op !='+' && op !='-' ) { -break ; - } -next (); - val2 =expr_logic (mon); -if (op =='+' ) { - val += val2; - }else { - val -= val2; - } - } -return val; -} - -static int get_expr (Monitor *mon,int64_t *pval,const char **pp) -{ - pch = *pp; -if (sigsetjmp (expr_env,0 )) { - *pp = pch; -return -1 ; - } -while (qemu_isspace (*pch)) { - pch++; - } - *pval =expr_sum (mon); - *pp = pch; -return 0 ; -} +#define HMP_EXPR_INC_TY uint64_t +#define HMP_EXPR_INC_IDENT (name) name ## _uint64 +#include "monitor/hmp-expr.inc" static int get_double (Monitor *mon,double *pval,const char **pp) {@@ -882,7 +700,7 @@ static QDict *monitor_parse_arguments(Monitor *mon, } typestr++; } -if (get_expr (mon, &val, &p)) { +if (get_expr_int64 (mon, &val, &p)) { goto fail; }/* Check if 'i' is greater than 32-bit */ @@ -900,6 +718,51 @@ static QDict *monitor_parse_arguments(Monitor *mon,qdict_put_int (qdict, key, val); }break ; +case 'd' : +case 'u' : +case 'm' : + { +uint64_t val; + +while (qemu_isspace (*p)) { + p++; + } +if (*typestr =='?' || *typestr =='.' ) { +if (*typestr =='?' ) { +if (*p =='\0' ) { + typestr++; +break ; + } + }else { +if (*p =='.' ) { + p++; +while (qemu_isspace (*p)) { + p++; + } + }else { + typestr++; +break ; + } + } + typestr++; + } + +if (get_expr_uint64 (mon, &val, &p)) { + goto fail; + } + +/* Check if 'd' is greater than 32-bit */ +if ((c =='d' ) && ((val >>32 ) &0xffffffff )) { +monitor_printf (mon,"\'%s\' has failed: " , cmd->name); +monitor_printf (mon,"integer is for 32-bit values\n" ); + goto fail; + }else if (c =='m' ) { + val *= MiB; + } + +qdict_put_uint (qdict, key, val); + } +break ;case 'o' : {int ret;qapi/machine.json +40
-2@@ -825,6 +825,44 @@ 'policy': 'HmatCacheWritePolicy', 'line': 'uint16' }} +## +# @MemTranslation: +# +# Result of a virtual-to-physical memory translation via @memtranslate. +# +# @phys: the physical address corresponding to the virtual address, +# or -1 if the translation failed +# +# Since: TBD +## +{ 'struct': 'MemTranslation', + 'data': { 'phys': 'uint64' } } + +## +# @memtranslate: +# +# Translate a guest virtual address to a physical address. +# +# @val: the virtual address of the guest to translate +# +# @cpu-index: the index of the virtual CPU to use for translating the +# virtual address (defaults to CPU 0) +# +# Returns: +# @MemTranslation +# +# Since: TBD +# +# .. qmp-example:: +# +# -> { "execute": "memtranslate", +# "arguments": { "val": 10 } } +# <- { "return": { "phys": 20 } } +## +{ 'command': 'memtranslate', + 'data': {'val': 'uint64', '*cpu-index': 'int'}, + 'returns': 'MemTranslation' } + ## # @memsave: #@@ -852,7 +890,7 @@ # <- { "return": {} } ## { 'command': 'memsave', - 'data': {'val': 'int', 'size': 'int', 'filename': 'str', '*cpu-index': 'int'} } + 'data': {'val': 'uint64', 'size': 'uint64', 'filename': 'str', '*cpu-index': 'int'} } ## # @pmemsave:@@ -878,7 +916,7 @@ # <- { "return": {} } ## { 'command': 'pmemsave', - 'data': {'val': 'int', 'size': 'int', 'filename': 'str'} } + 'data': {'val': 'uint64', 'size': 'uint64', 'filename': 'str'} } ## # @Memdev:qobject/qdict.c +38
-0@@ -136,6 +136,11 @@ void qdict_put_int(QDict *qdict, const char *key, int64_t value)qdict_put (qdict, key,qnum_from_int (value)); } +void qdict_put_uint (QDict *qdict,const char *key,uint64_t value) +{ +qdict_put (qdict, key,qnum_from_uint (value)); +} +void qdict_put_bool (QDict *qdict,const char *key,bool value) {qdict_put (qdict, key,qbool_from_bool (value));@@ -209,6 +214,19 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)return qnum_get_int (qobject_to (QNum,qdict_get (qdict, key))); } +/** +* qdict_get_int(): Get an unsigned integer mapped by 'key' +* +* This function assumes that 'key' exists and it stores a +* QNum representable as uint. +* +* Return integer mapped by 'key'. +*/ +uint64_t qdict_get_uint (const QDict *qdict,const char *key) +{ +return qnum_get_uint (qobject_to (QNum,qdict_get (qdict, key))); +} +/** * qdict_get_bool(): Get a bool mapped by 'key' * @@ -272,6 +290,26 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,return val; } +/** +* qdict_get_try_uint(): Try to get unsigned integer mapped by 'key' +* +* Return integer mapped by 'key', if it is not present in the +* dictionary or if the stored object is not a QNum representing an +* unsigned integer, 'def_value' will be returned. +*/ +uint64_t qdict_get_try_uint (const QDict *qdict,const char *key, +uint64_t def_value) +{ +QNum *qnum =qobject_to (QNum,qdict_get (qdict, key)); +uint64_t val; + +if (!qnum || !qnum_get_try_uint (qnum, &val)) { +return def_value; + } + +return val; +} +/** * qdict_get_try_bool(): Try to get a bool mapped by 'key' * system/cpus.c +29
-2@@ -792,7 +792,34 @@ int vm_stop_force_state(RunState state) } } -void qmp_memsave (int64_t addr,int64_t size,const char *filename, +MemTranslation *qmp_memtranslate (uint64_t val,bool has_cpu_index,int64_t cpu_index,Error **errp) +{ +CPUState *cpu; +hwaddr phys_addr; +MemTxAttrs attrs; +MemTranslation *translation; + +if (!has_cpu_index) { + cpu_index =0 ; + } + + cpu =qemu_get_cpu (cpu_index); +if (cpu ==NULL ) { +error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"cpu-index" , +"a CPU number" ); +return NULL ; + } + + phys_addr =cpu_memory_translate (cpu, val, &attrs); + + translation =g_new0 (MemTranslation,1 ); + + translation->phys = phys_addr; + +return translation; +} + +void qmp_memsave (uint64_t addr,uint64_t size,const char *filename,bool has_cpu,int64_t cpu_index,Error **errp) {FILE *f;@@ -840,7 +867,7 @@ exit:fclose (f); } -void qmp_pmemsave (int64_t addr,int64_t size,const char *filename, +void qmp_pmemsave (uint64_t addr,uint64_t size,const char *filename,Error **errp) {FILE *f;system/physmem.c +18
-0@@ -3524,6 +3524,24 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,#define RCU_READ_UNLOCK () ((void)0)#include "memory_ldst.c.inc" +/* virtual memory translation */ +hwaddr cpu_memory_translate (CPUState *cpu,vaddr addr,MemTxAttrs *attrs) +{ +hwaddr phys_addr, phys_addr_rel; +vaddr page; + + page = addr &TARGET_PAGE_MASK ; + phys_addr =cpu_get_phys_page_attrs_debug (cpu, page, attrs); + +if (phys_addr ==-1 ) { +return -1 ; + } + + phys_addr_rel = phys_addr + (addr & ~TARGET_PAGE_MASK ); + +return phys_addr_rel; +} +/* virtual memory access for debug (includes writing to ROM) */ int cpu_memory_rw_debug (CPUState *cpu,vaddr addr,void *ptr,size_t len,bool is_write)tests/qtest/test-hmp.c +1
-0@@ -44,6 +44,7 @@ static const char *hmp_cmds[] = {"i /w 0" ,"log all" ,"log none" , +"memtranslate 0" ,"memsave 0 4096 \"/dev/null\"" ,"migrate_set_parameter xbzrle-cache-size 64k" , "migrate_set_parameter downtime-limit 1",tests/unit/check-qdict.c +39
-0@@ -99,6 +99,21 @@ static void qdict_get_int_test(void)qobject_unref (tests_dict); } +static void qdict_get_uint_test (void ) +{ +int ret; +const unsigned int value =100 ; +const char *key ="int" ; +QDict *tests_dict =qdict_new (); + +qdict_put_uint (tests_dict, key, value); + + ret =qdict_get_uint (tests_dict, key); +g_assert (ret == value); + +qobject_unref (tests_dict); +} +static void qdict_get_try_int_test (void ) {int ret;@@ -121,6 +136,28 @@ static void qdict_get_try_int_test(void)qobject_unref (tests_dict); } +static void qdict_get_try_uint_test (void ) +{ +int ret; +const unsigned int value =100 ; +const char *key ="int" ; +QDict *tests_dict =qdict_new (); + +qdict_put_uint (tests_dict, key, value); +qdict_put_str (tests_dict,"string" ,"test" ); + + ret =qdict_get_try_uint (tests_dict, key,0 ); +g_assert (ret == value); + + ret =qdict_get_try_uint (tests_dict,"missing" ,-42 ); + g_assert_cmpuint(ret, ==, -42); + + ret =qdict_get_try_uint (tests_dict,"string" ,-42 ); + g_assert_cmpuint(ret, ==, -42); + +qobject_unref (tests_dict); +} +static void qdict_get_str_test (void ) {const char *p;@@ -358,7 +395,9 @@ int main(int argc, char **argv)/* Continue, but now with fixtures */ g_test_add_func ("/public/get" , qdict_get_test);g_test_add_func ("/public/get_int" , qdict_get_int_test); +g_test_add_func ("/public/get_uint" , qdict_get_uint_test);g_test_add_func ("/public/get_try_int" , qdict_get_try_int_test); +g_test_add_func ("/public/get_try_uint" , qdict_get_try_uint_test);g_test_add_func ("/public/get_str" , qdict_get_str_test);g_test_add_func ("/public/get_try_str" , qdict_get_try_str_test);g_test_add_func ("/public/haskey_not" , qdict_haskey_not_test);Signature · 1 line
2.34.1
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
31 July 2024 at 02:12, "Dr. David Alan Gilbert" <[email protected]> wrote:
Hello Dr. Gilbert,
Quoted 47 lines · * Josh Junon ([email protected]) wrote:
Hi Josh,
Quoted 23 lines
This commit adds a new QMP/HMP command
memtranslate,which translates a virtual address to a physical address
using the guest's MMU.
This uses the same mechanism that
[p]memsavedoes toperform the translation.
This commit also fixes a long standing issue of
[p]memsavenot properly handling higher-half virtual addresses correctly,
namely when used over QMP/the monitor. The use and assumption of
signed integers caused issues when parsing otherwise valid
Quoted 8 lines
virtual addresses that instead caused signed integer overflow
or ERANGE errors.
Signed-off-by Josh Junon <[email protected]>There's a few different changes in this one patch; so the first
thing is it needs splitting up; I suggest at least:
a) Fixing the signedness problems
b) The QMP implementation of the new command
c) The HMP implementation of the new command
Quoted 8 lines
That would make it a lot easier to review - also, it's good
to get fixes in first!
Now, going back a step; how does this compare to the existing
'gva2gpa' command which HMP has?
Good catch, they're definitely the same. I didn't see that was there before, perhaps because of the name. I've been looking for this exact command for a while now, so it surprises me that I missed it!
Since that's an HMP-only command, would it be okay if simply redirected its definition to a new qmp_gva2gpa command so the implementation is all in one spot?
If that's amenable, I can patch in the signedness fixes, then submit qmp_gva2gpa, then changing hmp_gva2gpa to use the qmp_gva2gpa similar to how other HMP commands with QMP analogs are implemented. Just let me know if that works and I'll get on it.
I appreciate the response!
Josh
Quoted 1,911 lines
Quoted 1,900 lines
---
docs/devel/loads-stores.rst | 11 ++hmp-commands.hx | 16 ++-hw/core/machine-hmp-cmds.c | 34 ++++-include/exec/cpu-common.h | 5 +include/monitor/hmp.h | 1 +include/qapi/qmp/qdict.h | 4 +monitor/hmp-expr.inc | 200 ++++++++++++++++++++++++++++++monitor/hmp.c | 241 ++++++++----------------------------qapi/machine.json | 42 ++++++-qobject/qdict.c | 38 ++++++system/cpus.c | 31 ++++-system/physmem.c | 18 +++tests/qtest/test-hmp.c | 1 +tests/unit/check-qdict.c | 39 ++++++14 files changed, 482 insertions(+), 199 deletions(-)create mode 100644 monitor/hmp-expr.incdiff --git
a/docs/devel/loads-stores.rstb/docs/devel/loads-stores.rstindex
ec627aa9c0..c2bf4bd015100644---
a/docs/devel/loads-stores.rst+++
b/docs/devel/loads-stores.rst@@ -465,6 +465,17 @@ For new code they are better avoided:
Regexes for git grep:
- ``\<cpu_physical_memory_\(read\|write\|rw\)\>``
+``cpu_memory_translate``
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Translates a virtual address to a physical address.
+
+This function is intended for use by QMP/HMP and similar code.
+It takes a virtual address and returns the physical address
+as it's seen by the MMU via a lookup, along with other attributes
+of the page as well as what occurred during the lookup itself.
+
+
``cpu_memory_rw_debug``
~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/hmp-commands.hx b/hmp-commands.hx
index
06746f0afc..213279e340100644--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -796,12 +796,24 @@ SRST
Stop capture with a given *index*, index can be obtained with::
info capture
+ERST
+
+ {
+ .name = "memtranslate",
+ .args_type = "val:u",
+ .params = "addr",
+ .help = "translate a guest virtual address 'addr' to a physical address",
+ .cmd =
hmp_memtranslate,+ },
+SRST
+``memtranslate`` *addr*
+ translate a guest virtual address *val* to a physical address
ERST
{
.name = "memsave",
- .args_type = "val:l,size:i,filename:s",
+ .args_type = "val:u,size:u,filename:s",
.params = "addr size file",
.help = "save to disk virtual memory dump starting at 'addr' of size 'size'",
.cmd =
hmp_memsave,@@ -814,7 +826,7 @@ ERST
{
.name = "pmemsave",
- .args_type = "val:l,size:i,filename:s",
+ .args_type = "val:u,size:u,filename:s",
.params = "addr size file",
.help = "save to disk physical memory dump starting at 'addr' of size 'size'",
.cmd =
hmp_pmemsave,diff --git
a/hw/core/machine-hmp-cmds.cb/hw/core/machine-hmp-cmds.cindex
8701f00cc7..cf4adfa80a100644---
a/hw/core/machine-hmp-cmds.c+++
b/hw/core/machine-hmp-cmds.c@@ -194,11 +194,37 @@ void
hmp_system_powerdown(Monitor *mon, const QDict *qdict)
qmp_system_powerdown(NULL);}
+void
hmp_memtranslate(Monitor *mon, const QDict *qdict)+{
+
uint64_taddr =qdict_get_uint(qdict, "val");+ Error *err = NULL;
+ int
cpu_index=monitor_get_cpu_index(mon);+ MemTranslation *translation;
+
+ if (
cpu_index< 0) {+
monitor_printf(mon, "No CPU available\n");+ return;
+ }
+
+ translation =
qmp_memtranslate(addr, true, cpu_index, &err);+
+ if (err == NULL) {
+ if (
translation->phys== -1) {+
monitor_printf(mon, "failed to translate\n");+ } else {
+
monitor_printf(mon, "phys: 0x%" PRIx64 "\n", translation->phys);+ }
+ }
+
+
qapi_free_MemTranslation(translation);+
hmp_handle_error(mon, err);+}
+
void
hmp_memsave(Monitor *mon, const QDict *qdict){
-
uint32_tsize =qdict_get_int(qdict, "size");+
uint64_tsize =qdict_get_uint(qdict, "size");const char *filename =
qdict_get_str(qdict, "filename");-
uint64_taddr =qdict_get_int(qdict, "val");+
uint64_taddr =qdict_get_uint(qdict, "val");Error *err = NULL;
int
cpu_index=monitor_get_cpu_index(mon);@@ -213,9 +239,9 @@ void
hmp_memsave(Monitor *mon, const QDict *qdict)void
hmp_pmemsave(Monitor *mon, const QDict *qdict){
-
uint32_tsize =qdict_get_int(qdict, "size");+
uint64_tsize =qdict_get_uint(qdict, "size");const char *filename =
qdict_get_str(qdict, "filename");-
uint64_taddr =qdict_get_int(qdict, "val");+
uint64_taddr =qdict_get_uint(qdict, "val");Error *err = NULL;
qmp_pmemsave(addr, size, filename, &err);diff --git
a/include/exec/cpu-common.hb/include/exec/cpu-common.hindex
2e1b499cb7..9484c82fe0100644---
a/include/exec/cpu-common.h+++
b/include/exec/cpu-common.h@@ -178,6 +178,11 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb,
uint64_tstart,#endif
+/* Returns: translated physical address on success, -1 on error.
+ * If the address is not valid,
*attrsis left untouched.+ */
+hwaddr
cpu_memory_translate(CPUState *cpu, vaddr addr, MemTxAttrs *attrs);+
/* Returns: 0 on success, -1 on error */
int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
void *ptr,
size_tlen, boolis_write);diff --git
a/include/monitor/hmp.hb/include/monitor/hmp.hindex
ae116d9804..febccf13cc100644---
a/include/monitor/hmp.h+++
b/include/monitor/hmp.h@@ -47,6 +47,7 @@ void
hmp_system_powerdown(Monitor *mon, const QDict *qdict);void
hmp_exit_preconfig(Monitor *mon, const QDict *qdict);void
hmp_announce_self(Monitor *mon, const QDict *qdict);void
hmp_cpu(Monitor *mon, const QDict *qdict);+void
hmp_memtranslate(Monitor *mon, const QDict *qdict);void
hmp_memsave(Monitor *mon, const QDict *qdict);void
hmp_pmemsave(Monitor *mon, const QDict *qdict);void
hmp_ringbuf_write(Monitor *mon, const QDict *qdict);diff --git
a/include/qapi/qmp/qdict.hb/include/qapi/qmp/qdict.hindex
82e90fc072..38c310becb100644---
a/include/qapi/qmp/qdict.h+++
b/include/qapi/qmp/qdict.h@@ -52,17 +52,21 @@ const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry);
void
qdict_put_bool(QDict *qdict, const char *key, bool value);void
qdict_put_int(QDict *qdict, const char *key, int64_t value);+void
qdict_put_uint(QDict *qdict, const char *key, uint64_t value);void
qdict_put_null(QDict *qdict, const char *key);void
qdict_put_str(QDict *qdict, const char *key, const char *value);double
qdict_get_double(const QDict *qdict, const char *key);
int64_tqdict_get_int(const QDict *qdict, const char *key);+uint64_t
qdict_get_uint(const QDict *qdict, const char *key);bool
qdict_get_bool(const QDict *qdict, const char *key);QList *qdict_get_qlist(const QDict *qdict, const char *key);
QDict *qdict_get_qdict(const QDict *qdict, const char *key);
const char *qdict_get_str(const QDict *qdict, const char *key);
int64_tqdict_get_try_int(const QDict *qdict, const char *key,
int64_tdef_value);+uint64_t qdict_get_try_uint(const QDict *qdict, const char *key,
+
uint64_tdef_value);bool
qdict_get_try_bool(const QDict *qdict, const char *key, bool def_value);const char *qdict_get_try_str(const QDict *qdict, const char *key);
diff --git a/monitor/hmp-expr.inc b/monitor/hmp-expr.inc
new file mode 100644
index 0000000000..789a957ed2
---
/dev/null+++ b/monitor/hmp-expr.inc
@@ -0,0 +1,200 @@
+#ifndef
HMP_EXPR_INC_TY+#error "missing
HMP_EXPR_INC_TY"+#endif
+
+#ifndef
HMP_EXPR_INC_IDENT+#error "missing
HMP_EXPR_INC_IDENT"+#endif
+
+static
HMP_EXPR_INC_TYHMP_EXPR_INC_IDENT(expr_sum)(Monitor *mon);+
+static
HMP_EXPR_INC_TYHMP_EXPR_INC_IDENT(expr_unary)(Monitor *mon)+{
+
HMP_EXPR_INC_TYn;+ char *p;
+ int ret;
+
+ switch (*pch) {
+ case '+':
+
next();+ n = HMP_EXPR_INC_IDENT(expr_unary)(mon);
+ break;
+ case '-':
+
next();+ n = -HMP_EXPR_INC_IDENT(expr_unary)(mon);
+ break;
+ case '~':
+
next();+ n = ~HMP_EXPR_INC_IDENT(expr_unary)(mon);
+ break;
+ case '(':
+
next();+ n = HMP_EXPR_INC_IDENT(expr_sum)(mon);
+ if (*pch != ')') {
+
expr_error(mon, "')' expected");+ }
+
next();+ break;
+ case '\'':
+ pch++;
+ if (*pch == '\0') {
+
expr_error(mon, "character constant expected");+ }
+ n = *pch;
+ pch++;
+ if (*pch != '\'') {
+
expr_error(mon, "missing terminating \' character");+ }
+
next();+ break;
+ case '$':
+ {
+ char buf[128], *q;
+
int64_treg = 0;+
+ pch++;
+ q = buf;
+ while ((*pch >= 'a' && *pch <= 'z') ||
+ (*pch >= 'A' && *pch <= 'Z') ||
+ (*pch >= '0' && *pch <= '9') ||
+ *pch == '_' || *pch == '.') {
+ if ((q - buf) < sizeof(buf) - 1) {
+ *q++ = *pch;
+ }
+ pch++;
+ }
+ while (
qemu_isspace(*pch)) {+ pch++;
+ }
+ *q = 0;
+ ret =
get_monitor_def(mon, ®, buf);+ if (ret < 0) {
+
expr_error(mon, "unknown register");+ }
+ n = (HMP_EXPR_INC_TY)reg;
+ }
+ break;
+ case '\0':
+
expr_error(mon, "unexpected end of expression");+ n = 0;
+ break;
+ default:
+ errno = 0;
+ n =
strtoull(pch, &p, 0);+ if (errno == ERANGE) {
+
expr_error(mon, "number too large");+ }
+ if (pch == p) {
+
expr_error(mon, "invalid char '%c' in expression", *p);+ }
+ pch = p;
+ while (
qemu_isspace(*pch)) {+ pch++;
+ }
+ break;
+ }
+ return n;
+}
+
+static
HMP_EXPR_INC_TYHMP_EXPR_INC_IDENT(expr_prod)(Monitor *mon)+{
+
HMP_EXPR_INC_TYval, val2;+ int op;
+
+ val = HMP_EXPR_INC_IDENT(expr_unary)(mon);
+ for (;;) {
+ op = *pch;
+ if (op != '*' && op != '/' && op != '%') {
+ break;
+ }
+
next();+ val2 = HMP_EXPR_INC_IDENT(expr_unary)(mon);
+ switch (op) {
+ default:
+ case '*':
+ val *= val2;
+ break;
+ case '/':
+ case '%':
+ if (val2 == 0) {
+
expr_error(mon, "division by zero");+ }
+ if (op == '/') {
+ val /= val2;
+ } else {
+ val %= val2;
+ }
+ break;
+ }
+ }
+ return val;
+}
+
+static
HMP_EXPR_INC_TYHMP_EXPR_INC_IDENT(expr_logic)(Monitor *mon)+{
+
HMP_EXPR_INC_TYval, val2;+ int op;
+
+ val = HMP_EXPR_INC_IDENT(expr_prod)(mon);
+ for (;;) {
+ op = *pch;
+ if (op != '&' && op != '|' && op != '^') {
+ break;
+ }
+
next();+ val2 = HMP_EXPR_INC_IDENT(expr_prod)(mon);
+ switch (op) {
+ default:
+ case '&':
+ val &= val2;
+ break;
+ case '|':
+ val |= val2;
+ break;
+ case '^':
+ val ^= val2;
+ break;
+ }
+ }
+ return val;
+}
+
+static
HMP_EXPR_INC_TYHMP_EXPR_INC_IDENT(expr_sum)(Monitor *mon)+{
+
HMP_EXPR_INC_TYval, val2;+ int op;
+
+ val = HMP_EXPR_INC_IDENT(expr_logic)(mon);
+ for (;;) {
+ op = *pch;
+ if (op != '+' && op != '-') {
+ break;
+ }
+
next();+ val2 = HMP_EXPR_INC_IDENT(expr_logic)(mon);
+ if (op == '+') {
+ val += val2;
+ } else {
+ val -= val2;
+ }
+ }
+ return val;
+}
+
+static int HMP_EXPR_INC_IDENT(get_expr)(Monitor *mon,
HMP_EXPR_INC_TY*pval, const char **pp)+{
+ pch = *pp;
+ if (
sigsetjmp(expr_env, 0)) {+ *pp = pch;
+ return -1;
+ }
+ while (
qemu_isspace(*pch)) {+ pch++;
+ }
+ *pval = HMP_EXPR_INC_IDENT(expr_sum)(mon);
+ *pp = pch;
+ return 0;
+}
+
+#undef
HMP_EXPR_INC_TY+#undef
HMP_EXPR_INC_IDENTdiff --git
a/monitor/hmp.cb/monitor/hmp.cindex
460e8832f6..95d965a20a100644---
a/monitor/hmp.c+++
b/monitor/hmp.c@@ -332,195 +332,13 @@ static void next(void)
}
}
-static
int64_texpr_sum(Monitor *mon);+#define
HMP_EXPR_INC_TYint64_t+#define
HMP_EXPR_INC_IDENT(name)name ##_int64+#include "monitor/hmp-expr.inc"
-static
int64_texpr_unary(Monitor *mon)-{
-
int64_tn;- char *p;
- int ret;
-
- switch (*pch) {
- case '+':
-
next();- n =
expr_unary(mon);- break;
- case '-':
-
next();- n = -expr_unary(mon);
- break;
- case '~':
-
next();- n = ~expr_unary(mon);
- break;
- case '(':
-
next();- n =
expr_sum(mon);- if (*pch != ')') {
-
expr_error(mon, "')' expected");- }
-
next();- break;
- case '\'':
- pch++;
- if (*pch == '\0') {
-
expr_error(mon, "character constant expected");- }
- n = *pch;
- pch++;
- if (*pch != '\'') {
-
expr_error(mon, "missing terminating \' character");- }
-
next();- break;
- case '$':
- {
- char buf[128], *q;
-
int64_treg = 0;-
- pch++;
- q = buf;
- while ((*pch >= 'a' && *pch <= 'z') ||
- (*pch >= 'A' && *pch <= 'Z') ||
- (*pch >= '0' && *pch <= '9') ||
- *pch == '_' || *pch == '.') {
- if ((q - buf) < sizeof(buf) - 1) {
- *q++ = *pch;
- }
- pch++;
- }
- while (
qemu_isspace(*pch)) {- pch++;
- }
- *q = 0;
- ret =
get_monitor_def(mon, ®, buf);- if (ret < 0) {
-
expr_error(mon, "unknown register");- }
- n = reg;
- }
- break;
- case '\0':
-
expr_error(mon, "unexpected end of expression");- n = 0;
- break;
- default:
- errno = 0;
- n =
strtoull(pch, &p, 0);- if (errno == ERANGE) {
-
expr_error(mon, "number too large");- }
- if (pch == p) {
-
expr_error(mon, "invalid char '%c' in expression", *p);- }
- pch = p;
- while (
qemu_isspace(*pch)) {- pch++;
- }
- break;
- }
- return n;
-}
-
-static
int64_texpr_prod(Monitor *mon)-{
-
int64_tval, val2;- int op;
-
- val =
expr_unary(mon);- for (;;) {
- op = *pch;
- if (op != '*' && op != '/' && op != '%') {
- break;
- }
-
next();- val2 =
expr_unary(mon);- switch (op) {
- default:
- case '*':
- val *= val2;
- break;
- case '/':
- case '%':
- if (val2 == 0) {
-
expr_error(mon, "division by zero");- }
- if (op == '/') {
- val /= val2;
- } else {
- val %= val2;
- }
- break;
- }
- }
- return val;
-}
-
-static
int64_texpr_logic(Monitor *mon)-{
-
int64_tval, val2;- int op;
-
- val =
expr_prod(mon);- for (;;) {
- op = *pch;
- if (op != '&' && op != '|' && op != '^') {
- break;
- }
-
next();- val2 =
expr_prod(mon);- switch (op) {
- default:
- case '&':
- val &= val2;
- break;
- case '|':
- val |= val2;
- break;
- case '^':
- val ^= val2;
- break;
- }
- }
- return val;
-}
-
-static
int64_texpr_sum(Monitor *mon)-{
-
int64_tval, val2;- int op;
-
- val =
expr_logic(mon);- for (;;) {
- op = *pch;
- if (op != '+' && op != '-') {
- break;
- }
-
next();- val2 =
expr_logic(mon);- if (op == '+') {
- val += val2;
- } else {
- val -= val2;
- }
- }
- return val;
-}
-
-static int
get_expr(Monitor *mon, int64_t *pval, const char **pp)-{
- pch = *pp;
- if (
sigsetjmp(expr_env, 0)) {- *pp = pch;
- return -1;
- }
- while (
qemu_isspace(*pch)) {- pch++;
- }
- *pval =
expr_sum(mon);- *pp = pch;
- return 0;
-}
+#define
HMP_EXPR_INC_TYuint64_t+#define
HMP_EXPR_INC_IDENT(name)name ##_uint64+#include "monitor/hmp-expr.inc"
static int
get_double(Monitor *mon, double *pval, const char **pp){
@@ -882,7 +700,7 @@ static QDict *monitor_parse_arguments(Monitor *mon,
}
typestr++;
}
- if (
get_expr(mon, &val, &p)) {+ if (
get_expr_int64(mon, &val, &p)) {goto fail;
}
/* Check if 'i' is greater than 32-bit */
@@ -900,6 +718,51 @@ static QDict *monitor_parse_arguments(Monitor *mon,
qdict_put_int(qdict, key, val);}
break;
+ case 'd':
+ case 'u':
+ case 'm':
+ {
+
uint64_tval;+
+ while (
qemu_isspace(*p)) {+ p++;
+ }
+ if (*typestr == '?' || *typestr == '.') {
+ if (*typestr == '?') {
+ if (*p == '\0') {
+ typestr++;
+ break;
+ }
+ } else {
+ if (*p == '.') {
+ p++;
+ while (
qemu_isspace(*p)) {+ p++;
+ }
+ } else {
+ typestr++;
+ break;
+ }
+ }
+ typestr++;
+ }
+
+ if (
get_expr_uint64(mon, &val, &p)) {+ goto fail;
+ }
+
+ /* Check if 'd' is greater than 32-bit */
+ if ((c == 'd') && ((val >> 32) &
0xffffffff)) {+
monitor_printf(mon, "\'%s\' has failed: ", cmd->name);+
monitor_printf(mon, "integer is for 32-bit values\n");+ goto fail;
+ } else if (c == 'm') {
+ val *= MiB;
+ }
+
+
qdict_put_uint(qdict, key, val);+ }
+ break;
case 'o':
{
int ret;
diff --git
a/qapi/machine.jsonb/qapi/machine.jsonindex
fcfd249e2d..7c2627c3e2100644---
a/qapi/machine.json+++
b/qapi/machine.json@@ -825,6 +825,44 @@
'policy': 'HmatCacheWritePolicy',
'line': 'uint16' }}
+##
+# @MemTranslation:
+#
+# Result of a virtual-to-physical memory translation via @memtranslate.
+#
+# @phys: the physical address corresponding to the virtual address,
+# or -1 if the translation failed
+#
+# Since: TBD
+##
+{ 'struct': 'MemTranslation',
+ 'data': { 'phys': 'uint64' } }
+
+##
+# @memtranslate:
+#
+# Translate a guest virtual address to a physical address.
+#
+# @val: the virtual address of the guest to translate
+#
+# @cpu-index: the index of the virtual CPU to use for translating the
+# virtual address (defaults to CPU 0)
+#
+# Returns:
+# @MemTranslation
+#
+# Since: TBD
+#
+# .. qmp-example::
+#
+# -> { "execute": "memtranslate",
+# "arguments": { "val": 10 } }
+# <- { "return": { "phys": 20 } }
+##
+{ 'command': 'memtranslate',
+ 'data': {'val': 'uint64', '*cpu-index': 'int'},
+ 'returns': 'MemTranslation' }
+
##
# @memsave:
#
@@ -852,7 +890,7 @@
# <- { "return": {} }
##
{ 'command': 'memsave',
- 'data': {'val': 'int', 'size': 'int', 'filename': 'str', '*cpu-index': 'int'} }
+ 'data': {'val': 'uint64', 'size': 'uint64', 'filename': 'str', '*cpu-index': 'int'} }
##
# @pmemsave:
@@ -878,7 +916,7 @@
# <- { "return": {} }
##
{ 'command': 'pmemsave',
- 'data': {'val': 'int', 'size': 'int', 'filename': 'str'} }
+ 'data': {'val': 'uint64', 'size': 'uint64', 'filename': 'str'} }
##
# @Memdev:
diff --git
a/qobject/qdict.cb/qobject/qdict.cindex
8faff230d3..9696eee57d100644---
a/qobject/qdict.c+++
b/qobject/qdict.c@@ -136,6 +136,11 @@ void
qdict_put_int(QDict *qdict, const char *key, int64_t value)
qdict_put(qdict, key, qnum_from_int(value));}
+void
qdict_put_uint(QDict *qdict, const char *key, uint64_t value)+{
+
qdict_put(qdict, key, qnum_from_uint(value));+}
+
void
qdict_put_bool(QDict *qdict, const char *key, bool value){
qdict_put(qdict, key, qbool_from_bool(value));@@ -209,6 +214,19 @@
int64_tqdict_get_int(const QDict *qdict, const char *key)return
qnum_get_int(qobject_to(QNum, qdict_get(qdict, key)));}
+/**
+ *
qdict_get_int(): Get an unsigned integer mapped by 'key'+ *
+ * This function assumes that 'key' exists and it stores a
+ * QNum representable as uint.
+ *
+ * Return integer mapped by 'key'.
+ */
+uint64_t
qdict_get_uint(const QDict *qdict, const char *key)+{
+ return
qnum_get_uint(qobject_to(QNum, qdict_get(qdict, key)));+}
+
/**
*
qdict_get_bool(): Get a bool mapped by 'key'*
@@ -272,6 +290,26 @@
int64_tqdict_get_try_int(const QDict *qdict, const char *key,return val;
}
+/**
+ *
qdict_get_try_uint(): Try to get unsigned integer mapped by 'key'+ *
+ * Return integer mapped by 'key', if it is not present in the
+ * dictionary or if the stored object is not a QNum representing an
+ * unsigned integer, '
def_value' will be returned.+ */
+uint64_t qdict_get_try_uint(const QDict *qdict, const char *key,
+
uint64_tdef_value)+{
+ QNum *qnum =
qobject_to(QNum, qdict_get(qdict, key));+
uint64_tval;+
+ if (!qnum || !qnum_get_try_uint(qnum, &val)) {
+ return
def_value;+ }
+
+ return val;
+}
+
/**
*
qdict_get_try_bool(): Try to get a bool mapped by 'key'*
diff --git
a/system/cpus.cb/system/cpus.cindex
5e3a988a0a..25d7d7c93f100644---
a/system/cpus.c+++
b/system/cpus.c@@ -792,7 +792,34 @@ int
vm_stop_force_state(RunState state)}
}
-void qmp_memsave(int64_t addr,
int64_tsize, const char *filename,+MemTranslation *qmp_memtranslate(uint64_t val, bool
has_cpu_index,int64_tcpu_index, Error **errp)+{
+ CPUState *cpu;
+ hwaddr
phys_addr;+ MemTxAttrs attrs;
+ MemTranslation *translation;
+
+ if (!has_cpu_index) {
+
cpu_index= 0;+ }
+
+ cpu =
qemu_get_cpu(cpu_index);+ if (cpu == NULL) {
+ error_setg(errp,
QERR_INVALID_PARAMETER_VALUE, "cpu-index",+ "a CPU number");
+ return NULL;
+ }
+
+
phys_addr=cpu_memory_translate(cpu, val, &attrs);+
+ translation =
g_new0(MemTranslation, 1);+
+
translation->phys=phys_addr;+
+ return translation;
+}
+
+void qmp_memsave(uint64_t addr,
uint64_tsize, const char *filename,bool
has_cpu,int64_tcpu_index, Error **errp){
FILE *f;
@@ -840,7 +867,7 @@ exit:
fclose(f);
}
-void qmp_pmemsave(int64_t addr,
int64_tsize, const char *filename,+void qmp_pmemsave(uint64_t addr,
uint64_tsize, const char *filename,Error **errp)
{
FILE *f;
diff --git
a/system/physmem.cb/system/physmem.cindex
0e19186e1b..d2fab35e3a100644---
a/system/physmem.c+++
b/system/physmem.c@@ -3524,6 +3524,24 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr,
#define
RCU_READ_UNLOCK()((void)0)#include "memory_ldst.c.inc"
+/* virtual memory translation */
+hwaddr
cpu_memory_translate(CPUState *cpu, vaddr addr, MemTxAttrs *attrs)+{
+ hwaddr
phys_addr,phys_addr_rel;+ vaddr page;
+
+ page = addr &
TARGET_PAGE_MASK;+
phys_addr=cpu_get_phys_page_attrs_debug(cpu, page, attrs);+
+ if (
phys_addr== -1) {+ return -1;
+ }
+
+
phys_addr_rel=phys_addr+ (addr & ~TARGET_PAGE_MASK);+
+ return
phys_addr_rel;+}
+
/* virtual memory access for debug (includes writing to ROM) */
int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
void *ptr,
size_tlen, boolis_write)diff --git
a/tests/qtest/test-hmp.cb/tests/qtest/test-hmp.cindex
1b2e07522f..13c45deb35100644---
a/tests/qtest/test-hmp.c+++
b/tests/qtest/test-hmp.c@@ -44,6 +44,7 @@ static const char *hmp_cmds[] = {
"i /w 0",
"log all",
"log none",
+ "memtranslate 0",
"memsave 0 4096 \"/dev/null\"",
"
migrate_set_parameterxbzrle-cache-size 64k","
migrate_set_parameterdowntime-limit 1",diff --git
a/tests/unit/check-qdict.cb/tests/unit/check-qdict.cindex
b5efa859b0..09ebe08900100644---
a/tests/unit/check-qdict.c+++
b/tests/unit/check-qdict.c@@ -99,6 +99,21 @@ static void
qdict_get_int_test(void)
qobject_unref(tests_dict);}
+static void
qdict_get_uint_test(void)+{
+ int ret;
+ const unsigned int value = 100;
+ const char *key = "int";
+ QDict
*tests_dict=qdict_new();+
+
qdict_put_uint(tests_dict, key, value);+
+ ret =
qdict_get_uint(tests_dict, key);+
g_assert(ret == value);+
+
qobject_unref(tests_dict);+}
+
static void
qdict_get_try_int_test(void){
int ret;
@@ -121,6 +136,28 @@ static void
qdict_get_try_int_test(void)
qobject_unref(tests_dict);}
+static void
qdict_get_try_uint_test(void)+{
+ int ret;
+ const unsigned int value = 100;
+ const char *key = "int";
+ QDict
*tests_dict=qdict_new();+
+
qdict_put_uint(tests_dict, key, value);+
qdict_put_str(tests_dict, "string", "test");+
+ ret =
qdict_get_try_uint(tests_dict, key, 0);+
g_assert(ret == value);+
+ ret =
qdict_get_try_uint(tests_dict, "missing", -42);+
g_assert_cmpuint(ret, ==, -42);+
+ ret =
qdict_get_try_uint(tests_dict, "string", -42);+
g_assert_cmpuint(ret, ==, -42);+
+
qobject_unref(tests_dict);+}
+
static void
qdict_get_str_test(void){
const char *p;
@@ -358,7 +395,9 @@ int
main(int argc, char **argv)/* Continue, but now with fixtures */
g_test_add_func("/public/get", qdict_get_test);
g_test_add_func("/public/get_int", qdict_get_int_test);+
g_test_add_func("/public/get_uint", qdict_get_uint_test);
g_test_add_func("/public/get_try_int", qdict_get_try_int_test);+
g_test_add_func("/public/get_try_uint", qdict_get_try_uint_test);
g_test_add_func("/public/get_str", qdict_get_str_test);
g_test_add_func("/public/get_try_str", qdict_get_try_str_test);
g_test_add_func("/public/haskey_not", qdict_haskey_not_test);--
2.34.1
Signature · 7 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org/ |_______/
Quoted 41 lines · [email protected] writes:
31 July 2024 at 02:12, "Dr. David Alan Gilbert" <[email protected]> wrote:
Hello Dr. Gilbert,
Quoted 27 lines · * Josh Junon ([email protected]) wrote:
Hi Josh,
Quoted 8 lines
This commit adds a new QMP/HMP command
memtranslate, which translates a virtual address to a physical address using the guest's MMU.This uses the same mechanism that
[p]memsavedoes to perform the translation.Quoted 8 lines
This commit also fixes a long standing issue of
[p]memsavenot properly handling higher-half virtual addresses correctly, namely when used over QMP/the monitor. The use and assumption of signed integers caused issues when parsing otherwise valid virtual addresses that instead caused signed integer overflow or ERANGE errors.Signed-off-by Josh Junon <[email protected]>There's a few different changes in this one patch; so the first thing is it needs splitting up; I suggest at least:
a) Fixing the signedness problems
Quoted 9 lines
b) The QMP implementation of the new command
c) The HMP implementation of the new command
That would make it a lot easier to review - also, it's good to get fixes in first!
Now, going back a step; how does this compare to the existing 'gva2gpa' command which HMP has?
Quoted 3 lines
Good catch, they're definitely the same. I didn't see that was there before, perhaps because of the name. I've been looking for this exact command for a while now, so it surprises me that I missed it!
Since that's an HMP-only command, would it be okay if simply redirected its definition to a new
qmp_gva2gpacommand so the implementation is all in one spot?
If you have a use case for a QMP version, go right ahead.
Quoted 1 line
If that's amenable, I can patch in the signedness fixes, then submit
qmp_gva2gpa, then changinghmp_gva2gpato use theqmp_gva2gpasimilar to how other HMP commands with QMP analogs are implemented. Just let me know if that works and I'll get on it.
Sounds like a plan to me.
Quoted 4 lines
I appreciate the response!
Josh