From patchwork Thu May 25 04:01: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: 13254756 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 4C5DCC77B7E for ; Thu, 25 May 2023 04:03:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6087280002; Thu, 25 May 2023 00:03:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D10656B0078; Thu, 25 May 2023 00:03:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD9C6280002; Thu, 25 May 2023 00:03:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AFD636B0075 for ; Thu, 25 May 2023 00:03:16 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 777E1809AC for ; Thu, 25 May 2023 04:03:16 +0000 (UTC) X-FDA: 80827432392.06.B35E681 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf04.hostedemail.com (Postfix) with ESMTP id 97F6440005 for ; Thu, 25 May 2023 04:03:13 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=C1d4liKZ; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf04.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684987393; 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=gNj2e5Vi2WIkbEKvTOMKfGlxOu0bnyuA1VYYGOrr0Yo=; b=ux94gi4gO7IF2iGV+rYjo2iNhiLFoSjA/sbg+KqhSty8rvpEh3gUwW7FtTH19AY3Sjuhtd o9d/bo1XWHjhpDoTqhREAWrnsS5ic74ggjrnize/dk1bej9iyNtq1PU6sglf3X+XUYopHr sPSMFboCu2bP817LSAinoM0u/86YKGM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=C1d4liKZ; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf04.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684987393; a=rsa-sha256; cv=none; b=lxiO0R5MnyFmdbdXXsEh8m3wCYahFZOJZqD9TDHqQQxfisuWojiNBQIHOkhvOLNSlMEP9o X4cF5Swx/wTeHvdZkiuQVBmJwTY/ejR0h4mZ8DJZc8z8Juml2U82lpIXHRF5HT/fBgj3D0 YYcChO5WdklPFmpxaRMIuAkrtQqOMk8= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-64d2a613ec4so1289807b3a.1 for ; Wed, 24 May 2023 21:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1684987392; x=1687579392; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gNj2e5Vi2WIkbEKvTOMKfGlxOu0bnyuA1VYYGOrr0Yo=; b=C1d4liKZ6puRJ9AH2oIPiS+SjvAzvsi3FfHBafsUWZksEXzfcpaeZOiYFlSc+3EW4C taHtMK6aihD0auG7B6m7TjdFHvOIVce7NXLlxnXdz9fQrfaChbk6HMazh/LuToWoah8i 8OxUImfnhXnQpCFMTYpyIYOA8cJyGzXTdYqyVZ+P1fOqx+7rVFVWXNF9PJy25pyri55f /KxbDXv8WalhMh27Pdc/v5vpjpfMnLVSvuoynurGKjBOmLlxUvPI78yq+8Lk9HKKkU/7 yxUjqWtn1CURH1hJ7nzteV3fY8iW0g2wbbryr0KergvkyF1lo+smv1sjR+oMkRkgZPOY YYtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684987392; x=1687579392; 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=gNj2e5Vi2WIkbEKvTOMKfGlxOu0bnyuA1VYYGOrr0Yo=; b=U3I4FF+QnLnfWcYWt6VSLOSVEdz+nVzxsAuV2LDPMShlhIYQhYb6/3/I+KhkH/y/E+ Qk7CH59CQ/9nelzupVhSZ0nzPfv0VqW60/x/ld4tSOSum+7wP5eNSbpm6pI9O0FtmYbO rFVH5o/Vl+x7hGfwE9MmV10uKvVT6j5lgEjEfR3hOpE/XFgnBfuZCoSdVLtu4u5pg6YI OU7jqVa3KY9nU+Ctf2nTG8mFW+dZ80SgyzBwovH/IWoxuYMlRXydd7uPbIRwl5SmdnHR auzTYCkp+/mcJVt0GQ9LN4avUVqC74rwF/FxW53yas3KCzkGN7KXrQ2gKGyrjVjg/a2N F3AQ== X-Gm-Message-State: AC+VfDzy6pGcJCfSfJrLufOvGCM+Kth8I7Vhd4XyXN5uzqCLjA80fFI+ zzID3HHj31gkEm64ufKtzVN5ZA== X-Google-Smtp-Source: ACHHUZ46LHkUfFKGLmC9bs93CWNBwcjgxU+AsZIPWLPp2Gx/kJ5+kN6V2e3c83ee06SiuTOfIrHARg== X-Received: by 2002:aa7:888f:0:b0:648:ebb2:3d6 with SMTP id z15-20020aa7888f000000b00648ebb203d6mr6505780pfe.26.1684987392528; Wed, 24 May 2023 21:03:12 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id i11-20020aa7908b000000b0064c56d04316sm189916pfa.193.2023.05.24.21.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 21:03:12 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org Cc: mhocko@suse.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 3/3] mm/mm_init.c: do not calculate zone_start_pfn/zone_end_pfn in zone_absent_pages_in_node() Date: Thu, 25 May 2023 04:01:50 +0000 Message-Id: <20230525040150.1588-3-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 483i116iu7dnoeufyek1ktp1ftcj3d5u X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 97F6440005 X-HE-Tag: 1684987393-185197 X-HE-Meta: U2FsdGVkX1+fwwfsQcyZ+0naJ+dQEt8EDVK+2awt6xN18RT3y+i+OmsnrFJIysBqCqFDD8rah3ysQbhxYGl8RfDOGJsR2rVB/BtdkHlEDwHzlslgdiVHYE/9lvNHLAe+6FhV35QPhc/OqRNlSuAciT92hYJ1yDgiskt6pb76wwWmx7lqzHMpk1nxCc3wSm7MAeMsknSA6ErH64WxN3mB8omJAZSueSo1ALqLHQoyQtXf9QCqzp2uRuj6r2OJAiZOiXxVkwQPJ+Ifbz0wbPzN2f4I2GsNuA4VIF+13Y0X1nIBzG2Apse+QikZrEJZ7OnR0rUqcIkcTRsDly9QbR03nQbGpRxgkyZhxaBFyXhv6D3WMbGz5ccZ6ecik8tFeSdIdqmn2REn4T0mmkd/in9iWJ8QxTJULysjEeHRnFtSa6MEBP5radyVr9yu4Ph4uw1+uB4dnwWwLh5kFp79NwnX+7CcRTusXol31k4EPY9Mft6Wi0hCwVd1CEPCiUleFPiCRRVSVcxlhOtb2KkfDvDEcOn+yaX61GzCj2woXNPg4iHnBlNUb1B0oGApk4iVZoJBXYbO8fv7ueYO2vyZcjRAfrdPC5+8u49pYRE6vckCKBAD6iXCpUjYEcB6ITQb05rFPCdxqIcHxV2vyyLNOFmIVoj7L2WREZucR+0y03F+yytXMED3CTF0asZzHZnAVpX0vtTJfJ87dwY41e1M3IuY/Xarsef+sYyCT2uPlIMS9QjEMuOlEL+Q1uw4pGElcqLXcVt8BSTptKpzDIeF/jrV94MFNGRKb4T8Hgnjbgj8pI7OAFdmZi+SFuPnT0NDpZIQmVJGbZXy+J7wIZHlChnoI9/GbBA+wIVTjTfM/JQfUbunB+Efg9VAJkBxhk6FPM3MN+71HnWV6LuK7Vn1sUnNmiO9cpbw9z7Epk4CSMnQlOtrpioXEwGPi6JhPXOiElW0puN8GFdgr1fkeGKOxiA r/DqIOgh L2reDFlGBOkkKgVP7qdWR0Q7NTUOSNC3dDzL7sUzuuS6bigLzmdTYxHqXFhcN3Qiysm4bnrlVdM9P6pUuJRCmlBryubMa4CPI5zKEr79gQDwgbbunGYg5bhlrvtw375D7ekUCGGFqcoUQCTnNu/lgPl9jV+1HI96MH1H+9OGaEZhFHhm7iAxC0AXeFrXTj1oECrTRsT0Xmr4loF3BG0nPfm55PeGLF4EZ4S7Kh9N/QYf+DhAOKYT9joLULX5JodtM9dN5G+OWP0TcifNHgGJAe4vHlVJefRQkHgAlHDNG6o/l6hk6Ll1zE0EsBOzqGx4TIMvXGN3hXBm5oaAO958B+9SK/iBBb+YIWB1mu7qqeMDxULr50tzk7VuQF4N5PaKNkbwUBnkWjYVZOJQ7peS9jHXQ4bLM4CjGy/YzgK3atxcsw3gZTLFvQhJBIqpcUS1aNG4SAI8UEP2jFieuSpnGnzpoS6Kgsdv6De97 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: In calculate_node_totalpages(), zone_start_pfn/zone_end_pfn are 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 --- mm/mm_init.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 898af4eb9ce2..88c4a9266e2a 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1166,23 +1166,11 @@ 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; - 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); - - 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); /* @@ -1254,6 +1242,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long node_end_pfn) { unsigned long realtotalpages = 0, totalpages = 0; + int nid = pgdat->node_id; enum zone_type i; for (i = 0; i < MAX_NR_ZONES; i++) { @@ -1262,15 +1251,15 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long spanned, absent; unsigned long real_size; - spanned = zone_spanned_pages_in_node(pgdat->node_id, i, - node_start_pfn, - node_end_pfn, - &zone_start_pfn, - &zone_end_pfn); + spanned = zone_spanned_pages_in_node(nid, i, + node_start_pfn, + node_end_pfn, + &zone_start_pfn, + &zone_end_pfn); if (spanned) { - absent = zone_absent_pages_in_node(pgdat->node_id, i, - node_start_pfn, - node_end_pfn); + absent = zone_absent_pages_in_node(nid, i, + zone_start_pfn, + zone_end_pfn); real_size = spanned - absent; zone->zone_start_pfn = zone_start_pfn; } else { @@ -1289,7 +1278,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, pgdat->node_spanned_pages = totalpages; pgdat->node_present_pages = realtotalpages; - pr_debug("On node %d totalpages: %lu\n", pgdat->node_id, realtotalpages); + pr_debug("On node %d totalpages: %lu\n", nid, realtotalpages); } static unsigned long __init calc_memmap_size(unsigned long spanned_pages,