gdbstub: add support to Xfer:auxv:read: packet
PATCH v2 1/1 gdbstub: add support to Xfer:auxv:read: packet
This allows gdb to access the target’s auxiliary vector, which can be helpful for telling system libraries important details about the hardware, operating system, and process.
---
Changelog since v1:
- Added a multiarch gdbstub test to verify this is working properly.
--- gdbstub.c | 54 ++++++++++++++++ tests/tcg/multiarch/Makefile.target | 9 ++- .../multiarch/gdbstub/test-qxfer-auxv-read.py | 64 +++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py
gdbstub.c +54 -0
@@ -2124,6 +2124,12 @@ static void handle_query_supported(GdbCmdContext *gdb_ctx, void *user_ctx)g_string_append (gdbserver_state.str_buf,";qXfer:features:read+" ); } +#ifdef CONFIG_USER_ONLY +if (gdbserver_state.c_cpu->opaque) { +g_string_append (gdbserver_state.str_buf,";qXfer:auxv:read+" ); + } +#endif +if (gdb_ctx->num_params &&strstr (gdb_ctx->params[0 ].data,"multiprocess+" )) { gdbserver_state.multiprocess = true;
@@ -2185,6 +2191,46 @@ static void handle_query_xfer_features(GdbCmdContext *gdb_ctx, void *user_ctx) gdbserver_state.str_buf->len, true); } +#ifdef CONFIG_USER_ONLY +static void handle_query_xfer_auxv (GdbCmdContext *gdb_ctx,void *user_ctx) +{ +TaskState *ts; +unsigned long offset, len, saved_auxv, auxv_len; +const char *mem; + +if (gdb_ctx->num_params <2 ) { +put_packet ("E22" ); +return ; + } + + offset = gdb_ctx->params[0 ].val_ul; + len = gdb_ctx->params[1 ].val_ul; + ts = gdbserver_state.c_cpu->opaque; + saved_auxv = ts->info->saved_auxv; + auxv_len = ts->info->auxv_len; + mem = (const char *)(saved_auxv + offset); +if (offset > auxv_len) { +put_packet ("E00" ); +return ; + } + +if (len > (MAX_PACKET_LENGTH -5 ) /2 ) { + len = (MAX_PACKET_LENGTH -5 ) /2 ; + } + +if (len < auxv_len - offset) { +g_string_assign (gdbserver_state.str_buf,"m" ); +memtox (gdbserver_state.str_buf, mem, len); + }else { +g_string_assign (gdbserver_state.str_buf,"l" ); +memtox (gdbserver_state.str_buf, mem, auxv_len - offset); + } + +put_packet_binary (gdbserver_state.str_buf->str, + gdbserver_state.str_buf->len, true); +} +#endif +static void handle_query_attached (GdbCmdContext *gdb_ctx,void *user_ctx) {put_packet (GDB_ATTACHED );
@@ -2290,6 +2336,14 @@ static GdbCmdParseEntry gdb_gen_query_table[] = { .cmd_startswith = 1, .schema = "s:l,l0" }, +#ifdef CONFIG_USER_ONLY + { + .handler = handle_query_xfer_auxv, + .cmd = "Xfer:auxv:read::", + .cmd_startswith = 1, + .schema = "l,l0" + }, +#endif { .handler = handle_query_attached, .cmd = "Attached:",
tests/tcg/multiarch/Makefile.target +8 -1
@@ -54,7 +54,14 @@ run-gdbstub-sha1: sha1 --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \ "basic gdbstub support") -EXTRA_RUNS += run-gdbstub-sha1 +run-gdbstub-qxfer-auxv-read: sha1 + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(HAVE_GDB_BIN) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \ + "basic gdbstub qXfer:auxv:read support") + +EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read endif
tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.28.0.163.g6104cc2f0b6-goog
Alex Bennée
AppliedQuoted 5 lines · Lirong Yuan
This allows gdb to access the target’s auxiliary vector, which can be helpful for telling system libraries important details about the hardware, operating system, and process.
Signed-off-by Lirong Yuan <[email protected]>
I cleaned up the test a little:
modified tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py
@@ -22,13 +22,9 @@ def report(cond, msg):
def run_test():
"Run through the tests one by one"
- cond = True
- try:
- gdb.execute("info auxv")
- except (gdb.error, AttributeError):
- cond = False
-
- report(cond, "Display the auxiliary vector of the inferior.")
+ auxv = gdb.execute("info auxv", False, True)
+ report(isinstance(auxv, str), "Fetched auxv from inferior")
+ report(auxv.find("sha1"), "Found test binary name in auxv") #
# This runs as the script it sourced (via -x, via run-test.py)
Queued to gdbstub/next, thanks.
Signature · 1 line
Alex Bennée
Quoted 32 lines · Alex Bennée
Quoted 5 lines · Lirong Yuan
This allows gdb to access the target’s auxiliary vector, which can be helpful for telling system libraries important details about the hardware, operating system, and process.
Signed-off-by Lirong Yuan <[email protected]>I cleaned up the test a little:
modified
tests/tcg/multiarch/gdbstub/test-qxfer-auxv-read.py(quoted diff) +3
-7@@ -22,13 +22,9 @@ def report(cond, msg): def run_test(): "Run through the tests one by one" - cond = True - try: - gdb.execute("info auxv") - except (gdb.error, AttributeError): - cond = False - - report(cond, "Display the auxiliary vector of the inferior.") + auxv = gdb.execute("info auxv", False, True) + report(isinstance(auxv, str), "Fetched auxv from inferior") + report(auxv.find("sha1"), "Found test binary name in auxv") # # This runs as the script it sourced (via -x, via run-test.py)
Quoted 4 lines
Queued to gdbstub/next, thanks.
--
Alex Bennée
Awesome, thank you Alex for the review and cleanup!
Regards,
Lirong