From owner-freebsd-current@FreeBSD.ORG  Thu Apr 13 01:07:54 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from localhost.my.domain (localhost [127.0.0.1])
	by hub.freebsd.org (Postfix) with ESMTP id D396B16A401;
	Thu, 13 Apr 2006 01:07:53 +0000 (UTC)
	(envelope-from davidxu@freebsd.org)
From: David Xu <davidxu@freebsd.org>
To: freebsd-current@freebsd.org
Date: Thu, 13 Apr 2006 09:07:50 +0800
User-Agent: KMail/1.8.2
References: <slrne3q1f7.18h.csaba@beastie.creo.hu>
	<200604121103.32647.jhb@freebsd.org>
In-Reply-To: <200604121103.32647.jhb@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200604130907.51163.davidxu@freebsd.org>
Cc: Csaba Henk <csaba-ml@creo.hu>
Subject: Re: panic: Assertion !(curthread->td_flags & TDF_SINTR) failed
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 01:07:54 -0000

On Wednesday 12 April 2006 23:03, John Baldwin wrote:
> On Wednesday 12 April 2006 09:52, Csaba Henk wrote:
> > Hi!
> >
> > With my CURRENT installation from Apr 1, I get:
> >
> > panic: Assertion !(curthread->td_flags & TDF_SINTR) failed at
> > /usr/src/sys/kern/subr_sleepqueue.c:529 cpuid = 0
> > KDB: enter: panic
>
> The sleepq_remove() in msleep() to handle this nested sleep case isn't
> clearing the TDF_SINTR from the previous tsleep.  I suspect this changed
> in the recent fixes as I think they changed the sleepqueue code to clear
> TDF_SINTR when the thread resumed, rather than clearing it when the thread
> was removed from the queue IIRC.
>
Can you test following patch ? I think the TDF_SINTR was never cleared in
sleepq_remove or sleepq_resume_thread, the functions were not touched in
my previous fixes.:-)

David Xu


Index: subr_sleepqueue.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_sleepqueue.c,v
retrieving revision 1.26
diff -u -r1.26 subr_sleepqueue.c
--- subr_sleepqueue.c	23 Feb 2006 03:42:17 -0000	1.26
+++ subr_sleepqueue.c	13 Apr 2006 00:59:01 -0000
@@ -633,6 +633,7 @@
 
 	td->td_wmesg = NULL;
 	td->td_wchan = NULL;
+	td->td_flags &= ~TDF_SINTR;
 
 	/*
 	 * Note that thread td might not be sleeping if it is running