Module Name: src
Committed By: maxv
Date: Fri Nov 1 15:11:43 UTC 2019
Modified Files:
src/sys/arch/amd64/include: pmap.h
Log Message:
Fix KUBSAN: the kernel size now exceeds the mapping limit, so bump the
limit.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amd64/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/amd64/include/pmap.h
diff -u src/sys/arch/amd64/include/pmap.h:1.62 src/sys/arch/amd64/include/pmap.h:1.63
--- src/sys/arch/amd64/include/pmap.h:1.62 Wed Aug 7 06:23:48 2019
+++ src/sys/arch/amd64/include/pmap.h Fri Nov 1 15:11:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.62 2019/08/07 06:23:48 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.63 2019/11/01 15:11:43 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -68,6 +68,7 @@
#if defined(_KERNEL_OPT)
#include "opt_xen.h"
#include "opt_kasan.h"
+#include "opt_kubsan.h"
#endif
#include <sys/atomic.h>
@@ -139,7 +140,11 @@ extern pt_entry_t *pte_base;
#define NKL4_KIMG_ENTRIES 1
#define NKL3_KIMG_ENTRIES 1
+#if defined(KUBSAN)
+#define NKL2_KIMG_ENTRIES 64 /* really big kernel */
+#else
#define NKL2_KIMG_ENTRIES 48
+#endif
/*
* Since kva space is below the kernel in its entirety, we start off
