diff options
author | dillon <dillon@FreeBSD.org> | 2002-03-27 05:39:23 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 2002-03-27 05:39:23 +0000 |
commit | dc5aafeb94ddee4f835e390dffaecbb0eec5d5e2 (patch) | |
tree | 8233f61cf29e01829b91c6a5cf27defe60e6b8d8 /sys/powerpc | |
parent | 9b5143f94f573dc8954cb0913f3edb055e6caf0f (diff) | |
download | FreeBSD-src-dc5aafeb94ddee4f835e390dffaecbb0eec5d5e2.zip FreeBSD-src-dc5aafeb94ddee4f835e390dffaecbb0eec5d5e2.tar.gz |
Compromise for critical*()/cpu_critical*() recommit. Cleanup the interrupt
disablement assumptions in kern_fork.c by adding another API call,
cpu_critical_fork_exit(). Cleanup the td_savecrit field by moving it
from MI to MD. Temporarily move cpu_critical*() from <arch>/include/cpufunc.h
to <arch>/<arch>/critical.c (stage-2 will clean this up).
Implement interrupt deferral for i386 that allows interrupts to remain
enabled inside critical sections. This also fixes an IPI interlock bug,
and requires uses of icu_lock to be enclosed in a true interrupt disablement.
This is the stage-1 commit. Stage-2 will occur after stage-1 has stabilized,
and will move cpu_critical*() into its own header file(s) + other things.
This commit may break non-i386 architectures in trivial ways. This should
be temporary.
Reviewed by: core
Approved by: core
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/include/cpufunc.h | 29 | ||||
-rw-r--r-- | sys/powerpc/include/proc.h | 1 | ||||
-rw-r--r-- | sys/powerpc/powerpc/critical.c | 62 |
3 files changed, 70 insertions, 22 deletions
diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h index 7ea27b0..b788aa6 100644 --- a/sys/powerpc/include/cpufunc.h +++ b/sys/powerpc/include/cpufunc.h @@ -35,7 +35,7 @@ #include <machine/psl.h> -#define CRITICAL_FORK (mfmsr() | PSL_EE | PSL_RI) +struct thread; #ifdef __GNUC__ @@ -108,20 +108,6 @@ intr_restore(register_t msr) mtmsr(msr); } -static __inline critical_t -cpu_critical_enter(void) -{ - u_int msr; - critical_t crit; - - msr = mfmsr(); - crit = (critical_t)msr; - msr &= ~(PSL_EE | PSL_RI); - mtmsr(msr); - - return (crit); -} - static __inline void restore_intr(unsigned int msr) { @@ -130,13 +116,6 @@ restore_intr(unsigned int msr) } static __inline void -cpu_critical_exit(critical_t msr) -{ - - mtmsr(msr); -} - -static __inline void powerpc_mb(void) { @@ -153,6 +132,12 @@ powerpc_get_pcpup(void) return(ret); } +void cpu_critical_enter(void); +void cpu_critical_exit(void); +void cpu_critical_fork_exit(void); +void cpu_thread_link(struct thread *td); + + #endif /* _KERNEL */ #endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/powerpc/include/proc.h b/sys/powerpc/include/proc.h index 82aa068..e307b24 100644 --- a/sys/powerpc/include/proc.h +++ b/sys/powerpc/include/proc.h @@ -39,6 +39,7 @@ * Machine-dependent part of the proc structure */ struct mdthread { + register_t md_savecrit; }; struct mdproc { diff --git a/sys/powerpc/powerpc/critical.c b/sys/powerpc/powerpc/critical.c new file mode 100644 index 0000000..cb80062 --- /dev/null +++ b/sys/powerpc/powerpc/critical.c @@ -0,0 +1,62 @@ +/*- + * Copyright (c) 2001 Matthew Dillon. This code is distributed under + * the BSD copyright, /usr/src/COPYRIGHT. + * + * $FreeBSD$ + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/pcpu.h> +#include <sys/eventhandler.h> /* XX */ +#include <sys/ktr.h> /* XX */ +#include <sys/signalvar.h> +#include <sys/sysproto.h> /* XX */ +#include <sys/kernel.h> +#include <sys/proc.h> +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/sysctl.h> +#include <sys/ucontext.h> + +void +cpu_critical_enter(void) +{ + u_int msr; + struct thread *td = curthread; + + msr = mfmsr(); + td->td_md.md_savecrit = msr; + msr &= ~(PSL_EE | PSL_RI); + mtmsr(msr); +} + +void +cpu_critical_exit(void) +{ + struct thread *td = curthread; + + mtmsr(td->td_md.md_savecrit); +} + +/* + * cpu_critical_fork_exit() - cleanup after fork + */ +void +cpu_critical_fork_exit(void) +{ + struct thread *td = curthread; + + td->td_critnest = 1; + td->td_md.md_savecrit = (mfmsr() | PSL_EE | PSL_RI); +} + +/* + * cpu_thread_link() - thread linkup, initialize machine-dependant fields + */ +void +cpu_thread_link(struct thread *td) +{ + td->td_md.md_savecrit = 0; +} + |