Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Pull memblock updates from Mike Rapoport:
"Robustness and debug improvements:

- add check for memory add/cap ordering

- add missing debug code to memblock_add_node()"

* tag 'memblock-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock: Check memory add/cap ordering
memblock: Add missing debug code to memblock_add_node()

+10
+10
mm/memblock.c
··· 665 665 int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, 666 666 int nid) 667 667 { 668 + phys_addr_t end = base + size - 1; 669 + 670 + memblock_dbg("%s: [%pa-%pa] nid=%d %pS\n", __func__, 671 + &base, &end, nid, (void *)_RET_IP_); 672 + 668 673 return memblock_add_range(&memblock.memory, base, size, nid, 0); 669 674 } 670 675 ··· 1684 1679 1685 1680 if (!size) 1686 1681 return; 1682 + 1683 + if (memblock.memory.cnt <= 1) { 1684 + pr_warn("%s: No memory registered yet\n", __func__); 1685 + return; 1686 + } 1687 1687 1688 1688 ret = memblock_isolate_range(&memblock.memory, base, size, 1689 1689 &start_rgn, &end_rgn);