Merge tag 'memblock-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

447cec03 · Linus Torvalds <[email protected]> · 2023-11-08 09:40:13 -08:00

Pull memblock update from Mike Rapoport:
 "Report failures when memblock_can_resize is not set.

  Numerous memblock reservations at early boot may exhaust static
  memblock.reserved array and it is unnoticed because most of the
  callers don't check memblock_reserve() return value.

  In this case the system will crash later, but the reason is hard to
  identify.

  Replace return of an error with panic() when memblock.reserved is
  exhausted before it can be resized"

* tag 'memblock-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: report failures when memblock_can_resize is not set

Commit: 447cec034b7896f4b19dbfe3ce6c366ce7c7602a
Parents: c1ef4df1 · e96c6b8f

Merge commit. Changes below are compared with the first parent: c1ef4df1.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
mm/memblock.c	modified	+1	−1	View file

mm/memblock.c

View file

diff --git a/mm/memblock.c b/mm/memblock.c
index fd492e5..5a88d6d 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -424,7 +424,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type,
 	 * of memory that aren't suitable for allocation
 	 */
 	if (!memblock_can_resize)
-		return -1;
+		panic("memblock: cannot resize %s array\n", type->name);
 
 	/* Calculate new doubled size */
 	old_size = type->max * sizeof(struct memblock_region);