[src/netbsd-6]: src/sys/uvm Pull up following revision(s) (requested by chs i...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/537b0745d52b
branches:  netbsd-6
changeset: 773997:537b0745d52b
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 09 18:13:11 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #173):
        sys/uvm/uvm_amap.c: revision 1.107
initialize amap per-page reference counts before changing the amap's
overall reference count.  this fixes the crashes seen for the last 9 months
with web browers and plugins, which was also the cause of PR 46193.

diffstat:

 sys/uvm/uvm_amap.c |  26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diffs (102 lines):

diff -r b3d8f45deff0 -r 537b0745d52b sys/uvm/uvm_amap.c
--- a/sys/uvm/uvm_amap.c        Mon Apr 09 18:10:10 2012 +0000
+++ b/sys/uvm/uvm_amap.c        Mon Apr 09 18:13:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_amap.c,v 1.105.2.1 2012/04/03 15:40:36 riz Exp $   */
+/*     $NetBSD: uvm_amap.c,v 1.105.2.2 2012/04/09 18:13:11 riz Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.105.2.1 2012/04/03 15:40:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_amap.c,v 1.105.2.2 2012/04/09 18:13:11 riz Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -888,6 +888,7 @@
                        continue;
                KASSERT(amap->am_anon[lcv]->an_lock == srcamap->am_lock);
                KASSERT(amap->am_anon[lcv]->an_ref > 0);
+               KASSERT(amap->am_nused < amap->am_maxslot);
                amap->am_anon[lcv]->an_ref++;
                amap->am_bckptr[lcv] = amap->am_nused;
                amap->am_slots[amap->am_nused] = lcv;
@@ -1193,6 +1194,7 @@
                }
                ref += adjval;
                KASSERT(ref >= 0);
+               KASSERT(ref <= amap->am_ref);
                if (lcv == prevlcv + prevlen && ref == prevref) {
                        pp_setreflen(ppref, prevlcv, ref, prevlen + len);
                } else {
@@ -1490,6 +1492,7 @@
                }
        } else {
                KASSERT(amap->am_anon[slot] == NULL);
+               KASSERT(amap->am_nused < amap->am_maxslot);
                amap->am_bckptr[slot] = amap->am_nused;
                amap->am_slots[amap->am_nused] = slot;
                amap->am_nused++;
@@ -1534,7 +1537,7 @@
 }
 
 /*
- * amap_adjref_anons: adjust the reference count(s) on anons of the amap.
+ * amap_adjref_anons: adjust the reference count(s) on amap and its anons.
  */
 static void
 amap_adjref_anons(struct vm_amap *amap, vaddr_t offset, vsize_t len,
@@ -1545,9 +1548,19 @@
 #ifdef UVM_AMAP_PPREF
        KASSERT(mutex_owned(amap->am_lock));
 
+       /*
+        * We must establish the ppref array before changing am_ref
+        * so that the ppref values match the current amap refcount.
+        */
+
        if (amap->am_ppref == NULL && !all && len != amap->am_nslot) {
                amap_pp_establish(amap, offset);
        }
+#endif
+
+       amap->am_ref += refv;
+
+#ifdef UVM_AMAP_PPREF
        if (amap->am_ppref && amap->am_ppref != PPREF_NONE) {
                if (all) {
                        amap_pp_adjref(amap, 0, amap->am_nslot, refv, &tofree);
@@ -1575,7 +1588,6 @@
        if (flags & AMAP_SHARED) {
                amap->am_flags |= AMAP_SHARED;
        }
-       amap->am_ref++;
        amap_adjref_anons(amap, offset, len, 1, (flags & AMAP_REFALL) != 0);
 
        UVMHIST_LOG(maphist,"<- done!  amap=0x%x", amap, 0, 0, 0);
@@ -1599,10 +1611,12 @@
            amap, amap->am_ref, amap->am_nused, 0);
        KASSERT(amap->am_ref > 0);
 
-       if (--amap->am_ref == 0) {
+       if (amap->am_ref == 1) {
+
                /*
                 * If the last reference - wipeout and destroy the amap.
                 */
+               amap->am_ref--;
                amap_wipeout(amap);
                UVMHIST_LOG(maphist,"<- done (was last ref)!", 0, 0, 0, 0);
                return;
@@ -1612,7 +1626,7 @@
         * Otherwise, drop the reference count(s) on anons.
         */
 
-       if (amap->am_ref == 1 && (amap->am_flags & AMAP_SHARED) != 0) {
+       if (amap->am_ref == 2 && (amap->am_flags & AMAP_SHARED) != 0) {
                amap->am_flags &= ~AMAP_SHARED;
        }
        amap_adjref_anons(amap, offset, len, -1, all);