diff mbox series

sh: Make protected symbols local for FDPIC -shared

Message ID 20240219070941.2254076-1-maskray@google.com
State New
Headers
Series sh: Make protected symbols local for FDPIC -shared |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

Fangrui Song Feb. 19, 2024, 7:09 a.m. UTC 
  From: Fangrui Song <maskray@gcc.gnu.org>

    __attribute__((visibility("protected"))) void protected_fun() {}
    void *get_protected_fun() { return protected_fun; }

links fine in the non-FDPIC mode but not in the FDPIC mode:

    R_SH_GOTOFFFUNCDESC relocation against external symbol "protected_fun"

The issue is similar to the x86 issue fixed by commit
d19a265487eda186b6977d9d15648cda9fad3298 ("x86: Make protected symbols
local for -shared").

SYMBOL_FUNCDESC_LOCAL in the R_SH_GOTOFFFUNCDESC check unnecessarily
considers protected symbols non-local.  elf32-frv.c:FRVFDPIC_SYM_LOCAL
avoids the issue by setting local_protected.  Set local_protected for sh
as well. It seems that the condition `! elf_hash_table
(INFO)->dynamic_sections_created` is redundant as `h->dynindx` should be
-1.  Let's remove the condition.
---
 bfd/elf32-sh.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Alan Modra Feb. 20, 2024, 10:10 p.m. UTC | #1 
On Sun, Feb 18, 2024 at 11:09:40PM -0800, Fangrui Song wrote:
> From: Fangrui Song <maskray@gcc.gnu.org>
> 
>     __attribute__((visibility("protected"))) void protected_fun() {}
>     void *get_protected_fun() { return protected_fun; }
> 
> links fine in the non-FDPIC mode but not in the FDPIC mode:
> 
>     R_SH_GOTOFFFUNCDESC relocation against external symbol "protected_fun"
> 

Right.
$ sh4-linux-gnu-gcc -fPIC -mfdpic -c fundesc.c
$ ld/ld-new -m shlelf_fd -shared -o fundesc.so fundesc.o
ld/ld-new: fundesc.o(.text+0x24): R_SH_GOTOFFFUNCDESC relocation against external symbol "protected_fun"
ld/ld-new: final link failed

> The issue is similar to the x86 issue fixed by commit
> d19a265487eda186b6977d9d15648cda9fad3298 ("x86: Make protected symbols
> local for -shared").
> 
> SYMBOL_FUNCDESC_LOCAL in the R_SH_GOTOFFFUNCDESC check unnecessarily
> considers protected symbols non-local.  elf32-frv.c:FRVFDPIC_SYM_LOCAL
> avoids the issue by setting local_protected.  Set local_protected for sh
> as well. It seems that the condition `! elf_hash_table
> (INFO)->dynamic_sections_created` is redundant as `h->dynindx` should be
> -1.  Let's remove the condition.

Are you sure the dynamic_sections_created test is redundant?
_bfd_elf_symbol_refs_local_p returns false for undefined syms.  BTW, I
think it is better to write SYMBOL_CALLS_LOCAL rather than expanding
to _bfd_elf_symbol_refs_local_p.  The name conveys meaning.

This isn't an ack or a nack on the patch, I'll leave that to Alexandre
since I really don't know enough about the sh fdpic ABI without
spending quite a lot of time checking, but I suspect the patch isn't
complete due to code like

	    else if (SYMBOL_CALLS_LOCAL (info, h)
		     && ! SYMBOL_FUNCDESC_LOCAL (info, h))
	      {
		/* If the symbol needs a non-local function descriptor
		   but binds locally (i.e., its visibility is
		   protected), emit a dynamic relocation decayed to
		   section+offset.  This is an optimization; the dynamic
		   linker would resolve our function descriptor request
		   to our copy of the function anyway.  */
		dynindx = elf_section_data (h->root.u.def.section
					    ->output_section)->dynindx;
		relocation += h->root.u.def.section->output_offset
		  + h->root.u.def.value;
	      }

That would be an "else if (0)" after your patch.

> ---
>  bfd/elf32-sh.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
> index bf4cb2a8242..7d35144cdc3 100644
> --- a/bfd/elf32-sh.c
> +++ b/bfd/elf32-sh.c
> @@ -64,8 +64,7 @@ static bfd_vma tpoff
>     not.  If the symbol is protected, we want the local address, but
>     its function descriptor must be assigned by the dynamic linker.  */
>  #define SYMBOL_FUNCDESC_LOCAL(INFO, H) \
> -  (SYMBOL_REFERENCES_LOCAL (INFO, H) \
> -   || ! elf_hash_table (INFO)->dynamic_sections_created)
> +  _bfd_elf_symbol_refs_local_p (H, INFO, 1)
>  
>  #define SH_PARTIAL32 true
>  #define SH_SRC_MASK32 0xffffffff
> -- 
> 2.44.0.rc0.258.g7320e95886-goog
diff mbox series

Patch

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index bf4cb2a8242..7d35144cdc3 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -64,8 +64,7 @@  static bfd_vma tpoff
    not.  If the symbol is protected, we want the local address, but
    its function descriptor must be assigned by the dynamic linker.  */
 #define SYMBOL_FUNCDESC_LOCAL(INFO, H) \
-  (SYMBOL_REFERENCES_LOCAL (INFO, H) \
-   || ! elf_hash_table (INFO)->dynamic_sections_created)
+  _bfd_elf_symbol_refs_local_p (H, INFO, 1)
 
 #define SH_PARTIAL32 true
 #define SH_SRC_MASK32 0xffffffff