lkml.org 
[lkml]   [2008]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: + bootmem-node-setup-agnostic-free_bootmem.patch added to -mm tree
Date
Hi,

Roel Kluin <12o3l@tiscali.nl> writes:

> Johannes Weiner wrote:
>
>> How about the following (untested, even uncompiled, but you should get
>> the idea) proposal which would replace the patch discussed in this
>> thread:
>>
>> --- tree-linus.orig/mm/bootmem.c
>> +++ tree-linus/mm/bootmem.c
>> @@ -421,7 +421,25 @@ int __init reserve_bootmem(unsigned long
>>
>> void __init free_bootmem(unsigned long addr, unsigned long size)
>> {
>> - free_bootmem_core(NODE_DATA(0)->bdata, addr, size);
>> + bootmem_data_t *bdata;
>> +
>> + list_for_each_entry(bdata, &bdata_list, list) {
>> + unsigned long remainder = 0;
>> +
>> + if (addr < bdata->node_boot_start)
>> + continue;
>> +
>> + if (PFN_DOWN(addr + size) > bdata->node_low_pfn)
>> + remainder = PFN_DOWN(addr + size) - bdata->node_low_pfn;
>> +
>> + size -= PFN_PHYS(remainder);
>> + free_bootmem_core(bdata, addr, size)
> Missing semicolon here -----------------------------^

Yes. Intentional compiler trap for untested code *cough*

>> +
>> + if (!remainder)
>> + break;
>> +
>> + addr = PFN_PHYS(bdata->node_low_pfn + 1);
>> + }
>> }
>
> This should do the same as (untested):
>
> void __init free_bootmem(unsigned long addr, unsigned long size)
> {
> bootmem_data_t *bdata;
>
> list_for_each_entry(bdata, &bdata_list, list) {
> unsigned long remainder;
^^^^^^^^
>
> if (addr < bdata->node_boot_start)
> continue;
>
> remainder = PFN_DOWN(addr + size) - bdata->node_low_pfn;
>
> if (remainder <= 0) {

Boom.

> free_bootmem_core(bdata, addr, size);
> return;
> }
>
> size -= PFN_PHYS(remainder);
> free_bootmem_core(bdata, addr, size);
> addr = PFN_PHYS(bdata->node_low_pfn + 1);
> }
> }

Hannes


\
 
 \ /
  Last update: 2008-04-15 16:05    [W:0.261 / U:0.536 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site