From patchwork Mon Mar 25 14:56:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13602379 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 752E3C54E58 for ; Mon, 25 Mar 2024 14:57:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FA286B00A9; Mon, 25 Mar 2024 10:57:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 081CE6B00AA; Mon, 25 Mar 2024 10:57:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB4E66B00AB; Mon, 25 Mar 2024 10:57:39 -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 D348A6B00A9 for ; Mon, 25 Mar 2024 10:57:39 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6BD141206E8 for ; Mon, 25 Mar 2024 14:57:39 +0000 (UTC) X-FDA: 81935865438.11.CE94A87 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 9F2D712001A for ; Mon, 25 Mar 2024 14:57:37 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xx1L73xL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.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=1711378657; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5tjcWip8Jh3x6TpRu3FCVwM3jxp/f+pF40FWxJhLLRM=; b=4t+Dd8OnSF30UIupc0I+qA53P74gvtbs6h051K4vnT5SgcGDeBeOP6x9YL3XWo4mFgSd3h ounbzbiZkDcJkbf+/ahZ0j0GfMJpVQft93suJ1wPLBOZmhDQRJ4aHO92AyyBDrhcQCMdVK QDlfKujiWt6cuvNADFjdQWwuoSX/Swk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xx1L73xL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711378657; a=rsa-sha256; cv=none; b=A1JRpm8ea4OY13NCh6prCKawXdHBatlO3ke2NKix3tnKXRxvhGR9WJCKcQcryPPSGrvbQp U6SofypklHey6a0R4rbqhCB6x+h95ZF3BeYKsZTdfGAnQbcz3Yibk0SZWqObSK7JsFLCt8 S5p0Jyh8dHWLXjEsUH0XX0dtEj8GLqo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711378657; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5tjcWip8Jh3x6TpRu3FCVwM3jxp/f+pF40FWxJhLLRM=; b=Xx1L73xLgje1Fwn6tn6DcG5+9u+tEdrRUGcqB8eSC6fLL1gLTxSXk6LyuZ+OB8QDl7PezI D6xW4Ux0g0FT1bo+9Xm7uHUiy38XVS1BsEq6By3j8S5sFrpKxz5CzAv3RiWM6Jsd8euSoA FSRIo2UiXJYcM6diFAiMF/eegE12IQY= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-184-pzvsJf6aPruLJH2f2paQ0g-1; Mon, 25 Mar 2024 10:57:33 -0400 X-MC-Unique: pzvsJf6aPruLJH2f2paQ0g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 C6BF53811F22; Mon, 25 Mar 2024 14:57:32 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id C39653C20; Mon, 25 Mar 2024 14:57:29 +0000 (UTC) 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, Baoquan He Subject: [PATCH v2 4/6] mm/mm_init.c: remove meaningless calculation of zone->managed_pages in free_area_init_core() Date: Mon, 25 Mar 2024 22:56:44 +0800 Message-ID: <20240325145646.1044760-5-bhe@redhat.com> In-Reply-To: <20240325145646.1044760-1-bhe@redhat.com> References: <20240325145646.1044760-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: 9F2D712001A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: czkswmgokxth4f5orf3e3baxnh94awzb X-HE-Tag: 1711378657-981895 X-HE-Meta: U2FsdGVkX1+n/g4pFk2qSFFcUR9hk7NRgO5RzDQKfKUoEWIMmrDDCXgJRLq9O+LJ89sFZMgXQWzi8pV9NQ20qNpt3rhwvcmgfL3jlFAc6Glqix7jkUTOsxw0JRYdej14xO8uoypo0Ma4VSEqZKLlpRbz7cpokqRuiXOeR25kYMnwGVDc495RChjxoE1cizvsjFrge+LmVEfuHGvODwn/Vy+Fw8D7EWz1rTj9wLe5b+NEeRYQYQ6fzuE1cNZM+xHhDIuE8XzZ2+5gOnQRiug+bgIjEoNWTSxEHPsteL34+OFGDKC4HJOSHQxJLiulmSif1OcVQjvdWLpXAh2FAKpwp9FZ97x8o+yZz9PSuYR69zJXxoR63RiJYJh7h1no8rUBYWVhPF33RK2kd+DfsQG/dPt9mUuP9566gK3F3XA0kWcKrhskn+4WTM4pXsYq0uE8n+jYNHQrcZe37OCM0HI/RNBxaqXU4lxY8UszddPo+0G61rSN4YKHVPSFkhbwjCcsQ3fR2+dd/lSImjFVco3Hxw5UFGQylDs+prL138o7+0/gBF7UV2kUv/mevhGR9/wHLi0orgNyXseRcEWrM7kXaD8iQHSUgxhFLvXP7iktx8LhlzDFQY/l/o3dpcuahRVOQJm+pvhLyG1O8uieM2C6O/PXG1BM3OYa4Sz59Fs5qRVdFg4FlahAPW48VlCGQ3io6JAAlUx9utbgI4osORsTTOzSoionrjALFTqen6Q8LjKoA5o5PvFc/lUjGz4qRd0oVxNb1apehZOWiplFlVIeeX37qCOtNDuO1Ta63sRMji2kCJ1wx1BQrQzb/JqMiFjw6hcDCqyRjz1zKmDs3fwrVSuzL4tnUb3TWmGLZbMawf0RC2SpS4Laon8hyjdh3ckdaly2qSgsiFOWuGiPGfNGe8E3csiXndyvc73Yz7nHg6KJkDhYXHfMD8ZucmRc5jJxyVIJdXO0p60CMk0FnOr j4qgLNug bW73OxwTivaz4Tl10LvpFSZalxAjmbvAksA++4WzT8jNea3AeeXCL11n41QhwKZeqH3+x0nGOgKhRrv85F7SEhrOglH5GjZiCTpv7RcE7PbuKufvLxdSwfPUlS9/QkI6sunsQCSTjEsRMKblyHauIWIBMgpA3P4FIjsYHciugDDmEUuHO2KU/6gvFc+JHqkctjc4eUQqR1eW2GT4ADxl8ajD55Q== 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), initialize zone->managed_pages as 0 which reflect its actual value because no any page is added into buddy system right now. It will be reset 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 Reviewed-by: Mike Rapoport (IBM) Signed-off-by: Baoquan He --- 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..7f71e56e83f3 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, 0); 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 */