From nobody Tue Jan 24 23:26:27 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 4P1jll5kgHz30yhZ; Tue, 24 Jan 2023 23:26:27 +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 4P1jll4nSlz3h39; Tue, 24 Jan 2023 23:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602787; 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=h3Qh98Tg63ynC2CMs0Leyx3L9b+9v0I3VUUOYdk+M24=; b=THcMTwgh+3QmOsxVVdMRhZ2jAQlfVN/eml3AZPVYqVtYTedr1ltDJ2qtPfLyS1lb251hg6 wJwYiHx8/k0EYWKa44OsowrZDKjv7+xHYkVDnX+HrF6g5Aapza5lRpwKeb0fTZDKUmZFp9 yIPy8rO7t+m3SLVap1CFTP/uTstNDfH7H3NN4kJ1WzXmq69+sR0ELGvx92DCAuYXj7sTJD jV+Z7mg5phnZ13p+ugTRFFWIEEKJByG6jg+XOt87f6D5hAF5h1YW2zBQjPbNapYD2N6pbz YDV08ZLAR2KX940u+w6nwzuLM1S2qg/GSSRn3AbVjCdDo/Hh458fjLGf7Iy1yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674602787; 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=h3Qh98Tg63ynC2CMs0Leyx3L9b+9v0I3VUUOYdk+M24=; b=SIIWtOUwIZaL3hJ5V5nG3rsqGvV76QcwFONPL5lMss+o6lPEN6LKwfjpAAVibMswWRh2fP 80e/5eCI2CNrTK2mCm3+sUH/uPTNW/AvTQ7Cp5tkYORvVgKtlBOWUpEZvL0kyZfR7ls14L sLb2l6YH4XPYRH5l+nQuwFnwhUqnBzF28d6rDUzrbymxQVeaMePOhM1eJc74AqwYc8qMT3 xrH+5rdSU2+euSObH2dLz3afm8KMzi/ISSeRteNbiVfnS7VC7WDCTNZwljMR5FK0m3aj5I vC/hbV8P3y7nLph42Hw4Kk/2qLX2zc9f+0OYJ1UtV0grIGp42ur4BGg5Tc9vHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674602787; a=rsa-sha256; cv=none; b=Y0uPGVwPMC7rhZTXIYK1r/hNmMPy0zxmUwXgfQNU18wqQpOUJHtZerf4CSmvmQba09Ypa5 jBu4gsX6Bu8iYQ6vMvdi9J/5lwKRSPFcePHbDKH25wnjcqpFv1DgCHPo0C9KFUjHskvfNF siMAV/jyDaa85rq1zSAjXXpUuz65nHosMwkJV31jDbQqadL8TzYUpEzoqSXalt15b5v/Fs wceIsiQj86yPyG4DpJk/f97QCN2d0PCzYJoJi1aA0ut/YVs5lB7dutVFrEt3INmETK/Leq E5coBQrF9chn2ots5KEoiJwkKgspfe+9W8EcNM0fykjmjQEmneMM7ZP2pPvzhw== 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 4P1jll3t9TzSbG; Tue, 24 Jan 2023 23:26:27 +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 30ONQRdc091780; Tue, 24 Jan 2023 23:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ONQRM4091779; Tue, 24 Jan 2023 23:26:27 GMT (envelope-from git) Date: Tue, 24 Jan 2023 23:26:27 GMT Message-Id: <202301242326.30ONQRM4091779@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: a25797c114da - stable/13 - riscv: 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: a25797c114da809da36f726110f446eac57bd9f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a25797c114da809da36f726110f446eac57bd9f1 commit a25797c114da809da36f726110f446eac57bd9f1 Author: Brooks Davis AuthorDate: 2023-01-17 16:36:15 +0000 Commit: Brooks Davis CommitDate: 2023-01-24 22:46:07 +0000 riscv: Fix thread0.td_kstack_pages init Commit 0ef3ca7ae37c70e9dc83475dc2e68e98e1c2a418 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/D38049 (cherry picked from commit b75062f23431fbabef1e7d665cae270b144f71b1) --- sys/riscv/riscv/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 76f357e53559..6a910ad6dc1e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -291,7 +291,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; thread0.td_pcb = (struct pcb *)(thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_fpflags = 0;