From nobody Tue Jan 17 16:38:24 2023 X-Original-To: dev-commits-src-main@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 4NxF284v5Rz2skbP; Tue, 17 Jan 2023 16:38:24 +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 4NxF284Dpbz3Dnv; Tue, 17 Jan 2023 16:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673973504; 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=dF/RawRwAVpX5NJ8OnT918Hpy9OW0s+M2aq7EOzXLiI=; b=deamlxWXaqQwa+eB1RexTeM5jLLSx6567XLcicAQY4g6SlUt9A7XyAX9eKyv6KBYvcXiLW oojdp/ZQtYUQ24DKMyDHGs/GvaRmNUJCZqJQ2s1qToAmhEBhN5pj0aXL2lVttlgPZUEtAZ BX22sWxpVFwDAH5AuLjFzoYmDOEE4+XOe1vILrxpkBNDAAE/Ci+/o+DkpoN7jz8rBaxcwZ 81Jf4G1Y4BQv/Q+b8GnlNhcXW2GX96YL28aFnj1cbR5lLouCX0ve6M7sQjbu2gCF9170Hk 6v+sB5W9hqI3qAEdt8yB4DA60/k3FvXB3D9QLCXNstrohwYFsvb0rL3HvnJKDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673973504; 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=dF/RawRwAVpX5NJ8OnT918Hpy9OW0s+M2aq7EOzXLiI=; b=X+PNeCYrOFLHhQ0Na5iayItq3JwwVsstmPYAdZlx1l5CQlApdrgzkO5HiWGOWnIj7djvbJ 47RYvlU7+qwmYP1iwLkw/DBHWOhKtns8j5jZMgmta+xDV340rMEno9i2kuJN/FWA1svBEZ fgUm/R+AES6G2fEIkyb8eD846WerppknpReL7p4tzWO3CgloQYB1Xq98vg1qkX5l6VVk7K g69XncVwyLE5i46mSpbOZ+afuHgSFVkstHIU7rw3g7lhz0fMOGdr+x8Xa+37fIwn/lsC0a BBi25QLvz8lFgm7Xunl6S9G/TzvpDOXBxJIhjiyX54U7Fbc4EnFZIISAeGvK/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673973504; a=rsa-sha256; cv=none; b=kJLdbD9UjKh7rMj3Ysb9IfbjSF7NqRfOwb18/TzAFXPBrGfvZOHmpLr4NVicCfbI08tcdE JLnr8YZNtqFT3sxyYDAZjFGh4OlJGtYJwL9jNbYAU5E6/GsJOD4HiSJ8ODH3bMboeb/EO5 EYcqKwTiOPA+x9blWKxB4wqwMtnJbJz8NdJLALG3g4pz90zIv0CiMdEkPQedDFrJEGWU3e 2kvItnJmMzbRVkdC6dtV0j6slcGTPvtpP2vSu6aHl3hrgm+LmKH9Tv6weX384znAxiaei6 zrFdDmqobtjpQ78QjeFzjq7OJ1b9SumZN1vIf2aAgDGA70gwxfMP7iJt4k5zGQ== 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 4NxF2832vPzdv7; Tue, 17 Jan 2023 16:38:24 +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 30HGcOqa091161; Tue, 17 Jan 2023 16:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30HGcO67091160; Tue, 17 Jan 2023 16:38:24 GMT (envelope-from git) Date: Tue, 17 Jan 2023 16:38:24 GMT Message-Id: <202301171638.30HGcO67091160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e1b610f76caa - main - arm64: Fix thread0.td_kstack_pages init List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1b610f76caa09bbc3910477da878ea5078c6569 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e1b610f76caa09bbc3910477da878ea5078c6569 commit e1b610f76caa09bbc3910477da878ea5078c6569 Author: Brooks Davis AuthorDate: 2023-01-17 16:35:08 +0000 Commit: Brooks Davis CommitDate: 2023-01-17 16:37:09 +0000 arm64: Fix thread0.td_kstack_pages init Commit 86a994d6537d7b5e1efb1019e466d86a688fd570 initialized thread0.td_kstack_pages to KSTACK_PAGES. Due to the lack of an include of opt_kstack_pages.h it used the fallback value of 4 from machine/param.h. This meant that increasing KSTACK_PAGES in the kernel config resulted in a panic in _epoch_enter_preempt as the following assertion was false during network stack setup: MPASS((vm_offset_t)et >= td->td_kstack && (vm_offset_t)et + sizeof(struct epoch_tracker) <= td->td_kstack + td->td_kstack_pages * PAGE_SIZE); Switch to initializing with kstack_pages following other architectures. Reviewed by: imp, markj Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D38048 --- sys/arm64/arm64/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b099980634f6..2eaf4ef14390 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -365,7 +365,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = KSTACK_PAGES; + thread0.td_kstack_pages = kstack_pages; #if defined(PERTHREAD_SSP) thread0.td_md.md_canary = boot_canary; #endif