e0f66ef861
and increase flexibility to allow various different approaches to be tried in the future. - Split struct ithd up into two pieces. struct intr_event holds the list of interrupt handlers associated with interrupt sources. struct intr_thread contains the data relative to an interrupt thread. Currently we still provide a 1:1 relationship of events to threads with the exception that events only have an associated thread if there is at least one threaded interrupt handler attached to the event. This means that on x86 we no longer have 4 bazillion interrupt threads with no handlers. It also means that interrupt events with only INTR_FAST handlers no longer have an associated thread either. - Renamed struct intrhand to struct intr_handler to follow the struct intr_foo naming convention. This did require renaming the powerpc MD struct intr_handler to struct ppc_intr_handler. - INTR_FAST no longer implies INTR_EXCL on all architectures except for powerpc. This means that multiple INTR_FAST handlers can attach to the same interrupt and that INTR_FAST and non-INTR_FAST handlers can attach to the same interrupt. Sharing INTR_FAST handlers may not always be desirable, but having sio(4) and uhci(4) fight over an IRQ isn't fun either. Drivers can always still use INTR_EXCL to ask for an interrupt exclusively. The way this sharing works is that when an interrupt comes in, all the INTR_FAST handlers are executed first, and if any threaded handlers exist, the interrupt thread is scheduled afterwards. This type of layout also makes it possible to investigate using interrupt filters ala OS X where the filter determines whether or not its companion threaded handler should run. - Aside from the INTR_FAST changes above, the impact on MD interrupt code is mostly just 's/ithread/intr_event/'. - A new MI ddb command 'show intrs' walks the list of interrupt events dumping their state. It also has a '/v' verbose switch which dumps info about all of the handlers attached to each event. - We currently don't destroy an interrupt thread when the last threaded handler is removed because it would suck for things like ppbus(8)'s braindead behavior. The code is present, though, it is just under #if 0 for now. - Move the code to actually execute the threaded handlers for an interrrupt event into a separate function so that ithread_loop() becomes more readable. Previously this code was all in the middle of ithread_loop() and indented halfway across the screen. - Made struct intr_thread private to kern_intr.c and replaced td_ithd with a thread private flag TDP_ITHREAD. - In statclock, check curthread against idlethread directly rather than curthread's proc against idlethread's proc. (Not really related to intr changes) Tested on: alpha, amd64, i386, sparc64 Tested on: arm, ia64 (older version of patch by cognet and marcel)
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/*-
|
|
* Copyright (c) 2001 Jake Burkholder.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_INTR_MACHDEP_H_
|
|
#define _MACHINE_INTR_MACHDEP_H_
|
|
|
|
#define IRSR_BUSY (1 << 5)
|
|
|
|
#define PIL_MAX (1 << 4)
|
|
#define IV_MAX (1 << 11)
|
|
#define IV_NAMLEN 1024
|
|
|
|
#define IR_FREE (PIL_MAX * 2)
|
|
|
|
#define IH_SHIFT PTR_SHIFT
|
|
#define IQE_SHIFT 5
|
|
#define IV_SHIFT 5
|
|
|
|
#define PIL_LOW 1 /* stray interrupts */
|
|
#define PIL_ITHREAD 2 /* interrupts that use ithreads */
|
|
#define PIL_RENDEZVOUS 3 /* smp rendezvous ipi */
|
|
#define PIL_AST 4 /* ast ipi */
|
|
#define PIL_STOP 5 /* stop cpu ipi */
|
|
#define PIL_FAST 13 /* fast interrupts */
|
|
#define PIL_TICK 14
|
|
|
|
struct trapframe;
|
|
|
|
typedef void ih_func_t(struct trapframe *);
|
|
typedef void iv_func_t(void *);
|
|
|
|
struct ithd;
|
|
|
|
struct intr_request {
|
|
struct intr_request *ir_next;
|
|
iv_func_t *ir_func;
|
|
void *ir_arg;
|
|
u_int ir_vec;
|
|
u_int ir_pri;
|
|
};
|
|
|
|
struct intr_vector {
|
|
iv_func_t *iv_func;
|
|
void *iv_arg;
|
|
struct intr_event *iv_event;
|
|
u_int iv_pri;
|
|
u_int iv_vec;
|
|
};
|
|
|
|
extern ih_func_t *intr_handlers[];
|
|
extern struct intr_vector intr_vectors[];
|
|
|
|
void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
|
|
void *iva);
|
|
void intr_init1(void);
|
|
void intr_init2(void);
|
|
int inthand_add(const char *name, int vec, void (*handler)(void *),
|
|
void *arg, int flags, void **cookiep);
|
|
int inthand_remove(int vec, void *cookie);
|
|
|
|
ih_func_t intr_fast;
|
|
|
|
#endif
|