From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Vineet Gupta <Vineet.Gupta1@synopsys.com>, libc-alpha@sourceware.org
Cc: linux-snps-arc@lists.infradead.org
Subject: Re: [PATCH] dl-runtime: reloc_{offset,index} now functions arch overide'able
Date: Fri, 29 May 2020 09:58:23 -0300 [thread overview]
Message-ID: <4c346276-085a-6e2d-16a4-c2b88252a74d@linaro.org> (raw)
In-Reply-To: <20200528194345.9829-1-vgupta@synopsys.com>
On 28/05/2020 16:43, Vineet Gupta wrote:
> The existing macros are fragile and expect local variables with a
> certain name. Fix this by defining them as functions with defaul
> timplementation in a new header dl-runtime.h which arches can overrid
> eif need be.
>
> This came up during ARC port review.
>
> This patch potentially only affects hppa/x86 ports,
> build tested for both those configs and a few more.
>
> Suggested-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> elf/dl-runtime.c | 24 +++++++-------
> elf/dl-runtime.h | 30 ++++++++++++++++++
> sysdeps/hppa/dl-runtime.c | 4 ---
> sysdeps/hppa/dl-runtime.h | 31 +++++++++++++++++++
> sysdeps/x86_64/{dl-runtime.c => dl-runtime.h} | 13 ++++++--
> 5 files changed, 84 insertions(+), 18 deletions(-)
> create mode 100644 elf/dl-runtime.h
> create mode 100644 sysdeps/hppa/dl-runtime.h
> rename sysdeps/x86_64/{dl-runtime.c => dl-runtime.h} (60%)
>
> diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
> index cf5f1d3e82e1..62f90579370b 100644
> --- a/elf/dl-runtime.c
> +++ b/elf/dl-runtime.c
> @@ -27,6 +27,7 @@
> #include "dynamic-link.h"
> #include <tls.h>
> #include <dl-irel.h>
> +#include <dl-runtime.h>
>
>
> #if (!ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \
> @@ -42,13 +43,6 @@
> # define ARCH_FIXUP_ATTRIBUTE
> #endif
>
> -#ifndef reloc_offset
> -# define reloc_offset reloc_arg
> -# define reloc_index reloc_arg / sizeof (PLTREL)
> -#endif
> -
> -
> -
> /* This function is called through a special trampoline from the PLT the
> first time each PLT entry is called. We must perform the relocation
> specified in the PLT of the given shared object, and return the resolved
> @@ -68,8 +62,11 @@ _dl_fixup (
> = (const void *) D_PTR (l, l_info[DT_SYMTAB]);
> const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
>
> + const uintptr_t pltgot = (uintptr_t) D_PTR (l, l_info[DT_PLTGOT]);
> +
> const PLTREL *const reloc
> - = (const void *) (D_PTR (l, l_info[DT_JMPREL]) + reloc_offset);
> + = (const void *) (D_PTR (l, l_info[DT_JMPREL])
> + + reloc_offset (pltgot, reloc_arg));
> const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)];
> const ElfW(Sym) *refsym = sym;
> void *const rel_addr = (void *)(l->l_addr + reloc->r_offset);
Ok (it should be dead code eliminated by compiler if reloc_offset does not
use the pltgot field, as for default implementation).
> @@ -182,7 +179,8 @@ _dl_profile_fixup (
>
> /* This is the address in the array where we store the result of previous
> relocations. */
> - struct reloc_result *reloc_result = &l->l_reloc_result[reloc_index];
> + struct reloc_result *reloc_result
> + = &l->l_reloc_result[reloc_index (reloc_arg, sizeof (PLTREL))];
>
> /* CONCURRENCY NOTES:
>
> @@ -219,8 +217,11 @@ _dl_profile_fixup (
> = (const void *) D_PTR (l, l_info[DT_SYMTAB]);
> const char *strtab = (const char *) D_PTR (l, l_info[DT_STRTAB]);
>
> + const uintptr_t pltgot = (uintptr_t) D_PTR (l, l_info[DT_PLTGOT]);
> +
> const PLTREL *const reloc
> - = (const void *) (D_PTR (l, l_info[DT_JMPREL]) + reloc_offset);
> + = (const void *) (D_PTR (l, l_info[DT_JMPREL])
> + + reloc_offset (pltgot, reloc_arg));
> const ElfW(Sym) *refsym = &symtab[ELFW(R_SYM) (reloc->r_info)];
> const ElfW(Sym) *defsym = refsym;
> lookup_t result;
> @@ -489,7 +490,8 @@ _dl_call_pltexit (struct link_map *l, ElfW(Word) reloc_arg,
> relocations. */
> // XXX Maybe the bound information must be stored on the stack since
> // XXX with bind_not a new value could have been stored in the meantime.
> - struct reloc_result *reloc_result = &l->l_reloc_result[reloc_index];
> + struct reloc_result *reloc_result =
> + &l->l_reloc_result[reloc_index (reloc_arg, sizeof (PLTREL))];
> ElfW(Sym) *defsym = ((ElfW(Sym) *) D_PTR (reloc_result->bound,
> l_info[DT_SYMTAB])
> + reloc_result->boundndx);
Ok.
> diff --git a/elf/dl-runtime.h b/elf/dl-runtime.h
> new file mode 100644
> index 000000000000..ed5db3ba51b7
> --- /dev/null
> +++ b/elf/dl-runtime.h
> @@ -0,0 +1,30 @@
> +/* Helpers for On-demand PLT fixup for shared objects, Generic version.
Maybe period here?
> + Copyright (C) 2020 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, write to the Free
> + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> + 02111-1307 USA. */
> +
> +static inline uintptr_t
> +reloc_offset (uintptr_t plt0, uintptr_t pltn)
> +{
> + return pltn;
> +}
> +
> +static inline uintptr_t
> +reloc_index (uintptr_t pltn, size_t size)
> +{
> + return pltn / size;
> +}
Ok.
> diff --git a/sysdeps/hppa/dl-runtime.c b/sysdeps/hppa/dl-runtime.c
> index 885a3f1837cb..2d061b150f06 100644
> --- a/sysdeps/hppa/dl-runtime.c
> +++ b/sysdeps/hppa/dl-runtime.c
> @@ -17,10 +17,6 @@
> Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> 02111-1307 USA. */
>
> -/* Clear PA_GP_RELOC bit in relocation offset. */
> -#define reloc_offset (reloc_arg & ~PA_GP_RELOC)
> -#define reloc_index (reloc_arg & ~PA_GP_RELOC) / sizeof (PLTREL)
> -
> #include <elf/dl-runtime.c>
>
> /* The caller has encountered a partially relocated function descriptor.
Ok.
> diff --git a/sysdeps/hppa/dl-runtime.h b/sysdeps/hppa/dl-runtime.h
> new file mode 100644
> index 000000000000..cfde0ec991e3
> --- /dev/null
> +++ b/sysdeps/hppa/dl-runtime.h
> @@ -0,0 +1,31 @@
> +/* Helpers for On-demand PLT fixup for shared objects, HPAA version.
Maybe period instead of comma here?
> + Copyright (C) 2020 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, write to the Free
> + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> + 02111-1307 USA. */
> +
> +/* Clear PA_GP_RELOC bit in relocation offset. */
> +static inline uintptr_t
> +reloc_offset (uintptr_t plt0, uintptr_t pltn)
> +{
> + return pltn & ~PA_GP_RELOC;
> +}
> +
> +static inline uintptr_t
> +reloc_index (uintptr_t pltn, size_t size)
> +{
> + return (pltn & ~PA_GP_RELOC )/ size;
> +}
Ok.
> diff --git a/sysdeps/x86_64/dl-runtime.c b/sysdeps/x86_64/dl-runtime.h
> similarity index 60%
> rename from sysdeps/x86_64/dl-runtime.c
> rename to sysdeps/x86_64/dl-runtime.h
> index b625d1e88257..494ff47b7091 100644
> --- a/sysdeps/x86_64/dl-runtime.c
> +++ b/sysdeps/x86_64/dl-runtime.h
> @@ -3,7 +3,14 @@
> also use the index. Therefore it is wasteful to compute the offset
> in the trampoline just to reverse the operation immediately
> afterwards. */
> -#define reloc_offset reloc_arg * sizeof (PLTREL)
> -#define reloc_index reloc_arg
> +static inline uintptr_t
> +reloc_offset (uintptr_t plt0, uintptr_t pltn)
> +{
> + return pltn * sizeof (ElfW(Rela));
> +}
>
> -#include <elf/dl-runtime.c>
> +static inline uintptr_t
> +reloc_index (uintptr_t pltn, size_t size)
> +{
> + return pltn;
> +}
>
Ok.
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
next prev parent reply other threads:[~2020-05-29 12:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 19:43 [PATCH] dl-runtime: reloc_{offset, index} now functions arch overide'able Vineet Gupta
2020-05-29 12:58 ` Adhemerval Zanella [this message]
2020-05-29 17:39 ` [PATCH] dl-runtime: reloc_{offset,index} " Vineet Gupta
2020-05-29 20:54 ` Adhemerval Zanella
2020-05-29 21:21 ` [PATCH 1/2] dl-runtime: reloc_{offset, index} " Vineet Gupta
2020-05-29 21:21 ` [PATCH 2/2] ARC/dl-runtime helper macros Vineet Gupta
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=4c346276-085a-6e2d-16a4-c2b88252a74d@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=Vineet.Gupta1@synopsys.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-snps-arc@lists.infradead.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 NNTP newsgroup(s).