From patchwork Thu Mar 28 09:12:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13608228 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 44110C54E67 for ; Thu, 28 Mar 2024 09:12:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA0B06B0082; Thu, 28 Mar 2024 05:12:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C500F6B0083; Thu, 28 Mar 2024 05:12:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B17EE6B0089; Thu, 28 Mar 2024 05:12:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 91E096B0082 for ; Thu, 28 Mar 2024 05:12:29 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2819C1210E3 for ; Thu, 28 Mar 2024 09:12:29 +0000 (UTC) X-FDA: 81945882018.04.937DBD4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 532DD2000E for ; Thu, 28 Mar 2024 09:12:27 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ALFVoDV/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711617147; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3BOFZe4TWqjEhb1bAaflU5nl+i6Cu2OrILowb6ESnek=; b=ZyVwSTX4Jf8QO9hQ/xsG/SKS/vHpTbKAtHuZeg6XEQ3d/M62pW0fBE7FKMDzWJtjPwWTuC zGbEOKAEiswFdv3EaMaVU/EyFyPYjO3LgBFmRtM73FcQdu8QEam/P+zlQa37mXQ9VDRMP0 AxBLJZZvH/A9ImeD3idzIFAwh2VJLgQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ALFVoDV/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711617147; a=rsa-sha256; cv=none; b=WXIH7ykwCacQX3c7nJnYCTV7piDUdd9EbAMSedoOCKDgLI2F+Hoz9XVFsWmKs5vxlF+qV1 ODyFrVgLYax6ukB62z/HQzHO3lERkKAPZ3rOTQfZfVgI59w3ASO/4tqhEue2K59KWKD43a MV1AP8PePL0/mGH7bDRnt3e67+DAU5E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711617146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3BOFZe4TWqjEhb1bAaflU5nl+i6Cu2OrILowb6ESnek=; b=ALFVoDV/u2FYJI0v82hgu9bvJAL1z1YEbmPPz84Yqu62wL2e39dgF2zLXz1Hciv5eriDVQ wIwfnZfwMSql13KaTB1B6z/uoTJ3KgzIpvsR8CRWSPUbi/gp3ivIPWTHyUA5ZWJRMGSiFR dR49kKkpJW7o/cCnXm+wu125Qq/W87E= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411-36l7FR52NXGgnYYGD1fFNw-1; Thu, 28 Mar 2024 05:12:22 -0400 X-MC-Unique: 36l7FR52NXGgnYYGD1fFNw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 778F780026D; Thu, 28 Mar 2024 09:12:22 +0000 (UTC) Received: from localhost (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF6BAC1576F; Thu, 28 Mar 2024 09:12:21 +0000 (UTC) Date: Thu, 28 Mar 2024 17:12:14 +0800 From: Baoquan He To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, rppt@kernel.org Subject: [PATCH v3 4/6] mm/mm_init.c: remove meaningless calculation of zone->managed_pages in free_area_init_core() Message-ID: References: <20240325145646.1044760-1-bhe@redhat.com> <20240325145646.1044760-5-bhe@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240325145646.1044760-5-bhe@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 532DD2000E X-Stat-Signature: qxy6i9w4re4t9d7roc39zjdurkjejcf5 X-Rspam-User: X-HE-Tag: 1711617147-15021 X-HE-Meta: U2FsdGVkX18H1bdRQDD+2AiCv6S1mhD85zJWuweF6GqFPbbFTTpriV8cFULKlhZ8bFWjBZQy2ok7WtqqAUqZDLYxcl02ACUJxB7uDGEZs+gqXnnCLrmlvAOSo5tzXxRF1AxAaZRy4iNBe6LPNfVK3WgRz+LawmNGtExRwMWb7QACY+akvgC4JOvdOS6jfH3NPbzzOXGcgmbGwmW7jxHT2LZjEXvwLg+28jSUg8md6TQH6sNtX0Lvvu76TlVKd6QalWh94veekWf9e9DOiEzdPL4doVD56u3Lsd2h9lnKGGegLfrOKuIvBLMWx+Z1MqeYZ3920jg9/HKLe8Vns5qssIhR2JuKxLUm5jxt2aPq/sbUWc02Eprnw6Sor7lyPwXc9ipwQ4sKuHucPq16Ar6nFodGU6BPF9lNgb1g8es26Wu1rB/icBQv3kKqW7IhXQHn1OjiXstF6Lw1+LJS+cPG/M3xv+SCc3u1+syVUTdV3+ye0e8ElBtsPxSry2JwBqX/KDI4VHW/Jqq5mhFBXjBp7ySXJp8EOB1t4HHySAzDohul8F2Her3TfH0lUP4zQIAXxwWnvaZHnOKbJkldcRUdmHl/y1woOBSojnPdfmxNuQJzA9YaOSX1WwsdAXquwwwN4dRuEtfKI0qkuaEkwYJxQmQ1DWE6oTf39hAQ9Ee0zZfqX7oOQ74KD+fIJu52P6sjGTekGFHEC6qdydsC+vpza8YDkBe/IrTNNLVNPQIC+fX8dKFd1FKUco6lq+3LzLST/pIwQ4Wjd2fi7hDYxGEPppNxc/n8o0wnZfgbhMjmpfkultuYMXZexpP5nkVEN93RdxFCXeWmhjxorOsNcgMjj86JWQKKn1sTVNWhVP0KzHetV1G5YNSyU4jeuhlWWMBlM0xUwRX0gpIXLdsb9GoPYwxY7LYtBTBSXPB1BCejTIiJBv218TCFlOavdNQVGWoduL19P4bMD0YS96da/tK biacCzse cy7X6eZ6OJVF+8ELX3uQ7xfv6YmVzt9OVZql4Nzmayu2hzFhLgyCdVjBN6CF6TcNizlo2sSt/w3fzcndr6lpuZ+pRen+Yg2VyjB0lMYILDrrrMc1y4wq6D2u/MLqFgjOojOx08OcDhrf+60AG6tStc6s+9tWgCG+GyyugdwVuLc3irWPsCg8ZRz6E+1lhNO9XNohzSDpqbxPkHOSpfWlXpvqlevP1i5YsmQVgnCry0kRI2DCp/dNUWgTSZoIsSx+rZcE+yp9D026kVy8= 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: List-Subscribe: List-Unsubscribe: Currently, in free_area_init_core(), when initialize zone's field, a rough value is set to zone->managed_pages. That value is calculated by (zone->present_pages - memmap_pages). In the meantime, add the value to nr_all_pages and nr_kernel_pages which represent all free pages of system (only low memory or including HIGHMEM memory separately). Both of them are gonna be used in alloc_large_system_hash(). However, the rough calculation and setting of zone->managed_pages is meaningless because a) memmap pages are allocated on units of node in sparse_init() or alloc_node_mem_map(pgdat); The simple (zone->present_pages - memmap_pages) is too rough to make sense for zone; b) the set zone->managed_pages will be zeroed out and reset with acutal value in mem_init() via memblock_free_all(). Before the resetting, no buddy allocation request is issued. Here, remove the meaningless and complicated calculation of (zone->present_pages - memmap_pages), directly set zone->managed_pages as zone->present_pages for now. It will be adjusted in mem_init(). And also remove the assignment of nr_all_pages and nr_kernel_pages in free_area_init_core(). Instead, call the newly added calc_nr_kernel_pages() to count up all free but not reserved memory in memblock and assign to nr_all_pages and nr_kernel_pages. The counting excludes memmap_pages, and other kernel used data, which is more accurate than old way and simpler, and can also cover the ppc required arch_reserved_kernel_pages() case. And also clean up the outdated code comment above free_area_init_core(). And free_area_init_core() is easy to understand now, no need to add words to explain. Signed-off-by: Baoquan He --- v2->v3: - Change to initialize zone->managed_pages as zone->present_pages for now because later page_group_by_mobility_disabled need be set according to zone->managed_pages. Otherwise it will cause setting page_group_by_mobility_disabled to 1 always. mm/mm_init.c | 46 +++++----------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index c57a7fc97a16..a4b80e8276bb 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1565,15 +1565,6 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) } #endif -/* - * Set up the zone data structures: - * - mark all pages reserved - * - mark all memory queues empty - * - clear the memory bitmaps - * - * NOTE: pgdat should get zeroed by caller. - * NOTE: this function is only called during early init. - */ static void __init free_area_init_core(struct pglist_data *pgdat) { enum zone_type j; @@ -1584,41 +1575,13 @@ static void __init free_area_init_core(struct pglist_data *pgdat) for (j = 0; j < MAX_NR_ZONES; j++) { struct zone *zone = pgdat->node_zones + j; - unsigned long size, freesize, memmap_pages; - - size = zone->spanned_pages; - freesize = zone->present_pages; - - /* - * Adjust freesize so that it accounts for how much memory - * is used by this zone for memmap. This affects the watermark - * and per-cpu initialisations - */ - memmap_pages = calc_memmap_size(size, freesize); - if (!is_highmem_idx(j)) { - if (freesize >= memmap_pages) { - freesize -= memmap_pages; - if (memmap_pages) - pr_debug(" %s zone: %lu pages used for memmap\n", - zone_names[j], memmap_pages); - } else - pr_warn(" %s zone: %lu memmap pages exceeds freesize %lu\n", - zone_names[j], memmap_pages, freesize); - } - - if (!is_highmem_idx(j)) - nr_kernel_pages += freesize; - /* Charge for highmem memmap if there are enough kernel pages */ - else if (nr_kernel_pages > memmap_pages * 2) - nr_kernel_pages -= memmap_pages; - nr_all_pages += freesize; + unsigned long size = zone->spanned_pages; /* - * Set an approximate value for lowmem here, it will be adjusted - * when the bootmem allocator frees pages into the buddy system. - * And all highmem pages will be managed by the buddy system. + * Initialize zone->managed_pages as 0 , it will be reset + * when memblock allocator frees pages into buddy system. */ - zone_init_internals(zone, j, nid, freesize); + zone_init_internals(zone, j, nid, zone->present_pages); if (!size) continue; @@ -1915,6 +1878,7 @@ void __init free_area_init(unsigned long *max_zone_pfn) check_for_memory(pgdat); } + calc_nr_kernel_pages(); memmap_init(); /* disable hash distribution for systems with a single node */