From owner-svn-src-all@FreeBSD.ORG  Sat Jun 25 10:01: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 162341065675;
	Sat, 25 Jun 2011 10:01:44 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0709C8FC18;
	Sat, 25 Jun 2011 10:01:44 +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 p5PA1h1w092971;
	Sat, 25 Jun 2011 10:01:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5PA1hcK092969;
	Sat, 25 Jun 2011 10:01:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201106251001.p5PA1hcK092969@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 25 Jun 2011 10:01: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: r223530 - head/sys/kern
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: Sat, 25 Jun 2011 10:01:44 -0000

Author: avg
Date: Sat Jun 25 10:01:43 2011
New Revision: 223530
URL: http://svn.freebsd.org/changeset/base/223530

Log:
  generic_stop_cpus: pull timeout logic from under DIAGNOSTIC
  
  ... and also increase the timeout.
  It's better to try to proceed somehow despite stuck CPUs than to hang
  indefinitely.  Especially so during shutdown and when entering kdb or panic.
  
  Timeout value is still an aribitrary value.
  Timeout diagnostic is just a printf; the work on something more
  debuggable is planned by attilio.  Need to be careful here as
  stop_cpus_hard is called very early while enetering kdb and soon(-ish)
  it may become called very early when entering panic.
  
  Reviewed by:	attilio
  MFC after:	2 months

Modified:
  head/sys/kern/subr_smp.c

Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c	Sat Jun 25 03:43:58 2011	(r223529)
+++ head/sys/kern/subr_smp.c	Sat Jun 25 10:01:43 2011	(r223530)
@@ -236,12 +236,10 @@ generic_stop_cpus(cpuset_t map, u_int ty
 		/* spin */
 		cpu_spinwait();
 		i++;
-#ifdef DIAGNOSTIC
-		if (i == 100000) {
+		if (i == 100000000) {
 			printf("timeout stopping cpus\n");
 			break;
 		}
-#endif
 	}
 
 	stopping_cpu = NOCPU;