lkml.org 
[lkml]   [2007]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 3/3] Use BOOTMEM_EXCLUSIVE on x86
    This patch uses the BOOTMEM_EXCLUSIVE, introduced in the previous patch,
    to avoid conflicts while reserving the memory for the kdump carpture kernel
    (crashkernel=).

    The modification has been tested on i386.


    Signed-off-by: Bernhard Walle <bwalle@suse.de>

    ---
    arch/x86/kernel/setup_32.c | 28 ++++++++++++++++++----------
    arch/x86/kernel/setup_64.c | 34 +++++++++++++++++++++-------------
    2 files changed, 39 insertions(+), 23 deletions(-)

    --- a/arch/x86/kernel/setup_32.c
    +++ b/arch/x86/kernel/setup_32.c
    @@ -403,18 +403,26 @@ static void __init reserve_crashkernel(v
    ret = parse_crashkernel(boot_command_line, total_mem,
    &crash_size, &crash_base);
    if (ret == 0 && crash_size > 0) {
    - if (crash_base > 0) {
    - printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
    - "for crashkernel (System RAM: %ldMB)\n",
    - (unsigned long)(crash_size >> 20),
    - (unsigned long)(crash_base >> 20),
    - (unsigned long)(total_mem >> 20));
    - crashk_res.start = crash_base;
    - crashk_res.end = crash_base + crash_size - 1;
    - reserve_bootmem(crash_base, crash_size);
    - } else
    + if (crash_base <= 0) {
    printk(KERN_INFO "crashkernel reservation failed - "
    "you have to specify a base address\n");
    + return;
    + }
    +
    + if (reserve_bootmem(crash_base, crash_size,
    + BOOTMEM_EXCLUSIVE) < 0) {
    + printk(KERN_INFO "crashkernel reservation failed - "
    + "memory is in use\n");
    + return;
    + }
    +
    + printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
    + "for crashkernel (System RAM: %ldMB)\n",
    + (unsigned long)(crash_size >> 20),
    + (unsigned long)(crash_base >> 20),
    + (unsigned long)(total_mem >> 20));
    + crashk_res.start = crash_base;
    + crashk_res.end = crash_base + crash_size - 1;
    }
    }
    #else
    --- a/arch/x86/kernel/setup_64.c
    +++ b/arch/x86/kernel/setup_64.c
    @@ -201,27 +201,35 @@ static inline void copy_edd(void)
    #ifdef CONFIG_KEXEC
    static void __init reserve_crashkernel(void)
    {
    - unsigned long long free_mem;
    + unsigned long long total_mem;
    unsigned long long crash_size, crash_base;
    int ret;

    - free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;
    + total_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;

    - ret = parse_crashkernel(boot_command_line, free_mem,
    + ret = parse_crashkernel(boot_command_line, total_mem,
    &crash_size, &crash_base);
    if (ret == 0 && crash_size) {
    - if (crash_base > 0) {
    - printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
    - "for crashkernel (System RAM: %ldMB)\n",
    - (unsigned long)(crash_size >> 20),
    - (unsigned long)(crash_base >> 20),
    - (unsigned long)(free_mem >> 20));
    - crashk_res.start = crash_base;
    - crashk_res.end = crash_base + crash_size - 1;
    - reserve_bootmem(crash_base, crash_size, 0);
    - } else
    + if (crash_base <= 0) {
    printk(KERN_INFO "crashkernel reservation failed - "
    "you have to specify a base address\n");
    + return;
    + }
    +
    + if (reserve_bootmem(crash_base, crash_size,
    + BOOTMEM_EXCLUSIVE) < 0) {
    + printk(KERN_INFO "crashkernel reservation failed - "
    + "memory is in use\n");
    + return;
    + }
    +
    + printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
    + "for crashkernel (System RAM: %ldMB)\n",
    + (unsigned long)(crash_size >> 20),
    + (unsigned long)(crash_base >> 20),
    + (unsigned long)(total_mem >> 20));
    + crashk_res.start = crash_base;
    + crashk_res.end = crash_base + crash_size - 1;
    }
    }
    #else
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-10-16 18:33    [W:0.026 / U:90.696 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site