From nobody Wed Jan 18 22:07:47 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 4Ny0Hn0hHbz2t91f; Wed, 18 Jan 2023 22:07:49 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ny0Hm6LrJz4D8K; Wed, 18 Jan 2023 22:07:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674079668; 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: in-reply-to:in-reply-to:references:references; bh=0z39l9jrtcycb1/9hiFXgdt3zQYtY7X/ARSg0z5ZDX8=; b=t/I7k8GWakr6ynZO5W8pipe3W8lEAAWVBEjGeBZi9zXCc0xoQTFHMfJiY6atTYAHrJFhsU qw2CuLvS+jjICjX2VVLBdchBCVeVMR4CtOA7AnAt/Wc1RLYobXAqbArBUpqxAHBwSUis22 Xi11dBEIM3DnhKj6xdTM3ZelqIPWXFGu4NqNbJ7TGei4NGmGFE3ohG/CiFRhuBxyn6yTjt gDcztNWWoRCPKQOBrqit6FQKkTuomJn66iyETwRIgGJZcdolxV2l+pDwzk79IbBNxbAdkU 5u1+AJ6jiJQROLkBHY8nQshVr610F4b8e971xsca1xRjiIARY3Hz0SR72VfASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674079668; 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: in-reply-to:in-reply-to:references:references; bh=0z39l9jrtcycb1/9hiFXgdt3zQYtY7X/ARSg0z5ZDX8=; b=XFtUW59m2YLTAPeki85/kaedcYzEIsn7Gxeg44nG2FcONJ+3X3+TsWnnxYH07QLMcGj8oV IAgsHPi+FJTsioLoaQEDkckohYcPAnWDc2UYY8beCfScABKmHxKBiywCb/yWQeIzYWFg+l brQloe4f/IbDjFCyqTkN0Hl8S8cy+Fx0t/qA2Dun84WLuxrpB+1DNdp9R2WGie07hzgbXm FEILuQVqMBtoyDDp13AM8wc8pkuBZ4Zp400Oh9VsB/Th41dKPliRaJ1mre1I40vth3O/vJ pMTjeLaqRwJ+zizEZmbn5HTiox4/nr+44vlWx4y1vVY5caT8xHG10RluB5Nnxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674079668; a=rsa-sha256; cv=none; b=pGBMyNztWVbkjE8EytSydyOWP0H8/+30woJeE6abBzM+VOISlgUfD+jtGgrGJb46ntvoUB 7HwMNuLY9W4FDS3JGgVqc4CNttLdZMuk5t/Z/goBY/3QD6eiX+CC9TG06jxyAHrv3P3YVz /zCVGRMQ1Bhym2A8BKNBnLNJljX7XdKLFTjIZmaG2yZZnJXXI1ayuvIljQOi3jYeHFwCM5 axrMOogg93CN3O03jAVQjq29/FNK8mL9h3oTcxYA2MZwqeCBVhA7W0IVBGFl7acScrKVqJ 6WugtkPMSapm+GB61BzCl/YUs0jKehFbkGguphx4ky0qTZKX+Zzhk5HYeJ5m2g== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Ny0Hm3WrDzSt9; Wed, 18 Jan 2023 22:07:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: Date: Wed, 18 Jan 2023 18:07:47 -0400 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: git: b75062f23431 - main - riscv: Fix thread0.td_kstack_pages init Content-Language: en-CA To: Brooks Davis , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202301171638.30HGcP3C091184@gitrepo.freebsd.org> From: Mitchell Horne In-Reply-To: <202301171638.30HGcP3C091184@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 1/17/23 12:38, Brooks Davis wrote: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b75062f23431fbabef1e7d665cae270b144f71b1 > > commit b75062f23431fbabef1e7d665cae270b144f71b1 > Author: Brooks Davis > AuthorDate: 2023-01-17 16:36:15 +0000 > Commit: Brooks Davis > CommitDate: 2023-01-17 16:37:42 +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. Does this mean that we could/should include opt_kstack_pages.h within machine/param.h (under #ifdef _KERNEL)? This header is both a consumer and provider of the KSTACK_PAGES definition, by virtue of the #ifndef. I think the hidden dependency should be avoided, if possible. Of course, the problem at hand has been fixed and we want to keep direct consumers of KSTACK_PAGES to a minimum, but I think the point still stands. Mitchell > 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 > --- > 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 b03d45b018ec..0821a29d11c1 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;