From patchwork Fri May 26 08:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 99412 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp331964vqr; Fri, 26 May 2023 02:18:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6M45PN6AUHfZsIs3SsS5mh+Lpz5q21Gltz2/ujnbC8Sdkx+UbCRII75RA7VkA7spD6aQwg X-Received: by 2002:a17:90a:aa8f:b0:253:6e6f:f5c5 with SMTP id l15-20020a17090aaa8f00b002536e6ff5c5mr5722430pjq.7.1685092707057; Fri, 26 May 2023 02:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685092707; cv=none; d=google.com; s=arc-20160816; b=aL6wcP/SOwafUBqxXDksBuq/tcqZGJyp8SwN/7fZMFJ1pzkNGl6Us4fT7BYrxzC2sW 1LjKAjO0JWkFodKRfPWqWGvqwgxlqGp8FgVJbdUO5RFgiGk2qbc2PwBejwu6yYUqld2p Vi9lO1KngZo+h2WlnNYdx6PyDu4r82PsY+AKoRhnFPtQIJ0JwvOMkGK2DhavD4EQ6L9u p1fMKoKXiZbY23XpnyGq9vpzTgpwWteku5GjkFjmvs0Mvb+tA5JhR2/dZ7J5g7sIKzG6 BNq8x/bEKtpdYk00ZKbfw3qReulXZ1uX6wDFICb6wwlyOjf5IE5rSLjdejvQbN3fcC4z dabQ== 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=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=s9pqA6bMUBl1e/Y5lnN8XyJGzzIv/4aMxjYNGERkBbgrCwpQm9VXLaomUbHP1/dO3l giV+0VMmoQGiBaij0hq0h0iHG+wWB29yUbOyVzz4XrCL4gqEUTOosKEW7DjBKEToJoKz Y//ZagTuOBN2T5DPto94r3vWS29vu6UtaCf3X4AKnyPfAZQf4xoLgRFu2P2bYMoTjJQv jOZsucw/ibn6xSmEsZu4moDNBGRLvHV3OhVHDeXM3QEtCreWdRna0vaDbedfrcLprQRI +8oWNOhKcHqQgBpBoUhGCnFUXDi+fOoNenM60M7RY2X/6zA+1g0xkUe+YW6lMJkD/p2J 8sPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=ZE2T2CWU; 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=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i2-20020a17090ac40200b002533a4c9ed9si1370860pjt.21.2023.05.26.02.18.13; Fri, 26 May 2023 02:18:27 -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=@shopee.com header.s=shopee.com header.b=ZE2T2CWU; 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=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242819AbjEZIxe (ORCPT + 99 others); Fri, 26 May 2023 04:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242649AbjEZIxc (ORCPT ); Fri, 26 May 2023 04:53:32 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E17C9B for ; Fri, 26 May 2023 01:53:31 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1afbc02c602so14569125ad.1 for ; Fri, 26 May 2023 01:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685091211; x=1687683211; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=ZE2T2CWUJ8fXrRdBuSxPnMkGmKH352ocr4/VgManWjp7N3POEfQ5B8IvhDcAtTJGLB ThDPY6JboiSIzxSskqNIa0/KYwVb4UK6lZZ/LQDgdCWPrRqXazsKIteW4P4gMSRmo5bL HB6RGmbwANNSjoZvuYiwvc2k2/VqnBRedk6pReISAUfpuhYz0p3rC9QnMgfofFH4OR9A uruWHE5HSQNPuR0El4DHtx8bzKE2C5r+MdDLcRoTmg7VEklCbFg1+b+y18f5ekAaUp2x c25eXq9xsnnY6GfgDyQ3tSlP9oBeZbz6UZCFhigMbA0Kkay+1I5rXas7FVdBQLVthnuU FiTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685091211; x=1687683211; 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=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=PojfcC+z8b8uUnkGgogdc0xUNF0ir2mO7fYIm1/IgnztdqwKtuiBy5MuUbyVMLHk5l usu0TSK4PmwXltSwdk/fbZLtlc0iRV5cEVM1FXdGyL+hzilRsPdqvTv0xCiuHkY6Hzbs u+LI6jS8YZ+gQ8SmNJqhFzYI4s1XfzupG3wYPuYdW1qGLboqimiumM81hu3qG5TlmMv/ Pl2B7kuPnzdImJCzdjVSPVuej6gybgaaWjNLN/ibzc6NAPUtWsoamCu+XopZgx0vxYIb q8euxY8ArGtHx45oUq5b7sTpEs0zuA4P8uFeLhu4gekkcnT5Y22rXtHlF/c2zPXBa68J 2l9Q== X-Gm-Message-State: AC+VfDytlgPOK3ZQPeo7QlZAhJ3KxhvvPfbRrsI0ezmiDLi+ycwnowiy NhQkzk4bSBjcislLUH81ea+8Eg== X-Received: by 2002:a17:903:44c:b0:1ae:4dda:c2e with SMTP id iw12-20020a170903044c00b001ae4dda0c2emr4829720plb.13.1685091211144; Fri, 26 May 2023 01:53:31 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2713911plr.308.2023.05.26.01.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 01:53:30 -0700 (PDT) From: Haifeng Xu To: rppt@kernel.org Cc: akpm@linux-foundation.org, mhocko@suse.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 1/2] mm/mm_init.c: introduce reset_memoryless_node_totalpages() Date: Fri, 26 May 2023 08:52:50 +0000 Message-Id: <20230526085251.1977-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766947770294544241?= X-GMAIL-MSGID: =?utf-8?q?1766947770294544241?= Currently, no matter whether a node actually has memory or not, calculate_node_totalpages() is used to account number of pages in zone/node. However, for node without memory, these unnecessary calculations can be skipped. All the zone/node page counts can be set to 0 directly. So introduce reset_memoryless_node_totalpages() to perform this action. Furthermore, calculate_node_totalpages() only gets called for the node with memory. Signed-off-by: Haifeng Xu Suggested-by: Mike Rapoport Reviewed-by: Mike Rapoport (IBM) --- v2: - drop patch 2 in v1 - inroduce new function reset_memoryless_node_totalpages() - call calculate_node_totalpages only if node actually has memory --- mm/mm_init.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 7f7f9c677854..f674e5798f7d 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1174,10 +1174,6 @@ static unsigned long __init zone_absent_pages_in_node(int nid, unsigned long zone_start_pfn, zone_end_pfn; unsigned long nr_absent; - /* When hotadd a new node from cpu_up(), the node should be empty */ - if (!node_start_pfn && !node_end_pfn) - return 0; - zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); zone_end_pfn = clamp(node_end_pfn, zone_low, zone_high); @@ -1227,9 +1223,6 @@ static unsigned long __init zone_spanned_pages_in_node(int nid, { unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type]; unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; - /* When hotadd a new node from cpu_up(), the node should be empty */ - if (!node_start_pfn && !node_end_pfn) - return 0; /* Get the start and end of the zone */ *zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); @@ -1250,6 +1243,24 @@ static unsigned long __init zone_spanned_pages_in_node(int nid, return *zone_end_pfn - *zone_start_pfn; } +static void __init reset_memoryless_node_totalpages(struct pglist_data *pgdat) +{ + struct zone *z; + + for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) { + z->zone_start_pfn = 0; + z->spanned_pages = 0; + z->present_pages = 0; +#if defined(CONFIG_MEMORY_HOTPLUG) + z->present_early_pages = 0; +#endif + } + + pgdat->node_spanned_pages = 0; + pgdat->node_present_pages = 0; + pr_debug("On node %d totalpages: 0\n", pgdat->node_id); +} + static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long node_start_pfn, unsigned long node_end_pfn) @@ -1702,11 +1713,13 @@ static void __init free_area_init_node(int nid) pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid, (u64)start_pfn << PAGE_SHIFT, end_pfn ? ((u64)end_pfn << PAGE_SHIFT) - 1 : 0); + + calculate_node_totalpages(pgdat, start_pfn, end_pfn); } else { pr_info("Initmem setup node %d as memoryless\n", nid); - } - calculate_node_totalpages(pgdat, start_pfn, end_pfn); + reset_memoryless_node_totalpages(pgdat); + } alloc_node_mem_map(pgdat); pgdat_set_deferred_range(pgdat); From patchwork Fri May 26 08:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 99410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp325406vqr; Fri, 26 May 2023 02:04:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6puSv5kD4ALVg6t2x2Xz9NBYSEHrKjejJi1K164IhylJy2+t1r3L7K/8xOBEnilVUwd+k+ X-Received: by 2002:a05:6a20:429f:b0:10c:96f0:5f63 with SMTP id o31-20020a056a20429f00b0010c96f05f63mr1757845pzj.28.1685091847422; Fri, 26 May 2023 02:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685091847; cv=none; d=google.com; s=arc-20160816; b=SUweC2zTxzglBLxYy9fG3jQBy4812uuNR+XsbyfU0Ca0KIdvx+jiQm8xbEOr2bhJDQ E4aL127dO8m9BlhbWpT5KP7nTOeC02PJK1+JmOmbHcePRFBrZng1QTpbiniS+qc5UAxu okw4mL9fcbbnLb00T5EiO4REj+M9eEDh6EXYglWMf0KxZJ/FQS0W2n+AtMSDUew6Fl+P OuJ5r4zBb92mweBxcFCYXZga9dFnlTmMP+KhmyEEF/k5TeqqOcBY8x1SJBi6hUSMy34w tznTN5LokvmTZ9TorV8afPc9MQk5UrNXlA5CLTq4BF6GZaovmGfP9788EWGxeC56Ais8 IUKA== 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=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=gatu7jSQ1Uj10AQUIpEkzBDvpUPufBD4YzkXg7LlOEVItz2CIIIRrn4nzp9UX8eu04 WMZNQbW5Oc/O38Hna3JuQoSLNQ1LJkY8KZk3VpgmYcyjDRjWArGvia8H510aptRUwE+D bg5zwPHPBy1JmyLZTSJcxP/LFIJtOC74MmGqZxU8fbb3Nch4n0O2mXSCBhw68mcqE2Kr bzloLK0e0+0tkMM91WV1efrVpS/g0PQe4KrzGyLQyPq1E7vQZddVZGjju8YW5DTCaFW0 c72Bps5gTKVag3h53e7j1K06g5exO4+UtlsWG9klL6Ib8bEuG3qaj+PrkugMDAcNhJ/s Lzsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@shopee.com header.s=shopee.com header.b=NklE6Udu; 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=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c17-20020a637251000000b0050beb3fe627si3045682pgn.459.2023.05.26.02.03.52; Fri, 26 May 2023 02:04:07 -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=@shopee.com header.s=shopee.com header.b=NklE6Udu; 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=REJECT sp=REJECT dis=NONE) header.from=shopee.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242835AbjEZIxn (ORCPT + 99 others); Fri, 26 May 2023 04:53:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242826AbjEZIxj (ORCPT ); Fri, 26 May 2023 04:53:39 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9622499 for ; Fri, 26 May 2023 01:53:35 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1b01bd7093aso356585ad.1 for ; Fri, 26 May 2023 01:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685091215; x=1687683215; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=NklE6UduAZJgJ1Ah+MN/NOXVNOB5UfOrDgXfh9g4uEkWBp2EI9bEPw442dfm096hwU vZGQokxLy8z83csOSqPszmJ0Bm9/ejb8bvj/O1sEq1qMU2PBJuI9rI1Kdpp/Ami3ozsC HY3Rf6ZYy3SpldjCO0W6d5Rr5ZvcZmiSVoiOOw5yLLiz8yKYAMLGvF42vW4jeomqnBMF gELfAS86efZ+CKjIRbVxj/Ku00cZWjonhjkqoX6WQjHUhs/G7S6yMbm60ssyymm+7UKF Tg0Qwa6PIYcuDB6s8nlw+Xv+1raP4X1jw4EB2OI5FT2tZe+OXUDs8fqvP0s1T7HX/PP0 45wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685091215; x=1687683215; 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=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=Ec29n9OUUkXBJACXd2WK2JR6tn60SMNylGEEwoteidzlAuVAC5e3aU0A2edXwBJ1yX XZyfjuzagYaD8w7MWAfT6/8hK+twGILpF1ctIa2JTQdfpo2xvsTcrSOUVlY3shP6NRRq sedk4uUPS8icoAdiQYIyVpSh/cHmqGfJnYHvFYq7VNcCATKbtXDyYcU5wCyvNjS6uqJd JAZmkYwBo01SrLq5Ka6IDaTcDlhtmrkogusJJ/TwJRgDhpDAcYEpc9d0L3kT0dBggvEv zVm7JenrtspAAc/l/vFV6CAqgnsxv1kvaFzVpN86zIiClPiUlb+LT2reFWixDCbYpWu2 c4Rg== X-Gm-Message-State: AC+VfDxQkZvMODAeQlv19HnHA0XkH6heyANYuvBuGiSsQ+qv530Dc+bN xx8TSIiJgyKojySxTVvIGek6mQ== X-Received: by 2002:a17:903:1d2:b0:1af:b7cd:5961 with SMTP id e18-20020a17090301d200b001afb7cd5961mr2070704plh.1.1685091215033; Fri, 26 May 2023 01:53:35 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2713911plr.308.2023.05.26.01.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 01:53:34 -0700 (PDT) From: Haifeng Xu To: rppt@kernel.org Cc: akpm@linux-foundation.org, mhocko@suse.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 2/2] mm/mm_init.c: do not calculate zone_start_pfn/zone_end_pfn in zone_absent_pages_in_node() Date: Fri, 26 May 2023 08:52:51 +0000 Message-Id: <20230526085251.1977-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766946868940740776?= X-GMAIL-MSGID: =?utf-8?q?1766946868940740776?= In calculate_node_totalpages(), zone_start_pfn/zone_end_pfn are already calculated in zone_spanned_pages_in_node(), so use them as parameters instead of node_start_pfn/node_end_pfn and the duplicated calculation process can de dropped. Signed-off-by: Haifeng Xu Suggested-by: Mike Rapoport Reviewed-by: Mike Rapoport (IBM) --- v2: - remove unrelated whitespace changes - do not replace pgdat->node_id with a local variable - remove redundant variable 'size' - add check that whether a zone is empty or not --- mm/mm_init.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index f674e5798f7d..2d91bb52c619 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1166,20 +1166,15 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn, /* Return the number of page frames in holes in a zone on a node */ static unsigned long __init zone_absent_pages_in_node(int nid, unsigned long zone_type, - unsigned long node_start_pfn, - unsigned long node_end_pfn) + unsigned long zone_start_pfn, + unsigned long zone_end_pfn) { - unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type]; - unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; - unsigned long zone_start_pfn, zone_end_pfn; unsigned long nr_absent; - zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); - zone_end_pfn = clamp(node_end_pfn, zone_low, zone_high); + /* zone is empty, we don't have any absent pages */ + if (zone_start_pfn == zone_end_pfn) + return 0; - adjust_zone_range_for_zone_movable(nid, zone_type, - node_start_pfn, node_end_pfn, - &zone_start_pfn, &zone_end_pfn); nr_absent = __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn); /* @@ -1272,7 +1267,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, struct zone *zone = pgdat->node_zones + i; unsigned long zone_start_pfn, zone_end_pfn; unsigned long spanned, absent; - unsigned long size, real_size; + unsigned long real_size; spanned = zone_spanned_pages_in_node(pgdat->node_id, i, node_start_pfn, @@ -1280,23 +1275,22 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, &zone_start_pfn, &zone_end_pfn); absent = zone_absent_pages_in_node(pgdat->node_id, i, - node_start_pfn, - node_end_pfn); + zone_start_pfn, + zone_end_pfn); - size = spanned; - real_size = size - absent; + real_size = spanned - absent; - if (size) + if (spanned) zone->zone_start_pfn = zone_start_pfn; else zone->zone_start_pfn = 0; - zone->spanned_pages = size; + zone->spanned_pages = spanned; zone->present_pages = real_size; #if defined(CONFIG_MEMORY_HOTPLUG) zone->present_early_pages = real_size; #endif - totalpages += size; + totalpages += spanned; realtotalpages += real_size; }