From nobody Tue Jan 24 23:26:26 2023 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 4P1jlk4y5Xz30yYg; Tue, 24 Jan 2023 23:26:26 +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 4P1jlk4SXmz3hDJ; Tue, 24 Jan 2023 23:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602786; 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=SXMLK0iWQB7YZp7OL4TI+hoH7oa1D4049Ca5u8t+eRY=; b=kZZMZlhu4PGbMyn6KWomf/dKcdnDKU5giB7M51xFdHsLODpu6MgOZrGS5oik4pn0Ym8gVi 2z+7zuF5rmZeT08JRGCRW4jyL/ELDrCgaPYRL2dFICq4mhGOF31Wcgi1rbtJKscHZ/1Yza +fEAO1QvRbw35rAfYr0BIt7Hgl8cGKIJNVJPQQJJFJVRqf8d4ZH41FQv/LPqY0ucrXJwVc lgRqcLHlTE2gC3PitAEtrlyLdZPyWufGvWyMV4XWULdblEbaCnqXADYZCJLeW7HTke5tBP uH/oLQS4eMuerEcEeYGNnr0FcOFlhJsMOPmrbud7DuNJilZz0l9GmedbF0D9mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602786; 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=SXMLK0iWQB7YZp7OL4TI+hoH7oa1D4049Ca5u8t+eRY=; b=KpQVb40LS46/VeFIm4wNr+VLaHjpbhmczI4IvwLG/sisp7biM+0UGmflfdgsyf367mJRDp 7uTmAAvJJJSvyf9TxVTmf017DbEsRhOmjawuKYJYeUpVg8TUn2C3V8IEbeUnyn4Z0A69Af 5lUgyS5R21jEkuiVduJvMM3XV7PAzC1BA04f0FrB5kbOz6TBujLho8Um3DhUmVpHzxlUg0 QiSvA/mLgse5AiFTZoc3n/AMNZZt8kCMvZ+Hop2IvUKubq8NOdSMInwKQgPacDKEn04/Bm 2fCOG2nRhxV7P9BPir2Fx3ID1oGKfQk6mvsPsVJeShyjdh+zBW8EktoSbMlwlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674602786; a=rsa-sha256; cv=none; b=nwTF5JlrgNtWb0bX7xqkQFG5OBdV2+AZcWvelNHbyJuLRHv0sby1Eovk0rYonjE0degiH8 8xrhcLZBoaUYPO07Zg4PNQpmo9C0uXmwX+2JaWviGWI0lHdPJBs6uC61oLNCtgGkAQ7RXx rS8MNIQsyBMg7W5zxBfZDODZGJjNTuk1r/CgRTxQI0fEaxXU2AkmdXPTTU6avMcslqH8pc FYiIyZXMKH1vmFH6SBi3rY0dcD1Jl289pb5cOeGVM8RW1VooaLck/D6iILokrgpTMBCNFF ifh6Haf5+lBufB2gq3xGmVnMJ3doVGh2VTDis0wsfrQKNKMikh9k214j+G0M8g== 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 4P1jlk3PkszSbF; Tue, 24 Jan 2023 23:26:26 +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 30ONQQSa091756; Tue, 24 Jan 2023 23:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ONQQnH091755; Tue, 24 Jan 2023 23:26:26 GMT (envelope-from git) Date: Tue, 24 Jan 2023 23:26:26 GMT Message-Id: <202301242326.30ONQQnH091755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: e3e6f08472b7 - stable/13 - arm64: Fix thread0.td_kstack_pages init 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3e6f08472b79f9c62fc3367a2c4adc5ccc3d94c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e6f08472b79f9c62fc3367a2c4adc5ccc3d94c commit e3e6f08472b79f9c62fc3367a2c4adc5ccc3d94c Author: Brooks Davis AuthorDate: 2023-01-17 16:35:08 +0000 Commit: Brooks Davis CommitDate: 2023-01-24 22:45:35 +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 (cherry picked from commit e1b610f76caa09bbc3910477da878ea5078c6569) --- 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 21c9ced1b0cc..6178221032eb 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