From owner-p4-projects@FreeBSD.ORG  Fri Jan 25 13:17:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC43416A418; Fri, 25 Jan 2008 13:17:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71C8616A46C
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:17:54 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6DBF213C4F5
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:17:54 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0PDHsaV034899
	for <perforce@freebsd.org>; Fri, 25 Jan 2008 13:17:54 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0PDHs7C034896
	for perforce@freebsd.org; Fri, 25 Jan 2008 13:17:54 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 25 Jan 2008 13:17:54 GMT
Message-Id: <200801251317.m0PDHs7C034896@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134077 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Jan 2008 13:17:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=134077

Change 134077 by jhb@jhb_zion on 2008/01/25 13:17:30

	Test for the TDF_INTERRUPT leakage that could result in early
	wakeups if a sleep timed out before the thread went to sleep.
	This could also happen prior to yesterday's fix if the timer
	fired during sleepq_catch_signals().

Affected files ...

.. //depot/projects/smpng/sys/modules/crash/crash.c#46 edit

Differences ...

==== //depot/projects/smpng/sys/modules/crash/crash.c#46 (text+ko) ====

@@ -138,9 +138,24 @@
 	printf("crash: sleepq_timedwait() returned %d\n", rval);
 	bintime_sub(&finish, &start);
 	bintime2timeval(&finish, &elapsed);
-	printf("crash: slept for %d.%04ld sec\n", (int)elapsed.tv_sec,
-	    elapsed.tv_usec / 1000);
+	printf("crash: slept for %d.%04ld sec (should be 2 sec)\n",
+	    (int)elapsed.tv_sec, elapsed.tv_usec / 1000);
 	callout_drain(&c);
+
+	/*
+	 * Test to see if we leaked TDF_INTERRUPT from the timeout
+	 * handler routine.  If so, this sleep will terminate
+	 * immediately with EWOULDBLOCK rather than waiting for the
+	 * timeout to fire.
+	 */
+	binuptime(&start);
+	ret = tsleep(&race_wchan, 0, "race", 5 * hz);
+	binuptime(&finish);
+	printf("crash: sleepq_timedwait() returned %d\n", rval);
+	bintime_sub(&finish, &start);
+	bintime2timeval(&finish, &elapsed);
+	printf("crash: slept for %d.%04ld sec (should be 5 sec)\n",
+	    (int)elapsed.tv_sec, elapsed.tv_usec / 1000);
 }
 CRASH_EVENT("exercise tsleep() race", exercise_tsleep_race);