[src/trunk]: src/sys/arch/amd64/include Fix KUBSAN: the kernel size now excee...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4fc336894ba
branches:  trunk
changeset: 460730:c4fc336894ba
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Nov 01 15:11:43 2019 +0000

description:
Fix KUBSAN: the kernel size now exceeds the mapping limit, so bump the
limit.

diffstat:

 sys/arch/amd64/include/pmap.h |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 42c72c2a111c -r c4fc336894ba sys/arch/amd64/include/pmap.h
--- a/sys/arch/amd64/include/pmap.h     Fri Nov 01 15:01:27 2019 +0000
+++ b/sys/arch/amd64/include/pmap.h     Fri Nov 01 15:11:43 2019 +0000
@@ -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 @@
 
 #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