summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuwei Guan <ssawgyw@gmail.com>2023-06-01 21:31:49 +0800
committerMike Rapoport (IBM) <rppt@kernel.org>2023-06-02 08:23:41 +0300
commitde649e7f5edb2e61dbd3d64deae44cb165e657ad (patch)
treeb2bacd66b2f27a9a778e556a1bf3f6dd3de2e7d8
parent493f349e38d022057b3b6e13f589f108269c42b0 (diff)
downloadlwn-de649e7f5edb2e61dbd3d64deae44cb165e657ad.tar.gz
lwn-de649e7f5edb2e61dbd3d64deae44cb165e657ad.zip
memblock: Update nid info in memblock debugfs
The node id for memblock reserved regions will be wrong, so let's show 'x' for reg->nid == MAX_NUMNODES in debugfs to keep it align. Suggested-by: Mike Rapoport (IBM) <rppt@kernel.org> Co-developed-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Yuwei Guan <ssawgyw@gmail.com> Link: https://lore.kernel.org/r/20230601133149.37160-1-ssawgyw@gmail.com Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
-rw-r--r--mm/memblock.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index c5c80d9bcea3..3d449aaba052 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -2169,17 +2169,21 @@ static int memblock_debug_show(struct seq_file *m, void *private)
{
struct memblock_type *type = m->private;
struct memblock_region *reg;
- int i, j;
+ int i, j, nid;
unsigned int count = ARRAY_SIZE(flagname);
phys_addr_t end;
for (i = 0; i < type->cnt; i++) {
reg = &type->regions[i];
end = reg->base + reg->size - 1;
+ nid = memblock_get_region_node(reg);
seq_printf(m, "%4d: ", i);
seq_printf(m, "%pa..%pa ", &reg->base, &end);
- seq_printf(m, "%4d ", memblock_get_region_node(reg));
+ if (nid != MAX_NUMNODES)
+ seq_printf(m, "%4d ", nid);
+ else
+ seq_printf(m, "%4c ", 'x');
if (reg->flags) {
for (j = 0; j < count; j++) {
if (reg->flags & (1U << j)) {