 @@ -1,403 +1,408 @@
-/*	$NetBSD: vm_machdep.c,v 1.18 2013/12/01 01:05:16 christos Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.19 2014/01/11 17:14:00 christos Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, 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. 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.
+ *
  *	@(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  */
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1989, 1990 William Jolitz
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, 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.
+ *
  *	@(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  */
 /*
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.18 2013/12/01 01:05:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.19 2014/01/11 17:14:00 christos Exp $");
 #include "opt_mtrr.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 #include <sys/ptrace.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <machine/gdt.h>
 #include <machine/reg.h>
 #include <machine/specialreg.h>
 #ifdef MTRR
 #include <machine/mtrr.h>
 #endif
 #ifdef __x86_64__
 #include <machine/fpu.h>
 #else
 #include "npx.h"
 #if NNPX > 0
 #define fpusave_lwp(x, y)	npxsave_lwp(x, y)
 #else
 #define fpusave_lwp(x, y)
 #endif
 #endif
 void
 cpu_proc_fork(struct proc *p1, struct proc *p2)
+{
 	p2->p_md.md_flags = p1->p_md.md_flags;
+}
 /*
  * cpu_lwp_fork: finish a new LWP (l2) operation.
+ *
  * First LWP (l1) is the process being forked.  If it is &lwp0, then we
  * are creating a kthread, where return path and argument are specified
  * with `func' and `arg'.
+ *
  * If an alternate user-level stack is requested (with non-zero values
  * in both the stack and stacksize arguments), then set up the user stack
  * pointer accordingly.
  */
 void
 cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
     void (*func)(void *), void *arg)
+{
 	struct pcb *pcb1, *pcb2;
 	struct trapframe *tf;
 	struct switchframe *sf;
 	vaddr_t uv;
 	pcb1 = lwp_getpcb(l1);
 	pcb2 = lwp_getpcb(l2);
 	/*
 	 * If parent LWP was using FPU, then we have to save the FPU h/w
 	 * state to PCB so that we can copy it.
 	 */
 	if (pcb1->pcb_fpcpu != NULL) {
 		fpusave_lwp(l1, true);
+	}
 	/*
 	 * Sync the PCB before we copy it.
 	 */
 	if (l1 == curlwp) {
 		KASSERT(pcb1 == curpcb);
 		savectx(pcb1);
 	} else {
 		KASSERT(l1 == &lwp0);
+	}
 	/* Copy the PCB from parent. */
 	memcpy(pcb2, pcb1, sizeof(struct pcb));
 #if defined(XEN)
 	pcb2->pcb_iopl = SEL_KPL;
 #endif
 	/*
 	 * Set the kernel stack address (from the address to uarea) and
 	 * trapframe address for child.
+	 *
 	 * Rig kernel stack so that it would start out in lwp_trampoline()
 	 * and call child_return() with l2 as an argument.  This causes the
 	 * newly-created child process to go directly to user level with a
 	 * parent return value of 0 from fork(), while the parent process
 	 * returns normally.
 	 */
 	uv = uvm_lwp_getuarea(l2);
 #ifdef __x86_64__
 	pcb2->pcb_rsp0 = (uv + KSTACK_SIZE - 16) & ~0xf;
 	tf = (struct trapframe *)pcb2->pcb_rsp0 - 1;
 #else
 	pcb2->pcb_esp0 = (uv + KSTACK_SIZE - 16);
 	tf = (struct trapframe *)pcb2->pcb_esp0 - 1;
 	pcb2->pcb_iomap = NULL;
 #endif
 	l2->l_md.md_regs = tf;
 	/*
 	 * Copy the trapframe from parent, so that return to userspace
 	 * will be to right address, with correct registers.
 	 */
 	memcpy(tf, l1->l_md.md_regs, sizeof(struct trapframe));
 	/* Child LWP might get aston() before returning to userspace. */
 	tf->tf_trapno = T_ASTFLT;
 #if 0 /* DIAGNOSTIC */
 	/* Set a red zone in the kernel stack after the uarea. */
 	pmap_kremove(uv, PAGE_SIZE);
 	pmap_update(pmap_kernel());
 #endif
 	/* If specified, set a different user stack for a child. */
 	if (stack != NULL) {
 #ifdef __x86_64__
 		tf->tf_rsp = (uint64_t)stack + stacksize;
 #else
 		tf->tf_esp = (uint32_t)stack + stacksize;
 #endif
+	}
 	l2->l_md.md_flags = l1->l_md.md_flags;
 	l2->l_md.md_astpending = 0;
 	sf = (struct switchframe *)tf - 1;
 #ifdef __x86_64__
 	sf->sf_r12 = (uint64_t)func;
 	sf->sf_r13 = (uint64_t)arg;
 	sf->sf_rip = (uint64_t)lwp_trampoline;
 	pcb2->pcb_rsp = (uint64_t)sf;
 	pcb2->pcb_rbp = (uint64_t)l2;
 #else
 	/*
 	 * XXX Is there a reason sf->sf_edi isn't initialized here?
 	 * Could this leak potentially sensitive information to new
 	 * userspace processes?
 	 */
 	sf->sf_esi = (int)func;
 	sf->sf_ebx = (int)arg;
 	sf->sf_eip = (int)lwp_trampoline;
 	pcb2->pcb_esp = (int)sf;
 	pcb2->pcb_ebp = (int)l2;
 #endif
+}
 /*
  * cpu_lwp_free is called from exit() to let machine-dependent
  * code free machine-dependent resources.  Note that this routine
  * must not block.
  */
 void
 cpu_lwp_free(struct lwp *l, int proc)
+{
 	struct pcb *pcb = lwp_getpcb(l);
 	/* If we were using the FPU, forget about it. */
 	if (pcb->pcb_fpcpu != NULL) {
 		fpusave_lwp(l, false);
+	}
 #ifdef MTRR
 	if (proc && l->l_proc->p_md.md_flags & MDP_USEDMTRR)
 		mtrr_clean(l->l_proc);
 #endif
+}
 /*
  * cpu_lwp_free2 is called when an LWP is being reaped.
  * This routine may block.
  */
 void
 cpu_lwp_free2(struct lwp *l)
+{
 	KASSERT(l->l_md.md_gc_ptp == NULL);
 	KASSERT(l->l_md.md_gc_pmap == NULL);
+}
 /*
  * Convert kernel VA to physical address
  */
 paddr_t
 kvtop(void *addr)
+{
 	paddr_t pa;
 	bool ret;
 	ret = pmap_extract(pmap_kernel(), (vaddr_t)addr, &pa);
 	KASSERT(ret == true);
 	return pa;
+}
 /*
  * Map a user I/O request into kernel virtual address space.
  * Note: the pages are already locked by uvm_vslock(), so we
  * do not need to pass an access_type to pmap_enter().
  */
 int
 vmapbuf(struct buf *bp, vsize_t len)
+{
 	vaddr_t faddr, taddr, off;
 	paddr_t fpa;
 	KASSERT((bp->b_flags & B_PHYS) != 0);
 	bp->b_saveaddr = bp->b_data;
 	faddr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - faddr;
 	len = round_page(off + len);
 	taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
 	bp->b_data = (void *)(taddr + off);
 	/*
 	 * The region is locked, so we expect that pmap_pte() will return
 	 * non-NULL.
 	 * XXX: unwise to expect this in a multithreaded environment.
 	 * anything can happen to a pmap between the time we lock a
 	 * region, release the pmap lock, and then relock it for
 	 * the pmap_extract().
+	 *
 	 * no need to flush TLB since we expect nothing to be mapped
 	 * where we we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
 		(void) pmap_extract(vm_map_pmap(&bp->b_proc->p_vmspace->vm_map),
 		    faddr, &fpa);
 		pmap_kenter_pa(taddr, fpa, VM_PROT_READ|VM_PROT_WRITE, 0);
 		faddr += PAGE_SIZE;
 		taddr += PAGE_SIZE;
 		len -= PAGE_SIZE;
+	}
 	pmap_update(pmap_kernel());
 	return 0;
+}
 /*
  * Unmap a previously-mapped user I/O request.
  */
 void
 vunmapbuf(struct buf *bp, vsize_t len)
+{
 	vaddr_t addr, off;
 	KASSERT((bp->b_flags & B_PHYS) != 0);
 	addr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - addr;
 	len = round_page(off + len);
 	pmap_kremove(addr, len);
 	pmap_update(pmap_kernel());
 	uvm_km_free(phys_map, addr, len, UVM_KMF_VAONLY);
 	bp->b_data = bp->b_saveaddr;
 	bp->b_saveaddr = 0;
+}
 #ifdef __HAVE_CPU_UAREA_ROUTINES
 void *
 cpu_uarea_alloc(bool system)
+{
 	struct pglist pglist;
 	int error;
 	/*
 	 * Allocate a new physically contiguous uarea which can be
 	 * direct-mapped.
 	 */
 	error = uvm_pglistalloc(USPACE, 0, ptoa(physmem), 0, 0, &pglist, 1, 1);
 	if (error) {
 		return NULL;
+	}
 	/*
 	 * Get the physical address from the first page.
 	 */
 	const struct vm_page * const pg = TAILQ_FIRST(&pglist);
 	KASSERT(pg != NULL);
 	const paddr_t pa = VM_PAGE_TO_PHYS(pg);
 	/*
 	 * We need to return a direct-mapped VA for the pa.
 	 */
 	return (void *)PMAP_MAP_POOLPAGE(pa);
+}
 /*
  * Return true if we freed it, false if we didn't.
  */
 bool
 cpu_uarea_free(void *vva)
+{
 	vaddr_t va = (vaddr_t) vva;
 	if (va >= VM_MIN_KERNEL_ADDRESS && va < VM_MAX_KERNEL_ADDRESS) {
 		return false;
+	}
 	/*
 	 * Since the pages are physically contiguous, the vm_page structures
 	 * will be as well.
 	 */
 	struct vm_page *pg = PHYS_TO_VM_PAGE(PMAP_UNMAP_POOLPAGE(va));
 	KASSERT(pg != NULL);
 	for (size_t i = 0; i < UPAGES; i++, pg++) {
 		uvm_pagefree(pg);
+	}
 	return true;
+}
 #endif /* __HAVE_CPU_UAREA_ROUTINES */