# HG changeset patch
# User Taylor R Campbell <riastradh@NetBSD.org>
# Date 1726062171 0
#      Wed Sep 11 13:42:51 2024 +0000
# Branch trunk
# Node ID f8d440865ed491a9d66f753735b8b5af78b678d7
# Parent  46423f010b5bc43991d69649b01bdecc0ea73537
# EXP-Topic riastradh-20240911-x86intrwrapper
x86/intr.c: Simplify diagnostic intr wrapper.

No functional change intended.  The only this cases potentially
changes are:

- KDTRACE_HOOKS, !DIAGNOSTIC -- but the assertions are noops anyway,
  so this doesn't change anything

- DIAGNOSTIC, !KDTRACE_HOOKS, !MULTIPROCESSOR -- but this isn't
  supported on x86 anyway, so it's moot

But there's substantially less code to maintain now.

diff -r 46423f010b5b -r f8d440865ed4 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c	Wed Sep 11 05:17:45 2024 +0000
+++ b/sys/arch/x86/x86/intr.c	Wed Sep 11 13:42:51 2024 +0000
@@ -657,16 +657,12 @@ intr_source_free(struct cpu_info *ci, in
 	isp->is_resume = NULL;
 }
 
-#ifdef MULTIPROCESSOR
-static int intr_biglock_wrapper(void *);
-static int intr_wrapper(void *);
+#if defined DIAGNOSTIC || defined KDTRACE_HOOKS || defined MULTIPROCESSOR
 
 /*
  * intr_wrapper: perform diagnostic checks before and after calling the
  * real handler.
- * intr_biglock_wrapper: grab biglock and call a real interrupt handler.
  */
-
 static int
 intr_wrapper(void *vp)
 {
@@ -687,13 +683,20 @@ intr_wrapper(void *vp)
 	    "%s @ %p slipped locks %d -> %d",
 	    ih->ih_xname, ih->ih_realfun, locks, curcpu()->ci_biglock_count);
 	KASSERTMSG(nopreempt == l->l_nopreempt,
-	    "%s @ %p slipped nopreempt %d -> %d lwp %p/%p func %p",
-	    ih->ih_xname, ih->ih_realfun, nopreempt, l->l_nopreempt, l, curlwp,
-	    ih->ih_realfun);
+	    "%s @ %p slipped nopreempt %d -> %d lwp %p/%p",
+	    ih->ih_xname, ih->ih_realfun, nopreempt, l->l_nopreempt,
+	    l, curlwp);
 
 	return ret;
 }
 
+#endif	/* DIAGNOSTIC | KDTRACE_HOOKS | MULTIPROCESSOR */
+
+#ifdef MULTIPROCESSOR
+
+/*
+ * intr_biglock_wrapper: grab biglock and call a real interrupt handler.
+ */
 static int
 intr_biglock_wrapper(void *vp)
 {
@@ -710,29 +713,6 @@ intr_biglock_wrapper(void *vp)
 
 #endif /* MULTIPROCESSOR */
 
-#ifdef KDTRACE_HOOKS
-static int
-intr_kdtrace_wrapper(void *vp)
-{
-	struct intrhand *ih = vp;
-	struct lwp *l = curlwp;
-	int ret;
-
-	int nopreempt;
-	nopreempt = l->l_nopreempt;
-	SDT_PROBE3(sdt, kernel, intr, entry,
-	    ih->ih_realfun, ih->ih_realarg, ih);
-	ret = (*ih->ih_realfun)(ih->ih_realarg);
-	SDT_PROBE4(sdt, kernel, intr, return,
-	    ih->ih_realfun, ih->ih_realarg, ih, ret);
-	KASSERTMSG(nopreempt == l->l_nopreempt,
-	    "%s @ %p slipped nopreempt %d -> %d  lwp %p/%p",
-	    ih->ih_xname, ih->ih_realfun, nopreempt, l->l_nopreempt, l, curlwp);
-
-	return ret;
-}
-#endif
-
 /*
  * Append device name to intrsource. If device A and device B share IRQ number,
  * the device name of the interrupt id is "device A, device B".
@@ -975,7 +955,7 @@ intr_establish_xname(int legacy_irq, str
 	ih->ih_cpu = ci;
 	ih->ih_slot = slot;
 	strlcpy(ih->ih_xname, xname, sizeof(ih->ih_xname));
-#ifdef KDTRACE_HOOKS
+#if defined DIAGNOSTIC || defined KDTRACE_HOOKS
 	/*
 	 * XXX i8254_clockintr is special -- takes a magic extra
 	 * argument.  This should be fixed properly in some way that
@@ -983,7 +963,7 @@ intr_establish_xname(int legacy_irq, str
 	 * the comments in x86/isa/clock.c.
 	 */
 	if (handler != __FPTRCAST(int (*)(void *), i8254_clockintr)) {
-		ih->ih_fun = intr_kdtrace_wrapper;
+		ih->ih_fun = intr_wrapper;
 		ih->ih_arg = ih;
 	}
 #endif
@@ -993,15 +973,6 @@ intr_establish_xname(int legacy_irq, str
 		    __FPTRCAST(int (*)(void *), i8254_clockintr));
 		ih->ih_fun = intr_biglock_wrapper;
 		ih->ih_arg = ih;
-	} else {
-		if (handler !=
-		    __FPTRCAST(int (*)(void *), i8254_clockintr)) { /* XXX */
-#ifdef DIAGNOSTIC
-			/* wrap all interrupts */
-			ih->ih_fun = intr_wrapper;
-			ih->ih_arg = ih;
-#endif
-		}
 	}
 #endif /* MULTIPROCESSOR */