svn commit: r353571 - releng/12.1/sys/riscv/riscv

[Mark Johnston]

Author: markj
Date: Tue Oct 15 16:27:04 2019
New Revision: 353571
URL: https://svnweb.freebsd.org/changeset/base/353571

Log:
  MFS r353475, r353553:
  Fix a couple of bugs around handling of PGA_WRITEABLE.
  
  Approved by:	re (kib)

Modified:
  releng/12.1/sys/riscv/riscv/pmap.c
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/sys/riscv/riscv/pmap.c
==============================================================================
--- releng/12.1/sys/riscv/riscv/pmap.c	Tue Oct 15 16:05:55 2019	(r353570)
+++ releng/12.1/sys/riscv/riscv/pmap.c	Tue Oct 15 16:27:04 2019	(r353571)
@@ -2090,6 +2090,7 @@ static int
 pmap_remove_l3(pmap_t pmap, pt_entry_t *l3, vm_offset_t va, 
     pd_entry_t l2e, struct spglist *free, struct rwlock **lockp)
 {
+	struct md_page *pvh;
 	pt_entry_t old_l3;
 	vm_paddr_t phys;
 	vm_page_t m;
@@ -2109,6 +2110,12 @@ pmap_remove_l3(pmap_t pmap, pt_entry_t *l3, vm_offset_
 			vm_page_aflag_set(m, PGA_REFERENCED);
 		CHANGE_PV_LIST_LOCK_TO_VM_PAGE(lockp, m);
 		pmap_pvh_free(&m->md, pmap, va);
+		if (TAILQ_EMPTY(&m->md.pv_list) &&
+		    (m->flags & PG_FICTITIOUS) == 0) {
+			pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
+			if (TAILQ_EMPTY(&pvh->pv_list))
+				vm_page_aflag_clear(m, PGA_WRITEABLE);
+		}
 	}
 
 	return (pmap_unuse_pt(pmap, va, l2e, free));
@@ -2830,7 +2837,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v
 			if ((new_l3 & PTE_SW_MANAGED) == 0)
 				free_pv_entry(pmap, pv);
 			if ((om->aflags & PGA_WRITEABLE) != 0 &&
-			    TAILQ_EMPTY(&om->md.pv_list))
+			    TAILQ_EMPTY(&om->md.pv_list) &&
+			    ((om->flags & PG_FICTITIOUS) != 0 ||
+			    TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list)))
 				vm_page_aflag_clear(om, PGA_WRITEABLE);
 		}
 		pmap_invalidate_page(pmap, va);