From owner-svn-src-head@FreeBSD.ORG  Thu Mar 21 14:06:27 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EB0F3DE3;
 Thu, 21 Mar 2013 14:06:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DE0E5BFB;
 Thu, 21 Mar 2013 14:06:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2LE6R5f097670;
 Thu, 21 Mar 2013 14:06:27 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2LE6RX8097668;
 Thu, 21 Mar 2013 14:06:27 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201303211406.r2LE6RX8097668@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 21 Mar 2013 14:06:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248584 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Mar 2013 14:06:28 -0000

Author: jhb
Date: Thu Mar 21 14:06:27 2013
New Revision: 248584
URL: http://svnweb.freebsd.org/changeset/base/248584

Log:
  Another NFS SIGSTOP related fix: Ignore thread suspend requests due to
  SIGSTOP if stop signals are currently deferred.  This can occur if a
  process is stopped via SIGSTOP while a thread is running or runnable
  but before it has set TDF_SBDRY.
  
  Tested by:	pho
  Reviewed by:	kib
  MFC after:	1 week

Modified:
  head/sys/kern/kern_thread.c

Modified: head/sys/kern/kern_thread.c
==============================================================================
--- head/sys/kern/kern_thread.c	Thu Mar 21 13:06:28 2013	(r248583)
+++ head/sys/kern/kern_thread.c	Thu Mar 21 14:06:27 2013	(r248584)
@@ -795,6 +795,17 @@ thread_suspend_check(int return_instead)
 			return (ERESTART);
 
 		/*
+		 * Ignore suspend requests for stop signals if they
+		 * are deferred.
+		 */
+		if (P_SHOULDSTOP(p) == P_STOPPED_SIG &&
+		    td->td_flags & TDF_SBDRY) {
+			KASSERT(return_instead,
+			    ("TDF_SBDRY set for unsafe thread_suspend_check"));
+			return (0);
+		}
+
+		/*
 		 * If the process is waiting for us to exit,
 		 * this thread should just suicide.
 		 * Assumes that P_SINGLE_EXIT implies P_STOPPED_SINGLE.