summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_switch.c
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-04-04 21:53:56 +0000
committerjhb <jhb@FreeBSD.org>2005-04-04 21:53:56 +0000
commit41cadaa11ed081720fe75d25094f73a53d9bf55c (patch)
treed48c8aa642d31e026486326f9d281f4d5eff0bdb /sys/kern/kern_switch.c
parent7d745ab8664182cd756c16538844d587ed753eb9 (diff)
downloadFreeBSD-src-41cadaa11ed081720fe75d25094f73a53d9bf55c.zip
FreeBSD-src-41cadaa11ed081720fe75d25094f73a53d9bf55c.tar.gz
Divorce critical sections from spinlocks. Critical sections as denoted by
critical_enter() and critical_exit() are now solely a mechanism for deferring kernel preemptions. They no longer have any affect on interrupts. This means that standalone critical sections are now very cheap as they are simply unlocked integer increments and decrements for the common case. Spin mutexes now use a separate KPI implemented in MD code: spinlock_enter() and spinlock_exit(). This KPI is responsible for providing whatever MD guarantees are needed to ensure that a thread holding a spin lock won't be preempted by any other code that will try to lock the same lock. For now all archs continue to block interrupts in a "spinlock section" as they did formerly in all critical sections. Note that I've also taken this opportunity to push a few things into MD code rather than MI. For example, critical_fork_exit() no longer exists. Instead, MD code ensures that new threads have the correct state when they are created. Also, we no longer try to fixup the idlethreads for APs in MI code. Instead, each arch sets the initial curthread and adjusts the state of the idle thread it borrows in order to perform the initial context switch. This change is largely a big NOP, but the cleaner separation it provides will allow for more efficient alternative locking schemes in other parts of the kernel (bare critical sections rather than per-CPU spin mutexes for per-CPU data for example). Reviewed by: grehan, cognet, arch@, others Tested on: i386, alpha, sparc64, powerpc, arm, possibly more
Diffstat (limited to 'sys/kern/kern_switch.c')
-rw-r--r--sys/kern/kern_switch.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 24a29cb..707a7f9 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -105,7 +105,6 @@ __FBSDID("$FreeBSD$");
#if defined(SMP) && (defined(__i386__) || defined(__amd64__))
#include <sys/smp.h>
#endif
-#include <machine/critical.h>
#if defined(SMP) && defined(SCHED_4BSD)
#include <sys/sysctl.h>
#endif
@@ -581,8 +580,6 @@ critical_enter(void)
struct thread *td;
td = curthread;
- if (td->td_critnest == 0)
- cpu_critical_enter(td);
td->td_critnest++;
CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td,
(long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest);
@@ -610,7 +607,6 @@ critical_exit(void)
}
#endif
td->td_critnest = 0;
- cpu_critical_exit(td);
} else {
td->td_critnest--;
}
OpenPOWER on IntegriCloud