Module Name: src
Committed By: skrll
Date: Sat Sep 19 13:33:08 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: asan.h pmap.h
Log Message:
Make __md_palloc pmap agnostic (think sys/uvm/pmap)
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/aarch64/include/pmap.h
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.89 src/sys/arch/aarch64/aarch64/pmap.c:1.90
--- src/sys/arch/aarch64/aarch64/pmap.c:1.89 Mon Sep 14 10:06:35 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.89 2020/09/14 10:06:35 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.90 2020/09/19 13:33:08 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.89 2020/09/14 10:06:35 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.90 2020/09/19 13:33:08 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -598,7 +598,7 @@ pmap_reference(struct pmap *pm)
atomic_inc_uint(&pm->pm_refcnt);
}
-paddr_t
+static paddr_t
pmap_alloc_pdp(struct pmap *pm, struct vm_page **pgp, int flags, bool waitok)
{
paddr_t pa;
Index: src/sys/arch/aarch64/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.11 src/sys/arch/aarch64/include/asan.h:1.12
--- src/sys/arch/aarch64/include/asan.h:1.11 Thu Sep 10 14:10:46 2020
+++ src/sys/arch/aarch64/include/asan.h Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.11 2020/09/10 14:10:46 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.12 2020/09/19 13:33:08 skrll Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -68,12 +68,29 @@ __md_palloc(void)
{
paddr_t pa;
- if (__predict_false(__md_early))
+ if (__predict_false(__md_early)) {
pa = (paddr_t)pmapboot_pagealloc();
- else
- pa = pmap_alloc_pdp(pmap_kernel(), NULL, 0, false);
+ return pa;
+ }
+
+ vaddr_t va;
+ if (!uvm.page_init_done) {
+ va = uvm_pageboot_alloc(PAGE_SIZE);
+ pa = AARCH64_KVA_TO_PA(va);
+ } else {
+ struct vm_page *pg;
+retry:
+ pg = uvm_pagealloc(NULL, 0, NULL, 0);
+ if (pg == NULL) {
+ uvm_wait(__func__);
+ goto retry;
+ }
+
+ pa = VM_PAGE_TO_PHYS(pg);
+ va = AARCH64_PA_TO_KVA(pa);
+ }
- /* The page is zeroed. */
+ __builtin_memset((void *)va, 0, PAGE_SIZE);
return pa;
}
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.42 src/sys/arch/aarch64/include/pmap.h:1.43
--- src/sys/arch/aarch64/include/pmap.h:1.42 Wed Aug 12 13:36:36 2020
+++ src/sys/arch/aarch64/include/pmap.h Sat Sep 19 13:33:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.42 2020/08/12 13:36:36 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.43 2020/09/19 13:33:08 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -205,8 +205,6 @@ const struct pmap_devmap *pmap_devmap_fi
vaddr_t pmap_devmap_phystov(paddr_t);
paddr_t pmap_devmap_vtophys(paddr_t);
-paddr_t pmap_alloc_pdp(struct pmap *, struct vm_page **, int, bool);
-
#define L1_TRUNC_BLOCK(x) ((x) & L1_FRAME)
#define L1_ROUND_BLOCK(x) L1_TRUNC_BLOCK((x) + L1_SIZE - 1)
#define L2_TRUNC_BLOCK(x) ((x) & L2_FRAME)
