Module Name: src
Committed By: riz
Date: Tue Dec 17 22:39:49 UTC 2013
Modified Files:
src/sys/arch/xen/xen [netbsd-6-0]: evtchn.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #995):
sys/arch/xen/xen/evtchn.c: revision 1.70
Remove the "evtchn_do_event: handler %p didn't lower ipl %d %d\n" printf.
With help from Robert Elz we've finally figured out what's going on, and
it actually isn't a bug in the handler, but related to spin mutexes.
When a spin mutex is released, the IPL isn't lowered back if the
curcpu is holding other spin mutexes. This is because mutexes may not
be released in order (and, in this case, the CPU in interrupted while
it holds a spin mutex at IPL < IPL_SCHED).
Also remove the test and resetting the IPL, it will be reset anyway
inside the loop, or at the end of the loop.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/arch/xen/xen/evtchn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.62 src/sys/arch/xen/xen/evtchn.c:1.62.8.1
--- src/sys/arch/xen/xen/evtchn.c:1.62 Sun Feb 12 14:24:08 2012
+++ src/sys/arch/xen/xen/evtchn.c Tue Dec 17 22:39:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.62 2012/02/12 14:24:08 jym Exp $ */
+/* $NetBSD: evtchn.c,v 1.62.8.1 2013/12/17 22:39:49 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.62 2012/02/12 14:24:08 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.62.8.1 2013/12/17 22:39:49 riz Exp $");
#include "opt_xen.h"
#include "isa.h"
@@ -347,13 +347,6 @@ splx:
ih_fun = (void *)ih->ih_fun;
ih_fun(ih->ih_arg, regs);
cli();
- if (ci->ci_ilevel != i) {
- printf("evtchn_do_event: "
- "handler %p didn't lower "
- "ipl %d %d\n",
- ih_fun, ci->ci_ilevel, i);
- ci->ci_ilevel = i;
- }
}
hypervisor_enable_ipl(i);
/* more pending IPLs may have been registered */
