d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Split out the support for per-CPU data from the SMP code. UP kernels

Browse Source 
have per-CPU data and gdb on the i386 at least needs access to it.
- Clean up includes in kern_idle.c and subr_smp.c.

Reviewed by:	jake
This commit is contained in:
John Baldwin 2001-05-10 17:45:49 +00:00
parent 6fac233604
commit ba228f6d96
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=76440
17 changed files with 139 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/alpha/alpha/db_interface.c
View File

@ -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>

4
sys/alpha/alpha/machdep.c
View File

@ -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
}

1
sys/alpha/alpha/mp_machdep.c
View File

@ -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>

1
sys/amd64/amd64/db_interface.c
View File

@ -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>

5
sys/amd64/amd64/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
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

1
sys/conf/files
View File

@ -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

1
sys/i386/i386/db_interface.c
View File

@ -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>

5
sys/i386/i386/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
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

3
sys/ia64/ia64/machdep.c
View File

@ -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
}

1
sys/ia64/ia64/mp_machdep.c
View File

@ -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>

19
sys/kern/kern_idle.c
View File

@ -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)

65
sys/kern/subr_pcpu.c Normal file
View File

@ -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]);
}

45
sys/kern/subr_smp.c
View File

@ -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)
{

5
sys/pc98/i386/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
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

5
sys/pc98/pc98/machdep.c
View File

@ -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 @@ cpu_startup(dummy)
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

50
sys/sys/pcpu.h Normal file
View File

@ -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_ */

6
sys/sys/smp.h
View File

@ -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);