 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_page.c,v 1.199 2019/03/14 19:10:04 kre Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.200 2019/09/20 11:09:43 maxv Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -56,27 +56,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * uvm_page.c: page ops.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.199 2019/03/14 19:10:04 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.200 2019/09/20 11:09:43 maxv Exp $");
 #include "opt_ddb.h"
 #include "opt_uvm.h"
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sched.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/atomic.h>
 @@ -619,45 +619,39 @@ uvm_page_physget_freelist(paddr_t *paddr
 	uvm_physseg_t lcv;
 	/* pass 1: try allocating from a matching end */
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_BIGFIRST)
 	for (lcv = uvm_physseg_get_last(); uvm_physseg_valid_p(lcv); lcv = uvm_physseg_get_prev(lcv))
 #else
 	for (lcv = uvm_physseg_get_first(); uvm_physseg_valid_p(lcv); lcv = uvm_physseg_get_next(lcv))
 #endif
+	{
 		if (uvm.page_init_done == true)
 			panic("uvm_page_physget: called _after_ bootstrap");
 		/* Try to match at front or back on unused segment */
-		if (uvm_page_physunload(lcv, freelist, paddrp) == false) {
+		if (uvm_page_physunload(lcv, freelist, paddrp))
 			if (paddrp == NULL) /* freelist fail, try next */
 				continue;
 		} else
 			return true;
+	}
 	/* pass2: forget about matching ends, just allocate something */
 #if (VM_PHYSSEG_STRAT == VM_PSTRAT_BIGFIRST)
 	for (lcv = uvm_physseg_get_last(); uvm_physseg_valid_p(lcv); lcv = uvm_physseg_get_prev(lcv))
 #else
 	for (lcv = uvm_physseg_get_first(); uvm_physseg_valid_p(lcv); lcv = uvm_physseg_get_next(lcv))
 #endif
+	{
 		/* Try the front regardless. */
-		if (uvm_page_physunload_force(lcv, freelist, paddrp) == false) {
+		if (uvm_page_physunload_force(lcv, freelist, paddrp))
 			if (paddrp == NULL) /* freelist fail, try next */
 				continue;
 		} else
 			return true;
+	}
 	return false;
+}
 bool
 uvm_page_physget(paddr_t *paddrp)
+{
 	int i;
 	/* try in the order of freelist preference */
 	for (i = 0; i < VM_NFREELIST; i++)
 		if (uvm_page_physget_freelist(paddrp, i) == true)

 @@ -1,14 +1,14 @@
-/* $NetBSD: uvm_physseg.c,v 1.9 2018/01/21 17:58:43 christos Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.10 2019/09/20 11:09:43 maxv Exp $ */
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -461,27 +461,26 @@ uvm_physseg_get_highest_frame(void)
  * caller.
  */
 bool
 uvm_page_physunload(uvm_physseg_t upm, int freelist, paddr_t *paddrp)
+{
 	struct uvm_physseg *seg;
 	if (__predict_true(uvm.page_init_done == true))
 		panic("%s: unload attempted after uvm_page_init()\n", __func__);
 	seg = HANDLE_TO_PHYSSEG_NODE(upm);
 	if (seg->free_list != freelist) {
 		paddrp = NULL;
 		return false;
+	}
 	/*
 	 * During cold boot, what we're about to unplug hasn't been
 	 * put on the uvm freelist, nor has uvmexp.npages been
 	 * updated. (This happens in uvm_page.c:uvm_page_init())
+	 *
 	 * For hotplug, we assume here that the pages being unloaded
 	 * here are completely out of sight of uvm (ie; not on any uvm
 	 * lists), and that  uvmexp.npages has been suitably
 	 * decremented before we're called.
+	 *
 @@ -506,27 +505,26 @@ uvm_page_physunload(uvm_physseg_t upm, i
+}
 bool
 uvm_page_physunload_force(uvm_physseg_t upm, int freelist, paddr_t *paddrp)
+{
 	struct uvm_physseg *seg;
 	seg = HANDLE_TO_PHYSSEG_NODE(upm);
 	if (__predict_true(uvm.page_init_done == true))
 		panic("%s: unload attempted after uvm_page_init()\n", __func__);
 	/* any room in this bank? */
 	if (seg->avail_start >= seg->avail_end) {
 		paddrp = NULL;
 		return false; /* nope */
+	}
 	*paddrp = ctob(seg->avail_start);
 	/* Always unplug from front */
 	return uvm_physseg_unplug(seg->avail_start, 1);
+}
 /*
  * vm_physseg_find: find vm_physseg structure that belongs to a PA
  */
 @@ -652,27 +650,26 @@ uvm_post_preload_check(void)
  * caller.
  */
 bool
 uvm_page_physunload(uvm_physseg_t psi, int freelist, paddr_t *paddrp)
+{
 	int x;
 	struct uvm_physseg *seg;
 	uvm_post_preload_check();
 	seg = VM_PHYSMEM_PTR(psi);
 	if (seg->free_list != freelist) {
 		paddrp = NULL;
 		return false;
+	}
 	/* try from front */
 	if (seg->avail_start == seg->start &&
 	    seg->avail_start < seg->avail_end) {
 		*paddrp = ctob(seg->avail_start);
 		seg->avail_start++;
 		seg->start++;
 		/* nothing left?   nuke it */
 		if (seg->avail_start == seg->end) {
 			if (vm_nphysmem == 1)
 				panic("uvm_page_physget: out of memory!");
 @@ -707,27 +704,26 @@ uvm_page_physunload(uvm_physseg_t psi, i
 bool
 uvm_page_physunload_force(uvm_physseg_t psi, int freelist, paddr_t *paddrp)
+{
 	int x;
 	struct uvm_physseg *seg;
 	uvm_post_preload_check();
 	seg = VM_PHYSMEM_PTR(psi);
 	/* any room in this bank? */
 	if (seg->avail_start >= seg->avail_end) {
 		paddrp = NULL;
 		return false; /* nope */
+	}
 	*paddrp = ctob(seg->avail_start);
 	seg->avail_start++;
 	/* truncate! */
 	seg->start = seg->avail_start;
 	/* nothing left?   nuke it */
 	if (seg->avail_start == seg->end) {
 		if (vm_nphysmem == 1)
 			panic("uvm_page_physget: out of memory!");
 		vm_nphysmem--;