On 12/27/2012 05:25 PM, David Rientjes wrote:
> On Sun, 23 Dec 2012, Sasha Levin wrote:
>
>> diff --git a/mm/bootmem.c b/mm/bootmem.c
>> index 1324cd7..198a92f 100644
>> --- a/mm/bootmem.c
>> +++ b/mm/bootmem.c
>> @@ -763,9 +763,6 @@ void * __init ___alloc_bootmem_node(pg_data_t *pgdat,
>> unsigned long size,
>> void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
>> unsigned long align, unsigned long goal)
>> {
>> - if (WARN_ON_ONCE(slab_is_available()))
>> - return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
>> -
>> return ___alloc_bootmem_node(pgdat, size, align, goal, 0);
>> }
>>
>
> All you're doing is removing the fallback if this happens to be called
> with slab_is_available(). It's still possible that the slab allocator can
> successfully allocate the memory, though. So it would be rather
> unfortunate to start panicking in a situation that used to only emit a
> warning.
>
> Why can't you panic only kzalloc_node() returns NULL and otherwise just
> return the allocated memory?
That's exactly what happens with the patch. Note that in the current upstream
version there are several slab checks scattered all over.
In this case for example, I'm removing it from __alloc_bootmem_node(), but the
first code line of__alloc_bootmem_node_nopanic() is:
if (WARN_ON_ONCE(slab_is_available()))
return kzalloc(size, GFP_NOWAIT);
So the current behaviour is still preserved, but the code is simplified to
have only one place that allocates memory (both from the slab and from bootmem),
instead of having slab allocations sprinkled all over.
Thanks,
Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
