PERFORCE change 136148 for review

[Kip Macy]

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

Change 136148 by kmacy at 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);