From patchwork Mon Mar 25 15:04:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13602385 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 91E28C54E64 for ; Mon, 25 Mar 2024 15:05:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C7CC6B009B; Mon, 25 Mar 2024 11:05:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 14D976B009C; Mon, 25 Mar 2024 11:05:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F09FD6B009E; Mon, 25 Mar 2024 11:05:25 -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 D73F16B009C for ; Mon, 25 Mar 2024 11:05:25 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 57A3B16082D for ; Mon, 25 Mar 2024 15:05:25 +0000 (UTC) X-FDA: 81935885010.08.5867D7F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 4D18D1A0003 for ; Mon, 25 Mar 2024 15:05:23 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="XHMJ/MNS"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1711379123; 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=haC805c7UMtqk1vnPtnCyFhz2JBWveKVvAFGAdaeEnOGcxTvrQiWWTt2ffL4P/ic6qwWKP 9L9030oDD/vvLT2iJGz2C9x+JbXSNvTg6txpWi4cp/1vbd57+r15F03FQiObrxuQYPW03H FNxi2P2MRADS93Faalh09Hlf5KcdyH0= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="XHMJ/MNS"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.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=1711379123; a=rsa-sha256; cv=none; b=BJQ7//N54aCNoUEmL1rhZTd00IyjQd4ZfSmqZHUaga13w4Vi2ZgVqsADr2I5p/Y+zMtLoT BeexTGTVnchyTo9MVcnh+1LR9j6eD2/yKoww4st6cH4OcKMM+AtsyPHgzHjuY6IANC9Spn iaPLFwp5hzE4dL3ZFGb+bEF+5Kd5X/4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711379122; 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=XHMJ/MNSllAM91QTWOeupOel662JOBBQuNtD2uOq9SAFgr7/bDshzNBTL2Fjh0VrnceloD M+sqfgKMT0SQpH660g6DcVDewGBbZ1uzaWWIZcHBpSO8chpyIKO8P4/yXZc0YHPGCvpiZc 5KO8YbdRVExDY46eQtwbSsmCKkaj/I4= 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-362-WN62Vo3yNfmGnYcHNz1UDw-1; Mon, 25 Mar 2024 11:05:19 -0400 X-MC-Unique: WN62Vo3yNfmGnYcHNz1UDw-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 A02C980026F; Mon, 25 Mar 2024 15:05:17 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 615D1C04120; Mon, 25 Mar 2024 15:05:15 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, rppt@kernel.org, mgorman@suse.de, Baoquan He Subject: [PATCH 3/7] mm/mm_init.c: remove meaningless calculation of zone->managed_pages in free_area_init_core() Date: Mon, 25 Mar 2024 23:04:55 +0800 Message-ID: <20240325150459.1045407-4-bhe@redhat.com> In-Reply-To: <20240325150459.1045407-1-bhe@redhat.com> References: <20240325150459.1045407-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain X-Rspamd-Queue-Id: 4D18D1A0003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ad4qzq1c3hke8b5tusi8rcrekoatb8w9 X-HE-Tag: 1711379123-721042 X-HE-Meta: U2FsdGVkX19TnTLk6VKDj1NyByXgeOTnO8ZAMTUj26nSCkRT9b7eKwvDKLOrxZtULLPALooTPatALjuDn5+kf7NHjFCPrnQKjQt+jv8IOafP6gBSkL8e7fehHeKopDPz7hJoUA4dEVnbrCmbXEfWoR5gw9I3DGuxHL95yr9NIIkPDFxYID0jzHCI7O0VmjsPbONMOs6tsSa0rU4ao1F55dE2uaPZPvaWCk5TLCs60bGg9r9O6Eu+9hDYd7ZpRQnArIMgx5c0GVIjJxOqDG93cnHAaYGbZlbmHE2t3Zdq5rrCWncVzZ0OANfGrIgGqffAON4uBtwJ2ai1O8lXxA5FOIxMRjyeTxxIdxojGV3yZ63ckGomC17K4XrZTItkRClxOkglUstNh2YUuqXDEWdrenThQD3X4t0DRQApFCyg8ZfE58aViXxUJCpv46yE2s5pGfTrUWHVD/YrGb8Sq1jS2XgzB381q8h5ixsqwFkY8DjDdqWwyXe4m1ocx5mh7JkNE/bE2ksmn3fKCYkoePDeDJUyB/scOXWw8SuTMvZnGZ5P1RJrbUjBWIGqUdutZ/3jcJ4LD7DuJ3fnzkdFJkOe4qet7++XoVWanQA3+cK0zVtMc9Q/8bn+sY+MmmOlJSojF1/m6R8ewd+1p6Sn2XwLxkAs0TMWUKBm/+l6zNOrY5yXn3jI1sBeej5RjXVu/dM5tK2lo3u/it767d4HSRUuG6xZ4M9rxhuqF8nOwv11e0uAA0lhkBj+Eo0hAKN7+kx9BDkqPbxymDnTvrDk7zUBNjtsxElhXcVkVjO8LdO5G+i9735to1GHbawArLFrl5o0j9lXg/eX4YCTpypbJ2+uJmbcjBFIfdfhCenuwoa2qFBUgp7eaHW6ghfpjbuvZ8J/UE4j7cLpiPK2sKGqSwp391btivsf3Ab4KxsreolAWR9tYhSsRUpcsEKGFfCvLrUP 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 --- 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 */