From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by sourceware.org (Postfix) with ESMTPS id 1EED3386103B for ; Mon, 19 Feb 2024 01:57:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1EED3386103B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1EED3386103B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:4860:4864:20::36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708307873; cv=none; b=BK5+oCbq5iR/Xcb6wDZcmlLPhXXIRzwMnbUG0gEDHJ1fVhMxP2lyJB42qav2cVWLmF5jcQ8nXxsqFju6nomzrHzhrzXvkmGox12c3T69kZyUBoLV6WjLUT8vYEmsCJpoAA15LVJ/ejF3nxQ1N5f1ztsX1dDAKoYKz/mnqbRAZQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708307873; c=relaxed/simple; bh=wbCzTcil9wWTL2PO2npXq6ZjackMHas1C1hueZFI8sQ=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=S+Pp4CqvXLuaNoGeVexw8FfoEbHPKjmyHPBnRPjG6bWiOU3Cxw5JCLE61pXUUIiCgJ66auqaVJvA2OFsa3uw3Z8Jj89YlGPoQiCF9AS82NH4wFaLW3a9i+v31DVfzsh/ojlNH3vC9il9gZ1JD2cZBf1zujUrrivbUIDoTFgbySw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-2185a9966bcso1493886fac.0 for ; Sun, 18 Feb 2024 17:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1708307870; x=1708912670; darn=sourceware.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5OG1dLggdFO8sPe6ABmw5OiPPakW+vLX0Oe7RnTWtLk=; b=fCDdweXqV3LhR0DdWsF/Jj8hUvhYQ9iEBlscCKYVL8zSMNcFEeh6D99KQCAdZ7Yse0 kmQBzf95X1yUGw+62D54YhSxE3I4uZt0C9Ur3bmiFcV1KWT9yf6uAt147dcMkJtHbYRY H/FtphmPa0Zn43sAleCX1+91s94Dx3D1YcYhn0Zsdt3JFVMyIWohM5jZbdmNvC64uZuF N+0PWMnV7vZ9tvlVsWCDeHPS3h1xXN+pm1pKs0kSJgCsjnXQhlnEmm+c9YLKkJK/Ys+9 4H/tby44MiNThFs6Z3gxd/wIbP8teSva3vjJfhI++S5RrbVp1UdjeV2AGnU3MbeZi4i+ Xhhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708307870; x=1708912670; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5OG1dLggdFO8sPe6ABmw5OiPPakW+vLX0Oe7RnTWtLk=; b=kvC4SM3mH6f37+Z2Q2obFtSelVQRaOp7pABIlov5ezzp6B6YnQHGL116f+RrIZBkgD OtR7ocLTggmlrPwIUgW1vQL5iUO1FD12rSFg3i6WyB1bzDqiwwatBPsEuo6vdccwSCyb n/BP2U7XWdG9Wbe3gtzvj62zDYlrd9hiB4DzAsXdIlLWmsz7PmQ9KE0ihJXF9UoCO20s 9RR0sIeV642UH4K4ZigDI11vaH2cCW6WZdwcsgo4kVMWw5iyopSmCDVCf9c84kE85wfV G4V90JuW85W/XytV9AQ0/2CbDuSEiw690Ea+SH2x9DxsS0CkaRGsFvl9iFA8hpbKIkLd baEw== X-Gm-Message-State: AOJu0YzQa22mCpl6L24r2j33JfAIehM1XUyBBo9gjO+4VFRy/4kEJe7p JIA3MoXhDN9rNZfN3rqXOwvgQkjPBt4Bxf2wTq6HmeBfGc/Rztzi4NT7Gx4X0ad4yZ6xUbR3fNt omO8AZw5WE+q3dh9m1tEmhzotqMrfTOeR4GtMeRCK5WpTgBkU6gE= X-Google-Smtp-Source: AGHT+IHKdHy2djAhz5fCoCMuux0vYblK6kw818Oez3KyS+2xTFCDXcEPoeEnTrpUzM8dwx1O2jhPjQmN+6y8h+EcLQc= X-Received: by 2002:a05:6870:b609:b0:21e:be11:c0fd with SMTP id cm9-20020a056870b60900b0021ebe11c0fdmr1108665oab.8.1708307870445; Sun, 18 Feb 2024 17:57:50 -0800 (PST) MIME-Version: 1.0 References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> <20231128085109.28422-1-ishitatsuyuki@gmail.com> <20231128085109.28422-5-ishitatsuyuki@gmail.com> In-Reply-To: <20231128085109.28422-5-ishitatsuyuki@gmail.com> From: Nelson Chu Date: Mon, 19 Feb 2024 09:57:39 +0800 Message-ID: Subject: Re: [PATCH v3 4/9] RISC-V: Define and use GOT entry size constants for TLS. To: Tatsuyuki Ishi Cc: binutils@sourceware.org, i@maskray.me, rui314@gmail.com, ruiu@bluewhale.systems Content-Type: multipart/alternative; boundary="000000000000c905a50611b26bde" X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000c905a50611b26bde Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Okay, but probably need to update the code since commit 20ef84ed2abb. Otherwise this patch looks good to me. Thanks Nelson On Tue, Nov 28, 2023 at 4:51=E2=80=AFPM Tatsuyuki Ishi wrote: > As the size calculation is split by global and local symbols, using a > shared constant definition for its size improves clarity. > > bfd/ > * elfnn-riscv.c: Add macros for sizes of a normal GOT entry, TLS GD a= nd > TLS IE entry. > (allocate_dynrelocs): Replace GOT size expressions with the new > constants. > (riscv_elf_size_dynamic_sections): Likewise. > (riscv_elf_relocate_section): Likewise. > --- > bfd/elfnn-riscv.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c > index c0207765906..d5190538503 100644 > --- a/bfd/elfnn-riscv.c > +++ b/bfd/elfnn-riscv.c > @@ -298,6 +298,8 @@ riscv_is_insn_reloc (const reloc_howto_type *howto) > #define PLT_HEADER_SIZE (PLT_HEADER_INSNS * 4) > #define PLT_ENTRY_SIZE (PLT_ENTRY_INSNS * 4) > #define GOT_ENTRY_SIZE RISCV_ELF_WORD_BYTES > +#define TLS_GD_GOT_ENTRY_SIZE (RISCV_ELF_WORD_BYTES * 2) > +#define TLS_IE_GOT_ENTRY_SIZE RISCV_ELF_WORD_BYTES > /* Reserve two entries of GOTPLT for ld.so, one is used for PLT resolver, > the other is used for link map. Other targets also reserve one more > entry used for runtime profile? */ > @@ -1320,7 +1322,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, > void *inf) > /* TLS_GD needs two dynamic relocs and two GOT slots. */ > if (tls_type & GOT_TLS_GD) > { > - s->size +=3D 2 * RISCV_ELF_WORD_BYTES; > + s->size +=3D TLS_GD_GOT_ENTRY_SIZE; > if (need_reloc) > htab->elf.srelgot->size +=3D 2 * sizeof > (ElfNN_External_Rela); > } > @@ -1328,14 +1330,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, > void *inf) > /* TLS_IE needs one dynamic reloc and one GOT slot. */ > if (tls_type & GOT_TLS_IE) > { > - s->size +=3D RISCV_ELF_WORD_BYTES; > + s->size +=3D TLS_IE_GOT_ENTRY_SIZE; > if (need_reloc) > htab->elf.srelgot->size +=3D sizeof (ElfNN_External_Rela); > } > } > else > { > - s->size +=3D RISCV_ELF_WORD_BYTES; > + s->size +=3D GOT_ENTRY_SIZE; > if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), = h) > && ! UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)) > htab->elf.srelgot->size +=3D sizeof (ElfNN_External_Rela); > @@ -1563,20 +1565,20 @@ riscv_elf_size_dynamic_sections (bfd *output_bfd, > struct bfd_link_info *info) > { > if (*local_tls_type & GOT_TLS_GD) > { > - s->size +=3D 2 * RISCV_ELF_WORD_BYTES; > + s->size +=3D TLS_GD_GOT_ENTRY_SIZE; > if (bfd_link_dll (info)) > srel->size +=3D sizeof (ElfNN_External_Rela); > } > if (*local_tls_type & GOT_TLS_IE) > { > - s->size +=3D RISCV_ELF_WORD_BYTES; > + s->size +=3D TLS_IE_GOT_ENTRY_SIZE; > if (bfd_link_dll (info)) > srel->size +=3D sizeof (ElfNN_External_Rela); > } > } > else > { > - s->size +=3D RISCV_ELF_WORD_BYTES; > + s->size +=3D GOT_ENTRY_SIZE; > if (bfd_link_pic (info)) > srel->size +=3D sizeof (ElfNN_External_Rela); > } > @@ -2912,7 +2914,7 @@ riscv_elf_relocate_section (bfd *output_bfd, > reference's GOT slot follows the GD reference's slots. */ > ie_off =3D 0; > if ((tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_IE)) > - ie_off =3D 2 * GOT_ENTRY_SIZE; > + ie_off =3D TLS_GD_GOT_ENTRY_SIZE; > > if ((off & 1) !=3D 0) > off &=3D ~1; > -- > 2.43.0 > > --000000000000c905a50611b26bde--