From owner-svn-src-head@FreeBSD.ORG  Sat Feb 15 13:27:46 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 015EF93;
 Sat, 15 Feb 2014 13:27:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E11B416F9;
 Sat, 15 Feb 2014 13:27:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FDRj5i021590;
 Sat, 15 Feb 2014 13:27:45 GMT (envelope-from zbb@svn.freebsd.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FDRjED021589;
 Sat, 15 Feb 2014 13:27:45 GMT (envelope-from zbb@svn.freebsd.org)
Message-Id: <201402151327.s1FDRjED021589@svn.freebsd.org>
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Sat, 15 Feb 2014 13:27:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261922 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Feb 2014 13:27:46 -0000

Author: zbb
Date: Sat Feb 15 13:27:45 2014
New Revision: 261922
URL: http://svnweb.freebsd.org/changeset/base/261922

Log:
  Handle pmap_enter() on already promoted mappings for ARMv6/v7
  
  Attempt to demote the superpage if trying to pmap_enter() on
  one. Panic only when the particular superpage should
  no longer exist for that pmap and address.

Modified:
  head/sys/arm/arm/pmap-v6.c

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Sat Feb 15 13:24:58 2014	(r261921)
+++ head/sys/arm/arm/pmap-v6.c	Sat Feb 15 13:27:45 2014	(r261922)
@@ -2973,8 +2973,10 @@ pmap_enter_locked(pmap_t pmap, vm_offset
 	}
 
 	pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(va)];
-	if ((*pl1pd & L1_TYPE_MASK) == L1_S_PROTO)
-		panic("pmap_enter_locked: attempt pmap_enter_on 1MB page");
+	if ((va < VM_MAXUSER_ADDRESS) &&
+	    (*pl1pd & L1_TYPE_MASK) == L1_S_PROTO) {
+		(void)pmap_demote_section(pmap, va);
+	}
 
 	user = 0;
 	/*
@@ -3014,6 +3016,10 @@ do_l2b_alloc:
 		}
 	}
 
+	pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(va)];
+	if ((*pl1pd & L1_TYPE_MASK) == L1_S_PROTO)
+		panic("pmap_enter: attempt to enter on 1MB page, va: %#x", va);
+
 	ptep = &l2b->l2b_kva[l2pte_index(va)];
 
 	opte = *ptep;