1993-06-12 14:58:17 +00:00
|
|
|
/*-
|
|
|
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
|
* the University of Utah, and William Jolitz.
|
|
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
|
* without specific prior written permission.
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
|
|
|
|
*
|
genassym.c:
Remove NKMEMCLUSTERS, it is no longer define or used.
locores.s:
Fix comment on PTDpde and APTDpde to be pde instead of pte
Add new equation for calculating location of Sysmap
Remove Bill's old #ifdef garbage for counting up memory,
that stuff will never be made to work and was just cluttering
up the file.
Add code that places the PTD, page table pages, and kernel
stack below the 640k ISA hole if there is room for it, otherwise
put this stuff all at 1MB. This fixes the 28K bogusity in
the boot blocks, that can now go away!
Fix the caclulation of where first is to be dependent on
NKPDE so that we can skip over the above mentioned areas.
The 28K thing is now 44K in size due to the increase in
kernel virtual memory space, but since we no longer have
to worry about that this is no big deal.
Use if NNPX > 0 instead of ifdef NPX for floating point code.
machdep.c
Change the calculation of for the buffer cache to be
20% of all memory above 2MB and add back the upper limit
of 2/5's of the VM_KMEM_SIZE so that we do not eat ALL
of the kernel memory space on large memory machines, note
that this will not even come into effect unless you have
more than 32MB. The current buffer cache limit is 6.7MB
due to this caclulation.
It seems that we where erroniously allocating bufpages pages
for buffer_map. buffer_map is UNUSED in this implementation
of the buffer cache, but since the map is referenced in
several if statements a quick fix was to simply allocate
1 vm page (but no real memory) to it.
pmap.h
Remove rcsid, don't want them in the kernel files!
Removed some cruft inside an #ifdef DEBUGx that caused
compiler errors if you where compiling this for debug.
Use the #defines for PD_SHIFT and PG_SHIFT in place of
constants.
trap.c:
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Remove a now completly invalid check for a maximum virtual
address, the virtual address now ends at 0xFFFFFFFF so
there is no more MAX!! (Thanks David, I completly missed
that one!)
vm_machdep.c
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Replace several 0xFE00000 constants with KERNBASE
1993-10-15 10:34:29 +00:00
|
|
|
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
1994-04-29 21:39:55 +00:00
|
|
|
* $Id: trap.c,v 1.22 1994/04/07 10:51:00 davidg Exp $
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 386 Trap and System call handleing
|
|
|
|
|
*/
|
|
|
|
|
|
1994-02-01 23:07:35 +00:00
|
|
|
#include "isa.h"
|
genassym.c:
Remove NKMEMCLUSTERS, it is no longer define or used.
locores.s:
Fix comment on PTDpde and APTDpde to be pde instead of pte
Add new equation for calculating location of Sysmap
Remove Bill's old #ifdef garbage for counting up memory,
that stuff will never be made to work and was just cluttering
up the file.
Add code that places the PTD, page table pages, and kernel
stack below the 640k ISA hole if there is room for it, otherwise
put this stuff all at 1MB. This fixes the 28K bogusity in
the boot blocks, that can now go away!
Fix the caclulation of where first is to be dependent on
NKPDE so that we can skip over the above mentioned areas.
The 28K thing is now 44K in size due to the increase in
kernel virtual memory space, but since we no longer have
to worry about that this is no big deal.
Use if NNPX > 0 instead of ifdef NPX for floating point code.
machdep.c
Change the calculation of for the buffer cache to be
20% of all memory above 2MB and add back the upper limit
of 2/5's of the VM_KMEM_SIZE so that we do not eat ALL
of the kernel memory space on large memory machines, note
that this will not even come into effect unless you have
more than 32MB. The current buffer cache limit is 6.7MB
due to this caclulation.
It seems that we where erroniously allocating bufpages pages
for buffer_map. buffer_map is UNUSED in this implementation
of the buffer cache, but since the map is referenced in
several if statements a quick fix was to simply allocate
1 vm page (but no real memory) to it.
pmap.h
Remove rcsid, don't want them in the kernel files!
Removed some cruft inside an #ifdef DEBUGx that caused
compiler errors if you where compiling this for debug.
Use the #defines for PD_SHIFT and PG_SHIFT in place of
constants.
trap.c:
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Remove a now completly invalid check for a maximum virtual
address, the virtual address now ends at 0xFFFFFFFF so
there is no more MAX!! (Thanks David, I completly missed
that one!)
vm_machdep.c
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Replace several 0xFE00000 constants with KERNBASE
1993-10-15 10:34:29 +00:00
|
|
|
#include "npx.h"
|
1994-02-01 23:07:35 +00:00
|
|
|
#include "ddb.h"
|
1993-06-12 14:58:17 +00:00
|
|
|
#include "machine/cpu.h"
|
|
|
|
|
#include "machine/psl.h"
|
|
|
|
|
#include "machine/reg.h"
|
1994-02-01 23:07:35 +00:00
|
|
|
#include "machine/eflags.h"
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
#include "param.h"
|
|
|
|
|
#include "systm.h"
|
|
|
|
|
#include "proc.h"
|
|
|
|
|
#include "user.h"
|
|
|
|
|
#include "acct.h"
|
|
|
|
|
#include "kernel.h"
|
|
|
|
|
#ifdef KTRACE
|
|
|
|
|
#include "ktrace.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "vm/vm_param.h"
|
|
|
|
|
#include "vm/pmap.h"
|
|
|
|
|
#include "vm/vm_map.h"
|
1993-12-19 00:55:01 +00:00
|
|
|
#include "vm/vm_user.h"
|
1994-01-14 16:25:31 +00:00
|
|
|
#include "vm/vm_page.h"
|
1993-06-12 14:58:17 +00:00
|
|
|
#include "sys/vmmeter.h"
|
|
|
|
|
|
|
|
|
|
#include "machine/trap.h"
|
|
|
|
|
|
1993-07-27 10:52:31 +00:00
|
|
|
#ifdef __GNUC__
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The "r" contraint could be "rm" except for fatal bugs in gas. As usual,
|
|
|
|
|
* we omit the size from the mov instruction to avoid nonfatal bugs in gas.
|
|
|
|
|
*/
|
|
|
|
|
#define read_gs() ({ u_short gs; __asm("mov %%gs,%0" : "=r" (gs)); gs; })
|
1993-12-19 00:55:01 +00:00
|
|
|
#define write_gs(newgs) __asm("mov %0,%%gs" : : "r" ((u_short) newgs))
|
1993-07-27 10:52:31 +00:00
|
|
|
|
|
|
|
|
#else /* not __GNUC__ */
|
|
|
|
|
|
|
|
|
|
u_short read_gs __P((void));
|
|
|
|
|
void write_gs __P((/* promoted u_short */ int gs));
|
|
|
|
|
|
|
|
|
|
#endif /* __GNUC__ */
|
1993-06-12 14:58:17 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
extern int grow(struct proc *,int);
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
struct sysent sysent[];
|
|
|
|
|
int nsysent;
|
|
|
|
|
|
First steps in rewriting locore.s, and making info useful
when the machine panics.
i386/i386/locore.s:
1) got rid of most .set directives that were being used like
#define's, and replaced them with appropriate #define's in
the appropriate header files (accessed via genassym).
2) added comments to header inclusions and global definitions,
and global variables
3) replaced some hardcoded constants with cpp defines (such as
PDESIZE and others)
4) aligned all comments to the same column to make them easier to
read
5) moved macro definitions for ENTRY, ALIGN, NOP, etc. to
/sys/i386/include/asmacros.h
6) added #ifdef BDE_DEBUGGER around all of Bruce's debugger code
7) added new global '_KERNend' to store last location+1 of kernel
8) cleaned up zeroing of bss so that only bss is zeroed
9) fix zeroing of page tables so that it really does zero them all
- not just if they follow the bss.
10) rewrote page table initialization code so that 1) works correctly
and 2) write protects the kernel text by default
11) properly initialize the kernel page directory, upages, p0stack PT,
and page tables. The previous scheme was more than a bit
screwy.
12) change allocation of virtual area of IO hole so that it is
fixed at KERNBASE + 0xa0000. The previous scheme put it
right after the kernel page tables and then later expected
it to be at KERNBASE +0xa0000
13) change multiple bogus settings of user read/write of various
areas of kernel VM - including the IO hole; we should never
be accessing the IO hole in user mode through the kernel
page tables
14) split kernel support routines such as bcopy, bzero, copyin,
copyout, etc. into a seperate file 'support.s'
15) split swtch and related routines into a seperate 'swtch.s'
16) split routines related to traps, syscalls, and interrupts
into a seperate file 'exception.s'
17) remove some unused global variables from locore that got
inserted by Garrett when he pulled them out of some .h
files.
i386/isa/icu.s:
1) clean up global variable declarations
2) move in declaration of astpending and netisr
i386/i386/pmap.c:
1) fix calculation of virtual_avail. It previously was calculated
to be right in the middle of the kernel page tables - not
a good place to start allocating kernel VM.
2) properly allocate kernel page dir/tables etc out of kernel map
- previously only took out 2 pages.
i386/i386/machdep.c:
1) modify boot() to print a warning that the system will reboot in
PANIC_REBOOT_WAIT_TIME amount of seconds, and let the user
abort with a key on the console. The machine will wait for
ever if a key is typed before the reboot. The default is
15 seconds, but can be set to 0 to mean don't wait at all,
-1 to mean wait forever, or any positive value to wait for
that many seconds.
2) print "Rebooting..." just before doing it.
kern/subr_prf.c:
1) remove PANICWAIT as it is deprecated by the change to machdep.c
i386/i386/trap.c:
1) add table of trap type strings and use it to print a real trap/
panic message rather than just a number. Lot's of work to
be done here, but this is the first step. Symbolic traceback
is in the TODO.
i386/i386/Makefile.i386:
1) add support in to build support.s, exception.s and swtch.s
...and various changes to various header files to make all of the
above happen.
1993-11-13 02:25:21 +00:00
|
|
|
#define MAX_TRAP_MSG 27
|
|
|
|
|
char *trap_msg[] = {
|
|
|
|
|
"reserved addressing fault", /* 0 T_RESADFLT */
|
|
|
|
|
"privileged instruction fault", /* 1 T_PRIVINFLT */
|
|
|
|
|
"reserved operand fault", /* 2 T_RESOPFLT */
|
|
|
|
|
"breakpoint instruction fault", /* 3 T_BPTFLT */
|
|
|
|
|
"", /* 4 unused */
|
|
|
|
|
"system call trap", /* 5 T_SYSCALL */
|
|
|
|
|
"arithmetic trap", /* 6 T_ARITHTRAP */
|
|
|
|
|
"system forced exception", /* 7 T_ASTFLT */
|
|
|
|
|
"segmentation (limit) fault", /* 8 T_SEGFLT */
|
|
|
|
|
"protection fault", /* 9 T_PROTFLT */
|
|
|
|
|
"trace trap", /* 10 T_TRCTRAP */
|
|
|
|
|
"", /* 11 unused */
|
|
|
|
|
"page fault", /* 12 T_PAGEFLT */
|
|
|
|
|
"page table fault", /* 13 T_TABLEFLT */
|
|
|
|
|
"alignment fault", /* 14 T_ALIGNFLT */
|
|
|
|
|
"kernel stack pointer not valid", /* 15 T_KSPNOTVAL */
|
|
|
|
|
"bus error", /* 16 T_BUSERR */
|
|
|
|
|
"kernel debugger fault", /* 17 T_KDBTRAP */
|
|
|
|
|
"integer divide fault", /* 18 T_DIVIDE */
|
|
|
|
|
"non-maskable interrupt trap", /* 19 T_NMI */
|
|
|
|
|
"overflow trap", /* 20 T_OFLOW */
|
|
|
|
|
"FPU bounds check fault", /* 21 T_BOUND */
|
|
|
|
|
"FPU device not available", /* 22 T_DNA */
|
|
|
|
|
"double fault", /* 23 T_DOUBLEFLT */
|
|
|
|
|
"FPU operand fetch fault", /* 24 T_FPOPFLT */
|
|
|
|
|
"invalid TSS fault", /* 25 T_TSSFLT */
|
|
|
|
|
"segment not present fault", /* 26 T_SEGNPFLT */
|
|
|
|
|
"stack fault", /* 27 T_STKFLT */
|
|
|
|
|
};
|
|
|
|
|
|
1993-12-12 12:22:57 +00:00
|
|
|
#define pde_v(v) (PTD[((v)>>PD_SHIFT)&1023].pd_v)
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* trap(frame):
|
|
|
|
|
* Exception, fault, and trap interface to BSD kernel. This
|
|
|
|
|
* common code is called from assembly language IDT gate entry
|
|
|
|
|
* routines that prepare a suitable stack frame, and restore this
|
|
|
|
|
* frame after the exception has been processed. Note that the
|
|
|
|
|
* effect is as if the arguments were passed call by reference.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*ARGSUSED*/
|
1993-11-25 01:38:01 +00:00
|
|
|
void
|
1993-06-12 14:58:17 +00:00
|
|
|
trap(frame)
|
|
|
|
|
struct trapframe frame;
|
|
|
|
|
{
|
|
|
|
|
register int i;
|
|
|
|
|
register struct proc *p = curproc;
|
|
|
|
|
struct timeval syst;
|
1994-02-01 23:07:35 +00:00
|
|
|
int ucode, type, code, eva, fault_type;
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
frame.tf_eflags &= ~PSL_NT; /* clear nested trap XXX */
|
|
|
|
|
type = frame.tf_trapno;
|
|
|
|
|
#if NDDB > 0
|
|
|
|
|
if (curpcb && curpcb->pcb_onfault) {
|
|
|
|
|
if (frame.tf_trapno == T_BPTFLT
|
|
|
|
|
|| frame.tf_trapno == T_TRCTRAP)
|
|
|
|
|
if (kdb_trap (type, 0, &frame))
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
if (curpcb == 0 || curproc == 0)
|
|
|
|
|
goto skiptoswitch;
|
1993-07-27 10:52:31 +00:00
|
|
|
if (curpcb->pcb_onfault && frame.tf_trapno != T_PAGEFLT) {
|
|
|
|
|
extern int _udatasel;
|
|
|
|
|
|
|
|
|
|
if (read_gs() != (u_short) _udatasel)
|
|
|
|
|
/*
|
|
|
|
|
* Some user has corrupted %gs but we depend on it in
|
|
|
|
|
* copyout() etc. Fix it up and retry.
|
|
|
|
|
*
|
|
|
|
|
* (We don't preserve %fs or %gs, so users can change
|
|
|
|
|
* them to either _ucodesel, _udatasel or a not-present
|
|
|
|
|
* selector, possibly ORed with 0 to 3, making them
|
|
|
|
|
* volatile for other users. Not preserving them saves
|
|
|
|
|
* time and doesn't lose functionality or open security
|
|
|
|
|
* holes.)
|
|
|
|
|
*/
|
|
|
|
|
write_gs(_udatasel);
|
|
|
|
|
else
|
1993-06-12 14:58:17 +00:00
|
|
|
copyfault:
|
1993-07-27 10:52:31 +00:00
|
|
|
frame.tf_eip = (int)curpcb->pcb_onfault;
|
1993-06-12 14:58:17 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
syst = p->p_stime;
|
|
|
|
|
if (ISPL(frame.tf_cs) == SEL_UPL) {
|
|
|
|
|
type |= T_USER;
|
|
|
|
|
p->p_regs = (int *)&frame;
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
skiptoswitch:
|
1993-06-12 14:58:17 +00:00
|
|
|
ucode=0;
|
|
|
|
|
eva = rcr2();
|
|
|
|
|
code = frame.tf_err;
|
1994-01-14 16:25:31 +00:00
|
|
|
|
|
|
|
|
if ((type & ~T_USER) == T_PAGEFLT)
|
|
|
|
|
goto pfault;
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
switch (type) {
|
|
|
|
|
case T_SEGNPFLT|T_USER:
|
|
|
|
|
case T_STKFLT|T_USER:
|
|
|
|
|
case T_PROTFLT|T_USER: /* protection fault */
|
|
|
|
|
ucode = code + BUS_SEGM_FAULT ;
|
|
|
|
|
i = SIGBUS;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_PRIVINFLT|T_USER: /* privileged instruction fault */
|
|
|
|
|
case T_RESADFLT|T_USER: /* reserved addressing fault */
|
|
|
|
|
case T_RESOPFLT|T_USER: /* reserved operand fault */
|
|
|
|
|
case T_FPOPFLT|T_USER: /* coprocessor operand fault */
|
|
|
|
|
ucode = type &~ T_USER;
|
|
|
|
|
i = SIGILL;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_ASTFLT|T_USER: /* Allow process switch */
|
|
|
|
|
astoff();
|
|
|
|
|
cnt.v_soft++;
|
|
|
|
|
if ((p->p_flag & SOWEUPC) && p->p_stats->p_prof.pr_scale) {
|
|
|
|
|
addupc(frame.tf_eip, &p->p_stats->p_prof, 1);
|
|
|
|
|
p->p_flag &= ~SOWEUPC;
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
case T_DNA|T_USER:
|
genassym.c:
Remove NKMEMCLUSTERS, it is no longer define or used.
locores.s:
Fix comment on PTDpde and APTDpde to be pde instead of pte
Add new equation for calculating location of Sysmap
Remove Bill's old #ifdef garbage for counting up memory,
that stuff will never be made to work and was just cluttering
up the file.
Add code that places the PTD, page table pages, and kernel
stack below the 640k ISA hole if there is room for it, otherwise
put this stuff all at 1MB. This fixes the 28K bogusity in
the boot blocks, that can now go away!
Fix the caclulation of where first is to be dependent on
NKPDE so that we can skip over the above mentioned areas.
The 28K thing is now 44K in size due to the increase in
kernel virtual memory space, but since we no longer have
to worry about that this is no big deal.
Use if NNPX > 0 instead of ifdef NPX for floating point code.
machdep.c
Change the calculation of for the buffer cache to be
20% of all memory above 2MB and add back the upper limit
of 2/5's of the VM_KMEM_SIZE so that we do not eat ALL
of the kernel memory space on large memory machines, note
that this will not even come into effect unless you have
more than 32MB. The current buffer cache limit is 6.7MB
due to this caclulation.
It seems that we where erroniously allocating bufpages pages
for buffer_map. buffer_map is UNUSED in this implementation
of the buffer cache, but since the map is referenced in
several if statements a quick fix was to simply allocate
1 vm page (but no real memory) to it.
pmap.h
Remove rcsid, don't want them in the kernel files!
Removed some cruft inside an #ifdef DEBUGx that caused
compiler errors if you where compiling this for debug.
Use the #defines for PD_SHIFT and PG_SHIFT in place of
constants.
trap.c:
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Remove a now completly invalid check for a maximum virtual
address, the virtual address now ends at 0xFFFFFFFF so
there is no more MAX!! (Thanks David, I completly missed
that one!)
vm_machdep.c
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Replace several 0xFE00000 constants with KERNBASE
1993-10-15 10:34:29 +00:00
|
|
|
#if NNPX > 0
|
1993-06-12 14:58:17 +00:00
|
|
|
/* if a transparent fault (due to context switch "late") */
|
|
|
|
|
if (npxdna()) return;
|
genassym.c:
Remove NKMEMCLUSTERS, it is no longer define or used.
locores.s:
Fix comment on PTDpde and APTDpde to be pde instead of pte
Add new equation for calculating location of Sysmap
Remove Bill's old #ifdef garbage for counting up memory,
that stuff will never be made to work and was just cluttering
up the file.
Add code that places the PTD, page table pages, and kernel
stack below the 640k ISA hole if there is room for it, otherwise
put this stuff all at 1MB. This fixes the 28K bogusity in
the boot blocks, that can now go away!
Fix the caclulation of where first is to be dependent on
NKPDE so that we can skip over the above mentioned areas.
The 28K thing is now 44K in size due to the increase in
kernel virtual memory space, but since we no longer have
to worry about that this is no big deal.
Use if NNPX > 0 instead of ifdef NPX for floating point code.
machdep.c
Change the calculation of for the buffer cache to be
20% of all memory above 2MB and add back the upper limit
of 2/5's of the VM_KMEM_SIZE so that we do not eat ALL
of the kernel memory space on large memory machines, note
that this will not even come into effect unless you have
more than 32MB. The current buffer cache limit is 6.7MB
due to this caclulation.
It seems that we where erroniously allocating bufpages pages
for buffer_map. buffer_map is UNUSED in this implementation
of the buffer cache, but since the map is referenced in
several if statements a quick fix was to simply allocate
1 vm page (but no real memory) to it.
pmap.h
Remove rcsid, don't want them in the kernel files!
Removed some cruft inside an #ifdef DEBUGx that caused
compiler errors if you where compiling this for debug.
Use the #defines for PD_SHIFT and PG_SHIFT in place of
constants.
trap.c:
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Remove a now completly invalid check for a maximum virtual
address, the virtual address now ends at 0xFFFFFFFF so
there is no more MAX!! (Thanks David, I completly missed
that one!)
vm_machdep.c
Remove patch kit header and rcsid, fix $Id$.
Now include "npx.h" and use NNPX for controlling the
floating point code.
Replace several 0xFE00000 constants with KERNBASE
1993-10-15 10:34:29 +00:00
|
|
|
#endif /* NNPX > 0 */
|
1994-04-29 21:39:55 +00:00
|
|
|
#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
|
1993-06-12 14:58:17 +00:00
|
|
|
i = math_emulate(&frame);
|
|
|
|
|
if (i == 0) return;
|
1994-04-29 21:39:55 +00:00
|
|
|
#else /* MATH_EMULATE || GPL_MATH_EMULATE */
|
1993-08-28 13:25:22 +00:00
|
|
|
panic("trap: math emulation necessary!");
|
1994-04-29 21:39:55 +00:00
|
|
|
#endif /* MATH_EMULATE || GPL_MATH_EMULATE */
|
1993-06-12 14:58:17 +00:00
|
|
|
ucode = FPE_FPU_NP_TRAP;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_BOUND|T_USER:
|
|
|
|
|
ucode = FPE_SUBRNG_TRAP;
|
|
|
|
|
i = SIGFPE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_OFLOW|T_USER:
|
|
|
|
|
ucode = FPE_INTOVF_TRAP;
|
|
|
|
|
i = SIGFPE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_DIVIDE|T_USER:
|
|
|
|
|
ucode = FPE_INTDIV_TRAP;
|
|
|
|
|
i = SIGFPE;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case T_ARITHTRAP|T_USER:
|
|
|
|
|
ucode = code;
|
|
|
|
|
i = SIGFPE;
|
|
|
|
|
break;
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
pfault:
|
1994-02-08 09:26:04 +00:00
|
|
|
case T_PAGEFLT: /* allow page faults in kernel mode */
|
1993-06-12 14:58:17 +00:00
|
|
|
case T_PAGEFLT|T_USER: /* page fault */
|
|
|
|
|
{
|
1994-02-08 09:26:04 +00:00
|
|
|
vm_offset_t va;
|
|
|
|
|
struct vmspace *vm;
|
|
|
|
|
vm_map_t map = 0;
|
|
|
|
|
int rv = 0, oldflags;
|
1993-06-12 14:58:17 +00:00
|
|
|
vm_prot_t ftype;
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
unsigned v;
|
1993-06-12 14:58:17 +00:00
|
|
|
extern vm_map_t kernel_map;
|
|
|
|
|
|
|
|
|
|
va = trunc_page((vm_offset_t)eva);
|
1994-02-08 09:26:04 +00:00
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
1994-02-08 09:26:04 +00:00
|
|
|
* Don't allow user-mode faults in kernel address space
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
1994-02-08 09:26:04 +00:00
|
|
|
if ((type == (T_PAGEFLT|T_USER)) && (va >= KERNBASE)) {
|
|
|
|
|
goto nogo;
|
|
|
|
|
}
|
1994-01-14 16:25:31 +00:00
|
|
|
|
|
|
|
|
if ((p == 0) || (type == T_PAGEFLT && va >= KERNBASE)) {
|
|
|
|
|
vm = 0;
|
1993-06-12 14:58:17 +00:00
|
|
|
map = kernel_map;
|
1994-01-14 16:25:31 +00:00
|
|
|
} else {
|
|
|
|
|
vm = p->p_vmspace;
|
1993-06-12 14:58:17 +00:00
|
|
|
map = &vm->vm_map;
|
1994-01-14 16:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
if (code & PGEX_W)
|
|
|
|
|
ftype = VM_PROT_READ | VM_PROT_WRITE;
|
|
|
|
|
else
|
|
|
|
|
ftype = VM_PROT_READ;
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
oldflags = p->p_flag;
|
|
|
|
|
if (map != kernel_map) {
|
1994-02-08 09:26:04 +00:00
|
|
|
vm_offset_t pa;
|
|
|
|
|
vm_offset_t v = (vm_offset_t) vtopte(va);
|
1994-03-24 23:12:48 +00:00
|
|
|
vm_page_t ptepg;
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/*
|
|
|
|
|
* Keep swapout from messing with us during this
|
|
|
|
|
* critical time.
|
|
|
|
|
*/
|
|
|
|
|
p->p_flag |= SLOCK;
|
1993-12-12 12:22:57 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/*
|
|
|
|
|
* Grow the stack if necessary
|
|
|
|
|
*/
|
|
|
|
|
if ((caddr_t)va > vm->vm_maxsaddr
|
|
|
|
|
&& (caddr_t)va < (caddr_t)USRSTACK) {
|
|
|
|
|
if (!grow(p, va)) {
|
|
|
|
|
rv = KERN_FAILURE;
|
1994-01-14 16:25:31 +00:00
|
|
|
p->p_flag &= ~SLOCK;
|
|
|
|
|
p->p_flag |= (oldflags & SLOCK);
|
1993-12-12 12:22:57 +00:00
|
|
|
goto nogo;
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/*
|
|
|
|
|
* Check if page table is mapped, if not,
|
|
|
|
|
* fault it first
|
|
|
|
|
*/
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/* Fault the pte only if needed: */
|
|
|
|
|
*(volatile char *)v += 0;
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-03-24 23:12:48 +00:00
|
|
|
ptepg = (vm_page_t) pmap_pte_vm_page(vm_map_pmap(map), v);
|
|
|
|
|
vm_page_hold(ptepg);
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/* Fault in the user page: */
|
|
|
|
|
rv = vm_fault(map, va, ftype, FALSE);
|
1994-01-14 16:25:31 +00:00
|
|
|
|
1994-03-24 23:12:48 +00:00
|
|
|
vm_page_unhold(ptepg);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* page table pages don't need to be kept if they
|
|
|
|
|
* are not held
|
|
|
|
|
*/
|
|
|
|
|
if( ptepg->hold_count == 0 && ptepg->wire_count == 0) {
|
|
|
|
|
pmap_page_protect( VM_PAGE_TO_PHYS(ptepg),
|
|
|
|
|
VM_PROT_NONE);
|
|
|
|
|
if( ptepg->flags & PG_CLEAN)
|
|
|
|
|
vm_page_free(ptepg);
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
|
|
|
|
|
p->p_flag &= ~SLOCK;
|
|
|
|
|
p->p_flag |= (oldflags & SLOCK);
|
1994-02-08 09:26:04 +00:00
|
|
|
} else {
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
1994-02-08 09:26:04 +00:00
|
|
|
* Since we know that kernel virtual address addresses
|
|
|
|
|
* always have pte pages mapped, we just have to fault
|
|
|
|
|
* the page.
|
1993-12-12 12:22:57 +00:00
|
|
|
*/
|
1994-02-08 09:26:04 +00:00
|
|
|
rv = vm_fault(map, va, ftype, FALSE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (rv == KERN_SUCCESS) {
|
1993-06-12 14:58:17 +00:00
|
|
|
if (type == T_PAGEFLT)
|
|
|
|
|
return;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
nogo:
|
|
|
|
|
if (type == T_PAGEFLT) {
|
|
|
|
|
if (curpcb->pcb_onfault)
|
|
|
|
|
goto copyfault;
|
1994-02-01 23:07:35 +00:00
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
goto we_re_toast;
|
|
|
|
|
}
|
|
|
|
|
i = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV;
|
1993-12-12 12:22:57 +00:00
|
|
|
|
|
|
|
|
/* kludge to pass faulting virtual address to sendsig */
|
1993-12-03 05:10:08 +00:00
|
|
|
ucode = type &~ T_USER;
|
|
|
|
|
frame.tf_err = eva;
|
1993-12-12 12:22:57 +00:00
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if NDDB == 0
|
|
|
|
|
case T_TRCTRAP: /* trace trap -- someone single stepping lcall's */
|
|
|
|
|
frame.tf_eflags &= ~PSL_T;
|
|
|
|
|
|
|
|
|
|
/* Q: how do we turn it on again? */
|
|
|
|
|
return;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
case T_BPTFLT|T_USER: /* bpt instruction fault */
|
|
|
|
|
case T_TRCTRAP|T_USER: /* trace trap */
|
|
|
|
|
frame.tf_eflags &= ~PSL_T;
|
|
|
|
|
i = SIGTRAP;
|
|
|
|
|
break;
|
|
|
|
|
|
1994-02-01 23:07:35 +00:00
|
|
|
#if NISA > 0
|
1993-06-12 14:58:17 +00:00
|
|
|
case T_NMI:
|
|
|
|
|
case T_NMI|T_USER:
|
|
|
|
|
#if NDDB > 0
|
|
|
|
|
/* NMI can be hooked up to a pushbutton for debugging */
|
|
|
|
|
printf ("NMI ... going to debugger\n");
|
|
|
|
|
if (kdb_trap (type, 0, &frame))
|
|
|
|
|
return;
|
|
|
|
|
#endif
|
|
|
|
|
/* machine/parity/power fail/"kitchen sink" faults */
|
1994-01-14 16:25:31 +00:00
|
|
|
if (isa_nmi(code) == 0) return;
|
1994-02-01 23:07:35 +00:00
|
|
|
/* FALL THROUGH */
|
|
|
|
|
#endif
|
|
|
|
|
default:
|
|
|
|
|
we_re_toast:
|
|
|
|
|
|
|
|
|
|
fault_type = type & ~T_USER;
|
1994-04-07 10:51:00 +00:00
|
|
|
#if NDDB > 0
|
|
|
|
|
if ((fault_type == T_BPTFLT) || (fault_type == T_TRCTRAP)) {
|
|
|
|
|
if (kdb_trap (type, 0, &frame))
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1994-02-01 23:07:35 +00:00
|
|
|
if (fault_type <= MAX_TRAP_MSG)
|
|
|
|
|
printf("\n\nFatal trap %d: %s while in %s mode\n",
|
|
|
|
|
fault_type, trap_msg[fault_type],
|
|
|
|
|
ISPL(frame.tf_cs) == SEL_UPL ? "user" : "kernel");
|
|
|
|
|
if (fault_type == T_PAGEFLT) {
|
|
|
|
|
printf("fault virtual address = 0x%x\n", eva);
|
|
|
|
|
printf("fault code = %s %s, %s\n",
|
|
|
|
|
code & PGEX_U ? "user" : "supervisor",
|
|
|
|
|
code & PGEX_W ? "write" : "read",
|
|
|
|
|
code & PGEX_P ? "protection violation" : "page not present");
|
|
|
|
|
}
|
|
|
|
|
printf("instruction pointer = 0x%x\n", frame.tf_eip);
|
|
|
|
|
printf("processor eflags = ");
|
|
|
|
|
if (frame.tf_eflags & EFL_TF)
|
|
|
|
|
printf("trace/trap, ");
|
|
|
|
|
if (frame.tf_eflags & EFL_IF)
|
|
|
|
|
printf("interrupt enabled, ");
|
|
|
|
|
if (frame.tf_eflags & EFL_NT)
|
|
|
|
|
printf("nested task, ");
|
|
|
|
|
if (frame.tf_eflags & EFL_RF)
|
|
|
|
|
printf("resume, ");
|
|
|
|
|
if (frame.tf_eflags & EFL_VM)
|
|
|
|
|
printf("vm86, ");
|
|
|
|
|
printf("IOPL = %d\n", (frame.tf_eflags & EFL_IOPL) >> 12);
|
|
|
|
|
printf("current process = ");
|
|
|
|
|
if (curproc) {
|
|
|
|
|
printf("%d (%s)\n",
|
|
|
|
|
curproc->p_pid, curproc->p_comm ?
|
|
|
|
|
curproc->p_comm : "");
|
|
|
|
|
} else {
|
|
|
|
|
printf("Idle\n");
|
|
|
|
|
}
|
|
|
|
|
printf("interrupt mask = ");
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
if ((cpl & net_imask) == net_imask)
|
1994-02-01 23:07:35 +00:00
|
|
|
printf("net ");
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
if ((cpl & tty_imask) == tty_imask)
|
1994-02-01 23:07:35 +00:00
|
|
|
printf("tty ");
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
if ((cpl & bio_imask) == bio_imask)
|
1994-02-01 23:07:35 +00:00
|
|
|
printf("bio ");
|
|
|
|
|
if (cpl == 0)
|
|
|
|
|
printf("none");
|
|
|
|
|
printf("\n");
|
|
|
|
|
|
|
|
|
|
#ifdef KDB
|
|
|
|
|
if (kdb_trap(&psl))
|
|
|
|
|
return;
|
1993-06-12 14:58:17 +00:00
|
|
|
#endif
|
1994-02-01 23:07:35 +00:00
|
|
|
#if NDDB > 0
|
|
|
|
|
if (kdb_trap (type, 0, &frame))
|
|
|
|
|
return;
|
|
|
|
|
#endif
|
|
|
|
|
if (fault_type <= MAX_TRAP_MSG)
|
|
|
|
|
panic(trap_msg[fault_type]);
|
|
|
|
|
else
|
|
|
|
|
panic("unknown/reserved trap");
|
|
|
|
|
|
1994-03-07 11:38:49 +00:00
|
|
|
/* NOTREACHED */
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
trapsignal(p, i, ucode);
|
|
|
|
|
if ((type & T_USER) == 0)
|
|
|
|
|
return;
|
1994-04-07 10:51:00 +00:00
|
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
|
fault_type = type & ~T_USER;
|
|
|
|
|
if (fault_type <= MAX_TRAP_MSG) {
|
|
|
|
|
uprintf("fatal process exception: %s",
|
|
|
|
|
trap_msg[fault_type]);
|
|
|
|
|
if ((fault_type == T_PAGEFLT) || (fault_type == T_PROTFLT))
|
|
|
|
|
uprintf(", fault VA = 0x%x", eva);
|
|
|
|
|
uprintf("\n");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
out:
|
|
|
|
|
while (i = CURSIG(p))
|
|
|
|
|
psig(i);
|
|
|
|
|
p->p_pri = p->p_usrpri;
|
|
|
|
|
if (want_resched) {
|
1993-11-04 15:05:41 +00:00
|
|
|
int s;
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* Since we are curproc, clock will normally just change
|
|
|
|
|
* our priority without moving us from one queue to another
|
|
|
|
|
* (since the running process is not on a queue.)
|
|
|
|
|
* If that happened after we setrq ourselves but before we
|
|
|
|
|
* swtch()'ed, we might not be on the queue indicated by
|
|
|
|
|
* our priority.
|
|
|
|
|
*/
|
1993-11-04 15:05:41 +00:00
|
|
|
s = splclock();
|
1993-06-12 14:58:17 +00:00
|
|
|
setrq(p);
|
|
|
|
|
p->p_stats->p_ru.ru_nivcsw++;
|
|
|
|
|
swtch();
|
1993-11-04 15:05:41 +00:00
|
|
|
splx(s);
|
1993-06-12 14:58:17 +00:00
|
|
|
while (i = CURSIG(p))
|
|
|
|
|
psig(i);
|
|
|
|
|
}
|
|
|
|
|
if (p->p_stats->p_prof.pr_scale) {
|
|
|
|
|
int ticks;
|
|
|
|
|
struct timeval *tv = &p->p_stime;
|
|
|
|
|
|
|
|
|
|
ticks = ((tv->tv_sec - syst.tv_sec) * 1000 +
|
|
|
|
|
(tv->tv_usec - syst.tv_usec) / 1000) / (tick / 1000);
|
|
|
|
|
if (ticks) {
|
|
|
|
|
#ifdef PROFTIMER
|
|
|
|
|
extern int profscale;
|
|
|
|
|
addupc(frame.tf_eip, &p->p_stats->p_prof,
|
|
|
|
|
ticks * profscale);
|
|
|
|
|
#else
|
|
|
|
|
addupc(frame.tf_eip, &p->p_stats->p_prof, ticks);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
curpri = p->p_pri;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
1993-07-27 10:52:31 +00:00
|
|
|
* Compensate for 386 brain damage (missing URKR).
|
|
|
|
|
* This is a little simpler than the pagefault handler in trap() because
|
|
|
|
|
* it the page tables have already been faulted in and high addresses
|
|
|
|
|
* are thrown out early for other reasons.
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
1993-07-27 10:52:31 +00:00
|
|
|
int trapwrite(addr)
|
|
|
|
|
unsigned addr;
|
|
|
|
|
{
|
|
|
|
|
struct proc *p;
|
1994-02-08 09:26:04 +00:00
|
|
|
vm_offset_t va, v;
|
1993-07-27 10:52:31 +00:00
|
|
|
struct vmspace *vm;
|
1994-01-14 16:25:31 +00:00
|
|
|
int oldflags;
|
|
|
|
|
int rv;
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
va = trunc_page((vm_offset_t)addr);
|
1993-07-27 10:52:31 +00:00
|
|
|
/*
|
|
|
|
|
* XXX - MAX is END. Changed > to >= for temp. fix.
|
|
|
|
|
*/
|
|
|
|
|
if (va >= VM_MAXUSER_ADDRESS)
|
|
|
|
|
return (1);
|
1994-02-08 09:26:04 +00:00
|
|
|
|
1993-07-27 10:52:31 +00:00
|
|
|
p = curproc;
|
|
|
|
|
vm = p->p_vmspace;
|
1994-01-14 16:25:31 +00:00
|
|
|
|
|
|
|
|
oldflags = p->p_flag;
|
|
|
|
|
p->p_flag |= SLOCK;
|
|
|
|
|
|
Patch from Gene Stark:
Subject: Page fault in PTE area fails in copyout
Index: sys/i386/i386/trap.c FreeBSD-1.0.2
Description:
Reading files of several megabytes into Emacs, or many small
files all at once, would fail with "IO error - bad address".
Repeat-By:
The bug can be exercised by a test program that malloc()'s
a 5MB chunk of memory, and then, without accessing the memory
first, filling it with data from a file using read().
(I read 64k chunks from /dev/wd0d into successive 64k regions
of the 5MB chunk.) The read() will fail with EFAULT at the first
virtual address boundary that is a multiple of 0x400000.
Fix:
The problem was code in sys/i386/i386/trap.c that tries to
figure out what kind of trap occurred and to handle it appropriately.
It was interpreting any page fault with virtual address
>= vm->vm_maxsaddr as being a user stack segment fault.
In fact, addresses >= USRSTACK are in the user structure/PTE area,
and if they are handled as stack faults, the proper PTE will
not be paged in when it is supposed to be. This situation comes
up in copyout() and copyoutstr(), if PTE's are accessed for the
first time ever. The page fault on accessing the nonexistent PTE
is mishandled as a stack fault, and then the fault that occurs on
the subsequent access to the page itself causes copyout to fail
with EFAULT.
1993-11-28 09:28:54 +00:00
|
|
|
if ((caddr_t)va >= vm->vm_maxsaddr
|
1993-12-12 12:22:57 +00:00
|
|
|
&& (caddr_t)va < (caddr_t)USRSTACK) {
|
1994-02-08 09:26:04 +00:00
|
|
|
if (!grow(p, va)) {
|
1994-01-14 16:25:31 +00:00
|
|
|
p->p_flag &= ~SLOCK;
|
|
|
|
|
p->p_flag |= (oldflags & SLOCK);
|
1993-07-27 10:52:31 +00:00
|
|
|
return (1);
|
1994-01-14 16:25:31 +00:00
|
|
|
}
|
1993-07-27 10:52:31 +00:00
|
|
|
}
|
|
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
v = trunc_page(vtopte(va));
|
1993-07-27 10:52:31 +00:00
|
|
|
|
1994-02-08 09:26:04 +00:00
|
|
|
/*
|
|
|
|
|
* wire the pte page
|
|
|
|
|
*/
|
|
|
|
|
if (va < USRSTACK) {
|
|
|
|
|
vm_map_pageable(&vm->vm_map, v, round_page(v+1), FALSE);
|
1994-01-14 16:25:31 +00:00
|
|
|
}
|
1994-02-08 09:26:04 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* fault the data page
|
|
|
|
|
*/
|
|
|
|
|
rv = vm_fault(&vm->vm_map, va, VM_PROT_READ|VM_PROT_WRITE, FALSE);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* unwire the pte page
|
|
|
|
|
*/
|
|
|
|
|
if (va < USRSTACK) {
|
|
|
|
|
vm_map_pageable(&vm->vm_map, v, round_page(v+1), TRUE);
|
|
|
|
|
}
|
|
|
|
|
|
1994-01-14 16:25:31 +00:00
|
|
|
p->p_flag &= ~SLOCK;
|
|
|
|
|
p->p_flag |= (oldflags & SLOCK);
|
|
|
|
|
|
|
|
|
|
if (rv != KERN_SUCCESS)
|
|
|
|
|
return 1;
|
1994-02-08 09:26:04 +00:00
|
|
|
|
1993-07-27 10:52:31 +00:00
|
|
|
return (0);
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* syscall(frame):
|
|
|
|
|
* System call request from POSIX system call gate interface to kernel.
|
|
|
|
|
* Like trap(), argument is call by reference.
|
|
|
|
|
*/
|
|
|
|
|
/*ARGSUSED*/
|
1993-11-25 01:38:01 +00:00
|
|
|
void
|
1993-06-12 14:58:17 +00:00
|
|
|
syscall(frame)
|
1994-01-03 07:55:47 +00:00
|
|
|
volatile struct trapframe frame;
|
1993-06-12 14:58:17 +00:00
|
|
|
{
|
|
|
|
|
register int *locr0 = ((int *)&frame);
|
|
|
|
|
register caddr_t params;
|
|
|
|
|
register int i;
|
|
|
|
|
register struct sysent *callp;
|
|
|
|
|
register struct proc *p = curproc;
|
|
|
|
|
struct timeval syst;
|
|
|
|
|
int error, opc;
|
|
|
|
|
int args[8], rval[2];
|
|
|
|
|
int code;
|
|
|
|
|
|
|
|
|
|
#ifdef lint
|
|
|
|
|
r0 = 0; r0 = r0; r1 = 0; r1 = r1;
|
|
|
|
|
#endif
|
|
|
|
|
syst = p->p_stime;
|
1994-01-03 07:55:47 +00:00
|
|
|
if (ISPL(frame.tf_cs) != SEL_UPL)
|
1993-06-12 14:58:17 +00:00
|
|
|
panic("syscall");
|
|
|
|
|
|
1994-01-03 07:55:47 +00:00
|
|
|
code = frame.tf_eax;
|
1993-06-12 14:58:17 +00:00
|
|
|
p->p_regs = (int *)&frame;
|
1994-01-03 07:55:47 +00:00
|
|
|
params = (caddr_t)frame.tf_esp + sizeof (int) ;
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Reconstruct pc, assuming lcall $X,y is 7 bytes, as it is always.
|
|
|
|
|
*/
|
1994-01-03 07:55:47 +00:00
|
|
|
opc = frame.tf_eip - 7;
|
|
|
|
|
if (code == 0) {
|
|
|
|
|
code = fuword(params);
|
1993-06-12 14:58:17 +00:00
|
|
|
params += sizeof (int);
|
|
|
|
|
}
|
1994-01-03 07:55:47 +00:00
|
|
|
if (code < 0 || code >= nsysent)
|
|
|
|
|
callp = &sysent[0];
|
|
|
|
|
else
|
|
|
|
|
callp = &sysent[code];
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
if ((i = callp->sy_narg * sizeof (int)) &&
|
|
|
|
|
(error = copyin(params, (caddr_t)args, (u_int)i))) {
|
1994-01-03 07:55:47 +00:00
|
|
|
frame.tf_eax = error;
|
|
|
|
|
frame.tf_eflags |= PSL_C; /* carry bit */
|
1993-06-12 14:58:17 +00:00
|
|
|
#ifdef KTRACE
|
|
|
|
|
if (KTRPOINT(p, KTR_SYSCALL))
|
1993-12-19 00:55:01 +00:00
|
|
|
ktrsyscall(p->p_tracep, code, callp->sy_narg, args);
|
1993-06-12 14:58:17 +00:00
|
|
|
#endif
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
#ifdef KTRACE
|
|
|
|
|
if (KTRPOINT(p, KTR_SYSCALL))
|
1993-12-19 00:55:01 +00:00
|
|
|
ktrsyscall(p->p_tracep, code, callp->sy_narg, args);
|
1993-06-12 14:58:17 +00:00
|
|
|
#endif
|
|
|
|
|
rval[0] = 0;
|
1994-01-03 07:55:47 +00:00
|
|
|
rval[1] = frame.tf_edx;
|
1993-06-12 14:58:17 +00:00
|
|
|
/*pg("%d. s %d\n", p->p_pid, code);*/
|
|
|
|
|
error = (*callp->sy_call)(p, args, rval);
|
|
|
|
|
if (error == ERESTART)
|
1994-01-03 07:55:47 +00:00
|
|
|
frame.tf_eip = opc;
|
1993-06-12 14:58:17 +00:00
|
|
|
else if (error != EJUSTRETURN) {
|
|
|
|
|
if (error) {
|
|
|
|
|
/*pg("error %d", error);*/
|
1994-01-03 07:55:47 +00:00
|
|
|
frame.tf_eax = error;
|
|
|
|
|
frame.tf_eflags |= PSL_C; /* carry bit */
|
1993-06-12 14:58:17 +00:00
|
|
|
} else {
|
1994-01-03 07:55:47 +00:00
|
|
|
frame.tf_eax = rval[0];
|
|
|
|
|
frame.tf_edx = rval[1];
|
|
|
|
|
frame.tf_eflags &= ~PSL_C; /* carry bit */
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* else if (error == EJUSTRETURN) */
|
|
|
|
|
/* nothing to do */
|
|
|
|
|
done:
|
|
|
|
|
/*
|
|
|
|
|
* Reinitialize proc pointer `p' as it may be different
|
|
|
|
|
* if this is a child returning from fork syscall.
|
|
|
|
|
*/
|
|
|
|
|
p = curproc;
|
|
|
|
|
while (i = CURSIG(p))
|
|
|
|
|
psig(i);
|
|
|
|
|
p->p_pri = p->p_usrpri;
|
|
|
|
|
if (want_resched) {
|
1993-11-04 15:05:41 +00:00
|
|
|
int s;
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* Since we are curproc, clock will normally just change
|
|
|
|
|
* our priority without moving us from one queue to another
|
|
|
|
|
* (since the running process is not on a queue.)
|
|
|
|
|
* If that happened after we setrq ourselves but before we
|
|
|
|
|
* swtch()'ed, we might not be on the queue indicated by
|
|
|
|
|
* our priority.
|
|
|
|
|
*/
|
1993-11-04 15:05:41 +00:00
|
|
|
s = splclock();
|
1993-06-12 14:58:17 +00:00
|
|
|
setrq(p);
|
|
|
|
|
p->p_stats->p_ru.ru_nivcsw++;
|
|
|
|
|
swtch();
|
1993-11-04 15:05:41 +00:00
|
|
|
splx(s);
|
1993-06-12 14:58:17 +00:00
|
|
|
while (i = CURSIG(p))
|
|
|
|
|
psig(i);
|
|
|
|
|
}
|
|
|
|
|
if (p->p_stats->p_prof.pr_scale) {
|
|
|
|
|
int ticks;
|
|
|
|
|
struct timeval *tv = &p->p_stime;
|
|
|
|
|
|
|
|
|
|
ticks = ((tv->tv_sec - syst.tv_sec) * 1000 +
|
|
|
|
|
(tv->tv_usec - syst.tv_usec) / 1000) / (tick / 1000);
|
|
|
|
|
if (ticks) {
|
|
|
|
|
#ifdef PROFTIMER
|
|
|
|
|
extern int profscale;
|
1994-01-03 07:55:47 +00:00
|
|
|
addupc(frame.tf_eip, &p->p_stats->p_prof,
|
1993-06-12 14:58:17 +00:00
|
|
|
ticks * profscale);
|
|
|
|
|
#else
|
1994-01-03 07:55:47 +00:00
|
|
|
addupc(frame.tf_eip, &p->p_stats->p_prof, ticks);
|
1993-06-12 14:58:17 +00:00
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
curpri = p->p_pri;
|
|
|
|
|
#ifdef KTRACE
|
|
|
|
|
if (KTRPOINT(p, KTR_SYSRET))
|
|
|
|
|
ktrsysret(p->p_tracep, code, error, rval[0]);
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef DIAGNOSTICx
|
|
|
|
|
{ extern int _udatasel, _ucodesel;
|
1994-01-03 07:55:47 +00:00
|
|
|
if (frame.tf_ss != _udatasel)
|
|
|
|
|
printf("ss %x call %d\n", frame.tf_ss, code);
|
|
|
|
|
if ((frame.tf_cs&0xffff) != _ucodesel)
|
|
|
|
|
printf("cs %x call %d\n", frame.tf_cs, code);
|
|
|
|
|
if (frame.tf_eip > VM_MAXUSER_ADDRESS) {
|
|
|
|
|
printf("eip %x call %d\n", frame.tf_eip, code);
|
|
|
|
|
frame.tf_eip = 0;
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
