From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A31DBC77B7A for ; Fri, 19 May 2023 10:53:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FEC3900005; Fri, 19 May 2023 06:53:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AE81900003; Fri, 19 May 2023 06:53:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19D8E900005; Fri, 19 May 2023 06:53:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 08B39900003 for ; Fri, 19 May 2023 06:53:38 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C8A81AE525 for ; Fri, 19 May 2023 10:53:37 +0000 (UTC) X-FDA: 80806693674.29.6F16EC3 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf07.hostedemail.com (Postfix) with ESMTP id 0C9AA4000E for ; Fri, 19 May 2023 10:53:35 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oJdmOAay; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of ssawgyw@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=ssawgyw@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684493616; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=n5ls3SeTHm3utb0beJFgdvQLna8e8DUOYvcEbBp6374=; b=vtq9C/PWBvgpzaHReUrPZHWmuprjazpcFujmsT8jH3Zr0U4XY4xXiJFMmVwvoguAcJA5yJ bkNqEPMT5cv0WqUx/M42/CcaAYfHls+SkuMYUomiNRlMhWLTCQT240jtjx+cZxYwnXzG+X m3PWLPguCyyxIobylyoydjSSfPDtAf8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=oJdmOAay; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of ssawgyw@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=ssawgyw@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684493616; a=rsa-sha256; cv=none; b=zp4b7CqZAvyl8G+DMdmwP8g/cEoq/yirgSdbOQlduOjjBGjify5jmMN3SC7s78oAORv+a6 C0A0GibDZfXGAJaAiErxvLTWQV7BJ9PjqFODp4y4Ovtd43Nc4EZ0mdQYxlgDVte8BQJgKW hlCe53w09zIUM8nCNMFqFtDfKYnViIg= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1ae3f6e5d70so29582595ad.1 for ; Fri, 19 May 2023 03:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684493615; x=1687085615; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n5ls3SeTHm3utb0beJFgdvQLna8e8DUOYvcEbBp6374=; b=oJdmOAayLhOyGpjHGxPM+kbykuT92LlGd7nhK+9Q3b+2FvumgN8yMgwlNYjsZvULzh tcBiIUZPO619L5N4ZFJ9YPruJxdA0exCv0dj3CfZQqzSS4Vvth48xTv7ZMh4QyFP0gRx MaaAeD8/nGIqyawaqNvBBPIJBtvbF5DzYuOQNB5XQSNbiD173ZZlmpxM3b0exgYWn1bZ 7o248jYzFx57MnvwE5G+MkB/kNf+0+E5NRJ6+28qMsv/4gfb4b3jKRN5lU67IfSgKWcZ w3eNbkv3giDA5nbMhDIzXYVI/EpNBEidp1OnuGw9lvrbz52Joo5XzlK/UA9y8dXlBq4q ji9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684493615; x=1687085615; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n5ls3SeTHm3utb0beJFgdvQLna8e8DUOYvcEbBp6374=; b=KOFi9XK2H2AJJyNGm/4QdgrJ1bT94C+jCy61vks984+0GCRgESG8hfNuPoJ1ghXfdd GRVaK316isYva3o+zFwCb4vV69mZcOCp1TpJ303vxNlYJRFcbdZPmTdOGLIIj3z0SaME 4fbx+6oVrPgvsoML7r8NsVn2KUTP5cCxXi9ni9xpvBum7RT8mYFC0SOi0TjeD6lHUdIX cboB3I43Qwmbk+dMbnUlQcNgre86TtV+VrNGDh9b99MbiSfWKyfHGKehrd2CBjwvbnAJ 6ZlZF6h9FtBixiooCyGfdd2MJRyFrADCLlyDOugB1scvn6eGO+2NBm+4wAtPJRaEw7Kx Us5A== X-Gm-Message-State: AC+VfDwEpErlonzW+Op98YjL5/0cBlSL1PfeQAEHWQGWyEI6UKgtiCk3 MUFEGboJV3yArnRbTwrY6UE= X-Google-Smtp-Source: ACHHUZ6uhILkqWsWS28g+auP15fNJuRo3OqpQ18EaSOLqLvMn6TxfHzVhz6TCHoDvD7WO2IpBJ5nRA== X-Received: by 2002:a17:902:f7c2:b0:1ae:4c2d:94a2 with SMTP id h2-20020a170902f7c200b001ae4c2d94a2mr1622005plw.65.1684493613204; Fri, 19 May 2023 03:53:33 -0700 (PDT) Received: from localhost.localdomain ([45.43.34.98]) by smtp.gmail.com with ESMTPSA id a16-20020a170902ecd000b001ac38343438sm3152478plh.176.2023.05.19.03.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 03:53:32 -0700 (PDT) From: Yuwei Guan To: rppt@kernel.org, akpm@linux-foundation.org, tsahu@linux.ibm.com, anshuman.khandual@arm.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yuwei Guan Subject: [PATCH v4] memblock: Add flags and nid info in memblock debugfs Date: Fri, 19 May 2023 18:53:21 +0800 Message-Id: <20230519105321.333-1-ssawgyw@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: 9katdkjmgmrg6iq54zjryc1s5ejc3p4u X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0C9AA4000E X-HE-Tag: 1684493615-247381 X-HE-Meta: U2FsdGVkX18ysW1AQbhT3JOk64U5pKyQdD9eWmkWKzx+F/pC5ny6fhwtFc537uQGaLk5RlJn/OEN44zj4wvQ5WArtNiboR5ACD/IzdwHaonvkVo70MQvsRqarqxo4/j4YOXa199uB6f7h7g2hrYq9zRVPbkUeBvrc46iXiHt0kPxY59oMiaFQNO1ISrABzvpe8Tv2PFix/vwA713tngNHk+mz9lTx01C9jjAiZVI1s8SqUvebxkaIi1DHgeIWfrQlq6eSvR/V+olc+AaB7g/U2qn7iGnFp6pYNJMz75yMZk9geDcbsUK3BJprt7SVt22zS13aF4yt+5zNKu0dwJ3vbIROWfCgD8fN/im1ac7rjVOWhzCygDHjzI0Qi1fz9RAZlfLYgnrTQFBQe9la+EMYBhE3x5saUD4HsA3WFfPZcWgr1hjIHPfLN4HSufSQC7c/Lbl1+GRnhZahC1MVwk+wiXTESu+TmEj8y1xqELYOZO8ac/SsYWd2ITcEAOeJAtdaVYp7mrFY42emDRiEzdOAN2qtQKbV3xu7q7JxiPmzxthDqArHwpmaJtwphN8katu+m6IO9UOtYQMiascos1DceHpVeqDsVEbygzoVK1JB9ql7Q+42SkCXVcDZeAiRsWY//WgnXMsE53iDT3O5z5vBnkDboRjBr/luuMt2QvWLm/mTvAx21deK/5oHZPvIT8Kz75zjYZKnuNsE9FG20e/NPTGcVngPl51Huq2gjNDs4D5iusWuusdSFPoqvyGch3DJXOF+ZF6dVMkfL/cZlm+dLSxo52q1PvZUe/oryvg+atPdoOHiGwEdPOZYLHcBLcZ6wDxCl4tp1NGtPQ3CGzSx3OnoDanO/NixNP3VP/gYN/pHuIXVPQi40SEf+8Ls0HbhwBI/gdiEXfiFQXBfrGa1DO8zEPKrmOUpQyEJ+Tc45NHevLyvO/CQZPmTxQlvP2oosQDPr+ouVzxsOtH67+ K+rNNzJL DHbGOMehXUkh0KhS1+4LNIz0N1pZtfpug1ny4Rgpz2Hf/jGwyWRB76dZSGdKSj6d6hcPtfm52pLedhHub2h3lcKzYeYxSXC0xm5i8nNNpi/I5vMkcsNV+HnV+Gyl1VcxyPS++IcecAahZo7sXN1P0txl4Fke1OVm+TrNe8+r1Ub+qVAENvdNVHUbG9ljt8dEQ07kuB9xIGtkghiC6DRIPxdBrtD/9TwHrYOWP2Hac6N3PUl/YeozBwYXD/Mzx5HtXM3oox3T/Y7DUS1T4uukwW7yaK53rgMPA/NKkKqPKXHzaIlhdSkAcCdv+r6wOd0pBYBjw7uQdWwUa10TjsqbQ8e5Sj7mnZFK5fsu06X9/i7HfT3ywoT8g15NSeT+lQ/jNECfyAFOC5bgRbsDiL2WLwzh9nZa2PgXjhTWF0F3sXmc6gS2FVlkykw09hw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Currently, the memblock debugfs can display the count of memblock_type and the base and end of the reg. However, when memblock_mark_*() or memblock_set_node() is executed on some range, the information in the existing debugfs cannot make it clear why the address is not consecutive. For example, cat /sys/kernel/debug/memblock/memory 0: 0x0000000080000000..0x00000000901fffff 1: 0x0000000090200000..0x00000000905fffff 2: 0x0000000090600000..0x0000000092ffffff 3: 0x0000000093000000..0x00000000973fffff 4: 0x0000000097400000..0x00000000b71fffff 5: 0x00000000c0000000..0x00000000dfffffff 6: 0x00000000e2500000..0x00000000f87fffff 7: 0x00000000f8800000..0x00000000fa7fffff 8: 0x00000000fa800000..0x00000000fd3effff 9: 0x00000000fd3f0000..0x00000000fd3fefff 10: 0x00000000fd3ff000..0x00000000fd7fffff 11: 0x00000000fd800000..0x00000000fd901fff 12: 0x00000000fd902000..0x00000000fd909fff 13: 0x00000000fd90a000..0x00000000fd90bfff 14: 0x00000000fd90c000..0x00000000ffffffff 15: 0x0000000880000000..0x0000000affffffff So we can add flags and nid to this debugfs. For example, cat /sys/kernel/debug/memblock/memory 0: 0x0000000080000000..0x00000000901fffff 0 NONE 1: 0x0000000090200000..0x00000000905fffff 0 NOMAP 2: 0x0000000090600000..0x0000000092ffffff 0 NONE 3: 0x0000000093000000..0x00000000973fffff 0 NOMAP 4: 0x0000000097400000..0x00000000b71fffff 0 NONE 5: 0x00000000c0000000..0x00000000dfffffff 0 NONE 6: 0x00000000e2500000..0x00000000f87fffff 0 NONE 7: 0x00000000f8800000..0x00000000fa7fffff 0 NOMAP 8: 0x00000000fa800000..0x00000000fd3effff 0 NONE 9: 0x00000000fd3f0000..0x00000000fd3fefff 0 NOMAP 10: 0x00000000fd3ff000..0x00000000fd7fffff 0 NONE 11: 0x00000000fd800000..0x00000000fd901fff 0 NOMAP 12: 0x00000000fd902000..0x00000000fd909fff 0 NONE 13: 0x00000000fd90a000..0x00000000fd90bfff 0 NOMAP 14: 0x00000000fd90c000..0x00000000ffffffff 0 NONE 15: 0x0000000880000000..0x0000000affffffff 0 NONE Signed-off-by: Yuwei Guan --- v4: - show string value for each memblock flag --- mm/memblock.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 511d4783dcf1..10d0ddbeebc1 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2136,12 +2136,19 @@ void __init memblock_free_all(void) } #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_ARCH_KEEP_MEMBLOCK) +static const char * const flagname[] = { + [ilog2(MEMBLOCK_HOTPLUG)] = "HOTPLUG", + [ilog2(MEMBLOCK_MIRROR)] = "MIRROR", + [ilog2(MEMBLOCK_NOMAP)] = "NOMAP", + [ilog2(MEMBLOCK_DRIVER_MANAGED)] = "DRV_MNG", +}; static int memblock_debug_show(struct seq_file *m, void *private) { struct memblock_type *type = m->private; struct memblock_region *reg; - int i; + int i, j; + unsigned int count = ARRAY_SIZE(flagname); phys_addr_t end; for (i = 0; i < type->cnt; i++) { @@ -2149,7 +2156,20 @@ static int memblock_debug_show(struct seq_file *m, void *private) end = reg->base + reg->size - 1; seq_printf(m, "%4d: ", i); - seq_printf(m, "%pa..%pa\n", ®->base, &end); + seq_printf(m, "%pa..%pa ", ®->base, &end); + seq_printf(m, "%4d ", memblock_get_region_node(reg)); + if (reg->flags) { + for (j = 0; j < count; j++) { + if (reg->flags & (1U << j)) { + seq_printf(m, "%s\n", flagname[j]); + break; + } + } + if (j == count) + seq_printf(m, "%s\n", "UNKNOWN"); + } else { + seq_printf(m, "%s\n", "NONE"); + } } return 0; } -- 2.34.1