From owner-p4-projects@FreeBSD.ORG  Mon Feb 25 04:42:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C84716A405; Mon, 25 Feb 2008 04:42:48 +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 1F36016A401
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:42:48 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 09A1813C44B
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:42:48 +0000 (UTC)
	(envelope-from kmacy@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 m1P4glwU021167
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:42:47 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4glXF021164
	for perforce@freebsd.org; Mon, 25 Feb 2008 04:42:47 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 25 Feb 2008 04:42:47 GMT
Message-Id: <200802250442.m1P4glXF021164@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136148 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: Mon, 25 Feb 2008 04:42:48 -0000

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

Change 136148 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:41:49

	assert that there aren't any pending updates when returning to user

Affected files ...

.. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#11 edit
.. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#19 edit
.. //depot/projects/xen31/sys/kern/subr_trap.c#4 edit

Differences ...

==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#11 (text+ko) ====

@@ -46,6 +46,7 @@
 void xen_pt_unpin(vm_paddr_t);
 void xen_flush_queue(void);
 void pmap_ref(pt_entry_t *pte, vm_paddr_t ma);
+void xen_check_queue(void);
 
 #ifdef INVARIANTS
 #define xen_queue_pt_update(a, b) _xen_queue_pt_update((a), (b), __FILE__, __LINE__)

==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#19 (text+ko) ====

@@ -288,6 +288,12 @@
 }
 
 void
+xen_check_queue(void)
+{
+	KASSERT(XPQ_IDX == 0, ("pending operations XPQ_IDX=%d", XPQ_IDX));
+}
+
+void
 xen_invlpg(vm_offset_t va)
 {
 	struct mmuext_op op;

==== //depot/projects/xen31/sys/kern/subr_trap.c#4 (text+ko) ====

@@ -86,6 +86,10 @@
 
 	CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid,
             td->td_name);
+#ifdef XEN
+	xen_check_queue();
+#endif	
+
 #ifdef DIAGNOSTIC
 	/* Check that we called signotify() enough. */
 	PROC_LOCK(p);