diff options
-rw-r--r-- | sys/alpha/alpha/db_interface.c | 1 | ||||
-rw-r--r-- | sys/alpha/alpha/machdep.c | 4 | ||||
-rw-r--r-- | sys/alpha/alpha/mp_machdep.c | 1 | ||||
-rw-r--r-- | sys/amd64/amd64/db_interface.c | 1 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 5 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/i386/i386/db_interface.c | 1 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 5 | ||||
-rw-r--r-- | sys/ia64/ia64/machdep.c | 3 | ||||
-rw-r--r-- | sys/ia64/ia64/mp_machdep.c | 1 | ||||
-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 | ||||
-rw-r--r-- | sys/pc98/i386/machdep.c | 5 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 5 | ||||
-rw-r--r-- | sys/sys/pcpu.h | 50 | ||||
-rw-r--r-- | sys/sys/smp.h | 6 |
17 files changed, 139 insertions, 79 deletions
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c index b4cc5dc..d37c6b8 100644 --- a/sys/alpha/alpha/db_interface.c +++ b/sys/alpha/alpha/db_interface.c @@ -60,6 +60,7 @@ #include <sys/cons.h> #include <sys/ktr.h> #include <sys/lock.h> +#include <sys/pcpu.h> #include <sys/smp.h> #include <vm/vm.h> diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 177fe8e..2ea7df6 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -103,6 +103,7 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/lock.h> +#include <sys/pcpu.h> #include <sys/malloc.h> #include <sys/reboot.h> #include <sys/bio.h> @@ -131,7 +132,6 @@ #include <machine/reg.h> #include <machine/fpu.h> #include <machine/pal.h> -#include <machine/globaldata.h> #include <machine/cpuconf.h> #include <machine/bootinfo.h> #include <machine/rpb.h> @@ -2241,7 +2241,5 @@ globaldata_init(struct globaldata *globaldata, int cpuid, size_t sz) globaldata->gd_cpuid = cpuid; globaldata->gd_next_asn = 0; globaldata->gd_current_asngen = 1; -#ifdef SMP globaldata_register(globaldata); -#endif } diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c index 3024102..ece7fe4 100644 --- a/sys/alpha/alpha/mp_machdep.c +++ b/sys/alpha/alpha/mp_machdep.c @@ -35,6 +35,7 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/kernel.h> +#include <sys/pcpu.h> #include <sys/smp.h> #include <sys/sysctl.h> diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index cdaefe4..51fc835 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -36,6 +36,7 @@ #include <sys/ktr.h> #include <sys/linker_set.h> #include <sys/lock.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/smp.h> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 8d77658..a9bf55b 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -437,9 +437,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif diff --git a/sys/conf/files b/sys/conf/files index 0ed4acc..8688d30 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -722,6 +722,7 @@ kern/subr_kobj.c standard kern/subr_log.c standard kern/subr_mchain.c optional libmchain kern/subr_module.c standard +kern/subr_pcpu.c standard kern/subr_prf.c standard kern/subr_prof.c standard kern/subr_rman.c standard diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index cdaefe4..51fc835 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -36,6 +36,7 @@ #include <sys/ktr.h> #include <sys/linker_set.h> #include <sys/lock.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/smp.h> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 8d77658..a9bf55b 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -437,9 +437,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 9eac9ed..566a7e5 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -39,6 +39,7 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/lock.h> +#include <sys/pcpu.h> #include <sys/malloc.h> #include <sys/reboot.h> #include <sys/bio.h> @@ -1368,7 +1369,5 @@ globaldata_init(struct globaldata *globaldata, int cpuid, size_t sz) { bzero(globaldata, sz); globaldata->gd_cpuid = cpuid; -#ifdef SMP globaldata_register(globaldata); -#endif } diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 143963a..95542f7 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -34,6 +34,7 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/kernel.h> +#include <sys/pcpu.h> #include <sys/smp.h> #include <sys/sysctl.h> 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) { diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 4564007..ff8ac2c 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -450,9 +450,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 4564007..ff8ac2c 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -62,6 +62,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/pcpu.h> #include <sys/proc.h> #include <sys/bio.h> #include <sys/buf.h> @@ -102,7 +103,6 @@ #include <machine/md_var.h> #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ -#include <machine/globaldata.h> #include <machine/globals.h> #include <machine/intrcnt.h> #ifdef PERFMON @@ -450,9 +450,8 @@ again: bufinit(); vm_pager_bufferinit(); -#ifdef SMP globaldata_register(GLOBALDATA); -#else +#ifndef SMP /* For SMP, we delay the cpu_setregs() until after SMP startup. */ cpu_setregs(); #endif diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h new file mode 100644 index 0000000..5f56e01 --- /dev/null +++ b/sys/sys/pcpu.h @@ -0,0 +1,50 @@ +/* + * 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$ + */ + +#ifndef _SYS_PCPU_H_ +#define _SYS_PCPU_H_ + +#ifdef _KERNEL +#include <machine/globaldata.h> + +#ifndef LOCORE + +SLIST_HEAD(cpuhead, globaldata); + +extern struct cpuhead cpuhead; + +void globaldata_register(struct globaldata *gd); +struct globaldata *globaldata_find(u_int cpuid); + +#endif /* !LOCORE */ +#endif /* _KERNEL */ +#endif /* _SYS_PCPU_H_ */ diff --git a/sys/sys/smp.h b/sys/sys/smp.h index dffd914..c608f96 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -13,15 +13,11 @@ #define _SYS_SMP_H_ #ifdef _KERNEL -#include <machine/globaldata.h> #include <machine/smp.h> #ifndef LOCORE #ifdef SMP -SLIST_HEAD(cpuhead, globaldata); - -extern struct cpuhead cpuhead; extern void (*cpustop_restartfunc)(void); extern int mp_ncpus; extern int smp_active; @@ -51,8 +47,6 @@ void cpu_mp_start(void); void forward_signal(struct proc *); void forward_roundrobin(void); -void globaldata_register(struct globaldata *gd); -struct globaldata *globaldata_find(u_int cpuid); int restart_cpus(u_int); int stop_cpus(u_int); void smp_rendezvous_action(void); |