From nobody Mon Jan 24 14:21:04 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 34DEE198FDED; Mon, 24 Jan 2022 14:21:05 +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 4JjBww6ZxJz3GxM; Mon, 24 Jan 2022 14:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643034065; 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=er/nN82V5nIpvRsmXf76zrROSiiGAG9fOvdshLe7eIM=; b=SPzzrc2HgqbLZnPdE+HKrBeh2GjvGT7E+dR3asdareA2TEUoDKiQlLNQTq2S1GAL6B08Es ywZcuUR/JIe5rPftU/24AYmrzMRPISY4YqP/sS3MXMjULA2/7PFzv8cLDOzbAEBhlSQBjk fSEOjhG9lDVYnBxdR2mbNHrpnhxWsVEv2rzrLJcdgmNOnQo4+Yknpz4vYAsC7be9NiH0GD bYNTAcY7oiPyzX7vUVTUqIe1fhAcwWRdLXHKRgzOpijzGUZnKm5os0rEw26dPeSz7RfVv+ UjL7XFRTQYl0amnK/Kq2XRCKLUQFdjbrs3PlCyu/a6neMqCVRA4SOanjgr5uqw== 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 A842117988; Mon, 24 Jan 2022 14:21:04 +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 20OEL4Oa042290; Mon, 24 Jan 2022 14:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OEL43u042289; Mon, 24 Jan 2022 14:21:04 GMT (envelope-from git) Date: Mon, 24 Jan 2022 14:21:04 GMT Message-Id: <202201241421.20OEL43u042289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7a38cb1e4e1b - stable/13 - Revert "libthr: Use kern.stacktop for thread stack calculation." 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a38cb1e4e1bb7edba0ef3c5c93f2aef75242ee3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643034065; 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=er/nN82V5nIpvRsmXf76zrROSiiGAG9fOvdshLe7eIM=; b=rQ9lN2FzEJYLvPkYvCMeURcA3MlcSOxg9fK/1lGwBMJFV7E236X/2h5C6L9v0E8DO//Yko XtzqdZL2DxTbwk1rAxbTddp/qAtZTAKG9m1dK1/AKSLEDZWtuKLGPmTwStPutm2+rtoGdx yInYb/Tzmhth/ZGsb6hTKC6JC5JjMNID3EsZvJpsofxYRPdQZRtPR2bRJIcNUIGPiNDXNG +srfaViYKZJxfCTvDbo9C1IVsEznXc5Nb8i7tGR3+xtijZ9RwF8YZLWMU+AuWYT/owtCA7 hoDnKmdYscIxR0Ee6fxDph+9/W+NCFI0aYhHoykunBDNH7IZsAV0Vzdrc8H9lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643034065; a=rsa-sha256; cv=none; b=btxXAcXUioLmvJvP74i2n+KNI7RqhFFAGEU2mo1T9TIMAb7cxFp6NYaJ/0Pt6RlL9UoYF5 4E9JaJoQWwH+CWvA1vB4AqfbBYnCQAKMo3b6/rG/rdTUd9sgGX8bWeT4h+CopKF7nRzbe+ OQgfMVA5HoOeUPv5dD5ArbCxZ9WfhHpIMRLzYOIJvKIFSs2TmJlGPtg68ydOiz5GuZSlOO BL1a1StmeeUgp7xvyNpwzzZgAKcYaDNcFj2hOQVSKhCXaaVWFAwt+Zl7HTeYICJNsnGn1X QcRWPso131OwqZD/1GU4LM5zgxomv4R70kn8osaqM4caoaWvb358cZOyVW5FAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7a38cb1e4e1bb7edba0ef3c5c93f2aef75242ee3 commit 7a38cb1e4e1bb7edba0ef3c5c93f2aef75242ee3 Author: Mark Johnston AuthorDate: 2022-01-17 16:41:49 +0000 Commit: Mark Johnston CommitDate: 2022-01-24 14:20:03 +0000 Revert "libthr: Use kern.stacktop for thread stack calculation." The current ASLR stack gap feature will be removed, and with that the need for this change, and the kern.stactop sysctl, is gone. Moreover, the approach taken in this revision does not provide compatibility for old copies of libthr.so, and the revision should have also updated __libc_map_stacks_exec(). This reverts commit 78df56ccfcb40013a3e6904bd6d39836220c3550. Reviewed by: kib Sponsored by: The FreeBSD Foundation (cherry picked from commit f75b1ff6e5698ac092aa33d66ea73a56f381ed99) --- lib/libthr/thread/thr_init.c | 19 ++++++++----------- lib/libthr/thread/thr_private.h | 2 +- lib/libthr/thread/thr_stack.c | 22 ++++++++++------------ 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index f2a66c406e85..82bde10a153e 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "thr_private.h" -char *_stacktop; +char *_usrstack; struct pthread *_thr_initial; int _libthr_debug; int _thread_event_mask; @@ -388,7 +388,7 @@ init_main_thread(struct pthread *thread) * resource limits, so this stack needs an explicitly mapped * red zone to protect the thread stack that is just beyond. */ - if (mmap(_stacktop - _thr_stack_initial - + if (mmap(_usrstack - _thr_stack_initial - _thr_guard_default, _thr_guard_default, 0, MAP_ANON, -1, 0) == MAP_FAILED) PANIC("Cannot allocate red zone for initial thread"); @@ -402,7 +402,7 @@ init_main_thread(struct pthread *thread) * actually free() it; it just puts it in the free * stack queue for later reuse. */ - thread->attr.stackaddr_attr = _stacktop - _thr_stack_initial; + thread->attr.stackaddr_attr = _usrstack - _thr_stack_initial; thread->attr.stacksize_attr = _thr_stack_initial; thread->attr.guardsize_attr = _thr_guard_default; thread->attr.flags |= THR_STACK_USER; @@ -427,7 +427,7 @@ init_main_thread(struct pthread *thread) thread->attr.prio = sched_param.sched_priority; #ifdef _PTHREAD_FORCED_UNWIND - thread->unwind_stackend = _stacktop; + thread->unwind_stackend = _usrstack; #endif /* Others cleared to zero by thr_alloc() */ @@ -464,13 +464,10 @@ init_private(void) __thr_malloc_init(); /* Find the stack top */ mib[0] = CTL_KERN; - mib[1] = KERN_STACKTOP; - len = sizeof (_stacktop); - if (sysctl(mib, 2, &_stacktop, &len, NULL, 0) == -1) { - mib[1] = KERN_USRSTACK; - if (sysctl(mib, 2, &_stacktop, &len, NULL, 0) == -1) - PANIC("Cannot get kern.usrstack from sysctl"); - } + mib[1] = KERN_USRSTACK; + len = sizeof (_usrstack); + if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1) + PANIC("Cannot get kern.usrstack from sysctl"); env_bigstack = getenv("LIBPTHREAD_BIGSTACK_MAIN"); env_splitstack = getenv("LIBPTHREAD_SPLITSTACK_MAIN"); if (env_bigstack != NULL || env_splitstack == NULL) { diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index d6fb74bb4372..a5bbc5997d30 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -724,7 +724,7 @@ extern int __isthreaded; * Global variables for the pthread kernel. */ -extern char *_stacktop __hidden; +extern char *_usrstack __hidden; /* For debugger */ extern int _libthr_debug; diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c index fe50bc76db5f..b08bafdd9417 100644 --- a/lib/libthr/thread/thr_stack.c +++ b/lib/libthr/thread/thr_stack.c @@ -149,20 +149,18 @@ singlethread_map_stacks_exec(void) { int mib[2]; struct rlimit rlim; - u_long stacktop; + u_long usrstack; size_t len; mib[0] = CTL_KERN; - mib[1] = KERN_STACKTOP; - len = sizeof(stacktop); - if (sysctl(mib, nitems(mib), &stacktop, &len, NULL, 0) == -1) { - mib[1] = KERN_USRSTACK; - if (sysctl(mib, nitems(mib), &stacktop, &len, NULL, 0) == -1) - return; - } + mib[1] = KERN_USRSTACK; + len = sizeof(usrstack); + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0) + == -1) + return; if (getrlimit(RLIMIT_STACK, &rlim) == -1) return; - mprotect((void *)(uintptr_t)(stacktop - rlim.rlim_cur), + mprotect((void *)(uintptr_t)(usrstack - rlim.rlim_cur), rlim.rlim_cur, _rtld_get_stack_prot()); } @@ -215,7 +213,7 @@ _thr_stack_alloc(struct pthread_attr *attr) /* * Use the garbage collector lock for synchronization of the - * spare stack lists and allocations from stacktop. + * spare stack lists and allocations from usrstack. */ THREAD_LIST_WRLOCK(curthread); /* @@ -251,11 +249,11 @@ _thr_stack_alloc(struct pthread_attr *attr) } else { /* - * Allocate a stack from or below stacktop, depending + * Allocate a stack from or below usrstack, depending * on the LIBPTHREAD_BIGSTACK_MAIN env variable. */ if (last_stack == NULL) - last_stack = _stacktop - _thr_stack_initial - + last_stack = _usrstack - _thr_stack_initial - _thr_guard_default; /* Allocate a new stack. */