From owner-svn-src-all@FreeBSD.ORG  Wed Nov  9 17:25:44 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 004E21065673;
	Wed,  9 Nov 2011 17:25:43 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E48378FC0A;
	Wed,  9 Nov 2011 17:25:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA9HPhZZ092221;
	Wed, 9 Nov 2011 17:25:43 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9HPhXh092218;
	Wed, 9 Nov 2011 17:25:43 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201111091725.pA9HPhXh092218@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 9 Nov 2011 17:25:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227394 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2011 17:25:44 -0000

Author: kib
Date: Wed Nov  9 17:25:43 2011
New Revision: 227394
URL: http://svn.freebsd.org/changeset/base/227394

Log:
  Stopped process may legitimately have some threads sleeping and not
  suspended, if the sleep is uninterruptible.
  
  Reported and tested by:	pho
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/machdep.c
  head/sys/i386/i386/machdep.c

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Wed Nov  9 17:15:51 2011	(r227393)
+++ head/sys/amd64/amd64/machdep.c	Wed Nov  9 17:25:43 2011	(r227394)
@@ -2047,7 +2047,8 @@ int
 fill_fpregs(struct thread *td, struct fpreg *fpregs)
 {
 
-	KASSERT(td == curthread || TD_IS_SUSPENDED(td),
+	KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
+	    (P_SHOULDSTOP(td->td_proc) && TD_IS_SLEEPING(td)),
 	    ("not suspended thread %p", td));
 	fpugetregs(td);
 	fill_fpregs_xmm(&td->td_pcb->pcb_user_save, fpregs);

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Wed Nov  9 17:15:51 2011	(r227393)
+++ head/sys/i386/i386/machdep.c	Wed Nov  9 17:25:43 2011	(r227394)
@@ -3299,7 +3299,8 @@ int
 fill_fpregs(struct thread *td, struct fpreg *fpregs)
 {
 
-	KASSERT(td == curthread || TD_IS_SUSPENDED(td),
+	KASSERT(td == curthread || TD_IS_SUSPENDED(td) ||
+	    (P_SHOULDSTOP(td->td_proc) && TD_IS_SLEEPING(td)),
 	    ("not suspended thread %p", td));
 #ifdef DEV_NPX
 	npxgetregs(td);