Fix gdb.Inferior.read_memory without execution (PR dap/30644) (was: Re: [PATCH v4 6/6] Use correct inferior in Inferior.read_memory et al)
Commit Message
On 2023-07-17 19:44, Tom Tromey wrote:
>>>>>> "Pedro" == Pedro Alves <pedro@palves.net> writes:
>
> Pedro> I'm thinking that we should just remove the ptid parameter and the
> Pedro> any_thread_of_inferior calls completely, and make
> Pedro> scoped_restore_current_inferior_for_memory switch inferior_ptid to
> Pedro> a pid ptid.
> ...
>
> Pedro> While on some ports like on AMD GPU we have things like thread-specific
> Pedro> address spaces, and so when accessing memory for those address spaces,
> Pedro> we must have the right thread context (via inferior_ptid) selected, in
> Pedro> Inferior.read_memory, we only have the inferior, so this means that this API as
> Pedro> is can't be used to access such address spaces.
>
> Yeah. Probably for this case we need to add Thread.read_memory et al,
> then make note of this in the gdb.Inferior docs.
>
> Pedro> I ran the testsuite on native and extended-gdbserver (x86_64 GNU/Linux),
> Pedro> and saw no regressions.
>
> +1 on this from me. Thank you.
>
> BTW this is https://sourceware.org/bugzilla/show_bug.cgi?id=30644
>
> Reviewed-By: Tom Tromey <tom@tromey.com>
Alright, now as a proper patch, with ctor intro comment tweaked, and with new test
added to gdb.python/py-inferior.exp. WDYT?
---8<---
From e15ab1d7209b65f344ec20931452861990706742 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedro@palves.net>
Date: Mon, 17 Jul 2023 18:31:02 +0100
Subject: [PATCH] Fix gdb.Inferior.read_memory without execution (PR dap/30644)
Andrew reported that the previous change to gdb.Inferior.read_memory &
friends introducing scoped_restore_current_inferior_for_memory broke
gdb.dap/stop-at-main.exp. This is also reported as PR dap/30644.
The root of the problem is that all the methods that now use
scoped_restore_current_inferior_for_memory cause GDB to crash with a
failed assert if they are run on an inferior that is not yet started.
E.g.:
(gdb) python i = gdb.selected_inferior ()
(gdb) python i.read_memory (4,4)
gdb/thread.c:626: internal-error: any_thread_of_inferior: Assertion `inf->pid != 0' failed.
This patch fixes the problem by removing
scoped_restore_current_inferior_for_memory's ctor ptid parameter and
the any_thread_of_inferior calls completely, and making
scoped_restore_current_inferior_for_memory switch inferior_ptid to a
pid ptid.
I was a little worried that some port might be assuming inferior_ptid
points at a thread in the xfer_partial memory access routines. We
know that anything that supports forks must not assume that, due to
how detach_breakpoints works. I looked at a number of xfer_partial
implementations, and didn't see anything that is looking at
inferior_ptid in a way that would misbehave. I'm thinking that we
could go forward with this and just fix ports if they break.
While on some ports like on AMD GPU we have thread-specific address
spaces, and so when accessing memory for those address spaces, we must
have the right thread context (via inferior_ptid) selected, in
Inferior.read_memory, we only have the inferior to work with, so this
API as is can't be used to access thread-specific address spaces.
IOW, it can only be used to access the global address space that is
visible to both the CPU and the GPUs.
In proc-service.c:ps_xfer_memory, the other spot using
scoped_restore_current_inferior_for_memory, we're always accessing
per-inferior memory.
If we end up using scoped_restore_current_inferior_for_memory later to
set up the context to read memory from a specific thread, then we can
add an alternative ctor that takes a thread_info pointer, and make
inferior_ptid point to the thread, for example.
New test added to gdb.python/py-inferior.exp, exercising
Inferior.read_memory without execution.
No regressions on native and extended-gdbserver x86_64 GNU/Linux.
Reviewed-By: Tom Tromey <tom@tromey.com>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30644
Change-Id: I11309c5ddbbb51a4594cf63c21b3858bfd9aed19
---
gdb/inferior.h | 8 ++++----
gdb/proc-service.c | 3 +--
gdb/python/py-inferior.c | 8 ++++----
gdb/testsuite/gdb.python/py-inferior.c | 1 +
gdb/testsuite/gdb.python/py-inferior.exp | 10 ++++++++++
5 files changed, 20 insertions(+), 10 deletions(-)
base-commit: 4676d03804285d76a51cb7f98ebe72374321a1f9
Comments
>>>>> "Pedro" == Pedro Alves <pedro@palves.net> writes:
Pedro> Alright, now as a proper patch, with ctor intro comment tweaked, and with new test
Pedro> added to gdb.python/py-inferior.exp. WDYT?
Looks good to me, thank you.
Tom
On 2023-07-18 18:25, Tom Tromey wrote:
>>>>>> "Pedro" == Pedro Alves <pedro@palves.net> writes:
>
> Pedro> Alright, now as a proper patch, with ctor intro comment tweaked, and with new test
> Pedro> added to gdb.python/py-inferior.exp. WDYT?
>
> Looks good to me, thank you.
I pushed this with a tiny change -- since scoped_restore_current_inferior_for_memory's ctor
ends up with one parameter, I made it explicit.
@@ -769,14 +769,14 @@ class scoped_restore_current_inferior_for_memory
public:
/* Save the current globals and switch to the given inferior and the
- inferior's program space. PTID must name a thread in INF, it is
- used as the new inferior_ptid. */
- scoped_restore_current_inferior_for_memory (inferior *inf, ptid_t ptid)
+ inferior's program space. inferior_ptid is set to point to the
+ inferior's process id (and not to any particular thread). */
+ scoped_restore_current_inferior_for_memory (inferior *inf)
: m_save_ptid (&inferior_ptid)
{
set_current_inferior (inf);
set_current_program_space (inf->pspace);
- inferior_ptid = ptid;
+ inferior_ptid = ptid_t (inf->pid);
}
DISABLE_COPY_AND_ASSIGN (scoped_restore_current_inferior_for_memory);
@@ -72,8 +72,7 @@ static ps_err_e
ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
gdb_byte *buf, size_t len, int write)
{
- scoped_restore_current_inferior_for_memory save_inferior (ph->thread->inf,
- ph->thread->ptid);
+ scoped_restore_current_inferior_for_memory save_inferior (ph->thread->inf);
CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
@@ -550,7 +550,7 @@ infpy_read_memory (PyObject *self, PyObject *args, PyObject *kw)
/* Use this scoped-restore because we want to be able to read
memory from an unwinder. */
scoped_restore_current_inferior_for_memory restore_inferior
- (inf->inferior, any_thread_of_inferior (inf->inferior)->ptid);
+ (inf->inferior);
buffer.reset ((gdb_byte *) xmalloc (length));
@@ -608,7 +608,7 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw)
still used here, just to keep the code similar to other code
in this file. */
scoped_restore_current_inferior_for_memory restore_inferior
- (inf->inferior, any_thread_of_inferior (inf->inferior)->ptid);
+ (inf->inferior);
write_memory_with_notification (addr, buffer, length);
}
@@ -683,7 +683,7 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw)
still used here, just to keep the code similar to other code
in this file. */
scoped_restore_current_inferior_for_memory restore_inferior
- (inf->inferior, any_thread_of_inferior (inf->inferior)->ptid);
+ (inf->inferior);
found = target_search_memory (start_addr, length,
buffer, pattern_size,
@@ -944,7 +944,7 @@ infpy_get_main_name (PyObject *self, void *closure)
still used, just to keep the code similar to other code in
this file. */
scoped_restore_current_inferior_for_memory restore_inferior
- (inf->inferior, any_thread_of_inferior (inf->inferior)->ptid);
+ (inf->inferior);
name = main_name ();
}
@@ -16,6 +16,7 @@ int64_t int64_search_buf[100];
static char *search_buf;
static int search_buf_size;
+int8_t int8_global = 42;
int f2 (int a)
{
@@ -34,6 +34,16 @@ switch [get_endianness] {
big { set python_pack_char ">" }
}
+# Test memory read operations without execution.
+
+gdb_py_test_silent_cmd "python addr = gdb.lookup_global_symbol ('int8_global').value().address" \
+ "get global variable address" 0
+gdb_test "python \
+ int8_global_mv = gdb.selected_inferior().read_memory (addr, 1); \
+ print(int.from_bytes(int8_global_mv\[0\], byteorder='little'))" \
+ "\r\n42" \
+ "read memory without execution"
+
# The following tests require execution.
if {![runto_main]} {