diff options
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_idle.c | 19 | ||||
-rw-r--r-- | sys/kern/subr_pcpu.c | 65 | ||||
-rw-r--r-- | sys/kern/subr_smp.c | 45 |
3 files changed, 73 insertions, 56 deletions
diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c index 8691f35..712b399 100644 --- a/sys/kern/kern_idle.c +++ b/sys/kern/kern_idle.c @@ -10,32 +10,23 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/ktr.h> +#include <sys/kthread.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> -#include <sys/signalvar.h> -#include <sys/smp.h> #include <sys/resourcevar.h> -#include <sys/vmmeter.h> -#include <sys/sysctl.h> +#include <sys/smp.h> #include <sys/unistd.h> -#include <sys/ipl.h> -#include <sys/kthread.h> -#include <sys/queue.h> -#include <sys/eventhandler.h> +#if 0 #include <vm/vm.h> #include <vm/vm_extern.h> +#endif #ifdef KTRACE #include <sys/uio.h> #include <sys/ktrace.h> #endif -#include <machine/cpu.h> -#include <machine/md_var.h> - -#include <machine/globaldata.h> -#include <machine/globals.h> - static void idle_setup(void *dummy); SYSINIT(idle_setup, SI_SUB_SCHED_IDLE, SI_ORDER_FIRST, idle_setup, NULL) diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c new file mode 100644 index 0000000..47ac12e --- /dev/null +++ b/sys/kern/subr_pcpu.c @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2001 Wind River Systems, Inc. + * All rights reserved. + * Written by: John Baldwin <jhb@FreeBSD.org> + * + * 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. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * 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$ + */ + +/* + * This module provides MI support for per-cpu data. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/pcpu.h> + +static struct globaldata *cpuid_to_globaldata[MAXCPU]; +struct cpuhead cpuhead = SLIST_HEAD_INITIALIZER(cpuhead); + +/* + * Register a struct globaldata. + */ +void +globaldata_register(struct globaldata *globaldata) +{ + + KASSERT(globaldata->gd_cpuid >= 0 && globaldata->gd_cpuid < MAXCPU, + ("globaldata_register: invalid cpuid")); + cpuid_to_globaldata[globaldata->gd_cpuid] = globaldata; + SLIST_INSERT_HEAD(&cpuhead, globaldata, gd_allcpu); +} + +/* + * Locate a struct globaldata by cpu id. + */ +struct globaldata * +globaldata_find(u_int cpuid) +{ + + return (cpuid_to_globaldata[cpuid]); +} diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 6c73e47..598fb16 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -31,33 +31,20 @@ /* * This module holds the global variables and machine independent functions - * used for the kernel SMP support. It also provides MI support for per-cpu - * data. + * used for the kernel SMP support. */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/ipl.h> +#include <sys/kernel.h> #include <sys/ktr.h> #include <sys/proc.h> #include <sys/lock.h> -#include <sys/malloc.h> #include <sys/mutex.h> -#include <sys/kernel.h> +#include <sys/pcpu.h> #include <sys/smp.h> #include <sys/sysctl.h> -#include <vm/vm.h> -#include <vm/pmap.h> -#include <vm/vm_map.h> -#include <sys/user.h> -#include <sys/dkstat.h> - -#include <machine/atomic.h> -#include <machine/globaldata.h> -#include <machine/pmap.h> -#include <machine/clock.h> - volatile u_int stopped_cpus; volatile u_int started_cpus; @@ -67,9 +54,6 @@ int mp_ncpus; volatile int smp_started; u_int all_cpus; -static struct globaldata *cpuid_to_globaldata[MAXCPU]; -struct cpuhead cpuhead = SLIST_HEAD_INITIALIZER(cpuhead); - SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD, NULL, "Kernel SMP"); int smp_active = 0; /* are the APs allowed to run? */ @@ -115,29 +99,6 @@ mp_start(void *dummy) } SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_SECOND, mp_start, NULL) -/* - * Register a struct globaldata. - */ -void -globaldata_register(struct globaldata *globaldata) -{ - - KASSERT(globaldata->gd_cpuid >= 0 && globaldata->gd_cpuid < MAXCPU, - ("globaldata_register: invalid cpuid")); - cpuid_to_globaldata[globaldata->gd_cpuid] = globaldata; - SLIST_INSERT_HEAD(&cpuhead, globaldata, gd_allcpu); -} - -/* - * Locate a struct globaldata by cpu id. - */ -struct globaldata * -globaldata_find(u_int cpuid) -{ - - return (cpuid_to_globaldata[cpuid]); -} - void forward_signal(struct proc *p) { |