From owner-svn-src-all@FreeBSD.ORG  Mon Dec 10 23:11:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EDC73C54;
 Mon, 10 Dec 2012 23:11:26 +0000 (UTC)
 (envelope-from alfred@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 D39F78FC0C;
 Mon, 10 Dec 2012 23:11:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBANBQe1034368;
 Mon, 10 Dec 2012 23:11:26 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBANBQwt034367;
 Mon, 10 Dec 2012 23:11:26 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201212102311.qBANBQwt034367@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Mon, 10 Dec 2012 23:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244099 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 10 Dec 2012 23:11:27 -0000

Author: alfred
Date: Mon Dec 10 23:11:26 2012
New Revision: 244099
URL: http://svnweb.freebsd.org/changeset/base/244099

Log:
  allow KASSERT to enter KDB.

Modified:
  head/sys/kern/kern_shutdown.c

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Mon Dec 10 23:09:55 2012	(r244098)
+++ head/sys/kern/kern_shutdown.c	Mon Dec 10 23:11:26 2012	(r244099)
@@ -542,6 +542,9 @@ shutdown_reset(void *junk, int howto)
 
 #ifdef INVARIANTS
 static int kassert_warn_only = 0;
+#ifdef KDB
+static int kassert_do_kdb = 0;
+#endif
 #ifdef KTR
 static int kassert_do_ktr = 0;
 #endif
@@ -558,6 +561,12 @@ SYSCTL_INT(_debug_kassert, OID_AUTO, war
     "KASSERT triggers a panic (1) or just a warning (0)");
 TUNABLE_INT("debug.kassert.warn_only", &kassert_warn_only);
 
+#ifdef KDB
+SYSCTL_INT(_debug_kassert, OID_AUTO, do_kdb, CTLFLAG_RW | CTLFLAG_TUN,
+    &kassert_do_kdb, 0, "KASSERT will enter the debugger");
+TUNABLE_INT("debug.kassert.do_kdb", &kassert_do_kdb);
+#endif
+
 #ifdef KTR
 SYSCTL_UINT(_debug_kassert, OID_AUTO, do_ktr, CTLFLAG_RW | CTLFLAG_TUN,
     &kassert_do_ktr, 0,
@@ -650,6 +659,11 @@ kassert_panic(const char *fmt, ...)
 			kdb_backtrace();
 		}
 	}
+#ifdef KDB
+	if (kassert_do_kdb) {
+		kdb_enter(KDB_WHY_KASSERT, buf);
+	}
+#endif
 	atomic_add_int(&kassert_warnings, 1);
 }
 #endif