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 14AFEC7EE23 for ; Mon, 29 May 2023 06:21:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8709900002; Mon, 29 May 2023 02:21:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A35EA280001; Mon, 29 May 2023 02:21:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FE3F900004; Mon, 29 May 2023 02:21:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7DE2C900002 for ; Mon, 29 May 2023 02:21:25 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 49CDAAD71F for ; Mon, 29 May 2023 06:21:25 +0000 (UTC) X-FDA: 80842295730.28.8FB99FD Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 8D565180015 for ; Mon, 29 May 2023 06:21:23 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Byamjtd2; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of ssawgyw@gmail.com designates 209.85.215.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=1685341283; 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=k/cHDpwc28ZZjHBwUVLQXbchHSi6eHYMpanfKaLsNQE=; b=0sEB6tjjrjMkLZBJVXjMvVnHTaXmI0XsIkZLDGACg54zgeSfkMc6GWkqZOBkTIc/sE/SLt NBIGl/TCnRGSzQWjbBJTZ1v2xyDEA0/XisOxLtjocL0bdWjOCD4N4HqO1PiGSbgUvjcMVF uaOlY7Hlky5kokFYT9+LdRQNrkcraJo= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Byamjtd2; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf16.hostedemail.com: domain of ssawgyw@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=ssawgyw@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685341283; a=rsa-sha256; cv=none; b=2dVSM4vsMDuRaUfxIqu7jVR0UrueKX5nyBsq/rDpuj2y0dCeBPhfDVlv7uRHGyMeA6xQf9 t4cVij4Q4XkbKmN3pJbsSXTvkcvFjttZ4/F5LQInj+8JtsT0psogPcL0Jtpy5XaAT/pWhx Hn/Se6374Xrxq683252mIV36hWM3Lhg= Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-53482b44007so1803471a12.2 for ; Sun, 28 May 2023 23:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685341282; x=1687933282; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k/cHDpwc28ZZjHBwUVLQXbchHSi6eHYMpanfKaLsNQE=; b=Byamjtd2kq7YFAJ6v1H6OE4Ifg2G2rAICj1mu49zs/QvpmtxO+V7Qi9lzuoQWQyfnK iVTbFe5qr1yNuRyLEiazUy6mewi3ij3bTViGFIlGl5SYXYAY3nTYQTxkj+XSdR4umfRs +eIhCi4rR7MiM5JCC48LNJ/101t5vgmu2KMhUgV7gCICTBkXqDFH9ATzDlDVh3pRxwjE IcGuOaFaBgJuKf7/GxmFQh6Glwwb2lvIBOh8R7I7HWavF4U1D1uKAC8tEB5qMWGQqum+ Bl2wDYBOia4ABFzx8nM5u0404RAeDFVlraNy2jEUX8D+dz1N4QENmiyvFyWmjss1BQqU pKiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685341282; x=1687933282; 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=k/cHDpwc28ZZjHBwUVLQXbchHSi6eHYMpanfKaLsNQE=; b=kQSZ0N0lb6dltFh+DyhtXM4oOWLAvBiAc4HFej8vIJRatB43uN4+WYwTPdp4Vk3iLv MoKQhcgLSUToeMdW2A6Z5N2+VijG7tNLtja87maRG53T1/6SIv6whLYhkS6wLapVNxa4 IN/oMgfJ1bm4ZuAqHsd/aAneTAuNMBoxKy+CgW1US9XOe+z13STG/I6oPVbHDzNJ24Ng sB5Ki6nRyUo2n6qgiNsw9zcNacIgFVrV79tebIUfwopO5jnD5aOWMkqQqEm9FnZcWXd5 6BNzJaOyTUVmqQtjCYp8op075ys3lf8nfdG0awnCuZVciIwCi5ArZcrKzZAME2b0LAbY xsiA== X-Gm-Message-State: AC+VfDxeyjTuo5WovDrfThBpqmYd25FNE+CrliQG1hn1PJE32X79RFyU vzwo040kNAKQTFYnXTBTzZ0= X-Google-Smtp-Source: ACHHUZ4P2WxrMfDhodFYq8vsUgQtfS830xOFwaxK4jmDVUsSHPlkYiqivJtnVbs99ROKDHWM6qvc0Q== X-Received: by 2002:a17:902:da82:b0:1b0:2cd0:af3b with SMTP id j2-20020a170902da8200b001b02cd0af3bmr6965807plx.6.1685341282325; Sun, 28 May 2023 23:21:22 -0700 (PDT) Received: from localhost.localdomain ([45.43.34.98]) by smtp.gmail.com with ESMTPSA id h20-20020a170902f7d400b001aaed55aff3sm2922270plw.137.2023.05.28.23.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 23:21:21 -0700 (PDT) From: Yuwei Guan To: rppt@kernel.org, akpm@linux-foundation.org, wangkefeng.wang@huawei.com, anshuman.khandual@arm.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yuwei Guan Subject: [PATCH] memblock: Update nid info in memblock debugfs Date: Mon, 29 May 2023 14:20:02 +0800 Message-Id: <20230529062002.157-1-ssawgyw@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8D565180015 X-Stat-Signature: a3b6p1791tknxr3egwa7y8op4otkdupq X-HE-Tag: 1685341283-360774 X-HE-Meta: U2FsdGVkX18NVfYwYtCYLJvpzvJ3X0JcfxFE1qaQOapQ7BDIZ0o06igskC24hzvY2ANY3+O8+vm1VkI7utE6ZYNAFLfxbRmj49xCpOfbbRaoce69jan1RXJP1kHSPDgWFy8u78R7sIdPNsOrHXIkv3vlIRrIFe1qMA327PsVepTxuYDfJsfXp7fOWT+cmRHPhCdbqXaeRxv5aqqxZmDj3sR5sbRQVgEaXChhlQv/3waNMhb8qCrtgNka/X+GI1PBjT7Cu/9Jaq2DROd+b2MploChEYgl8EyMHvfVS+NZVem8TrHoBePGQpOkVW3NTzcQ/VnK8MzpNadFK4SvHIUhp0GmaZUNubAm/PMOfNygtWMn/TVbOR1l0XrpiOYJMYcK2Kja63Fpk+2ulWhqJUbhm8tYbF6MqYtHbRbG08uFv2blp4Pfs8N1TzQnDIG9Cdnb3dEhix+0s/Qnk2opHTtkn1MQV/pUTaXwPtEjuLHfYAuGMZ83zQa698fB8Dq1kHzekitCueK4u3gAd3acsFmR/NnofcpOOARP6hdkFyOikwHJV6/fQOtetXL0zjgtOzEnmvVwXNEsTo7ELl5y0cDZQ5/KpfjlMcdtDoanaQx8dZ/Z8xtYEZv7eFsdiSb22IUzqafzg0GOPVDJYq4Q/vVAMU0dbKCFMjkzeeDZju6nCtVp7VkdLhhIdpgpAWqEd019sdVli21va5Hw00vj8th09up6fH5yONu81sZ75nfna/YoD4ScMAwmL//WBEyB5EsSJvGwTlXwzfSBnQZhLOqZvWRdAsw+4XsdBL7DtnpJw+krAnkfMjU33zoPzjmAaQB2etB6znYtdb5XCkF0Dd4PSZ1ZmJknh/9N633rRXpmEB3barmgIOZepqF0OaZJvgJxpAMZbDmRaiqs2+xRX4kIBoND5SNphvgShcW4VrrcNW7Y007nyg4wtjZ+FT4UPOnIMC8bW4qZvt0T9fLkgFX q5+2L611 ZBB4Uu1Q63KqZmzN+AkPIrqPQ/6MZvl3j89Nv+Z5RTvgc7ctd5m/HfsJ91lylLBZsOYSl6PnYspp+3DF6KEbr6P6QRnDBMA7nrM6Eh6pnFs9UJLU3FDeJuTgGuf3SSDdpAxL3pVM6gv86I4XpbMaRuOX6xNptSUIRh01a0anknAEa6ofnFueSNPWw+mUPFoGEavl5AzEFvLO1NP4xMbL6EULpIfCBuIaSECSxnd9Ogv1bkHmveTHn91MoOY7En/bj26x/p4eBqBv9vOoLB+ltj1GUELk66LW2P5yGFzQ+MjzDNz98eWcEAReodtpEP3MfEkX0LtdygMbf+I553y1RD/fcba9odZ1k4tZWt5t+jShob/vmG6Pu7hBvGKsKcfAzoOmduWKEESdvTzfi6TUE6sO/psY3w4Ifnk/yFOLIsnetgzpbGfjlcKIhX5Q3Pw0cgMaSEU/oT1SvRa0jONkejckrzLPpgBG1yMK+EjYKyf9cjWFKinxAy8Otyimo/+kEmqw7wkcUjaKkDK26sSVp6j0bUQ== 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: 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) Signed-off-by: Kefeng Wang Signed-off-by: Yuwei Guan --- mm/memblock.c | 8 ++++++-- 1 file 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 ", ®->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)) { -- 2.34.1