689641c1ea
syscall path inward. A system call may select whether it needs the MP
lock or not (the default being that it does need it).
A great deal of conditional SMP code for various deadended experiments
has been removed. 'cil' and 'cml' have been removed entirely, and the
locking around the cpl has been removed. The conditional
separately-locked fast-interrupt code has been removed, meaning that
interrupts must hold the CPL now (but they pretty much had to anyway).
Another reason for doing this is that the original separate-lock for
interrupts just doesn't apply to the interrupt thread mechanism being
contemplated.
Modifications to the cpl may now ONLY occur while holding the MP
lock. For example, if an otherwise MP safe syscall needs to mess with
the cpl, it must hold the MP lock for the duration and must (as usual)
save/restore the cpl in a nested fashion.
This is precursor work for the real meat coming later: avoiding having
to hold the MP lock for common syscalls and I/O's and interrupt threads.
It is expected that the spl mechanisms and new interrupt threading
mechanisms will be able to run in tandem, allowing a slow piecemeal
transition to occur.
This patch should result in a moderate performance improvement due to
the considerable amount of code that has been removed from the critical
path, especially the simplification of the spl*() calls. The real
performance gains will come later.
Approved by: jkh
Reviewed by: current, bde (exception.s)
Some work taken from: luoqi's patch
96 lines
3.3 KiB
C
96 lines
3.3 KiB
C
/*-
|
|
* Copyright (c) Peter Wemm <peter@netplex.com.au>
|
|
* All rights reserved.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 structure maps out the global data that needs to be kept on a
|
|
* per-cpu basis. genassym uses this to generate offsets for the assembler
|
|
* code, which also provides external symbols so that C can get at them as
|
|
* though they were really globals.
|
|
*
|
|
* The SMP parts are setup in pmap.c and locore.s for the BSP, and
|
|
* mp_machdep.c sets up the data for the AP's to "see" when they awake.
|
|
* The reason for doing it via a struct is so that an array of pointers
|
|
* to each CPU's data can be set up for things like "check curproc on all
|
|
* other processors"
|
|
*/
|
|
struct globaldata {
|
|
struct privatespace *gd_prvspace; /* self-reference */
|
|
struct proc *gd_curproc;
|
|
struct proc *gd_npxproc;
|
|
struct pcb *gd_curpcb;
|
|
struct timeval gd_switchtime;
|
|
struct i386tss gd_common_tss;
|
|
int gd_switchticks;
|
|
struct segment_descriptor gd_common_tssd;
|
|
struct segment_descriptor *gd_tss_gdt;
|
|
#ifdef USER_LDT
|
|
int gd_currentldt;
|
|
#endif
|
|
#ifdef SMP
|
|
u_int gd_cpuid;
|
|
u_int gd_cpu_lockid;
|
|
u_int gd_other_cpus;
|
|
int gd_inside_intr;
|
|
u_int gd_ss_eflags;
|
|
pt_entry_t *gd_prv_CMAP1;
|
|
pt_entry_t *gd_prv_CMAP2;
|
|
pt_entry_t *gd_prv_CMAP3;
|
|
pt_entry_t *gd_prv_PMAP1;
|
|
caddr_t gd_prv_CADDR1;
|
|
caddr_t gd_prv_CADDR2;
|
|
caddr_t gd_prv_CADDR3;
|
|
unsigned *gd_prv_PADDR1;
|
|
#endif
|
|
u_int gd_astpending;
|
|
};
|
|
|
|
#ifdef SMP
|
|
/*
|
|
* This is the upper (0xff800000) address space layout that is per-cpu.
|
|
* It is setup in locore.s and pmap.c for the BSP and in mp_machdep.c for
|
|
* each AP. genassym helps export this to the assembler code.
|
|
*/
|
|
struct privatespace {
|
|
/* page 0 - data page */
|
|
struct globaldata globaldata;
|
|
char __filler0[PAGE_SIZE - sizeof(struct globaldata)];
|
|
|
|
/* page 1..4 - CPAGE1,CPAGE2,CPAGE3,PPAGE1 */
|
|
char CPAGE1[PAGE_SIZE];
|
|
char CPAGE2[PAGE_SIZE];
|
|
char CPAGE3[PAGE_SIZE];
|
|
char PPAGE1[PAGE_SIZE];
|
|
|
|
/* page 5..4+UPAGES - idle stack (UPAGES pages) */
|
|
char idlestack[UPAGES * PAGE_SIZE];
|
|
};
|
|
|
|
extern struct privatespace SMP_prvspace[];
|
|
|
|
#endif
|