From owner-svn-src-projects@FreeBSD.ORG Wed Aug 20 15:57:53 2014 Return-Path: Delivered-To: svn-src-projects@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 3A2474FA; Wed, 20 Aug 2014 15:57:53 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C5553045; Wed, 20 Aug 2014 15:57:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KFvqPf074983; Wed, 20 Aug 2014 15:57:52 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KFvqCm074982; Wed, 20 Aug 2014 15:57:52 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201408201557.s7KFvqCm074982@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 20 Aug 2014 15:57:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270220 - projects/arm64/sys/arm64/arm64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2014 15:57:53 -0000 Author: andrew Date: Wed Aug 20 15:57:52 2014 New Revision: 270220 URL: http://svnweb.freebsd.org/changeset/base/270220 Log: Update pmap_enter to allocate l2 and l3 tables as needed. Modified: projects/arm64/sys/arm64/arm64/pmap.c Modified: projects/arm64/sys/arm64/arm64/pmap.c ============================================================================== --- projects/arm64/sys/arm64/arm64/pmap.c Wed Aug 20 15:56:18 2014 (r270219) +++ projects/arm64/sys/arm64/arm64/pmap.c Wed Aug 20 15:57:52 2014 (r270220) @@ -843,17 +843,50 @@ void pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, vm_prot_t prot, boolean_t wired) { - vm_paddr_t pa; - pt_entry_t *l3, opte; + pt_entry_t *l1, *l2, *l3, opte; + vm_paddr_t pa, pte_pa; + vm_page_t pte_m; PMAP_LOCK(pmap); - pa = VM_PAGE_TO_PHYS(m); l3 = pmap_l3(pmap, va); - KASSERT(l3 != NULL, ("TODO: grow va")); - KASSERT(pmap == pmap_kernel(), ("Only kernel mappings for now")); + + /* TODO: This is not optimal, but should mostly work */ + if (l3 == NULL) { + l2 = pmap_l2(pmap, va); + + if (l2 == NULL) { + pte_m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | + VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + if (pte_m == NULL) + panic("pmap_enter: l2 pte_m == NULL"); + if ((pte_m->flags & PG_ZERO) == 0) + pmap_zero_page(pte_m); + + pte_pa = VM_PAGE_TO_PHYS(pte_m); + l1 = pmap_l1(pmap, va); + *l1 = pte_pa | ATTR_AF | L1_TABLE; + l2 = pmap_l2(pmap, va); + } + KASSERT(l2 != NULL, ("TODO: grow l2 va")); + + pte_m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | + VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + if (pte_m == NULL) + panic("pmap_enter: l3 pte_m == NULL"); + if ((pte_m->flags & PG_ZERO) == 0) + pmap_zero_page(pte_m); + + pte_pa = VM_PAGE_TO_PHYS(pte_m); + *l2 = pte_pa | ATTR_AF | L2_TABLE; + l3 = pmap_l3(pmap, va); + } + + KASSERT(l3 != NULL, ("TODO: grow l3 va")); opte = *l3; + if (opte != 0) printf("%llx\n", opte); KASSERT(opte == 0, ("TODO: Update the entry")); + pa = VM_PAGE_TO_PHYS(m); *l3 = (pa & ~L3_OFFSET) | ATTR_AF | L3_PAGE; PMAP_UNLOCK(pmap);