From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1805) id 18A9038582A6; Tue, 18 Oct 2022 13:25:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18A9038582A6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666099503; bh=eow6uv/t3L6gkC2dZntoUvfC8ksHdhm0wEsvef5YS/E=; h=From:To:Subject:Date:From; b=GQomdq0MpPzHJLrqCT1mMEgBaydihYfFXGKUwanmM34cxLU6ScSoLcNMrdTjoArGS v19IT3BZv1dtd+1B1SWHXrrqi0RnftnoQyN2anl956vTBWW/oc0+fKx8ZVZ9XnNtU+ dj8eEr8ou9QpIb9CEIDIt6RTDVWeSaus28kRflew= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Markus Metzger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb, gdbserver: extend RSP to support namespaces X-Act-Checkin: binutils-gdb X-Git-Author: Markus Metzger X-Git-Refname: refs/heads/master X-Git-Oldrev: ad10f44e568806c2399f9405f4588f3e27f7d9ae X-Git-Newrev: 2733d9d5d62c62023dc2d7a93fa5afa22f386ffd Message-Id: <20221018132503.18A9038582A6@sourceware.org> Date: Tue, 18 Oct 2022 13:25:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D2733d9d5d62c= 62023dc2d7a93fa5afa22f386ffd commit 2733d9d5d62c62023dc2d7a93fa5afa22f386ffd Author: Markus Metzger Date: Tue Mar 15 18:08:06 2022 +0100 gdb, gdbserver: extend RSP to support namespaces =20 Introduce a new qXfer:libraries-svr4:read annex key/value pair =20 lmid=3D =20 to be used together with start and prev to provide the namespace of sta= rt and prev to gdbserver. =20 Unknown key/value pairs are ignored by gdbserver so no new supports che= ck is needed. =20 Introduce a new library-list-svr4 library attribute =20 lmid =20 to provide the namespace of a library entry to GDB. =20 This implementation uses the address of a namespace's r_debug object as namespace identifier. =20 This should have incremented the minor version but since unknown XML attributes are ignored, anyway, and since changing the version results = in a warning from GDB, the version is left at 1.0. Diff: --- gdb/doc/gdb.texinfo | 16 ++++++++++++++-- gdb/features/library-list-svr4.dtd | 4 ++++ gdb/solib-svr4.c | 38 ++++++++++++++++++++++++++++++++++= +--- gdbserver/linux-low.cc | 26 +++++++++++++++++--------- 4 files changed, 70 insertions(+), 14 deletions(-) diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 3de511a4844..ea66f4ee42d 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -43706,6 +43706,12 @@ specified by the @samp{start} argument. If unset = or zero then the remote stub will expect that no @samp{struct link_map} exists prior to the starting point. =20 +@item lmid=3D@var{lmid} +A hexadecimal number specifying a namespace identifier. This is +currently only used together with @samp{start} to provide the +namespace identifier back to @value{GDBN} in the response. +@value{GDBN} will only provide values that were previously reported to +it. If unset, the response will include @samp{lmid=3D"0x0"}. @end table =20 Arguments that are not understood by the remote stub will be silently @@ -46244,6 +46250,11 @@ memory address. It is a displacement of absolute = memory address against address the file was prelinked to during the library load. @item @code{l_ld}, which is memory address of the @code{PT_DYNAMIC} segment +@item +@code{lmid}, which is an identifier for a linker namespace, such as +the memory address of the @code{r_debug} object that contains this +namespace's load map or the namespace identifier returned by +@code{dlinfo (3)}. @end itemize =20 Additionally the single @code{main-lm} attribute specifies address of @@ -46259,9 +46270,9 @@ looks like this: @smallexample + l_ld=3D"0xe4eefc" lmid=3D"0xfffe0"/> + l_ld=3D"0x152350" lmid=3D"0xfffe0"/> @end smallexample =20 @@ -46277,6 +46288,7 @@ The format of an SVR4 library list is described by = this DTD: + @end smallexample =20 @node Memory Map Format diff --git a/gdb/features/library-list-svr4.dtd b/gdb/features/library-list= -svr4.dtd index 7d62354c34c..e869ff1349e 100644 --- a/gdb/features/library-list-svr4.dtd +++ b/gdb/features/library-list-svr4.dtd @@ -14,3 +14,7 @@ + + diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index a80e7e30561..295e9b8b69d 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1067,8 +1067,37 @@ library_list_start_library (struct gdb_xml_parser *p= arser, new_elem->so_name[sizeof (new_elem->so_name) - 1] =3D 0; strcpy (new_elem->so_original_name, new_elem->so_name); =20 - *list->tailp =3D new_elem; - list->tailp =3D &new_elem->next; + /* Older versions did not supply lmid. Put the element into the flat + list of the special namespace zero in that case. */ + gdb_xml_value *at_lmid =3D xml_find_attribute (attributes, "lmid"); + if (at_lmid =3D=3D nullptr) + { + *list->tailp =3D new_elem; + list->tailp =3D &new_elem->next; + } + else + { + ULONGEST lmid =3D *(ULONGEST *) at_lmid->value.get (); + + /* Ensure that the element is actually initialized. */ + if (list->solib_lists.find (lmid) =3D=3D list->solib_lists.end ()) + list->solib_lists[lmid] =3D nullptr; + + so_list **psolist =3D &list->solib_lists[lmid]; + so_list **pnext =3D psolist; + + /* Walk to the end of the list if we have one. */ + so_list *solist =3D *psolist; + if (solist !=3D nullptr) + { + for (; solist->next !=3D nullptr; solist =3D solist->next) + /* Nothing. */; + + pnext =3D &solist->next; + } + + *pnext =3D new_elem; + } } =20 /* Handle the start of a element. */ @@ -1108,6 +1137,7 @@ static const struct gdb_xml_attribute svr4_library_at= tributes[] =3D { "lm", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, { "l_addr", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, { "l_ld", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { "lmid", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, { NULL, GDB_XML_AF_NONE, NULL, NULL } }; =20 @@ -1869,7 +1899,9 @@ solist_update_incremental (svr4_info *info, CORE_ADDR= debug_base, struct svr4_library_list library_list; char annex[64]; =20 - xsnprintf (annex, sizeof (annex), "start=3D%s;prev=3D%s", + /* Unknown key=3Dvalue pairs are ignored by the gdbstub. */ + xsnprintf (annex, sizeof (annex), "lmid=3D%s;start=3D%s;prev=3D%s", + phex_nz (debug_base, sizeof (debug_base)), phex_nz (lm, sizeof (lm)), phex_nz (prev_lm, sizeof (prev_lm))); if (!svr4_current_sos_via_xfer_libraries (&library_list, annex)) diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index e83ccceed83..4754366d443 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6489,8 +6489,8 @@ static const link_map_offsets lmo_64bit_offsets =3D /* Get the loaded shared libraries from one namespace. */ =20 static void -read_link_map (std::string &document, CORE_ADDR lm_addr, CORE_ADDR lm_prev, - int ptr_size, const link_map_offsets *lmo) +read_link_map (std::string &document, CORE_ADDR lmid, CORE_ADDR lm_addr, + CORE_ADDR lm_prev, int ptr_size, const link_map_offsets *lmo) { CORE_ADDR l_name, l_addr, l_ld, l_next, l_prev; =20 @@ -6525,9 +6525,9 @@ read_link_map (std::string &document, CORE_ADDR lm_ad= dr, CORE_ADDR lm_prev, string_appendf (document, "", + "l_ld=3D\"0x%s\" lmid=3D\"0x%s\"/>", paddress (lm_addr), paddress (l_addr), - paddress (l_ld)); + paddress (l_ld), paddress (lmid)); } =20 lm_prev =3D lm_addr; @@ -6547,7 +6547,7 @@ linux_process_target::qxfer_libraries_svr4 (const cha= r *annex, char filename[PATH_MAX]; int pid, is_elf64; unsigned int machine; - CORE_ADDR lm_addr =3D 0, lm_prev =3D 0; + CORE_ADDR lmid =3D 0, lm_addr =3D 0, lm_prev =3D 0; =20 if (writebuf !=3D NULL) return -2; @@ -6581,7 +6581,9 @@ linux_process_target::qxfer_libraries_svr4 (const cha= r *annex, break; =20 name_len =3D sep - annex; - if (name_len =3D=3D 5 && startswith (annex, "start")) + if (name_len =3D=3D 4 && startswith (annex, "lmid")) + addrp =3D &lmid; + else if (name_len =3D=3D 5 && startswith (annex, "start")) addrp =3D &lm_addr; else if (name_len =3D=3D 4 && startswith (annex, "prev")) addrp =3D &lm_prev; @@ -6600,19 +6602,25 @@ linux_process_target::qxfer_libraries_svr4 (const c= har *annex, std::string document =3D ""; - read_link_map (document, lm_addr, lm_prev, ptr_size, lmo); + read_link_map (document, lmid, lm_addr, lm_prev, ptr_size, lmo); } else { if (lm_prev !=3D 0) warning ("ignoring prev=3D0x%s without start", paddress (lm_prev)); =20 + /* We could interpret LMID as 'provide only the libraries for this + namespace' but GDB is currently only providing lmid, start, and + prev, or nothing. */ + if (lmid !=3D 0) + warning ("ignoring lmid=3D0x%s without start", paddress (lmid)); + CORE_ADDR r_debug =3D priv->r_debug; if (r_debug =3D=3D 0) r_debug =3D priv->r_debug =3D get_r_debug (pid, is_elf64); @@ -6678,7 +6686,7 @@ linux_process_target::qxfer_libraries_svr4 (const cha= r *annex, } } =20 - read_link_map (document, lm_addr, lm_prev, ptr_size, lmo); + read_link_map (document, r_debug, lm_addr, lm_prev, ptr_size, lmo); =20 if (r_version < 2) break;