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.6
------>
commit 2c3d4203ed393d91ba79a0fa59f5e1ce5fe7627a
Author: Andrey Ryabinin <[email protected]>
Date:   Thu Sep 3 19:27:49 2015 +0400

    ms/x86/init: Clear 'init_level4_pgt' earlier
    
    https://jira.sw.ru/browse/PSBM-26429
    
    From: Andrey Ryabinin <[email protected]>
    
    commit d0f77d4d04b222a817925d33ba3589b190bfa863 upstream.
    
    Currently x86_64_start_kernel() has two KASAN related
    function calls. The first call maps shadow to early_level4_pgt,
    the second maps shadow to init_level4_pgt.
    
    If we move clear_page(init_level4_pgt) earlier, we could hide
    KASAN low level detail from generic x86_64 initialization code.
    The next patch will do it.
    
    Signed-off-by: Andrey Ryabinin <[email protected]>
    Cc: <[email protected]> # 4.0+
    Cc: Alexander Popov <[email protected]>
    Cc: Alexander Potapenko <[email protected]>
    Cc: Andrey Konovalov <[email protected]>
    Cc: Borislav Petkov <[email protected]>
    Cc: Dmitry Vyukov <[email protected]>
    Cc: Linus Torvalds <[email protected]>
    Cc: Peter Zijlstra <[email protected]>
    Cc: Thomas Gleixner <[email protected]>
    Link: 
http://lkml.kernel.org/r/[email protected]
    Signed-off-by: Ingo Molnar <[email protected]>
    Signed-off-by: Andrey Ryabinin <[email protected]>
    
    Signed-off-by: Andrey Ryabinin <[email protected]>
---
 arch/x86/kernel/head64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 67df086..357ce8a 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -164,6 +164,8 @@ void __init x86_64_start_kernel(char * real_mode_data)
        /* clear bss before set_intr_gate with early_idt_handler */
        clear_bss();
 
+       clear_page(init_level4_pgt);
+
        for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
                set_intr_gate(i, early_idt_handlers[i]);
        load_idt((const struct desc_ptr *)&idt_descr);
@@ -178,7 +180,6 @@ void __init x86_64_start_kernel(char * real_mode_data)
        if (console_loglevel == 10)
                early_printk("Kernel alive\n");
 
-       clear_page(init_level4_pgt);
        /* set init_level4_pgt kernel high mapping*/
        init_level4_pgt[511] = early_level4_pgt[511];
 
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to