Received: by 2002:ab2:b82:0:b0:1f3:401:3cfb with SMTP id 2csp280439lqh; Thu, 28 Mar 2024 01:32:58 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUOPgXJRJoewQkIVayzSNu7UFskBhAUVCCe3Uav6NokezKow3hEkik/18mz4oPKCSQmrOxuMqUY4V9KDV9zK2B6Le5hQBAcXdKZedIHZg== X-Google-Smtp-Source: AGHT+IFTqUaMr4G5pQFFJx2DtSfhB16QTbojM4KqbeajeIlEjq7dF30wxHYDvYyhnJpERCard7/B X-Received: by 2002:a17:902:654e:b0:1e0:e16:8cd4 with SMTP id d14-20020a170902654e00b001e00e168cd4mr1755000pln.63.1711614778542; Thu, 28 Mar 2024 01:32:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711614778; cv=pass; d=google.com; s=arc-20160816; b=S5iGrk3+k2n9ItTDzJM/W0pa0wUvv0UhLv+YwwCoYwqaEHpPpi1t7WxLX7/OBRBV6X ZlBquX9pwPkWYRkccW9+Sh54IndqFWeW1ISnW2mICKdhJZcNADHgrcY2Kr/Wizc7MIIG Pqr6PfoUu5DZdEtfevRwhGKYKVXu+B6TeijJ93JZrws6LTfXtqFMHnLiiGCJGyR8pNyD 4n5DPaVqdtpBZ53mtjbG3xTU8FeTGpBRJoVYFhkSwU4Vo0SYNezgPkkrJzuMXcpKKGj7 w6ZY5hUlAprTVAMEpOmwu6xJIFPbxnDrO5qWSNn2uL7cNDRqjg+Yy3W1eeGph0eJRR4X 4nog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=YU98x6HKPS4cGaJBRCphv0qa0ztW8Hkud3KMpoGM99k=; fh=8+p5ju2K4csD8bOxvchprxo84K9LEycwtsCw26AdYu8=; b=TB3kxZaOdrwfGk69LGss0ozOJiizsCYOILVQvTf/CTkl1naCpsDc/1RROAXyNp2kQY ZKjhCi28ETj7tWGDki8dbAaip5kbdn1LovJNfqiqhWF85MT27ljHiKb26IZlm8FSTLmX zQwjkLpis7qIZPD5XwTDGuJP0Xf2m+CVsoP0oS117XR0mJPQ5PiIMeATcSWXiuMQ2kdD i8qK5CgPv9SJgrk0TcHTH8iX6AFWM0dads8AxeZikNBSZU/T9beGQipEzvDFrZN2bhDg 8KP8y7GN98nkS9irxnKqbs2An06z7mr9KYkvPd4MbAsc3VewjKH2WPnVGtEUstY8NxFl LYaQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="ZI+74/pc"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-122587-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-122587-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d13-20020a170903230d00b001e00f3fd38fsi1000608plh.285.2024.03.28.01.32.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 01:32:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-122587-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="ZI+74/pc"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-122587-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-122587-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id EC205298733 for ; Thu, 28 Mar 2024 08:32:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BC8185024E; Thu, 28 Mar 2024 08:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZI+74/pc" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2861621344 for ; Thu, 28 Mar 2024 08:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711614772; cv=none; b=WdodS9AwZ/bbs79XMzG8WUPMytSeXfCzaXdDzXCSQJ5GVI+IPNsWxxftNt1kq3R5xzSKpltKiOks4qGiMz6iD8NQu7G/sy8zkaiKX31d/FmfffFSXxS4Tpw9t2VGHH22+v9FcsX3y1qtFLFZ+d7xjxwIDfVle3Wl7JWK24nNS5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711614772; c=relaxed/simple; bh=5hmL0Us1EtMexYH5BrqNgE1/GbtXwYapuj2tsnxoLIw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Q6LDEBghi+2ZU40vlw8QUAN6lIG3ZVglb/SudNO+9etN7vsP3scMsA5z2ak+vBWpSfLv4WqqXYWqAL4bhAYaS8dSNvff2nf76zYgfinANxlSs/9FKbQtjY4ril0URtGm/40ZrVw7rsg1YoyLAFqAyiD86P0uuMqJFWdnBdnn7Zw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZI+74/pc; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711614770; 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=YU98x6HKPS4cGaJBRCphv0qa0ztW8Hkud3KMpoGM99k=; b=ZI+74/pctXFNa6WO8YAbdAb3gXtbEk87hsx9wAH0UKrqFhYKtkUnur36MOK+9RaIQSPOdA iE9EvzGyl0Ly4MK5U6f2dBh0YDJCUk0R0ITx8U5uy4JD3IuBKkRsHF8GB0Z22W4/phVeSk Cp7dK7KVTXJ7lGz0DGkh09NuAVLe5Xs= 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-252-Jahxg1_oOjKaLrJVe7kmLQ-1; Thu, 28 Mar 2024 04:32:46 -0400 X-MC-Unique: Jahxg1_oOjKaLrJVe7kmLQ-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 0B332852000; Thu, 28 Mar 2024 08:32:46 +0000 (UTC) Received: from localhost (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F752C01600; Thu, 28 Mar 2024 08:32:45 +0000 (UTC) Date: Thu, 28 Mar 2024 16:32:38 +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: Re: [PATCH v2 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240325145646.1044760-5-bhe@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 On 03/25/24 at 10:56pm, Baoquan He wrote: > 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); Here, we should initialize zone->managed_pages as zone->present_pages because later page_group_by_mobility_disabled need be set according to zone->managed_pages. Otherwise page_group_by_mobility_disabled will be set to 1 always. I will sent out v3. From a17b0921b4bd00596330f61ee9ea4b82386a9fed Mon Sep 17 00:00:00 2001 From: Baoquan He Date: Thu, 28 Mar 2024 16:20:15 +0800 Subject: [PATCH] mm/mm_init.c: set zone's ->managed_pages as ->present_pages for now Content-type: text/plain Because page_group_by_mobility_disabled need be set according to zone's managed_pages later. Signed-off-by: Baoquan He --- mm/mm_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index cc24e7958c0c..dd875f943cbb 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1561,7 +1561,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat) * Initialize zone->managed_pages as 0 , it will be reset * when memblock allocator frees pages into buddy system. */ - zone_init_internals(zone, j, nid, 0); + zone_init_internals(zone, j, nid, zone->present_pages); if (!size) continue; -- 2.41.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 */ > -- > 2.41.0 >