Re: CVS commit: src/sys/arch/x86/x86

[Valery Ushakov <uwe%stderr.spb.ru@localhost>]

On Wed, Sep 11, 2024 at 05:17:45 +0000, matthew green wrote:

> Module Name:	src
> Committed By:	mrg
> Date:		Wed Sep 11 05:17:45 UTC 2024
> 
> Modified Files:
> 	src/sys/arch/x86/x86: intr.c
> 
> Log Message:
> apply some more diagnostic checks for x86 interrupts

How does this mix with KDTRACE_HOOKS?  To paraphrase:

#define IS_I8254_CLOCKINTR \
    (handler == __FPTRCAST(int (*)(void *), i8254_clockintr))

#ifdef KDTRACE_HOOKS
    if (!IS_I8254_CLOCKINTR) {
        ih->ih_fun = intr_kdtrace_wrapper;
        ih->ih_arg = ih;
    }
#endif
#ifdef MULTIPROCESSOR
    if (!mpsafe) {
        KASSERT(!IS_I8254_CLOCKINTR);
        ih->ih_fun = intr_biglock_wrapper;
        ih->ih_arg = ih;
    }
#ifdef DIAGNOSTIC               /* wrap all interrupts */
    else if (!IS_I8254_CLOCKINTR) {
        ih->ih_fun = intr_wrapper;
        ih->ih_arg = ih;
    }
#endif
#endif /* MULTIPROCESSOR */

and MULTIPROCESSOR case overwrites whatever KDTRACE_HOOKS did, doesn't
it?

-uwe