Message ID | 20230529062002.157-1-ssawgyw@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1310858vqr; Sun, 28 May 2023 23:26:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7qllGcMu3HkKv5l+VfO9LPA+XLnU6EPUpLkg+vNPx0yRkR5Fb9TT9koQY+fGi++YYIWtNS X-Received: by 2002:a17:90b:30f:b0:253:70b7:18d1 with SMTP id ay15-20020a17090b030f00b0025370b718d1mr10086517pjb.34.1685341579813; Sun, 28 May 2023 23:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685341579; cv=none; d=google.com; s=arc-20160816; b=Fh3FT3EF19naFf2m9Dg/fvgdueMW4lgNw4YiarxsR+0jaj9Nj2W39Qdjg004bhw79C kyAyFYvBdNx1wJ/K8up64DZN6Ks6gDbeVTYS/zve5KwBDPISuUWXiIz0GveQrsRQg1DX GqRLv74xpjXAaz512vL0og8Bud7bUw4SWhDWtG2h1NetJgizpbGmVdeMQNSjVWbYGHdp LYL1NANBoIJ7T8g4lLbCK7RzGLxpENFpxV4HU3sK+D73afeNMdH2OTqMkEKEboC+WWAG ho0hE8PIJlmbC7sLXKXnh38UrKiHdJQY/9puL0Jgm/I7p2JYZZ2paopdiMJOvSZwnamZ /RJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=k/cHDpwc28ZZjHBwUVLQXbchHSi6eHYMpanfKaLsNQE=; b=urUYypNNXytr1umRUmsnJVBuI4Lwooio8fO4SI5rWtjIGDjt33f7vjDe8yI6PHLDSl Ghlw2l2BH3JRjTUBCMOnrF5cRBMC+ROv0A6we+5Or83smDc1g4wJq9YMU865XNEN0Z21 jBFRRDvFg+h8+8pZB8fUu1bNM/Rt+uj6/OaW8CGHOEB8N975yKV6k+iuvLCgI6jnc3zx R7XBRFpmwfVMZHZKJEIH3/9RJkMf3QULZkdOfT68a66ExjXGiQBUXZ+ocjVNLMZ7fRQ0 EcQe6Re8XGjDWgwOdNtZWqppEyFeZTBM/MKCF3YYY4ABNDDcToJgF51NUR15Ml7maKxq 9cLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Byamjtd2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y30-20020a63b51e000000b0053f47561f35si3056728pge.335.2023.05.28.23.26.06; Sun, 28 May 2023 23:26:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Byamjtd2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231508AbjE2GVZ (ORCPT <rfc822;callmefire3@gmail.com> + 99 others); Mon, 29 May 2023 02:21:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229589AbjE2GVX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 29 May 2023 02:21:23 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD436B1 for <linux-kernel@vger.kernel.org>; Sun, 28 May 2023 23:21:22 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-53f8da65701so386992a12.1 for <linux-kernel@vger.kernel.org>; Sun, 28 May 2023 23:21:22 -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=edBX3HH4Drayvc8YptQ85ksJhk9msjpByhxU+Dfp+HXXpGcI1EQc4H5KvbMy+E0Aer cm52Fr3YROD4J2MQIpy+8mK7/ebNX3fJqIf3DOQwUdmBQBQYxvY6JA+qhh/GsaSm8Gi9 3BtLGj6UUL1HjGrnxJa6GIOGoJMO/peIELAgrASzcmQKoxYfMEo2j0RvYUOeBuAUirdI YtKVeE8tZ3vSA9G902BwmeqwEDpQin6AtkZh6V/6HXwNevbCFlnjlHnk8TOkWIUn47aC xDXUMunR4dp2gfpi+fFz2a25QegmPSzyCnKM1SHCnm69/ZXkcqMeGpB4nCw8kyc2pw84 VTag== X-Gm-Message-State: AC+VfDwb6N0Mc6VqzrTsgvDAoPU1u9n/ZhOo4/uQUP78GSDDB507r+aA rkjvtlr5ifquFaETepLA/RqXfx5Zu4B+PA== 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 <ssawgyw@gmail.com> 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 <ssawgyw@gmail.com> 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767208732469634223?= X-GMAIL-MSGID: =?utf-8?q?1767208732469634223?= |
Series |
memblock: Update nid info in memblock debugfs
|
|
Commit Message
Yuwei Guan
May 29, 2023, 6:20 a.m. UTC
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> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Yuwei Guan <ssawgyw@gmail.com> --- mm/memblock.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Comments
On Mon, May 29, 2023 at 02:20:02PM +0800, Yuwei Guan wrote: > 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> > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > Signed-off-by: Yuwei Guan <ssawgyw@gmail.com> I believe this could use Co-developed-by tags. Please take a look at Documentation/process/submitting-patches.rst > --- > 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 >
Mike Rapoport <rppt@kernel.org> 于2023年6月1日周四 13:21写道: > > On Mon, May 29, 2023 at 02:20:02PM +0800, Yuwei Guan wrote: > > 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> > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > > Signed-off-by: Yuwei Guan <ssawgyw@gmail.com> > > I believe this could use Co-developed-by tags. > Please take a look at Documentation/process/submitting-patches.rst > Hi Mike, Thanks, I will look into it, and resend this patch soon. > > --- > > 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 > > > > -- > Sincerely yours, > Mike.
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)) {