Module Name: src
Committed By: maxv
Date: Tue Jun 23 17:21:55 UTC 2020
Modified Files:
src/sys/arch/aarch64/include: asan.h
src/sys/arch/amd64/include: asan.h
Log Message:
Rename __MD_CANONICAL_BASE -> __MD_KERNMEM_BASE for clarity.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/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/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.6 src/sys/arch/aarch64/include/asan.h:1.7
--- src/sys/arch/aarch64/include/asan.h:1.6 Mon Apr 8 21:18:22 2019
+++ src/sys/arch/aarch64/include/asan.h Tue Jun 23 17:21:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.6 2019/04/08 21:18:22 ryo Exp $ */
+/* $NetBSD: asan.h,v 1.7 2020/06/23 17:21:55 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <aarch64/machdep.h>
#define __MD_VIRTUAL_SHIFT 48 /* 49bit address space, cut half */
-#define __MD_CANONICAL_BASE 0xFFFF000000000000
+#define __MD_KERNMEM_BASE 0xFFFF000000000000 /* kern mem base address */
#define __MD_SHADOW_SIZE (1ULL << (__MD_VIRTUAL_SHIFT - KASAN_SHADOW_SCALE_SHIFT))
#define KASAN_MD_SHADOW_START (AARCH64_KSEG_END)
@@ -52,7 +52,7 @@ kasan_md_addr_to_shad(const void *addr)
{
vaddr_t va = (vaddr_t)addr;
return (int8_t *)(KASAN_MD_SHADOW_START +
- ((va - __MD_CANONICAL_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
+ ((va - __MD_KERNMEM_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
}
static inline bool
Index: src/sys/arch/amd64/include/asan.h
diff -u src/sys/arch/amd64/include/asan.h:1.6 src/sys/arch/amd64/include/asan.h:1.7
--- src/sys/arch/amd64/include/asan.h:1.6 Sat May 2 16:28:37 2020
+++ src/sys/arch/amd64/include/asan.h Tue Jun 23 17:21:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.6 2020/05/02 16:28:37 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.7 2020/06/23 17:21:55 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#endif
#define __MD_VIRTUAL_SHIFT 47 /* 48bit address space, cut half */
-#define __MD_CANONICAL_BASE 0xFFFF800000000000
+#define __MD_KERNMEM_BASE 0xFFFF800000000000 /* kern mem base address */
#define __MD_SHADOW_SIZE (1ULL << (__MD_VIRTUAL_SHIFT - KASAN_SHADOW_SCALE_SHIFT))
#define KASAN_MD_SHADOW_START (VA_SIGN_NEG((L4_SLOT_KASAN * NBPD_L4)))
@@ -113,7 +113,7 @@ kasan_md_addr_to_shad(const void *addr)
{
vaddr_t va = (vaddr_t)addr;
return (int8_t *)(KASAN_MD_SHADOW_START +
- ((va - __MD_CANONICAL_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
+ ((va - __MD_KERNMEM_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
}
static inline bool
