Module Name: src
Committed By: skrll
Date: Mon Dec 30 16:03:48 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Update pmap_map_chunk to allow L[12] block mappings and L3 page mappings
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/aarch64/aarch64/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.59 src/sys/arch/aarch64/aarch64/pmap.c:1.60
--- src/sys/arch/aarch64/aarch64/pmap.c:1.59 Mon Dec 30 15:42:39 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Dec 30 16:03:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.60 2019/12/30 16:03:48 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60 2019/12/30 16:03:48 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -268,6 +268,12 @@ pm_unlock(struct pmap *pm)
static const struct pmap_devmap *pmap_devmap_table;
+#define L1_BLK_MAPPABLE_P(va, pa, size) \
+ ((((va) | (pa)) & L1_OFFSET) == 0 && (size) >= L1_SIZE)
+
+#define L2_BLK_MAPPABLE_P(va, pa, size) \
+ ((((va) | (pa)) & L2_OFFSET) == 0 && (size) >= L2_SIZE)
+
static vsize_t
pmap_map_chunk(vaddr_t va, paddr_t pa, vsize_t size,
vm_prot_t prot, u_int flags)
@@ -276,25 +282,40 @@ pmap_map_chunk(vaddr_t va, paddr_t pa, v
psize_t blocksize;
int rc;
- /* devmap always use L2 mapping */
- blocksize = L2_SIZE;
+ vsize_t resid = round_page(size);
+ vsize_t mapped = 0;
- attr = _pmap_pte_adjust_prot(L2_BLOCK, prot, VM_PROT_ALL, false);
- attr = _pmap_pte_adjust_cacheflags(attr, flags);
- /* user cannot execute, and kernel follows the prot */
- attr |= (LX_BLKPAG_UXN|LX_BLKPAG_PXN);
- if (prot & VM_PROT_EXECUTE)
- attr &= ~LX_BLKPAG_PXN;
+ while (resid > 0) {
+ if (L1_BLK_MAPPABLE_P(va, pa, resid)) {
+ blocksize = L1_SIZE;
+ attr = L1_BLOCK;
+ } else if (L2_BLK_MAPPABLE_P(va, pa, resid)) {
+ blocksize = L2_SIZE;
+ attr = L2_BLOCK;
+ } else {
+ blocksize = L3_SIZE;
+ attr = L3_PAGE;
+ }
+
+ attr = _pmap_pte_adjust_prot(attr, prot, VM_PROT_ALL, false);
+ attr = _pmap_pte_adjust_cacheflags(attr, flags);
- rc = pmapboot_enter(va, pa, size, blocksize, attr,
- PMAPBOOT_ENTER_NOOVERWRITE, bootpage_alloc, NULL);
- if (rc != 0)
- panic("%s: pmapboot_enter failed. %lx is already mapped?\n",
- __func__, va);
+ rc = pmapboot_enter(va, pa, blocksize, blocksize, attr,
+ PMAPBOOT_ENTER_NOOVERWRITE, bootpage_alloc, NULL);
+ if (rc != 0) {
+ panic("%s: pmapboot_enter failed. %lx is already mapped?\n",
+ __func__, va);
+ }
- aarch64_tlbi_by_va(va);
+ va += blocksize;
+ pa += blocksize;
+ resid -= blocksize;
+ mapped += blocksize;
+
+ aarch64_tlbi_by_va(va);
+ }
- return ((va + size + blocksize - 1) & ~(blocksize - 1)) - va;
+ return mapped;
}
void
