From patchwork Thu Jun 1 13:31:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 101946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp348651vqr; Thu, 1 Jun 2023 06:59:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hfCDtwRExAchT2qkok+z30FZ2sEzmP/TTdn0DswEy2/PgfFoH1yusmzEIQTYIOXkssBeP X-Received: by 2002:a17:902:ec8a:b0:1b0:36ad:fe13 with SMTP id x10-20020a170902ec8a00b001b036adfe13mr7377717plg.16.1685627972805; Thu, 01 Jun 2023 06:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685627972; cv=none; d=google.com; s=arc-20160816; b=q6iCbOLRsbY1bA7Bq3/pc9QTfFDuqZPmtG56Xc/4INDtHlegwDW2J8htxFAfcrY2+5 HzpUf5JOogarxqMVLJeAczljtirNnUBII0jVEXYFOgiA6RMfOFCqs+nrrbAQ/1wnTkBL BXJxYxxvSHb42+NDO2fXyeUPvME38XWymdurKYmc6hrc45wxzQZEVivnyOx4yrWHPi68 wBrMwsFecTpfOMnI12spU1kfyWvSVcED4EZFOI1zo4XoSWs1uIvRI9dXX+rTa8WWcFUZ xCngjEiMB5uRavFs87Uv3mAH4akotuNRWxvN7k5PCdgHeOC1N+3qU7No3VLToMbp6wg7 Xw8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=rWt6V6FL8uiL8DaqLP59q0+kgyWrAbxTEuQv+TzGgyQ=; b=Dn5Icdxcy5LBjiAM/eVVRvX6PeW0UJ/qvXGYhL2yq9JgIvYJGwBHnq7uFC8U7Mm/Uz au1pT8/2GYQYt7Tu5NQWty0w6C1J0If2DXk03vYsc798Kfv4NWxY6T14dOpp6YPPW1M6 bb7r+5T9OuD4pZnJaQo1XdjzNRrgISFqx6eMEAT2FwmE9mMS7dUIXM5RMSCGhVnAvuGk 9mzHnk21xVo2eousldX21XOu55OnhDoit2eFqHWUs3hL9PaQiLwuV55+2OUpxq4I9W+8 PgcRU9PvTiLL2AD5cuJcvoOPaq0rdDOQqf02F8qMXW1Qlab83cJOW/8Kf6yd6TI5SNrb jdKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=V1jLdqJl; 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 j7-20020a170903024700b001aaeed1a0e3si2786229plh.487.2023.06.01.06.59.15; Thu, 01 Jun 2023 06:59:32 -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=V1jLdqJl; 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 S233517AbjFANcx (ORCPT + 99 others); Thu, 1 Jun 2023 09:32:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234193AbjFANcS (ORCPT ); Thu, 1 Jun 2023 09:32:18 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20A8810DA for ; Thu, 1 Jun 2023 06:32:00 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-25632c99eecso261708a91.2 for ; Thu, 01 Jun 2023 06:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685626319; x=1688218319; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rWt6V6FL8uiL8DaqLP59q0+kgyWrAbxTEuQv+TzGgyQ=; b=V1jLdqJlox6Dv/VNXEtx2l/Mpa5/1/YFPoc5rStWuHKzZDsqr1yvxY2Dmsg6P5XEnb o0z6yw83pmjrIgaPJrVEEUio9rA2qRvoLf+/B9FL6duQbQ6Bx6+gcTgLyt51l1kXe347 /93c7sW2wDkFuqkYoQwEtbzdu6LN5HYm90sU15fVDE+3urBs0l4tInKGcN3i6vEZYPF0 jH+hBEXUpfb9eBRBDDFn0aX7ekVuBlbWBiD1hK+Sz4cY+jNxg2izR3zcy8JyvEXIavAx qsc+nytlC44Jbb9C/h1VuT57BEgpJUIV6vMEU6dzVVPdFommPYDCF2frCfj9ZIIVm4n5 +Dhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685626319; x=1688218319; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rWt6V6FL8uiL8DaqLP59q0+kgyWrAbxTEuQv+TzGgyQ=; b=QJaw9kJ3QuO+9ZvZJ8t6KoULEjEjGLYs61QZHFDVeDovexne6X5N3XXNBfhi9S2VCY O1VHd2wflVy8VySjtjre7VbHZjv9hG7QbXR2LR6CweOFZl4cj0TkIqSzFQViv/9jqsH1 eAqb31oOX6AgZKxDnBi+AJkyzNmrxDn5MK0R7gXyXtUS9fFzsKR9yi6wodPSQmKRM78D IvlTWT8mh9Fvxyw+L5rkImMfsEinXNP1JhdiMtOzY+UqGNpOe2uqCHdfE9OvzoEd/PB9 Y21KWJZrXHtyKAHTUqeZ8y4E9eWm8TvuoJNv5IgNryBtV6dh/U75RghQ18QgXSx7NTOt LUoQ== X-Gm-Message-State: AC+VfDxyhEKuNU8ZGhVDN7ccJk8doa2WHMSKqMGwpNtGf0Id8IW6buFo 36LRVwa+bpR4MesNqw4T7Dc= X-Received: by 2002:a17:90b:118:b0:250:8f09:75f2 with SMTP id p24-20020a17090b011800b002508f0975f2mr5757388pjz.22.1685626319448; Thu, 01 Jun 2023 06:31:59 -0700 (PDT) Received: from localhost.localdomain ([58.246.67.170]) by smtp.gmail.com with ESMTPSA id f5-20020a17090a700500b0023d386e4806sm1441245pjk.57.2023.06.01.06.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:31:59 -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: [RESEND PATCH] memblock: Update nid info in memblock debugfs Date: Thu, 1 Jun 2023 21:31:49 +0800 Message-Id: <20230601133149.37160-1-ssawgyw@gmail.com> X-Mailer: git-send-email 2.17.1 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: 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?1767509037077337895?= 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) Co-developed-by: Kefeng Wang 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 9ddd1ecb9af8..f50b418ccb11 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2160,17 +2160,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)) {