From nobody Thu Dec 09 21:23:42 2021 X-Original-To: dev-commits-src-all@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 1FBDC18D0977; Thu, 9 Dec 2021 21:23:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J96Tp38YCz3K9p; Thu, 9 Dec 2021 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 410975C76; Thu, 9 Dec 2021 21:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9LNgv9047025; Thu, 9 Dec 2021 21:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9LNgaM047024; Thu, 9 Dec 2021 21:23:42 GMT (envelope-from git) Date: Thu, 9 Dec 2021 21:23:42 GMT Message-Id: <202112092123.1B9LNgaM047024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 299617496cc3 - main - amd64: Allocate TCB with alignment of 16 rather than 8. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 299617496cc3c525a63833894fd8dbdc4e5de6a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639085022; 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=AmAlivx/U8PSbO9+R6FtiBtbiKRcHR1zTYuNoCtzcXc=; b=fUQizcl39HUTO2/zVtCM6JbGm67B+yFBwRDuQW/gfOA+fd0wXU+9krtwTAU6fJnjYDJKHf X6CRWN61RzF64ISCbTbOqcxI6GAh2i49rD95BUHkf3Gz21HcD3Xc17aIOdzCraWdrK4W4d A0pVAN+FjyYqb1Zncg18Ya8AX2vxg0UdcV+FDMuuGx7NpxYr38FD/yQK5Uerv0H66lUY/l YoELL9cVKOrezUpIXgHe6IL92WXn6UBiDZCnCwVu42jtDcNiPuKSDlypCfsm3CAgR6vNHH o/Cuz4CHlvk6+vMWBJaRw56h60Yt1JLCaBgGe+tP20OBWxroRqOUMGAH5t/E2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639085022; a=rsa-sha256; cv=none; b=pIkmSftjgwqrh0nbrK/3WgxaG5Fy38g27sHroG2xoitcBLKQCLKjRveyDKQ6mxcumrx6Wa CIvAM5Eob//P+3yHV8+4rTPg0pDMHHA4OOjQN/RRLkUfkmu+xCHTnMBlwL6Z+3E6DXdqUa 8mgsTqf0avM4Orvt9vLrXDzJxV5XdYH41UnkZVILlr3U1fGXHVD6tBo24R8KsYOann65Bj 9gCCNf6sPIJK7eadEMuJVT6v1n7iHkyuVi66+pOhJur1aClpeGfE0gWUSY4Ko8VNEbKS9G zA7KO9tBvVdgmCr8ZbKEbzpml9ojAzNy0iDwKvxJXcod4miqgDj+UNAuuR+qaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=299617496cc3c525a63833894fd8dbdc4e5de6a7 commit 299617496cc3c525a63833894fd8dbdc4e5de6a7 Author: John Baldwin AuthorDate: 2021-12-09 21:16:45 +0000 Commit: John Baldwin CommitDate: 2021-12-09 21:16:45 +0000 amd64: Allocate TCB with alignment of 16 rather than 8. This matches the TLS_TCB_ALIGN definition in libc. Reviewed by: kib, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33349 --- libexec/rtld-elf/amd64/reloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 1fec863c063b..62547f1bb4a2 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -530,7 +530,7 @@ allocate_initial_tls(Obj_Entry *objs) */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; - addr = allocate_tls(objs, 0, 3 * sizeof(Elf_Addr), sizeof(Elf_Addr)); + addr = allocate_tls(objs, 0, 3 * sizeof(Elf_Addr), 16); if (__getosreldate() >= P_OSREL_WRFSBASE && (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) wrfsbase((uintptr_t)addr);