From owner-svn-src-all@freebsd.org Tue Oct 22 15:40:41 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 921CB15DCA8; Tue, 22 Oct 2019 15:40:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46yHlY3H9sz3RJl; Tue, 22 Oct 2019 15:40:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x741.google.com with SMTP id w2so16663838qkf.2; Tue, 22 Oct 2019 08:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=i3VHXEVUeWf/W/lIellzl2O2hyjwBWYQ3Rtd5M48ETI=; b=MJP2olE1FNAKAwS8OSr10uvfWFpTvc5LMT2GRs1Y1qAUH0iQruF9IfVs8N3EZ39eBz Uxvm94HxrtCDT/NyDWdoIdD49vh43LrB0mIix9Gu+EJmm7QfMSC4FC/gYQdruoCQRjqo Au/wPTR7+pU+kuGqtWIoxg0HaL20I5tISOll1nqyTKL4Epr8FBDxSRmiC4pI9q6qkp/r 8v0v9tq3NE1TWgkPr/ZHMq0M4cfS7x3CMGvL0DroGE6zHVJmYPd/KedEdo/CmvewrtHi UrRXUp7AsCOpDrTFX/3fYCMvoL0Vhy8ss6eGYYu0k87vuLZTFJtojnOojfw1q2Qo4cXf HiZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=i3VHXEVUeWf/W/lIellzl2O2hyjwBWYQ3Rtd5M48ETI=; b=MXIYZWgu4w0dFZH8rZQCEC9Pr9LGBVkffCdnLcTsuax8rEIe3TLD7juC5fWenaTPN6 1sagPlRzzBaRQX/9KD7kFo4/7d8JIDnGoOuaKMQAdPQIp1IAV9LVxXE9PChcbc4OPhGj /1J5Zqi1pKc+kac3ict0cVLupqYauag8MQVzoBWDDITlfO7UkyniCHKpLiWZ4FMbZa34 X1Nxm8xriyjiKhdBK8uxWWn9y7U4hSHCLSNVGrHtPJjGGgQZz3XHLVioO1pHWL5ZUBup dPbS85z2f0wMJqiDgliTwUUmQeTwLR4XZPyejuBGeDDefbUox8R0i7uiSOkSMvBTlCUt i26A== X-Gm-Message-State: APjAAAX8EITCvzk4M8LjKZrJOv2oo1TP9SyroJ9utN25MJBZtaqd1sNq niAOSfGZec3aEvKFvQgyK5vyQZmK X-Google-Smtp-Source: APXvYqymhEvJOl9gcqYbUUnPUh+YLcEhCfcIloBs7S2ukH+l9T2Ay1brp0MUevvIhUS2wAkSQvkR7A== X-Received: by 2002:a37:a448:: with SMTP id n69mr3595498qke.325.1571758839613; Tue, 22 Oct 2019 08:40:39 -0700 (PDT) Received: from raichu (toroon0560w-lp130-05-69-158-183-252.dsl.bell.ca. [69.158.183.252]) by smtp.gmail.com with ESMTPSA id a15sm1448541qtp.77.2019.10.22.08.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 08:40:38 -0700 (PDT) Sender: Mark Johnston Date: Tue, 22 Oct 2019 11:40:36 -0400 From: Mark Johnston To: Gleb Smirnoff Cc: Li-Wen Hsu , br@freebsd.org, src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r353876 - head/sys/kern Message-ID: <20191022154036.GE540@raichu> References: <201910212312.x9LNCEbX052414@repo.freebsd.org> <20191022152913.GJ4086@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191022152913.GJ4086@FreeBSD.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 46yHlY3H9sz3RJl X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.98 / 15.00]; NEURAL_HAM_MEDIUM(-0.98)[-0.985,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2019 15:40:41 -0000 On Tue, Oct 22, 2019 at 08:29:13AM -0700, Gleb Smirnoff wrote: > Li-Wen, > > On Tue, Oct 22, 2019 at 04:28:45PM +0800, Li-Wen Hsu wrote: > L> > Modified: head/sys/kern/subr_epoch.c > L> > ============================================================================== > L> > --- head/sys/kern/subr_epoch.c Mon Oct 21 21:21:34 2019 (r353875) > L> > +++ head/sys/kern/subr_epoch.c Mon Oct 21 23:12:14 2019 (r353876) > L> > @@ -366,9 +366,13 @@ _epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et > L> > struct thread *td; > L> > > L> > MPASS(cold || epoch != NULL); > L> > - INIT_CHECK(epoch); > L> > MPASS(epoch->e_flags & EPOCH_PREEMPT); > L> > td = curthread; > L> > + MPASS((vm_offset_t)et >= td->td_kstack && > L> > + (vm_offset_t)et + sizeof(struct epoch_tracker) < > L> > + td->td_kstack + td->td_kstack_pages * PAGE_SIZE); > L> > + > L> > + INIT_CHECK(epoch); > L> > #ifdef EPOCH_TRACE > L> > epoch_trace_enter(td, epoch, et, file, line); > L> > #endif > L> > L> Hello Gleb, > L> > L> RISC-V boot panics with this message: > L> > L> panic: Assertion (vm_offset_t)et >= td->td_kstack && (vm_offset_t)et + > L> sizeof(struct epoch_tracker) < td->td_kstack + td->td_kstack_pages * > L> PAGE_SIZE failed at /workspace/src/sys/kern/subr_epoch.c:373 > L> > L> Full log: https://ci.freebsd.org/job/FreeBSD-head-riscv64-test/12334/console > L> > L> Can you help check this? > > I need help from RISC-V experts. I suspect the problem is that init_proc0() on several arches does not initialize td_kstack_pages. I will test this patch and commit if it fixes the panic. Note that on arm64 and riscv thread0's kernel stack is statically allocated. diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index dc0a84404f02..990c3df49328 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -771,6 +771,7 @@ init_proc0(vm_offset_t kstack) { proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; + thread0.td_kstack_pages = kstack_pages; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_flags = 0; diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 4356add12aa0..967e1deaa55e 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -745,6 +745,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; + thread0.td_kstack_pages = KSTACK_PAGES; thread0.td_pcb = (struct pcb *)(thread0.td_kstack) - 1; thread0.td_pcb->pcb_fpflags = 0; thread0.td_pcb->pcb_fpusaved = &thread0.td_pcb->pcb_fpustate; diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index e01f7e42895d..07113534706e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -658,6 +658,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; + thread0.td_kstack_pages = KSTACK_PAGES; thread0.td_pcb = (struct pcb *)(thread0.td_kstack) - 1; thread0.td_pcb->pcb_fpflags = 0; thread0.td_frame = &proc0_tf;