Module Name: src
Committed By: skrll
Date: Thu Apr 29 09:27:29 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: asan.h
Log Message:
Remove some unnecessary tlb invalidate in pmap_growkernel and ASAN shadow
map. Ensure the shadow map mappings are visible to the TLB walkers.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/include/asan.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.105 src/sys/arch/aarch64/aarch64/pmap.c:1.106
--- src/sys/arch/aarch64/aarch64/pmap.c:1.105 Wed Apr 21 09:52:20 2021
+++ src/sys/arch/aarch64/aarch64/pmap.c Thu Apr 29 09:27:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.105 2021/04/21 09:52:20 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.106 2021/04/29 09:27:29 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.105 2021/04/21 09:52:20 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.106 2021/04/29 09:27:29 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -756,7 +756,6 @@ pmap_growkernel(vaddr_t maxkvaddr)
__func__, error);
}
}
- aarch64_tlbi_by_asid(pm->pm_asid);
kasan_shadow_map((void *)pmap_maxkvaddr,
(size_t)(va - pmap_maxkvaddr));
pmap_maxkvaddr = va;
Index: src/sys/arch/aarch64/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.17 src/sys/arch/aarch64/include/asan.h:1.18
--- src/sys/arch/aarch64/include/asan.h:1.17 Sun Mar 21 07:32:44 2021
+++ src/sys/arch/aarch64/include/asan.h Thu Apr 29 09:27:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.17 2021/03/21 07:32:44 skrll Exp $ */
+/* $NetBSD: asan.h,v 1.18 2021/04/29 09:27:29 skrll Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -189,8 +189,9 @@ kasan_md_shadow_map_page(vaddr_t va)
atomic_swap_64(&l3[idx], pa | L3_PAGE | LX_BLKPAG_UXN |
LX_BLKPAG_PXN | LX_BLKPAG_AF | LX_BLKPAG_SH_IS |
LX_BLKPAG_AP_RW | LX_BLKPAG_ATTR_NORMAL_WB);
- aarch64_tlbi_by_va(va);
}
+ dsb(ishst);
+ isb();
}
static void
