From nobody Fri Apr 29 20:55:12 2022 X-Original-To: dev-commits-src-branches@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 6045A1995156; Fri, 29 Apr 2022 20:55:15 +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 4Kql9r5qHCz3F6K; Fri, 29 Apr 2022 20:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265714; 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=oiikgtR1lY7lxkFVzdp2gtLGFLU9Ywey1DNNnY+KQDg=; b=UxzcpLCj0DcZz+JxLCeyuNAH8BBiFMhPPlOwZbqOhznyzOd1FFSHAWmd8JTwlo5kROyy3K RkKtQ0GxPK/uJlk67lyCsNXPRjODo9srSWJp2bpjt3xfZZsyVMXMjcwKmF6Wpw2kbdU4lM Om7w9lmlvb12Hvkzn14wimPW3bBPpbdxxMILcz73tIS+e1OCugdEhc6WkROsjXM+Vna9MV egzWn+uraiTVAVdY8lcE0pDkAcN365OuezObp4KuKiOY7c6W88/br1YTQ0ZCsfgN+zjPGx wLV5w4oqMcH6Wjllm1d3xeShesYivEfU02dzztLcynhfFcYa8y3w4emrmBT4iA== 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 83A60143C6; Fri, 29 Apr 2022 20:55:12 +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 23TKtCNk055338; Fri, 29 Apr 2022 20:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKtC88055337; Fri, 29 Apr 2022 20:55:12 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:12 GMT Message-Id: <202204292055.23TKtC88055337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1e2235df43f2 - stable/13 - amd64: Allocate TCB with alignment of 16 rather than 8. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e2235df43f2618fecfb1370d5366d2f73f29c58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265714; 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=oiikgtR1lY7lxkFVzdp2gtLGFLU9Ywey1DNNnY+KQDg=; b=piWv7QDRLDgYljsC5lI7n8m/vY0x97lBs+X5pQjJ/W4oRqE7dMJI1HfRbkwAybn4+BNcQY 529MbSr0/yE/QjVOnw1qNVimJdEsbgJEHMImm9NhTdvvLCSXwObCxh2tgRKf29xqBh0z/c Lg9GxkfJBKKKOrqY8QSbsK/0tHG8FXu5utUuP17gl0IAOe5nzNz/QXM/ci1ie8UBaHOeCO 4NQtON7LdxZ1qEoVB6wrlPlOAKvGL2W8kbHNsXI8u0XYG/79vRZiyie+adC6svb6i63ULF zjSyVjMke2SbGw+Vns6X0u9QjKjVNM9pnZA2NJz5sisGiLj2q+M7YOwDMRn+Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265714; a=rsa-sha256; cv=none; b=afF5Xq6hBhnlKPn5OMCFazBQmiE6GKTvYv/6qEa8pDsHAtQZ7Vvy8Mvi+ExPdtgcBeT/JF 2O2R6q2OTjfDmJ2kTLF6yymGDJpO/z2awOdTUMOBqCdmrrGo/nlYaRl+Nk1OuzGTqk3ui+ 0rhsj7NEVTZzuH599F3wEGgsZn7OBglzf6IZKajaTJsAGHiph5ncqCwaxl6qkPycp3c31Y Iq0AhppKR62z3NHvGhAfzFVHSFkwjzpyZKdT74FZ3jpgV3lxoDj4TfTSMbgeHapGmaDynm Qw/wimbwLYy79UqsN3AulES6vCCrOYjQfIIlmQd0Yyr06h+Ushrq4EpS0MsVPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1e2235df43f2618fecfb1370d5366d2f73f29c58 commit 1e2235df43f2618fecfb1370d5366d2f73f29c58 Author: John Baldwin AuthorDate: 2021-12-09 21:16:45 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:05 +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 (cherry picked from commit 299617496cc3c525a63833894fd8dbdc4e5de6a7) --- 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);