From: Carlos O'Donell <carlos@redhat.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH] mips: pldd: support DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL
Date: Fri, 28 Jan 2022 15:50:36 -0500 [thread overview]
Message-ID: <97e93b5d-8100-e576-a4bf-d7cd703c9093@redhat.com> (raw)
In-Reply-To: <31decb16-c634-183a-a82d-6710157216af@linaro.org>
On 1/28/22 15:48, Adhemerval Zanella via Libc-alpha wrote:
>
>
> On 28/01/2022 17:45, H.J. Lu via Libc-alpha wrote:
>> On Fri, Jan 28, 2022 at 10:57 AM Xi Ruoyao via Libc-alpha
>> <libc-alpha@sourceware.org> wrote:
>>>
>>> MIPS uses DT_MIPS_RLD_MAP and DT_MIPS_RLD_MAP_REL for accessing r_debug,
>>> instead of DT_DEBUG.
>>> ---
>>> elf/pldd-xx.c | 67 ++++++++++++++++++++++++++++++++++++++++-----------
>>> 1 file changed, 53 insertions(+), 14 deletions(-)
>>>
>>> diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c
>>> index 1cdfb49c53..ec397f00e5 100644
>>> --- a/elf/pldd-xx.c
>>> +++ b/elf/pldd-xx.c
>>> @@ -22,6 +22,12 @@
>>> #define EW_(e, w, t) EW__(e, w, _##t)
>>> #define EW__(e, w, t) e##w##t
>>>
>>> +#if CLASS == 32
>>> +typedef Elf32_Word E(val_type);
>>> +#else
>>> +typedef Elf64_Xword E(val_type);
>>> +#endif
>>> +
>>> struct E(link_map)
>>> {
>>> EW(Addr) l_addr;
>>> @@ -70,6 +76,35 @@ _Static_assert (offsetof (struct r_debug, r_map)
>>> == offsetof (struct E(r_debug), r_map), "r_map");
>>> #endif
>>>
>>> +static EW(Addr)
>>> +E(r_debug_offset) (EW(Dyn) *d, int memfd, EW(Addr) d_addr)
>>> +{
>>> +#ifdef __mips__
>>> + EW(Addr) ptr;
>>> +
>>> + switch (d->d_tag)
>>> + {
>>> + case DT_MIPS_RLD_MAP_REL:
>>> + ptr = d_addr + d->d_un.d_val;
>>> + break;
>>> + case DT_MIPS_RLD_MAP:
>>> + ptr = d->d_un.d_ptr;
>>> + break;
>>> + default:
>>> + return 0;
>>> + }
>>> +
>>> + if (pread (memfd, &ptr, sizeof (ptr), ptr) != sizeof (ptr))
>>> + return 0;
>>> +
>>> + return ptr;
>>> +#else
>>> + if (d->d_tag == DT_DEBUG)
>>> + return (off_t) d->d_un.d_ptr;
>>> +
>>> + return 0;
>>> +#endif
>>> +}
>>>
>>> static int
>>>
>>> @@ -126,21 +161,25 @@ E(find_maps) (const char *exe, int memfd, pid_t pid, void *auxv,
>>> != p[i].p_filesz)
>>> error (EXIT_FAILURE, 0, gettext ("cannot read dynamic section"));
>>>
>>> - /* Search for the DT_DEBUG entry. */
>>> + /* Search for the r_debug struct. */
>>> for (unsigned int j = 0; j < p[i].p_filesz / sizeof (EW(Dyn)); ++j)
>>> - if (dyn[j].d_tag == DT_DEBUG && dyn[j].d_un.d_ptr != 0)
>>> - {
>>> - struct E(r_debug) r;
>>> - if (pread (memfd, &r, sizeof (r), dyn[j].d_un.d_ptr)
>>> - != sizeof (r))
>>> - error (EXIT_FAILURE, 0, gettext ("cannot read r_debug"));
>>> -
>>> - if (r.r_map != 0)
>>> - {
>>> - list = r.r_map;
>>> - break;
>>> - }
>>> - }
>>> + {
>>> + EW(Addr) d_addr = offset + p[i].p_vaddr + sizeof (EW(Dyn)) * j;
>>> + EW(Addr) off = E(r_debug_offset)(&dyn[j], memfd, d_addr);
>>> + if (off != 0)
>>> + {
>>> + struct E(r_debug) r;
>>> + if (pread (memfd, &r, sizeof (r), off)
>>> + != sizeof (r))
>>> + error (EXIT_FAILURE, 0, gettext ("cannot read r_debug"));
>>> +
>>> + if (r.r_map != 0)
>>> + {
>>> + list = r.r_map;
>>> + break;
>>> + }
>>> + }
>>> + }
>>>
>>> free (dyn);
>>> break;
>>> --
>>> 2.35.0
>>>
>>>
>>
>> I think a header file to access r_debug works better. MIPS can provide
>> one to override the generic header file.
>>
>
> Agreed, I think we should avoid arch specific defines (__mips__) on generic
> code.
Ah! I see, the objection if about arch-defines in tests. Yes, lets clean that up.
--
Cheers,
Carlos.
next prev parent reply other threads:[~2022-01-28 20:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 18:56 Xi Ruoyao
2022-01-28 20:45 ` H.J. Lu
2022-01-28 20:48 ` Adhemerval Zanella
2022-01-28 20:50 ` Carlos O'Donell [this message]
2022-01-28 21:17 ` [PATCH v2] " Xi Ruoyao
2022-01-28 21:22 ` H.J. Lu
2022-01-28 22:04 ` [PATCH v3 0/3] mips: add target-specific r_debug offset Xi Ruoyao
2022-01-28 22:05 ` [PATCH v3 1/3] add sysdeps/{generic,mips}/elfxx-r_debug.h Xi Ruoyao
2022-01-28 22:08 ` [PATCH v3 3/3] elf: tst-dlmopen4: use target specific r_debug_offset function Xi Ruoyao
2022-01-28 22:07 ` [PATCH v3 2/3] pldd: use target-specific " Xi Ruoyao
2022-01-29 19:41 ` [PATCH] elf: Add <dl-r_debug.h> H.J. Lu
2022-01-29 19:56 ` Xi Ruoyao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=97e93b5d-8100-e576-a4bf-d7cd703c9093@redhat.com \
--to=carlos@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).