lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 4/4] x86: also use debug_pagealloc_enabled() for free_init_pages
    Date
    we want to couple all debugging features with debug_pagealloc_enabled()
    and not with the config option CONFIG_DEBUG_PAGEALLOC.

    Suggested-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    ---
    arch/x86/mm/init.c | 29 +++++++++++++++--------------
    1 file changed, 15 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
    index 39823fd..9d56f27 100644
    --- a/arch/x86/mm/init.c
    +++ b/arch/x86/mm/init.c
    @@ -667,21 +667,22 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
    * mark them not present - any buggy init-section access will
    * create a kernel page fault:
    */
    -#ifdef CONFIG_DEBUG_PAGEALLOC
    - printk(KERN_INFO "debug: unmapping init [mem %#010lx-%#010lx]\n",
    - begin, end - 1);
    - set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
    -#else
    - /*
    - * We just marked the kernel text read only above, now that
    - * we are going to free part of that, we need to make that
    - * writeable and non-executable first.
    - */
    - set_memory_nx(begin, (end - begin) >> PAGE_SHIFT);
    - set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
    + if (debug_pagealloc_enabled()) {
    + pr_info("debug: unmapping init [mem %#010lx-%#010lx]\n",
    + begin, end - 1);
    + set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
    + } else {
    + /*
    + * We just marked the kernel text read only above, now that
    + * we are going to free part of that, we need to make that
    + * writeable and non-executable first.
    + */
    + set_memory_nx(begin, (end - begin) >> PAGE_SHIFT);
    + set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);

    - free_reserved_area((void *)begin, (void *)end, POISON_FREE_INITMEM, what);
    -#endif
    + free_reserved_area((void *)begin, (void *)end,
    + POISON_FREE_INITMEM, what);
    + }
    }

    void free_initmem(void)
    --
    2.3.0
    \
     
     \ /
      Last update: 2016-02-03 10:01    [W:4.452 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site