From nobody Tue Jan 25 19:38:59 2022 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 97B57196B364; Tue, 25 Jan 2022 19:39:00 +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 4JjxxJ03dpz4rL8; Tue, 25 Jan 2022 19:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139540; 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=AnCWd72bcAGD5SWpTMO7xm3dCuHXSSmDlyk3nfa2STA=; b=u24h+dFMZKGCeQVn1UabZFBtsCC6eoscujs8UyyzOGjvjMlykNHRppMZx+G0kpt8HR+vdA t4eTwe7KD2l0HFOUZVbiqfFO4fSC8USPyIHBVYbqn7AXVw8u0gwZaTeHn9VOcdAXUpSImH 4AnxkyI45YSAL4o3x14EUajATIEgd05v5B9zM+G79tR6NidMPfKzvNxg66BG6fKzvcFO/5 BPZhWJi7LsQbITTvLWuSqU4OGsY8gzuZtM8LJnxagMjZHBvwBay4QG9jqgcVK4SAvNZZxj aly6lbXRpsRg2Ni0BDx4eRdtYc3BHf5fB3QdjnZm3RBOCU53Y6MEuJ8PF9qQYQ== 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 AEF567B08; Tue, 25 Jan 2022 19:38:59 +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 20PJcxmI091397; Tue, 25 Jan 2022 19:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PJcx42091396; Tue, 25 Jan 2022 19:38:59 GMT (envelope-from git) Date: Tue, 25 Jan 2022 19:38:59 GMT Message-Id: <202201251938.20PJcx42091396@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: 8de1a8131e42 - main - libthr: Use TLS_TCB_* in _tcb_[cd]tor. 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: 8de1a8131e42f96f8dcfbca9073896d249ff7d2c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139540; 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=AnCWd72bcAGD5SWpTMO7xm3dCuHXSSmDlyk3nfa2STA=; b=JnR5Npw72pBh9l0FswHmCV4J3i0RiH9+yJSJKqS9v1iqpqtG+ZByPllbbwzx7RnnNeQ9G2 eBbsqj9gVNV7i5iE9nIaurSDGWF4F7ggxyK4GuvFS98xtEVF2Z4egn4lcYpNH0r8w8EfD4 unz7fNDN7iA7aDYy5A0hJ8Uk/SKOphy6Shqq13rEn9gJEC400L+GLdE7h+vXW4cJTkSo8Y eIvFwBM33NTZJ0uGCXDGcUEx1PXUQJDxrct+y5U1zrruuVU30ER4PW+Plet0jpsaBWI3Ge PG9Kia3+0Im+WwmPXsLYs5NzM14ozTflu+pOq+GrMEZHrd31HzBbXXW91DUxRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643139540; a=rsa-sha256; cv=none; b=ds2yGl1mR5qi7N4dCDguqYW22TJc5Ce+MrtXlA0PSb/JjG8a56tPmJ0U8q4ATUmpjQ1eVX zihTE4GI81TrF909xfTI5U/BLA5SQQWiRysIkwih9vAguOnRXlIDLUyumZQ077vv0vpUZn pPxX1IvJxmQ0AOMp4LuIrEKLvx++/TFmXallR7pAliKYBAtuqVcWXBr0AjiPGQ0iEDLrEU /DCOxNife87vEAdwiM8T1PW0tR3VqfTSSykOF4Fz+fWleKOr6xNmsSk8EBKG1Zs2AKgV8w hO53CqMi+ZM/l9T0V6l8NkBV7VrWwlfuGqxnj8JHfhjz1hb7cKtmTFIvKWuQcw== 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=8de1a8131e42f96f8dcfbca9073896d249ff7d2c commit 8de1a8131e42f96f8dcfbca9073896d249ff7d2c Author: John Baldwin AuthorDate: 2022-01-25 19:38:34 +0000 Commit: John Baldwin CommitDate: 2022-01-25 19:38:34 +0000 libthr: Use TLS_TCB_* in _tcb_[cd]tor. This matches libc and rtld in using the alignment (TLS_TCB_ALIGN) from machine/tls.h instead of hardcoding 16. Reviewed by: kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34023 --- lib/libthr/thread/thr_ctrdtr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_ctrdtr.c b/lib/libthr/thread/thr_ctrdtr.c index 9d4301ef719f..9ce068072524 100644 --- a/lib/libthr/thread/thr_ctrdtr.c +++ b/lib/libthr/thread/thr_ctrdtr.c @@ -42,7 +42,7 @@ _tcb_ctor(struct pthread *thread, int initial) if (initial) tcb = _tcb_get(); else - tcb = _rtld_allocate_tls(NULL, sizeof(struct tcb), 16); + tcb = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); if (tcb) tcb->tcb_thread = thread; return (tcb); @@ -52,5 +52,5 @@ void _tcb_dtor(struct tcb *tcb) { - _rtld_free_tls(tcb, sizeof(struct tcb), 16); + _rtld_free_tls(tcb, TLS_TCB_SIZE, TLS_TCB_ALIGN); }