 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.284 2021/05/30 01:41:45 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.285 2021/05/30 04:04:26 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
  * 	The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Andrew Doran and Mindaugas Rasiukevicius,
  * and by Chris G. Demetriou.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -125,27 +125,27 @@
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include "opt_lockdebug.h"
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.284 2021/05/30 01:41:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.285 2021/05/30 04:04:26 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
 @@ -3348,118 +3348,112 @@ pmap_pv_page_alloc(struct pool *pp, int
+ *
  *	Free a pv_entry pool page.
  */
 static void
 pmap_pv_page_free(struct pool *pp, void *v)
+{
 	pmap_physpage_free(ALPHA_K0SEG_TO_PHYS((vaddr_t)v));
+}
 /******************** misc. functions ********************/
 /*
  * Pages that are in-use as page table pages should never be part
  * of a UVM loan, so we'll use that field for our PT page reference
  * count.
  */
 #define	PHYSPAGE_REFCNT(pg)	atomic_load_relaxed(&(pg)->loan_count)
 #define	PHYSPAGE_REFCNT_INC(pg)	atomic_inc_uint_nv(&(pg)->loan_count)
 #define	PHYSPAGE_REFCNT_DEC(pg)	atomic_dec_uint_nv(&(pg)->loan_count)
 /*
  * pmap_physpage_alloc:
+ *
  *	Allocate a single page from the VM system and return the
  *	physical address for that page.
  */
 static struct vm_page *
 pmap_physpage_alloc(int usage)
+{
 	struct vm_page *pg;
 	/*
 	 * Don't ask for a zero'd page in the L1PT case -- we will
 	 * properly initialize it in the constructor.
 	 */
 	pg = uvm_pagealloc(NULL, 0, NULL, usage == PGU_L1PT ?
 	    UVM_PGA_USERESERVE : UVM_PGA_USERESERVE|UVM_PGA_ZERO);
 	if (pg != NULL) {
-#ifdef DEBUG
+		KASSERT(PHYSPAGE_REFCNT(pg) == 0);
 		struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 		if (md->pvh_refcnt != 0) {
 			printf("pmap_physpage_alloc: page 0x%lx has "
 			    "%d references\n", pa, md->pvh_refcnt);
 			panic("pmap_physpage_alloc");
 #endif
+	}
 	return pg;
+}
 /*
  * pmap_physpage_free:
+ *
  *	Free the single page table page at the specified physical address.
  */
 static void
 pmap_physpage_free(paddr_t pa)
+{
 	struct vm_page *pg;
 	if ((pg = PHYS_TO_VM_PAGE(pa)) == NULL)
 		panic("pmap_physpage_free: bogus physical page address");
-#ifdef DEBUG
+	KASSERT(PHYSPAGE_REFCNT(pg) == 0);
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	if (md->pvh_refcnt != 0)
 		panic("pmap_physpage_free: page still has references");
 #endif
 	uvm_pagefree(pg);
+}
 /*
  * pmap_physpage_addref:
+ *
  *	Add a reference to the specified special use page.
  */
 static int
 pmap_physpage_addref(void *kva)
+{
 	struct vm_page *pg;
 	struct vm_page_md *md;
 	paddr_t pa;
 	pa = ALPHA_K0SEG_TO_PHYS(trunc_page((vaddr_t)kva));
 	pg = PHYS_TO_VM_PAGE(pa);
 	md = VM_PAGE_TO_MD(pg);
-	KASSERT((int)md->pvh_refcnt >= 0);
+	KASSERT(PHYSPAGE_REFCNT(pg) < UINT32_MAX);
-	return atomic_inc_uint_nv(&md->pvh_refcnt);
+	return PHYSPAGE_REFCNT_INC(pg);
+}
 /*
  * pmap_physpage_delref:
+ *
  *	Delete a reference to the specified special use page.
  */
 static int
 pmap_physpage_delref(void *kva)
+{
 	struct vm_page *pg;
 	struct vm_page_md *md;
 	paddr_t pa;
 	pa = ALPHA_K0SEG_TO_PHYS(trunc_page((vaddr_t)kva));
 	pg = PHYS_TO_VM_PAGE(pa);
 	md = VM_PAGE_TO_MD(pg);
-	KASSERT((int)md->pvh_refcnt > 0);
+	KASSERT(PHYSPAGE_REFCNT(pg) != 0);
-	return atomic_dec_uint_nv(&md->pvh_refcnt);
+	return PHYSPAGE_REFCNT_DEC(pg);
+}
 /******************** page table page management ********************/
 static bool
 pmap_kptpage_alloc(paddr_t *pap)
+{
 	if (uvm.page_init_done == false) {
 		/*
 		 * We're growing the kernel pmap early (from
 		 * uvm_pageboot_alloc()).  This case must
 		 * be handled a little differently.
 		 */
 @@ -3675,30 +3669,28 @@ pmap_ptpage_free(pmap_t pmap, pt_entry_t
     struct pmap_tlb_context * const tlbctx)
+{
 	/*
 	 * Extract the physical address of the page from the PTE
 	 * and clear the entry.
 	 */
 	const paddr_t ptpa = pmap_pte_pa(pte);
 	atomic_store_relaxed(pte, PG_NV);
 	struct vm_page * const pg = PHYS_TO_VM_PAGE(ptpa);
 	KASSERT(pg != NULL);
 	KASSERT(PHYSPAGE_REFCNT(pg) == 0);
 #ifdef DEBUG
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	KDASSERT(md->pvh_refcnt == 0);
 	pmap_zero_page(ptpa);
 #endif
 	LIST_REMOVE(pg, pageq.list);
 	LIST_INSERT_HEAD(&tlbctx->t_freeptq, pg, pageq.list);
+}
 /*
  * pmap_l3pt_delref:
+ *
  *	Delete a reference on a level 3 PT page.  If the reference drops
  *	to zero, free it.
+ *

 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.h,v 1.90 2021/05/30 01:41:45 thorpej Exp $ */
+/* $NetBSD: pmap.h,v 1.91 2021/05/30 04:04:26 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -351,25 +351,24 @@ do {									\
 	if ((pmap)->pm_percpu[cpu_id].pmc_needisync) {			\
 		(pmap)->pm_percpu[cpu_id].pmc_needisync = 0;		\
 		alpha_pal_imb();					\
 	}								\
 } while (0)
 /*
  * pmap-specific data store in the vm_page structure.
  */
 #define	__HAVE_VM_PAGE_MD
 struct vm_page_md {
 	struct pv_entry *pvh_list;		/* pv_entry list */
 	int pvh_attrs;				/* page attributes */
 	unsigned pvh_refcnt;
 };
 #define	VM_MDPAGE_INIT(pg)						\
 do {									\
 	(pg)->mdpage.pvh_list = NULL;					\
-	(pg)->mdpage.pvh_refcnt = 0;					\
+	(pg)->mdpage.pvh_attrs = 0;					\
 } while (/*CONSTCOND*/0)
 #endif /* _KERNEL */
 #endif /* _PMAP_MACHINE_ */