From nobody Wed May 28 20:28:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71KM3zrcz5xD8k; Wed, 28 May 2025 20:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71KM3Ct9z44tG; Wed, 28 May 2025 20:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0CIsSuePsK11G42XmiR9Zl9/52Pk+g3mXNDjfol1wJY=; b=PsZv8bWrsG//ARG44pvs/yf0cBhl+AU+5Ucrts9Plq4+GnaXQS2584UPCugfHGWZi0jY4K nlovGJqCIKZItGoQPkCDPVx2Y3dGDT8MrkqmmdI9CRzwfupeBiuk5tTCkwYPkgL7UiMwQ8 1lys7FrYZJJP2VixxQElZOwxRtFl+4Y6nn5MPeY3ESYfS052ivwLn7F5UpLhe6aydYWIIB abYuJZWZgUoI4DLs/Z3rsvAd718NcwELC+o3KxK1MN38haUI3sXOeQSPe/4VVvcZnT/onf Kv6xiX2RuluYySSzzd0Y7gG036HFP9iHDsHuj9KMmlOIiZF1+np5JhDcy2ZhcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748464087; a=rsa-sha256; cv=none; b=M0pxbl6WMhqvVUoBk5uKhfpA/Tl9E62d+xfM8O6BxM8jjX6SU8a0cOMWKQU6HgIiojwErG KV256+qWH8+rBe/+WlsmoMsUNKgWZH/rqeymgPdXOdCEVbsEdJrlTi4pmC/JjxtSkdLNW0 RWG8GIdzBZqbVcSNZtUCVuua1fIHwqTGz/hHQLLchCYOfF4ThkOJwYXr1B5G4nk000vO1t RV8MgwurIo/tujiDuxPIQy/EKV52HoyVLecceUbw+rS/vVy15BIkFaydfDdTMoO0G12UPS j+nDNpl4ARyJjcAdRfHaX+QBegc3o90csHBPNitzB75iFHp7il+2PL+jF7/pqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0CIsSuePsK11G42XmiR9Zl9/52Pk+g3mXNDjfol1wJY=; b=MfvONxcyim5CU4hfljrV/ZXa7SAxkYjRhl1iM8EWGiaIFkF+uy6BnZjkNzxxvo0i99jsdl 0/XUxUIZbmKhE2/kSUEnjNj3YFWvBxjb9UA2SyRI1jAJNRwRK4bRsEmLBgbwO+XIxmOPr/ 5yhk1RpSwR16Y8hCZVSAn824ojUSRLoCz+WKLmeJn/Tvl4tFpLRV9bSHZB2XRde1eJOHx0 GMrT4ccGdkdrEwy45JhZh8xJI/fNkHFLrgfwNRw9GbwpBTH2fiJoMIkj/eWw34nX1SJuYW MSpjiI7Psb06WO4hnVfu5r/sOpNuP9ZzhZknaEisFX6JDUKmBiD4iMWvvMQYEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71KM2qXHzsZc; Wed, 28 May 2025 20:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SKS7wU087174; Wed, 28 May 2025 20:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SKS7FY087171; Wed, 28 May 2025 20:28:07 GMT (envelope-from git) Date: Wed, 28 May 2025 20:28:07 GMT Message-Id: <202505282028.54SKS7FY087171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 03801d449a37 - main - rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03801d449a3731cb643a51625c8c4d5d07b2e54c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=03801d449a3731cb643a51625c8c4d5d07b2e54c commit 03801d449a3731cb643a51625c8c4d5d07b2e54c Author: Jessica Clarke AuthorDate: 2025-05-28 20:22:15 +0000 Commit: Jessica Clarke CommitDate: 2025-05-28 20:22:15 +0000 rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations Provided you don't run out of extra static TLS space this should work, but it's wholly unnecessary and not how things are supposed to be done. Only static TLS relocations should allocate static TLS. Reviewed by: kib Fixes: 4b1859c0e943 ("Add support for RISC-V architecture.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50563 --- libexec/rtld-elf/riscv/reloc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 4b61c4b9a061..cfa474aa93b7 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -404,23 +404,6 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, lockstate); if (def == NULL) return (-1); - /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. - */ - if (!defobj->tls_static) { - if (!allocate_tls_offset( - __DECONST(Obj_Entry *, defobj))) { - _rtld_error( - "%s: No space available for static " - "Thread Local Storage", obj->path); - return (-1); - } - } *where += (Elf_Addr)(def->st_value + rela->r_addend - TLS_DTV_OFFSET);