[Devel] [PATCH RHEL7 COMMIT] kexec, kasan: increase KEXEC_AUTO_RESERVED_SIZE under CONFIG_KASAN=y

[Vladimir Davydov]

The commit is pushed to "branch-rh7-3.10.0-229.7.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.6.8
------>
commit 5a1ebaa3041e7648f5cf248bb0561ad208245126
Author: Andrey Ryabinin <aryabinin at odin.com>
Date:   Tue Sep 8 19:30:58 2015 +0400

    kexec, kasan: increase KEXEC_AUTO_RESERVED_SIZE under CONFIG_KASAN=y
    
    CONFIG_KASAN=y significantly increases kernel's memory usage.
    160Mb for crash kernel is not enough. Increase it up to
    196Mb.
    
    https://jira.sw.ru/browse/PSBM-39339
    
    Signed-off-by: Andrey Ryabinin <aryabinin at odin.com>
---
 include/asm-generic/kexec.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/asm-generic/kexec.h b/include/asm-generic/kexec.h
index 76726f09b59b..ab22eaf20423 100644
--- a/include/asm-generic/kexec.h
+++ b/include/asm-generic/kexec.h
@@ -4,7 +4,11 @@
 #ifdef CONFIG_KEXEC_AUTO_RESERVE
 
 #ifndef KEXEC_AUTO_RESERVED_SIZE
+#ifndef CONFIG_KASAN
 #define KEXEC_AUTO_RESERVED_SIZE ((1ULL<<27) + (1ULL<<25)) /* 160M */
+#else
+#define KEXEC_AUTO_RESERVED_SIZE ((1ULL<<27) + (1ULL<<26)) /* 196M */
+#endif
 #endif
 #ifndef KEXEC_AUTO_THRESHOLD
 #define KEXEC_AUTO_THRESHOLD (1ULL<<31) /* 2G */