 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_amap.c,v 1.126 2021/03/13 15:29:55 skrll Exp $	*/
+/*	$NetBSD: uvm_amap.c,v 1.127 2023/04/09 09:00:56 riastradh Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,27 +25,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * uvm_amap.c: amap operations
  */
 /*
  * this file contains functions that perform operations on amaps.  see
  * uvm_amap.h for a brief explanation of the role of amaps in uvm.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.126 2021/03/13 15:29:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.127 2023/04/09 09:00:56 riastradh Exp $");
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/atomic.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_swap.h>
 @@ -313,27 +313,28 @@ uvm_amap_init(void)
 /*
  * amap_free: free an amap
+ *
  * => the amap must be unlocked
  * => the amap should have a zero reference count and be empty
  */
 void
 amap_free(struct vm_amap *amap)
+{
 	int slots;
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
-	KASSERT(amap->am_ref == 0 && amap->am_nused == 0);
+	KASSERT(amap->am_ref == 0);
 	KASSERT(amap->am_nused == 0);
 	KASSERT((amap->am_flags & AMAP_SWAPOFF) == 0);
 	slots = amap->am_maxslot;
 	kmem_free(amap->am_slots, slots * sizeof(*amap->am_slots));
 	kmem_free(amap->am_bckptr, slots * sizeof(*amap->am_bckptr));
 	kmem_free(amap->am_anon, slots * sizeof(*amap->am_anon));
 #ifdef UVM_AMAP_PPREF
 	if (amap->am_ppref && amap->am_ppref != PPREF_NONE)
 		kmem_free(amap->am_ppref, slots * sizeof(*amap->am_ppref));
 #endif
 	pool_cache_put(&uvm_amap_cache, amap);
 	UVMHIST_LOG(maphist,"<- done, freed amap = %#jx", (uintptr_t)amap,
 , 0, 0);
+}
 @@ -764,27 +765,28 @@ amap_wipeout(struct vm_amap *amap)
 		/*
 		 * Note: amap_swap_off() will call us again.
 		 */
 		amap_unlock(amap);
 		return;
+	}
 	for (lcv = 0 ; lcv < amap->am_nused ; lcv++) {
 		struct vm_anon *anon;
 		u_int slot;
 		slot = amap->am_slots[lcv];
 		anon = amap->am_anon[slot];
-		KASSERT(anon != NULL && anon->an_ref != 0);
+		KASSERT(anon != NULL);
 		KASSERT(anon->an_ref != 0);
 		KASSERT(anon->an_lock == amap->am_lock);
 		UVMHIST_LOG(maphist,"  processing anon %#jx, ref=%jd",
 		    (uintptr_t)anon, anon->an_ref, 0, 0);
 		/*
 		 * Drop the reference.
 		 */
 		if (__predict_true(--anon->an_ref == 0)) {
 			uvm_anfree(anon);
+		}
 		if (__predict_false((lcv & 31) == 31)) {
 @@ -1059,27 +1061,28 @@ ReStart:
 		pg = anon->an_page;
 		KASSERT(pg != NULL);
 		KASSERT(pg->wire_count > 0);
 		/*
 		 * If the page is loaned then it must already be mapped
 		 * read-only and we don't need to copy it.
 		 */
 		if (pg->loan_count != 0) {
 			continue;
+		}
-		KASSERT(pg->uanon == anon && pg->uobject == NULL);
+		KASSERT(pg->uanon == anon);
 		KASSERT(pg->uobject == NULL);
 		/*
 		 * If the page is busy, then we have to unlock, wait for
 		 * it and then restart.
 		 */
 		if (pg->flags & PG_BUSY) {
 			uvm_pagewait(pg, amap->am_lock, "cownow");
 			goto ReStart;
+		}
 		/*
 		 * Perform a copy-on-write.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_bio.c,v 1.127 2023/02/12 16:28:32 andvar Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.128 2023/04/09 09:00:56 riastradh Exp $	*/
 /*
  * Copyright (c) 1998 Chuck Silvers.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * 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.
+ *
  */
 /*
  * uvm_bio.c: buffered i/o object mapping cache
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.127 2023/02/12 16:28:32 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.128 2023/04/09 09:00:56 riastradh Exp $");
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/bitops.h>		/* for ilog2() */
 @@ -545,27 +545,29 @@ again:
 		LIST_INSERT_HEAD(&ubc_object.hash[UBC_HASH(uobj, umap_offset)],
 		    umap, hash);
 		LIST_INSERT_HEAD(&uobj->uo_ubc, umap, list);
 	} else {
 		UBC_EVCNT_INCR(wincachehit);
 		va = UBC_UMAP_ADDR(umap);
+	}
 	if (umap->refcount == 0) {
 		TAILQ_REMOVE(UBC_QUEUE(offset), umap, inactive);
+	}
 	if (flags & UBC_WRITE) {
-		KASSERTMSG(umap->writeoff == 0 && umap->writelen == 0,
+		KASSERTMSG(umap->writeoff == 0,
 		    "ubc_alloc: concurrent writes to uobj %p", uobj);
 		KASSERTMSG(umap->writelen == 0,
 		    "ubc_alloc: concurrent writes to uobj %p", uobj);
 		umap->writeoff = slot_offset;
 		umap->writelen = *lenp;
+	}
 	umap->refcount++;
 	umap->advice = advice;
 	rw_exit(ubc_object.uobj.vmobjlock);
 	UVMHIST_LOG(ubchist, "umap %#jx refs %jd va %#jx flags %#jx",
 	    (uintptr_t)umap, umap->refcount, (uintptr_t)va, flags);
 	if (flags & UBC_FAULTBUSY) {
 		int npages = (*lenp + (offset & (PAGE_SIZE - 1)) +

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_fault.c,v 1.231 2022/10/26 23:27:32 riastradh Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.232 2023/04/09 09:00:56 riastradh Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * 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.
+ *
  * from: Id: uvm_fault.c,v 1.1.2.23 1998/02/06 05:29:05 chs Exp
  */
 /*
  * uvm_fault.c: fault handler
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.231 2022/10/26 23:27:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.232 2023/04/09 09:00:56 riastradh Exp $");
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/kernel.h>
 #include <sys/mman.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 /*
 @@ -2660,41 +2660,42 @@ uvm_fault_unwire_locked(struct vm_map *m
 	struct vm_page *pg;
 	/*
 	 * we assume that the area we are unwiring has actually been wired
 	 * in the first place.   this means that we should be able to extract
 	 * the PAs from the pmap.   we also lock out the page daemon so that
 	 * we can call uvm_pageunwire.
 	 */
 	/*
 	 * find the beginning map entry for the region.
 	 */
-	KASSERT(start >= vm_map_min(map) && end <= vm_map_max(map));
+	KASSERT(start >= vm_map_min(map));
 	KASSERT(end <= vm_map_max(map));
 	if (uvm_map_lookup_entry(map, start, &entry) == false)
 		panic("uvm_fault_unwire_locked: address not in map");
 	oentry = NULL;
 	for (va = start; va < end; va += PAGE_SIZE) {
 		/*
 		 * find the map entry for the current address.
 		 */
 		KASSERT(va >= entry->start);
 		while (va >= entry->end) {
-			KASSERT(entry->next != &map->header &&
+			KASSERT(entry->next != &map->header);
-				entry->next->start <= entry->end);
+			KASSERT(entry->next->start <= entry->end);
 			entry = entry->next;
+		}
 		/*
 		 * lock it.
 		 */
 		if (entry != oentry) {
 			if (oentry != NULL) {
 				uvm_map_unlock_entry(oentry);
+			}
 			uvm_map_lock_entry(entry, RW_WRITER);
 			oentry = entry;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_km.c,v 1.164 2023/02/26 07:27:14 skrll Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.165 2023/04/09 09:00:56 riastradh 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:
 @@ -142,27 +142,27 @@
  * kmem_meta_arena:
  *	Imports from kmem_va_meta_arena.  Allocations from this arena are
  *	backed with the pages.
+ *
  * Arena stacking:
+ *
  *	kmem_arena
  *		kmem_va_arena
  *		kmem_va_meta_arena
  *			kmem_meta_arena
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.164 2023/02/26 07:27:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.165 2023/04/09 09:00:56 riastradh Exp $");
 #include "opt_uvmhist.h"
 #include "opt_kmempages.h"
 #ifndef NKMEMPAGES
 #define NKMEMPAGES 0
 #endif
 /*
  * Defaults for lower and upper-bounds for the kmem_arena page count.
  * Can be overridden by kernel config options.
  */
 @@ -527,27 +527,28 @@ uvm_km_pgremove_intrsafe(struct vm_map *
 		     va += PAGE_SIZE) {
 			if (!pmap_extract(pmap_kernel(), va, &pa[i])) {
 				continue;
+			}
 			i++;
+		}
 		npgrm = i;
 		/* now remove the mappings */
 		pmap_kremove(batch_vastart, va - batch_vastart);
 		/* and free the pages */
 		for (i = 0; i < npgrm; i++) {
 			pg = PHYS_TO_VM_PAGE(pa[i]);
 			KASSERT(pg);
-			KASSERT(pg->uobject == NULL && pg->uanon == NULL);
+			KASSERT(pg->uobject == NULL);
 			KASSERT(pg->uanon == NULL);
 			KASSERT((pg->flags & PG_BUSY) == 0);
 			uvm_pagefree(pg);
+		}
+	}
 #undef __PGRM_BATCH
+}
 #if defined(DEBUG)
 void
 uvm_km_check_empty(struct vm_map *map, vaddr_t start, vaddr_t end)
+{
 	vaddr_t va;
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_page.c,v 1.251 2022/10/26 23:38:09 riastradh Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.252 2023/04/09 09:00:56 riastradh Exp $	*/
 /*-
  * Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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.
 @@ -85,27 +85,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.251 2022/10/26 23:38:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.252 2023/04/09 09:00:56 riastradh 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/radixtree.h>
 @@ -1205,27 +1205,28 @@ uvm_pagealloc_strat(struct uvm_object *o
 			if (pg != NULL) {
 				goto gotit;
+			}
+		}
 		/* No pages free!  Have pagedaemon free some memory. */
 		splx(s);
 		uvm_kick_pdaemon();
 		return NULL;
 	case UVM_PGA_STRAT_ONLY:
 	case UVM_PGA_STRAT_FALLBACK:
 		/* Attempt to allocate from the specified free list. */
-		KASSERT(free_list >= 0 && free_list < VM_NFREELIST);
+		KASSERT(free_list >= 0);
 		KASSERT(free_list < VM_NFREELIST);
 		pg = uvm_pagealloc_pgfl(ucpu, free_list, &color, flags);
 		if (pg != NULL) {
 			goto gotit;
+		}
 		/* Fall back, if possible. */
 		if (strat == UVM_PGA_STRAT_FALLBACK) {
 			strat = UVM_PGA_STRAT_NORMAL;
 			goto again;
+		}
 		/* No pages free!  Have pagedaemon free some memory. */
 		splx(s);
 @@ -2090,38 +2091,40 @@ uvm_pagereadonly_p(struct vm_page *pg)
  * for it. Used to avoid actually mapping the pages, pmap most likely uses direct map
  * or equivalent.
  */
 int
 uvm_direct_process(struct vm_page **pgs, u_int npages, voff_t off, vsize_t len,
             int (*process)(void *, size_t, void *), void *arg)
+{
 	int error = 0;
 	paddr_t pa;
 	size_t todo;
 	voff_t pgoff = (off & PAGE_MASK);
 	struct vm_page *pg;
-	KASSERT(npages > 0 && len > 0);
+	KASSERT(npages > 0);
 	KASSERT(len > 0);
 	for (int i = 0; i < npages; i++) {
 		pg = pgs[i];
 		KASSERT(len > 0);
 		/*
 		 * Caller is responsible for ensuring all the pages are
 		 * available.
 		 */
-		KASSERT(pg != NULL && pg != PGO_DONTCARE);
+		KASSERT(pg != NULL);
 		KASSERT(pg != PGO_DONTCARE);
 		pa = VM_PAGE_TO_PHYS(pg);
 		todo = MIN(len, PAGE_SIZE - pgoff);
 		error = pmap_direct_process(pa, pgoff, todo, process, arg);
 		if (error)
 			break;
 		pgoff = 0;
 		len -= todo;
+	}
 	KASSERTMSG(error != 0 || len == 0, "len %lu != 0 for non-error", len);

 @@ -1,14 +1,14 @@
-/* $NetBSD: uvm_physseg.c,v 1.17 2020/07/15 15:08:26 rin Exp $ */
+/* $NetBSD: uvm_physseg.c,v 1.18 2023/04/09 09:00:56 riastradh 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:
 @@ -163,27 +163,28 @@ uvm_physseg_alloc(size_t sz)
 	 * During boot time, we only support allocating vm_physseg
 	 * entries from the static array.
 	 * We need to assert for this.
 	 */
 	if (__predict_false(uvm.page_init_done == false)) {
 		if (sz % sizeof(struct uvm_physseg))
 			panic("%s: tried to alloc size other than multiple"
 			    " of struct uvm_physseg at boot\n", __func__);
 		size_t n = sz / sizeof(struct uvm_physseg);
 		nseg += n;
-		KASSERT(nseg > 0 && nseg <= VM_PHYSSEG_MAX);
+		KASSERT(nseg > 0);
 		KASSERT(nseg <= VM_PHYSSEG_MAX);
 		return &uvm_physseg[nseg - n];
+	}
 	return kmem_zalloc(sz, KM_NOSLEEP);
+}
 static void
 uvm_physseg_free(void *p, size_t sz)
+{
 	/*
 	 * This is a bit tricky. We do allow simulation of free()
 	 * during boot (for eg: when MD code is "steal"ing memory,
 @@ -1002,42 +1003,44 @@ uvm_physseg_get_avail_start(uvm_physseg_
 	return HANDLE_TO_PHYSSEG_NODE(upm)->avail_start;
+}
 #if defined(UVM_PHYSSEG_LEGACY)
 void
 uvm_physseg_set_avail_start(uvm_physseg_t upm, paddr_t avail_start)
+{
 	struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
 #if defined(DIAGNOSTIC)
 	paddr_t avail_end;
 	avail_end = uvm_physseg_get_avail_end(upm);
 	KASSERT(uvm_physseg_valid_p(upm));
-	KASSERT(avail_start < avail_end && avail_start >= ps->start);
+	KASSERT(avail_start < avail_end);
 	KASSERT(avail_start >= ps->start);
 #endif
 	ps->avail_start = avail_start;
+}
 void
 uvm_physseg_set_avail_end(uvm_physseg_t upm, paddr_t avail_end)
+{
 	struct uvm_physseg *ps = HANDLE_TO_PHYSSEG_NODE(upm);
 #if defined(DIAGNOSTIC)
 	paddr_t avail_start;
 	avail_start = uvm_physseg_get_avail_start(upm);
 	KASSERT(uvm_physseg_valid_p(upm));
-	KASSERT(avail_end > avail_start && avail_end <= ps->end);
+	KASSERT(avail_end > avail_start);
 	KASSERT(avail_end <= ps->end);
 #endif
 	ps->avail_end = avail_end;
+}
 #endif /* UVM_PHYSSEG_LEGACY */
 paddr_t
 uvm_physseg_get_avail_end(uvm_physseg_t upm)
+{
 	if (uvm_physseg_valid_p(upm) == false)
 		return (paddr_t) -1;
 @@ -1083,27 +1086,28 @@ uvm_physseg_set_start_hint(uvm_physseg_t
 	HANDLE_TO_PHYSSEG_NODE(upm)->start_hint = start_hint;
 	return true;
+}
 void
 uvm_physseg_init_seg(uvm_physseg_t upm, struct vm_page *pgs)
+{
 	psize_t i;
 	psize_t n;
 	paddr_t paddr;
 	struct uvm_physseg *seg;
 	struct vm_page *pg;
-	KASSERT(upm != UVM_PHYSSEG_TYPE_INVALID && pgs != NULL);
+	KASSERT(upm != UVM_PHYSSEG_TYPE_INVALID);
 	KASSERT(pgs != NULL);
 	seg = HANDLE_TO_PHYSSEG_NODE(upm);
 	KASSERT(seg != NULL);
 	KASSERT(seg->pgs == NULL);
 	n = seg->end - seg->start;
 	seg->pgs = pgs;
 	/* init and free vm_pages (we've already zeroed them) */
 	paddr = ctob(seg->start);
 	for (i = 0 ; i < n ; i++, paddr += PAGE_SIZE) {
 		pg = &seg->pgs[i];
 		pg->phys_addr = paddr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_swap.c,v 1.207 2022/12/21 02:28:06 chs Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.208 2023/04/09 09:00:56 riastradh Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * 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.
+ *
  * from: NetBSD: vm_swap.c,v 1.52 1997/12/02 13:47:37 pk Exp
  * from: Id: uvm_swap.c,v 1.1.2.42 1998/02/02 20:38:06 chuck Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.207 2022/12/21 02:28:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.208 2023/04/09 09:00:56 riastradh Exp $");
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_vmswap.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/cprng.h>
 @@ -1863,27 +1863,28 @@ uvm_swap_io(struct vm_page **pps, int st
 	bool write, async, swap_encrypt;
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLARGS(pdhist, "<- called, startslot=%jd, npages=%jd, flags=%#jx",
 	    startslot, npages, flags, 0);
 	write = (flags & B_READ) == 0;
 	async = (flags & B_ASYNC) != 0;
 	swap_encrypt = atomic_load_relaxed(&uvm_swap_encrypt);
 	/*
 	 * allocate a buf for the i/o.
 	 */
-	KASSERT(curlwp != uvm.pagedaemon_lwp || (write && async));
+	KASSERT(curlwp != uvm.pagedaemon_lwp || write);
 	KASSERT(curlwp != uvm.pagedaemon_lwp || async);
 	bp = getiobuf(swapdev_vp, curlwp != uvm.pagedaemon_lwp);
 	if (bp == NULL) {
 		uvm_aio_aiodone_pages(pps, npages, true, ENOMEM);
 		return ENOMEM;
+	}
 	/*
 	 * convert starting drum slot to block number
 	 */
 	startblk = btodb((uint64_t)startslot << PAGE_SHIFT);
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_vnode.c,v 1.118 2021/03/13 15:29:55 skrll Exp $	*/
+/*	$NetBSD: uvm_vnode.c,v 1.119 2023/04/09 09:00:56 riastradh Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.
  * Copyright (c) 1990 University of Utah.
+ *
  * 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.
+ *
 @@ -35,27 +35,27 @@
  * 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.
+ *
  *      @(#)vnode_pager.c       8.8 (Berkeley) 2/13/94
  * from: Id: uvm_vnode.c,v 1.1.2.26 1998/02/02 20:38:07 chuck Exp
  */
 /*
  * uvm_vnode.c: the vnode pager.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.118 2021/03/13 15:29:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.119 2023/04/09 09:00:56 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_uvmhist.h"
 #endif
 #include <sys/atomic.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 @@ -439,54 +439,56 @@ uvm_vnp_setsize(struct vnode *vp, voff_t
 	voff_t pgend = round_page(newsize);
 	voff_t oldsize;
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(ubchist);
 	rw_enter(uobj->vmobjlock, RW_WRITER);
 	UVMHIST_LOG(ubchist, "vp %#jx old %#jx new %#jx",
 	    (uintptr_t)vp, vp->v_size, newsize, 0);
 	/*
 	 * now check if the size has changed: if we shrink we had better
 	 * toss some pages...
 	 */
-	KASSERT(newsize != VSIZENOTSET && newsize >= 0);
+	KASSERT(newsize != VSIZENOTSET);
 	KASSERT(newsize >= 0);
 	KASSERT(vp->v_size <= vp->v_writesize);
 	KASSERT(vp->v_size == vp->v_writesize ||
 	    newsize == vp->v_writesize || newsize <= vp->v_size);
 	oldsize = vp->v_writesize;
 	/*
 	 * check whether size shrinks
 	 * if old size hasn't been set, there are no pages to drop
 	 * if there was an integer overflow in pgend, then this is no shrink
 	 */
 	if (oldsize > pgend && oldsize != VSIZENOTSET && pgend >= 0) {
 		(void) uvn_put(uobj, pgend, 0, PGO_FREE | PGO_SYNCIO);
 		rw_enter(uobj->vmobjlock, RW_WRITER);
+	}
 	mutex_enter(vp->v_interlock);
 	vp->v_size = vp->v_writesize = newsize;
 	mutex_exit(vp->v_interlock);
 	rw_exit(uobj->vmobjlock);
+}
 void
 uvm_vnp_setwritesize(struct vnode *vp, voff_t newsize)
+{
 	rw_enter(vp->v_uobj.vmobjlock, RW_WRITER);
-	KASSERT(newsize != VSIZENOTSET && newsize >= 0);
+	KASSERT(newsize != VSIZENOTSET);
 	KASSERT(newsize >= 0);
 	KASSERT(vp->v_size != VSIZENOTSET);
 	KASSERT(vp->v_writesize != VSIZENOTSET);
 	KASSERT(vp->v_size <= vp->v_writesize);
 	KASSERT(vp->v_size <= newsize);
 	mutex_enter(vp->v_interlock);
 	vp->v_writesize = newsize;
 	mutex_exit(vp->v_interlock);
 	rw_exit(vp->v_uobj.vmobjlock);
+}
 bool
 uvn_text_p(struct uvm_object *uobj)
+{