From nobody Tue Jun 23 16:28:35 2026 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 4gl9VX3h69z6hhg8 for ; Tue, 23 Jun 2026 16:28:36 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9VW5vWgz3N3Z for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wammWYllKZq0KdGfvQxk8GSmbsrMlG648QOpwYNESVw=; b=DLFrJSm2HJebIQK4kx2GLCowq2lgHBK9a4aMBh83e/sjU6a7Mi9W5Ct/ErzG7OMg8vKrAh hNHy1CtEiUw72uKAimGLYEwTX9fMK2fBL5KZt7tTGA4Wdpx1BX+96GFVuwmYH2/do/Ei+E 1l8XseJmrXKN+yiX1c6UXoS8+cvPr3pcvMS8G+6ZTBg7AtbpBs28whnbN3U6hz6VtMCkAv p85oshfkKSMAGrtcNlOgKvuSj1iTKaukVzxGWOWWSDUK8/wgeaw04TxHcYgWAGMqfZqZMY Z3y+xIP9XcANlwOcJq5wd938lr/sb3IFepgHNlKLFlcdsz1KMSB5YINh5vPRHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232115; a=rsa-sha256; cv=none; b=Z8N7al+1iLGxodhwYRN9LFfax5wecf81QQ/dy1kGbzLxpjDTDJnR/HS2Nj9ntslQ0F1hQm 64Ux0fMqlIvSO2o5rpmMUobYPKNN0P1cd0LRXqL90NmeIS0ffj6ZJm7nhBcc6r2yfro66G qYNuhOD0JqS/LCdkhhlp4pfvJzXOs9JOtuhT7qijMWPY9zbMekHDcjws8Spa8AoAEsyzNV NhEdSY46pjSO5MBiyaFg89+mMKXt9+OhRc0W6NGkWQDFMtkjVGJZ4lyBufkfS8Mi0AoXc4 D8RCoONDIHb0EPw21mkbJ/v47vkgeD33+Y+USg0MRhBQoLILg50QDXqkYeHsiA== 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=1782232115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wammWYllKZq0KdGfvQxk8GSmbsrMlG648QOpwYNESVw=; b=lGSCw4pRmr/31piOfmS7XGnPQ0NsN3OYJq5SEDkAsEJK+TRGVvX3zv79E+Pp3BFYS4m8KK s2Ff+JtOcQSqX7xRX8lRWnseqRa6pJLgTwcw+GI0nk9B9NXxgb8C4PJDEBPgINYxB3PkWn hUNJ7KngJTWz0hxJm85tgwDep/zBmYxpzEraUxXf0DuekjnAYLOlzrMTiAN/GScScyzwCu ibFdN2YUeGQz9SsKlJIOjOi4y0ll5rO0BWwOW9kzUAW8BNd4d/Hr2v5sU9WP/3IqMq/X5D TIDyC1e7zCBhMUANJ4QmUO/Y8RAdFCn4uPlnzoPXkdCBfGl6FNg4zehmSq7cHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9VW4j3Nzhpn for ; Tue, 23 Jun 2026 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2700a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alfredo Mazzinghi From: John Baldwin Subject: git: f62f0a16448c - stable/15 - arm64: Adjust the kernel stack pointer at the end of fork_trampoline 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: f62f0a16448c34a4bc783a85b25b2142552796f2 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:35 +0000 Message-Id: <6a3ab433.2700a.4fdf4213@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f62f0a16448c34a4bc783a85b25b2142552796f2 commit f62f0a16448c34a4bc783a85b25b2142552796f2 Author: Alfredo Mazzinghi AuthorDate: 2026-04-22 23:46:14 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:17:31 +0000 arm64: Adjust the kernel stack pointer at the end of fork_trampoline All other paths that return from the kernel to userspace pop the user trapframe off of the kernel stack pointer before returning to userspace in restore_registers. fork_trampoline was missing this, so all of the user faults after fork pushed another trapframe leaving a trapframe's worth of wasted space on the kstack. This would be fatal after a future change to remove duplicate initialization of td_frame in cpu_fork() as without this fix each time a thread was recycled it would "lose" another trapframe's worth of space. Reviewed by: kib, andrew Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/23 (cherry picked from commit a1e07f21dc7458d85bd0d04c294f0389d4591666) --- sys/arm64/arm64/swtch.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index b3bf88135e57..0cc0d7462ae6 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -276,6 +276,8 @@ ENTRY(fork_trampoline) ldp x26, x27, [sp, #TF_X + 26 * 8] ldp x28, x29, [sp, #TF_X + 28 * 8] + add sp, sp, #(TF_SIZE) + /* * No need for interrupts reenabling since PSR * will be set to the desired value anyway.