Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/locore.S,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.113.2.6 retrieving revision 1.123 diff -u -p -r1.113.2.6 -r1.123 --- src/sys/arch/i386/i386/locore.S 2017/02/05 13:40:12 1.113.2.6 +++ src/sys/arch/i386/i386/locore.S 2016/05/15 07:01:36 1.123 @@ -1,39 +1,10 @@ -/* $NetBSD: locore.S,v 1.113.2.6 2017/02/05 13:40:12 skrll Exp $ */ +/* $NetBSD: locore.S,v 1.123 2016/05/15 07:01:36 maxv Exp $ */ /* * Copyright-o-rama! */ /* - * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009, 2016 - * The NetBSD Foundation, Inc., All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Charles M. Hannum, by Andrew Doran and by Maxime Villard. - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - */ - -/* * Copyright (c) 2006 Manuel Bouyer. * * Redistribution and use in source and binary forms, with or without @@ -94,6 +65,35 @@ */ /*- + * Copyright (c) 1998, 2000, 2004, 2006, 2007, 2009 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Charles M. Hannum, and by Andrew Doran. + * + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +/*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -128,7 +128,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.113.2.6 2017/02/05 13:40:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.123 2016/05/15 07:01:36 maxv Exp $"); #include "opt_compat_oldboot.h" #include "opt_copy_symtab.h" @@ -147,14 +147,13 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 #include #include +#include #include #include #include #include #include #include -#include - #ifndef XEN #include #endif @@ -193,21 +192,16 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 * instruction just clears the page table entry. */ #define fillkpt \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ 1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \ movl %eax,(%ebx) ; /* store phys addr */ \ addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ addl $PAGE_SIZE,%eax ; /* next phys page */ \ - loop 1b ; \ -2: ; + loop 1b ; /* * fillkpt_nox - Same as fillkpt, but sets the NX/XD bit. */ #define fillkpt_nox \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ pushl %ebp ; \ movl RELOC(nox_flag),%ebp ; \ 1: movl %ebp,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: NX */ \ @@ -215,22 +209,7 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ addl $PAGE_SIZE,%eax ; /* next phys page */ \ loop 1b ; \ - popl %ebp ; \ -2: ; - -/* - * fillkpt_blank - Fill in a kernel page table with blank entries - * ebx = page table address - * ecx = number of pages to map - */ -#define fillkpt_blank \ - cmpl $0,%ecx ; /* zero-sized? */ \ - je 2f ; \ -1: movl $0,(PDE_SIZE-4)(%ebx) ; /* upper 32 bits: 0 */ \ - movl $0,(%ebx) ; /* lower 32 bits: 0 */ \ - addl $PDE_SIZE,%ebx ; /* next PTE/PDE */ \ - loop 1b ; \ -2: ; + popl %ebp ; /* * killkpt - Destroy a kernel page table @@ -270,21 +249,53 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1 */ .data - .globl _C_LABEL(tablesize) .globl _C_LABEL(nox_flag) .globl _C_LABEL(cputype) .globl _C_LABEL(cpuid_level) .globl _C_LABEL(esym) .globl _C_LABEL(eblob) .globl _C_LABEL(atdevbase) - .globl _C_LABEL(PDPpaddr) .globl _C_LABEL(lwp0uarea) + .globl _C_LABEL(PDPpaddr) .globl _C_LABEL(gdt) .globl _C_LABEL(idt) + .globl _C_LABEL(lapic_tpr) + +#if NLAPIC > 0 +#ifdef __ELF__ + .align PAGE_SIZE +#else + .align 12 +#endif + .globl _C_LABEL(local_apic), _C_LABEL(lapic_id) + .type _C_LABEL(local_apic), @object +LABEL(local_apic) + .space LAPIC_ID +END(local_apic) + .type _C_LABEL(lapic_id), @object +LABEL(lapic_id) + .long 0x00000000 + .space LAPIC_TPRI-(LAPIC_ID+4) +END(lapic_id) + .type _C_LABEL(lapic_tpr), @object +LABEL(lapic_tpr) + .space LAPIC_PPRI-LAPIC_TPRI +END(lapic_tpr) + .type _C_LABEL(lapic_ppr), @object +_C_LABEL(lapic_ppr): + .space LAPIC_ISR-LAPIC_PPRI +END(lapic_ppr) + .type _C_LABEL(lapic_isr), @object +_C_LABEL(lapic_isr): + .space PAGE_SIZE-LAPIC_ISR +END(lapic_isr) +#else + .type _C_LABEL(lapic_tpr), @object +LABEL(lapic_tpr) + .long 0 +END(lapic_tpr) +#endif - .type _C_LABEL(tablesize), @object -_C_LABEL(tablesize): .long 0 -END(tablesize) .type _C_LABEL(nox_flag), @object LABEL(nox_flag) .long 0 /* 32bit NOX flag, set if supported */ END(nox_flag) @@ -292,7 +303,7 @@ END(nox_flag) LABEL(cputype) .long 0 /* are we 80486, Pentium, or.. */ END(cputype) .type _C_LABEL(cpuid_level), @object -LABEL(cpuid_level) .long -1 /* max. level accepted by cpuid instr */ +LABEL(cpuid_level) .long 0 END(cpuid_level) .type _C_LABEL(atdevbase), @object LABEL(atdevbase) .long 0 /* location of start of iomem in virt */ @@ -303,6 +314,9 @@ END(lwp0uarea) .type _C_LABEL(PDPpaddr), @object LABEL(PDPpaddr) .long 0 /* paddr of PDP, for libkvm */ END(PDPpaddr) + .type _C_LABEL(tablesize), @object +_C_LABEL(tablesize): .long 0 +END(tablesize) /* Space for the temporary stack */ .size tmpstk, tmpstk - . @@ -377,6 +391,8 @@ _C_LABEL(Multiboot_Header): xorl %eax,%eax movw %ax,%fs movw %ax,%gs + decl %eax + movl %eax,RELOC(cpuid_level) /* Find out our CPU type. */ @@ -588,9 +604,9 @@ no_NOX: * +------+--------+------+-----+--------+---------------------+----------- * (1) (2) (3) * - * -------+-------------+ - * TABLES | ISA I/O MEM | - * -------+-------------+ + * -------+------------+ + * TABLES | ISA IO MEM | + * -------+------------+ * (4) * * PROC0 STK is obviously not linked as a page level. It just happens to be @@ -601,7 +617,7 @@ no_NOX: */ /* Find end of kernel image; brings us on (1). */ - movl $RELOC(__kernel_end),%edi + movl $RELOC(end),%edi #if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB) /* Save the symbols (if loaded); brinds us on (2). */ @@ -633,7 +649,7 @@ no_NOX: incl %eax /* one more PTP for VAs stolen by bootstrap */ 1: movl %eax,RELOC(nkptp)+1*4 - /* tablesize = (PDP_SIZE + UPAGES + nkptp[1]) << PGSHIFT; */ + /* tablesize = (PDP_SIZE + UPAGES + nkptp) << PGSHIFT; */ addl $(PDP_SIZE+UPAGES),%eax #ifdef PAE incl %eax /* one more page for L3 */ @@ -643,8 +659,7 @@ no_NOX: #endif movl %eax,RELOC(tablesize) - /* Ensure that nkptp[1] covers BOOTSTRAP TABLES, ie: - * (esi + tablesize) >> L2_SHIFT + 1 < nkptp[1] */ + /* Ensure that nkptp covers BOOTSTRAP TABLES. */ addl %esi,%eax addl $~L2_FRAME,%eax shrl $L2_SHIFT,%eax @@ -671,13 +686,16 @@ no_NOX: */ leal (PROC0_PTP1_OFF)(%esi),%ebx - /* Skip the area below the kernel text. */ - movl $(KERNTEXTOFF - KERNBASE),%ecx - shrl $PGSHIFT,%ecx - fillkpt_blank + /* Skip the first MB. */ + movl $(KERNTEXTOFF - KERNBASE),%eax + movl %eax,%ecx + shrl $(PGSHIFT-2),%ecx /* ((n >> PGSHIFT) << 2) for # PDEs */ +#ifdef PAE + shll $1,%ecx /* PDEs are twice larger with PAE */ +#endif + addl %ecx,%ebx /* Map the kernel text RX. */ - movl $(KERNTEXTOFF - KERNBASE),%eax /* start of TEXT */ movl $RELOC(__rodata_start),%ecx subl %eax,%ecx shrl $PGSHIFT,%ecx @@ -700,27 +718,26 @@ no_NOX: orl $(PG_V|PG_KW),%eax fillkpt_nox - /* Map [SYMS]+[PRELOADED MODULES] RW. */ + /* + * We actually have to be careful here. The memory layout is as + * follows: + * +----------+---------------------+------------------+ + * | DATA+BSS < [PRELOADED MODULES] | BOOTSTRAP TABLES > + * +----------+---------------------+------------------+ + * We just map everything from < to > with RWX rights. + */ movl $RELOC(__kernel_end),%eax movl %esi,%ecx /* start of BOOTSTRAP TABLES */ - subl %eax,%ecx + addl RELOC(tablesize),%ecx /* end of BOOTSTRAP TABLES */ + subl %eax,%ecx /* subtract end of kernel image */ shrl $PGSHIFT,%ecx orl $(PG_V|PG_KW),%eax - fillkpt_nox - - /* Map the BOOTSTRAP TABLES RW. */ - movl %esi,%eax /* start of BOOTSTRAP TABLES */ - movl RELOC(tablesize),%ecx /* length of BOOTSTRAP TABLES */ - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW),%eax - fillkpt_nox + fillkpt - /* We are on (4). Map ISA I/O MEM RW. */ - movl $IOM_BEGIN,%eax - movl $IOM_SIZE,%ecx /* size of ISA I/O MEM */ - shrl $PGSHIFT,%ecx - orl $(PG_V|PG_KW/*|PG_N*/),%eax - fillkpt_nox + /* We are on (4). Map ISA I/O mem (later atdevbase) RWX. */ + movl $(IOM_BEGIN|PG_V|PG_KW/*|PG_N*/),%eax + movl $(IOM_SIZE>>PGSHIFT),%ecx + fillkpt /* * Build L2 for identity mapping. Linked to L1. @@ -738,12 +755,12 @@ no_NOX: movl RELOC(nkptp)+1*4,%ecx fillkpt - /* Install recursive top level PDE */ + /* Install a PDE recursively mapping page directory as a page table! */ leal (PROC0_PDIR_OFF + PDIR_SLOT_PTE * PDE_SIZE)(%esi),%ebx leal (PROC0_PDIR_OFF)(%esi),%eax orl $(PG_V|PG_KW),%eax movl $PDP_SIZE,%ecx - fillkpt_nox + fillkpt #ifdef PAE /* @@ -838,7 +855,7 @@ begin: pushl $0 /* init386() expects a 64 bits paddr_t with PAE */ #endif pushl %eax - call _C_LABEL(init386) + call _C_LABEL(init386) /* wire 386 chip for unix operation */ addl $PDE_SIZE,%esp /* pop paddr_t */ addl $NGDT*8,%esp /* pop temporary gdt */ @@ -867,67 +884,62 @@ begin: popfl cld - - /* - * Xen info: - * - %esp -> stack, *theoretically* the last used page by Xen bootstrap - */ - movl %esp,%ebx - movl $_RELOC(tmpstk),%esp + movl %esp, %ebx /* save start of available space */ + movl $_RELOC(tmpstk),%esp /* bootstrap stack end location */ /* Clear BSS. */ xorl %eax,%eax movl $RELOC(__bss_start),%edi movl $RELOC(_end),%ecx subl %edi,%ecx - rep - stosb + rep stosb /* Copy the necessary stuff from start_info structure. */ /* We need to copy shared_info early, so that sti/cli work */ movl $RELOC(start_info_union),%edi movl $128,%ecx - rep - movsl + rep movsl - /* Clear segment registers. */ + /* Clear segment registers; always null in proc0. */ xorl %eax,%eax movw %ax,%fs movw %ax,%gs + decl %eax + movl %eax,RELOC(cpuid_level) xorl %eax,%eax cpuid movl %eax,RELOC(cpuid_level) /* - * Use a temporary GDT page. We'll re-add it to uvm(9) once we're done - * using it. + * Use a temp page. We'll re- add it to uvm(9) once we're + * done using it. */ - movl $RELOC(tmpgdt),%eax + movl $RELOC(tmpgdt), %eax pushl %eax /* start of temporary gdt */ call _C_LABEL(initgdt) addl $4,%esp - call xen_locore + call xen_pmap_bootstrap /* - * The first VA available is returned by xen_locore in %eax. We - * use it as the UAREA, and set up the stack here. + * First avail returned by xen_pmap_bootstrap in %eax */ - movl %eax,%esi - movl %esi,_C_LABEL(lwp0uarea) + movl %eax, %esi; + movl %esi, _C_LABEL(lwp0uarea) + + /* Set up bootstrap stack. */ leal (USPACE-FRAMESIZE)(%eax),%esp xorl %ebp,%ebp /* mark end of frames */ - /* Set first_avail after the DUMMY PAGE (see xen_locore). */ - addl $(USPACE+PAGE_SIZE),%esi - subl $KERNBASE,%esi /* init386 wants a physical address */ + addl $USPACE, %esi + subl $KERNBASE, %esi /* init386 wants a physical address */ #ifdef PAE pushl $0 /* init386() expects a 64 bits paddr_t with PAE */ #endif pushl %esi - call _C_LABEL(init386) + call _C_LABEL(init386) /* wire 386 chip for unix operation */ addl $PDE_SIZE,%esp /* pop paddr_t */ call _C_LABEL(main) #endif /* XEN */ @@ -1067,7 +1079,7 @@ END(dumpsys) /* * struct lwp *cpu_switchto(struct lwp *oldlwp, struct lwp *newlwp, - * bool returning) + * bool returning) * * 1. if (oldlwp != NULL), save its context. * 2. then, restore context of newlwp. @@ -1095,18 +1107,16 @@ ENTRY(cpu_switchto) movl 16(%esp),%esi /* oldlwp */ movl 20(%esp),%edi /* newlwp */ movl 24(%esp),%edx /* returning */ - - testl %esi,%esi /* oldlwp = NULL ? */ - jz skip_save + testl %esi,%esi + jz 1f /* Save old context. */ movl L_PCB(%esi),%eax movl %esp,PCB_ESP(%eax) movl %ebp,PCB_EBP(%eax) -skip_save: /* Switch to newlwp's stack. */ - movl L_PCB(%edi),%ebx +1: movl L_PCB(%edi),%ebx movl PCB_EBP(%ebx),%ebp movl PCB_ESP(%ebx),%esp @@ -1119,33 +1129,33 @@ skip_save: /* Skip the rest if returning to a pinned LWP. */ testl %edx,%edx - jnz switch_return + jnz 4f - /* Switch ring0 stack */ #ifdef XEN pushl %edi call _C_LABEL(i386_switch_context) addl $4,%esp -#else +#else /* !XEN */ + /* Switch ring0 esp */ movl PCB_ESP0(%ebx),%eax movl %eax,CPUVAR(ESP0) -#endif +#endif /* !XEN */ /* Don't bother with the rest if switching to a system process. */ testl $LW_SYSTEM,L_FLAG(%edi) - jnz switch_return + jnz 4f #ifndef XEN /* Restore thread-private %fs/%gs descriptors. */ movl CPUVAR(GDT),%ecx - movl PCB_FSD(%ebx),%eax - movl PCB_FSD+4(%ebx),%edx - movl %eax,(GUFS_SEL*8)(%ecx) - movl %edx,(GUFS_SEL*8+4)(%ecx) - movl PCB_GSD(%ebx),%eax - movl PCB_GSD+4(%ebx),%edx - movl %eax,(GUGS_SEL*8)(%ecx) - movl %edx,(GUGS_SEL*8+4)(%ecx) + movl PCB_FSD(%ebx), %eax + movl PCB_FSD+4(%ebx), %edx + movl %eax, (GUFS_SEL*8)(%ecx) + movl %edx, (GUFS_SEL*8+4)(%ecx) + movl PCB_GSD(%ebx), %eax + movl PCB_GSD+4(%ebx), %edx + movl %eax, (GUGS_SEL*8)(%ecx) + movl %edx, (GUGS_SEL*8+4)(%ecx) #endif /* !XEN */ /* Switch I/O bitmap */ @@ -1158,25 +1168,14 @@ skip_save: /* Is this process using RAS (restartable atomic sequences)? */ movl L_PROC(%edi),%eax cmpl $0,P_RASLIST(%eax) - je no_RAS - - /* Handle restartable atomic sequences (RAS). */ - movl L_MD_REGS(%edi),%ecx - pushl TF_EIP(%ecx) - pushl %eax - call _C_LABEL(ras_lookup) - addl $8,%esp - cmpl $-1,%eax - je no_RAS - movl L_MD_REGS(%edi),%ecx - movl %eax,TF_EIP(%ecx) -no_RAS: + jne 5f /* * Restore cr0 (including FPU state). Raise the IPL to IPL_HIGH. * FPU IPIs can alter the LWP's saved cr0. Dropping the priority * is deferred until mi_switch(), when cpu_switchto() returns. */ +2: #ifdef XEN pushl %edi call _C_LABEL(i386_tls_switch) @@ -1191,24 +1190,34 @@ no_RAS: * set CR0_TS so we'll trap rather than reuse bogus state. */ cmpl CPUVAR(FPCURLWP),%edi - je skip_TS + je 3f orl $CR0_TS,%ecx -skip_TS: /* Reloading CR0 is very expensive - avoid if possible. */ - cmpl %edx,%ecx - je switch_return +3: cmpl %edx,%ecx + je 4f movl %ecx,%cr0 #endif /* !XEN */ -switch_return: /* Return to the new LWP, returning 'oldlwp' in %eax. */ - movl %esi,%eax +4: movl %esi,%eax popl %edi popl %esi popl %ebx ret + /* Check for restartable atomic sequences (RAS). */ +5: movl L_MD_REGS(%edi),%ecx + pushl TF_EIP(%ecx) + pushl %eax + call _C_LABEL(ras_lookup) + addl $8,%esp + cmpl $-1,%eax + je 2b + movl L_MD_REGS(%edi),%ecx + movl %eax,TF_EIP(%ecx) + jmp 2b + .Lcopy_iobitmap: /* Copy I/O bitmap. */ incl _C_LABEL(pmap_iobmp_evcnt)+EV_COUNT