Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c8f4a2d095bcb7ff798f984b9c7d16b4c8d194c3

Authored by Yinghai Lu
Committed by Linus Torvalds
1 parent 84a1caf145
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

bootmem: make ___alloc_bootmem_node_nopanic() really nopanic 

In reaction to commit 99ab7b19440a ("mm: sparse: fix usemap allocation
above node descriptor section") Johannes said:
| while backporting the below patch, I realised that your fix busted
| f5bf18fa22f8 again.  The problem was not a panicking version on
| allocation failure but when the usemap size was too large such that
| goal + size > limit triggers the BUG_ON in the bootmem allocator.  So
| we need a version that passes limit ONLY if the usemap is smaller than
| the section.

after checking the code, the name of ___alloc_bootmem_node_nopanic()
does not reflect the fact.

Make bootmem really not panic.

Hope will kill bootmem sooner.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: <stable@vger.kernel.org>    [3.3.x, 3.4.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

... ... @@ -710,6 +710,10 @@
710 710 if (ptr)
711 711 return ptr;
712 712  
  713 + /* do not panic in alloc_bootmem_bdata() */
  714 + if (limit && goal + size > limit)
  715 + limit = 0;
  716 +
713 717 ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, limit);
714 718 if (ptr)
715 719 return ptr;