Factor out the common operation of marking a range on the bitmap.
Signed-off-by: Johannes Weiner <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: Yinghai Lu <[email protected]>
CC: Andi Kleen <[email protected]>
---
mm/bootmem.c | 64 +++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 43 insertions(+), 21 deletions(-)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -225,6 +225,44 @@ unsigned long __init free_all_bootmem(vo
return free_all_bootmem_core(NODE_DATA(0)->bdata);
}
+static void __init __free(bootmem_data_t *bdata,
+ unsigned long sidx, unsigned long eidx)
+{
+ unsigned long idx;
+
+ bdebug("nid=%d start=%lx end=%lx\n", bdata - bootmem_node_data,
+ sidx + PFN_DOWN(bdata->node_boot_start),
+ eidx + PFN_DOWN(bdata->node_boot_start));
+
+ for (idx = sidx; idx < eidx; idx++)
+ if (!test_and_clear_bit(idx, bdata->node_bootmem_map))
+ BUG();
+}
+
+static int __init __reserve(bootmem_data_t *bdata, unsigned long sidx,
+ unsigned long eidx, int flags)
+{
+ unsigned long idx;
+ int exclusive = flags & BOOTMEM_EXCLUSIVE;
+
+ bdebug("nid=%d start=%lx end=%lx flags=%x\n",
+ bdata - bootmem_node_data,
+ sidx + PFN_DOWN(bdata->node_boot_start),
+ eidx + PFN_DOWN(bdata->node_boot_start),
+ flags);
+
+ for (idx = sidx; idx < eidx; idx++)
+ if (test_and_set_bit(idx, bdata->node_bootmem_map)) {
+ if (exclusive) {
+ __free(bdata, sidx, idx);
+ return -EBUSY;
+ }
+ bdebug("silent double reserve of PFN %lx\n",
+ idx + PFN_DOWN(bdata->node_boot_start));
+ }
+ return 0;
+}
+
static void __init free_bootmem_core(bootmem_data_t *bdata, unsigned long addr,
unsigned long size)
{
@@ -258,14 +296,7 @@ static void __init free_bootmem_core(boo
if (eidx > bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start))
eidx = bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start);
- bdebug("nid=%d start=%lx end=%lx\n", bdata - bootmem_node_data,
- sidx + PFN_DOWN(bdata->node_boot_start),
- eidx + PFN_DOWN(bdata->node_boot_start));
-
- for (i = sidx; i < eidx; i++) {
- if (unlikely(!test_and_clear_bit(i, bdata->node_bootmem_map)))
- BUG();
- }
+ __free(bdata, sidx, eidx);
}
/**
@@ -367,16 +398,7 @@ static void __init reserve_bootmem_core(
if (eidx > bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start))
eidx = bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start);
- bdebug("nid=%d start=%lx end=%lx flags=%x\n",
- bdata - bootmem_node_data,
- sidx + PFN_DOWN(bdata->node_boot_start),
- eidx + PFN_DOWN(bdata->node_boot_start),
- flags);
-
- for (i = sidx; i < eidx; i++)
- if (test_and_set_bit(i, bdata->node_bootmem_map))
- bdebug("hm, page %lx reserved twice.\n",
- PFN_DOWN(bdata->node_boot_start) + i);
+ return __reserve(bdata, sidx, eidx, flags);
}
/**
@@ -509,9 +531,9 @@ find_block:
/*
* Reserve the area now:
*/
- for (i = PFN_DOWN(new_start) + merge; i < PFN_UP(new_end); i++)
- if (test_and_set_bit(i, bdata->node_bootmem_map))
- BUG();
+ if (__reserve(bdata, PFN_DOWN(new_start) + merge,
+ PFN_UP(new_end), BOOTMEM_EXCLUSIVE))
+ BUG();
region = phys_to_virt(bdata->node_boot_start + new_start);
memset(region, 0, size);
--