memblock: Improve debug output when resizing the reserve array

Print out the location info in addition to which array is being resized. Also use memblocK_dbg() to put that under control of the memblock_debug flag. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

memblock: Improve debug output when resizing the reserve array
Print out the location info in addition to which array is being resized. Also use memblocK_dbg() to put that under control of the memblock_debug flag. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Yinghai Lu · Benjamin Herrenschmidt
1 parent 5e63cf43af
Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff
mm/memblock.c
@@ -192,8 +192,6 @@
 	if (!memblock_can_resize)
 		return -1;
  
-	pr_debug("memblock: %s array full, doubling...", memblock_type_name(type));
-
 	/* Calculate new doubled size */
 	old_size = type->max * sizeof(struct memblock_region);
 	new_size = old_size << 1;
@@ -221,6 +219,9 @@
 	}
 	new_array = __va(addr);
  
+	memblock_dbg("memblock: %s array is doubled to %ld at [%#010llx-%#010llx]",
+		 memblock_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size - 1);
+
 	/* Found space, we now need to move the array over before
 	 * we add the reserved region since it may be our reserved
 	 * array itself that is full.
@@ -672,7 +673,7 @@
 		base = region->regions[i].base;
 		size = region->regions[i].size;
  
-		pr_info(" %s[0x%x]\t0x%016llx - 0x%016llx, 0x%llx bytes\n",
+		pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes\n",
 		    name, i, base, base + size - 1, size);
 	}
 }
...	...	@@ -192,8 +192,6 @@
192	192	if (!memblock_can_resize)
193	193	return -1;
194	194
195		- pr_debug("memblock: %s array full, doubling...", memblock_type_name(type));
196		-
197	195	/* Calculate new doubled size */
198	196	old_size = type->max * sizeof(struct memblock_region);
199	197	new_size = old_size << 1;
...	...	@@ -221,6 +219,9 @@
221	219	}
222	220	new_array = __va(addr);
223	221
	222	+ memblock_dbg("memblock: %s array is doubled to %ld at [%#010llx-%#010llx]",
	223	+ memblock_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size - 1);
	224	+
224	225	/* Found space, we now need to move the array over before
225	226	* we add the reserved region since it may be our reserved
226	227	* array itself that is full.
...	...	@@ -672,7 +673,7 @@
672	673	base = region->regions[i].base;
673	674	size = region->regions[i].size;
674	675
675		- pr_info(" %s[0x%x]\t0x%016llx - 0x%016llx, 0x%llx bytes\n",
	676	+ pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes\n",
676	677	name, i, base, base + size - 1, size);
677	678	}
678	679	}