Skip to content

Commit

Permalink
x86: add flags parameter to reserve_bootmem_generic()
Browse files Browse the repository at this point in the history
This patch adds a 'flags' parameter to reserve_bootmem_generic() like it
already has been added in reserve_bootmem() with commit
72a7fe3.

It also changes all users to use BOOTMEM_DEFAULT, which doesn't effectively
change the behaviour. Since the change is x86-specific, I don't think it's
necessary to add a new API for migration. There are only 4 users of that
function.

The change is necessary for the next patch, using reserve_bootmem_generic()
for crashkernel reservation.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Bernhard Walle authored and Ingo Molnar committed Jul 8, 2008
1 parent 053713f commit 3fd052b
Showing 5 changed files with 20 additions and 10 deletions.
3 changes: 2 additions & 1 deletion arch/x86/kernel/e820_64.c
Original file line number Diff line number Diff line change
@@ -118,7 +118,8 @@ void __init early_res_to_bootmem(unsigned long start, unsigned long end)
continue;
printk(KERN_INFO " early res: %d [%lx-%lx] %s\n", i,
final_start, final_end - 1, r->name);
reserve_bootmem_generic(final_start, final_end - final_start);
reserve_bootmem_generic(final_start, final_end - final_start,
BOOTMEM_DEFAULT);
}
}

3 changes: 2 additions & 1 deletion arch/x86/kernel/efi_64.c
Original file line number Diff line number Diff line change
@@ -100,7 +100,8 @@ void __init efi_call_phys_epilog(void)
void __init efi_reserve_bootmem(void)
{
reserve_bootmem_generic((unsigned long)memmap.phys_map,
memmap.nr_map * memmap.desc_size);
memmap.nr_map * memmap.desc_size,
BOOTMEM_DEFAULT);
}

void __iomem * __init efi_ioremap(unsigned long phys_addr, unsigned long size)
5 changes: 3 additions & 2 deletions arch/x86/kernel/mpparse.c
Original file line number Diff line number Diff line change
@@ -729,10 +729,11 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
if (!reserve)
return 1;

reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE);
reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
BOOTMEM_DEFAULT);
if (mpf->mpf_physptr)
reserve_bootmem_generic(mpf->mpf_physptr,
PAGE_SIZE);
PAGE_SIZE, BOOTMEM_DEFAULT);
#endif
return 1;
}
17 changes: 12 additions & 5 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
@@ -799,34 +799,39 @@ void free_initrd_mem(unsigned long start, unsigned long end)
}
#endif

void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
int __init reserve_bootmem_generic(unsigned long phys, unsigned len, int flags)
{
#ifdef CONFIG_NUMA
int nid, next_nid;
#endif
unsigned long pfn = phys >> PAGE_SHIFT;
int ret;

if (pfn >= end_pfn) {
/*
* This can happen with kdump kernels when accessing
* firmware tables:
*/
if (pfn < max_pfn_mapped)
return;
return -EFAULT;

printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",
phys, len);
return;
return -EFAULT;
}

/* Should check here against the e820 map to avoid double free */
#ifdef CONFIG_NUMA
nid = phys_to_nid(phys);
next_nid = phys_to_nid(phys + len - 1);
if (nid == next_nid)
reserve_bootmem_node(NODE_DATA(nid), phys, len, BOOTMEM_DEFAULT);
ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags);
else
reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
ret = reserve_bootmem(phys, len, flags);

if (ret != 0)
return ret;

#else
reserve_bootmem(phys, len, BOOTMEM_DEFAULT);
#endif
@@ -835,6 +840,8 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len)
dma_reserve += len / PAGE_SIZE;
set_dma_reserve(dma_reserve);
}

return 0;
}

int kern_addr_valid(unsigned long addr)
2 changes: 1 addition & 1 deletion include/asm-x86/proto.h
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ extern void ia32_syscall(void);
extern void ia32_cstar_target(void);
extern void ia32_sysenter_target(void);

extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
extern int reserve_bootmem_generic(unsigned long phys, unsigned len, int flags);

extern void syscall32_cpu_init(void);

0 comments on commit 3fd052b

Please sign in to comment.