From patchwork Tue Sep 26 02:33:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 144869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1877669vqu; Tue, 26 Sep 2023 05:37:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGx4an9stnAT10b+eM19Em34a9E6oH3wNG5IOyvGp10gAwH2Y6Lqx9K+YcY032APx6bqgaT X-Received: by 2002:a05:6a20:1590:b0:15b:c800:48af with SMTP id h16-20020a056a20159000b0015bc80048afmr6799048pzj.23.1695731830113; Tue, 26 Sep 2023 05:37:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695731830; cv=none; d=google.com; s=arc-20160816; b=sBBYfjsQeC5w2yAWfre3TLtvyqxoDlfL4DeHOJSzq3f54K8XMlXlCM1rVqRn5R2pK7 vB1NBcLeTOh6ze572CHbdaf4wCCVgZG7cSO2iXWqnMYxbGgEP2LEtJjjtFJflYXPGjr5 kWd+hy4NM94fs91pvK+UDnB3m63XkFXkKkxvGU7wKuSeGntYp2jNtz1SkSGxSDK2D/l9 U2em3m2K0INqJh7r0kcylYyTwmK7EqguHWUNbLW1oopb31HXPh11Lv2s9KsK5rvo9J0A xuTpZOdRtkhfgAW6UZANXBRohTl3ZPYiPyIgmoiii/35HwceUkXjkOn/bYx4y232nj/b tTVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mbaQjpBujw9FQ7lVsONZ8zG8x5WSfMi70JpOWR62DEA=; fh=KOqnwf3wLq339F86BgBAUBm2BDBdSDR9Q3xMFmvILoY=; b=1IQRs4/BrUPelj1bVZ0YFoALmnX+aAO+8RxjrwpSK2AU1sj7b60ZgFsN/+r4gQTIvh 4q8P89t8mStpv8y2YRU/LHajU5WMDAHJb6KeYL3ezNmECenndKxdh+4GIVOgrIObLn40 V67RCFQNcs8UPIj/jjGNe7JFiJp2TJ5XhHDqKvjcZZxAjMy1Xf7eD9gq2yJCxlFX67ae u17TmPAvuU30b7SljI4UYxVfo0d04g+ALuTF9VAnbrWjTUHSbu1Z/VzqAsfs5qxyBVAo lzpE8Oi6pSfQJxZoSufYb/509GCMTGAngGn5D4HGE65dZnYk8zkz0oxki0NrJWaCGXDr 6OpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=lSQW+083; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y17-20020a170902e19100b001bee6def27esi11706275pla.260.2023.09.26.05.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 05:37:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=lSQW+083; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D6AE68184E02; Mon, 25 Sep 2023 19:34:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233513AbjIZCeV (ORCPT + 27 others); Mon, 25 Sep 2023 22:34:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233498AbjIZCeS (ORCPT ); Mon, 25 Sep 2023 22:34:18 -0400 Received: from out-209.mta0.migadu.com (out-209.mta0.migadu.com [91.218.175.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3B1C103 for ; Mon, 25 Sep 2023 19:34:10 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1695695649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mbaQjpBujw9FQ7lVsONZ8zG8x5WSfMi70JpOWR62DEA=; b=lSQW+083sAYjXW0rFYgELsoroKpHPC3apsKS0WEq7AlaS3MjgN96HZKIHnoMCC/hjtqp4Q aIRfnT0bcCCVA6kpYLGiiTenr6umkTKdly4pSF/bWaL5X+CXopmYgGAMfExwzIXSXeE7p0 96DVrrj2fy4IEKt67/8SbYK+Bj7ngAU= From: Yajun Deng To: akpm@linux-foundation.org, rppt@kernel.org Cc: mike.kravetz@oracle.com, muchun.song@linux.dev, willy@infradead.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3 1/2] mm: pass page count and reserved to __init_single_page Date: Tue, 26 Sep 2023 10:33:40 +0800 Message-Id: <20230926023341.991124-2-yajun.deng@linux.dev> In-Reply-To: <20230926023341.991124-1-yajun.deng@linux.dev> References: <20230926023341.991124-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 25 Sep 2023 19:34:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778102323925458869 X-GMAIL-MSGID: 1778103699401330612 When we init a single page, we need to mark this page reserved if it does. And some pages may not need to set page count, such as compound pages. Introduce enum init_page_flags, the caller init page count and mark page reserved by passing INIT_PAGE_COUNT and INIT_PAGE_RESERVED. Signed-off-by: Yajun Deng --- v3: Introduce enum init_page_flags. v2: Introduce INIT_PAGE_COUNT and INIT_PAGE_RESERVED. v1: https://lore.kernel.org/all/20230922070923.355656-1-yajun.deng@linux.dev/ --- mm/hugetlb.c | 2 +- mm/internal.h | 8 +++++++- mm/mm_init.c | 31 +++++++++++++++++-------------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index de220e3ff8be..cb282eadc729 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3196,7 +3196,7 @@ static void __init hugetlb_folio_init_tail_vmemmap(struct folio *folio, for (pfn = head_pfn + start_page_number; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __init_single_page(page, pfn, zone, nid); + __init_single_page(page, pfn, zone, nid, INIT_PAGE_COUNT); prep_compound_tail((struct page *)folio, pfn - head_pfn); ret = page_ref_freeze(page, 1); VM_BUG_ON(!ret); diff --git a/mm/internal.h b/mm/internal.h index d7916f1e9e98..449891ad7fdb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1209,8 +1209,14 @@ struct vma_prepare { struct vm_area_struct *remove2; }; +enum init_page_flags { + INIT_PAGE_COUNT = (1 << 0), + INIT_PAGE_RESERVED = (1 << 1), +}; + void __meminit __init_single_page(struct page *page, unsigned long pfn, - unsigned long zone, int nid); + unsigned long zone, int nid, + enum init_page_flags flags); /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, diff --git a/mm/mm_init.c b/mm/mm_init.c index 06a72c223bce..07fe7e489769 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -557,11 +557,11 @@ static void __init find_zone_movable_pfns_for_nodes(void) } void __meminit __init_single_page(struct page *page, unsigned long pfn, - unsigned long zone, int nid) + unsigned long zone, int nid, + enum init_page_flags flags) { mm_zero_struct_page(page); set_page_links(page, zone, nid, pfn); - init_page_count(page); page_mapcount_reset(page); page_cpupid_reset_last(page); page_kasan_tag_reset(page); @@ -572,6 +572,10 @@ void __meminit __init_single_page(struct page *page, unsigned long pfn, if (!is_highmem_idx(zone)) set_page_address(page, __va(pfn << PAGE_SHIFT)); #endif + if (flags & INIT_PAGE_COUNT) + init_page_count(page); + if (flags & INIT_PAGE_RESERVED) + __SetPageReserved(page); } #ifdef CONFIG_NUMA @@ -714,7 +718,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) if (zone_spans_pfn(zone, pfn)) break; } - __init_single_page(pfn_to_page(pfn), pfn, zid, nid); + __init_single_page(pfn_to_page(pfn), pfn, zid, nid, INIT_PAGE_COUNT); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} @@ -821,8 +825,8 @@ static void __init init_unavailable_range(unsigned long spfn, pfn = pageblock_end_pfn(pfn) - 1; continue; } - __init_single_page(pfn_to_page(pfn), pfn, zone, node); - __SetPageReserved(pfn_to_page(pfn)); + __init_single_page(pfn_to_page(pfn), pfn, zone, node, + INIT_PAGE_COUNT | INIT_PAGE_RESERVED); pgcnt++; } @@ -884,7 +888,7 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone } page = pfn_to_page(pfn); - __init_single_page(page, pfn, zone, nid); + __init_single_page(page, pfn, zone, nid, INIT_PAGE_COUNT); if (context == MEMINIT_HOTPLUG) __SetPageReserved(page); @@ -965,11 +969,9 @@ static void __init memmap_init(void) #ifdef CONFIG_ZONE_DEVICE static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, unsigned long zone_idx, int nid, - struct dev_pagemap *pgmap) + struct dev_pagemap *pgmap, + unsigned int flags) { - - __init_single_page(page, pfn, zone_idx, nid); - /* * Mark page reserved as it will need to wait for onlining * phase for it to be fully associated with a zone. @@ -977,7 +979,7 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, * We can use the non-atomic __set_bit operation for setting * the flag as we are still initializing the pages. */ - __SetPageReserved(page); + __init_single_page(page, pfn, zone_idx, nid, flags | INIT_PAGE_RESERVED); /* * ZONE_DEVICE pages union ->lru with a ->pgmap back pointer @@ -1041,7 +1043,7 @@ static void __ref memmap_init_compound(struct page *head, for (pfn = head_pfn + 1; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + __init_zone_device_page(page, pfn, zone_idx, nid, pgmap, 0); prep_compound_tail(head, pfn - head_pfn); set_page_count(page, 0); @@ -1084,7 +1086,8 @@ void __ref memmap_init_zone_device(struct zone *zone, for (pfn = start_pfn; pfn < end_pfn; pfn += pfns_per_compound) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + __init_zone_device_page(page, pfn, zone_idx, nid, pgmap, + INIT_PAGE_COUNT); if (pfns_per_compound == 1) continue; @@ -2058,7 +2061,7 @@ static unsigned long __init deferred_init_pages(struct zone *zone, } else { page++; } - __init_single_page(page, pfn, zid, nid); + __init_single_page(page, pfn, zid, nid, INIT_PAGE_COUNT); nr_pages++; } return (nr_pages); From patchwork Tue Sep 26 02:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 144780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1767189vqu; Tue, 26 Sep 2023 01:52:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEog0Vv/+YzbGdaME47qwBQGHM6BEE36zuamJQyOgOpKarpXCqpaBghiPneDq7nOHce804F X-Received: by 2002:a05:6a00:13a1:b0:690:463a:fa9d with SMTP id t33-20020a056a0013a100b00690463afa9dmr7644685pfg.22.1695718377919; Tue, 26 Sep 2023 01:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695718377; cv=none; d=google.com; s=arc-20160816; b=KuuTx3s0DODeRLccc5IeC/8/Rsb/5T1gDxkTaPVfXZ3qizq2AY8U5BvZI1BHHPnfxU Ruw/C2TSTTv+prx8HPQpA1taYcCIZS3jI7lNX68FWLNlXuvIO003L+y2jiByzWiCZ5B8 dsQkacieQ0ITbDxAxU3QqVCuw4JJ7K9iUSfZl6xtrYJ1iSqF7aswYK2G+g5hg0AcTgWK P9n8d18h64KdXA5Ia7kLPEYA0QnCDT9+vt5JS8GIgtWYpWpCBSd6IifVgLx1aauv4aNV UJkYg+rJg9pWp9AQ11eQvJlwE7dfvVCmHyHmwMBBe8SQXmdue4M9cQnmFuAovgZLyTzy q+eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O4gdwyymXhv1akvvXy7XdiAE7b0Qw7mzBDzL0vbfvGE=; fh=KOqnwf3wLq339F86BgBAUBm2BDBdSDR9Q3xMFmvILoY=; b=hctqmSieB69VQuc9eoaoZKeYE6vCT5yjr/e0+BPF5Qj+PDUbNe+MbvRMIOlpVHkY68 RXfTxv0H3UJTtibD1wHtvuyIj0QxXE1UGCbA+OOfwr+XKIyMqVNTjFA2lZ+YBSEuxBEh YIR5JTOgYd1sT5UcpN9AC4yzq3/FsbYeUZaHjRRIodzEMtEkrAc8TUxS6+4t4DoMZMlD fyKiL3noW60tbHDiBTMMuMEaL/FQa7sf1xRBZQzNYLeNwIUl55pkUHAS734dIkedPhr4 kF+X816XDoXY9DbCSoR0m6pP8k0QXqqmLW5Rb9zkkt8sLVmB+j2iFCqdQbNdJpnPT5yt 8C0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=PNjKmnQw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ca21-20020a056a00419500b0068e29a05fa4si11863747pfb.326.2023.09.26.01.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 01:52:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=PNjKmnQw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9EFE88339678; Mon, 25 Sep 2023 19:34:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233498AbjIZCe2 (ORCPT + 27 others); Mon, 25 Sep 2023 22:34:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233504AbjIZCe1 (ORCPT ); Mon, 25 Sep 2023 22:34:27 -0400 Received: from out-203.mta0.migadu.com (out-203.mta0.migadu.com [91.218.175.203]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C76DBBF for ; Mon, 25 Sep 2023 19:34:20 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1695695659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O4gdwyymXhv1akvvXy7XdiAE7b0Qw7mzBDzL0vbfvGE=; b=PNjKmnQwnMzOqfxuvKSAPWIU9KnNN9QPLkyG+c8Bbg3eJ+YE/ZJRFcltMVXWxRXclXOp5l SBjkLkc7wMzfjBEMZdLVjld0qCtwi8EYwfcACs9pVGrHfuMREpjA35wI9a23uLHLs361w/ MqGUo/p8Q4mUx+NYuq4q0YEpessgzzY= From: Yajun Deng To: akpm@linux-foundation.org, rppt@kernel.org Cc: mike.kravetz@oracle.com, muchun.song@linux.dev, willy@infradead.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v3 2/2] mm: Init page count in reserve_bootmem_region when MEMINIT_EARLY Date: Tue, 26 Sep 2023 10:33:41 +0800 Message-Id: <20230926023341.991124-3-yajun.deng@linux.dev> In-Reply-To: <20230926023341.991124-1-yajun.deng@linux.dev> References: <20230926023341.991124-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 19:34:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778089593627245965 X-GMAIL-MSGID: 1778089593627245965 memmap_init_range() would set page count of all pages, but the free pages count would be reset in __free_pages_core(). There are opposite operations. It's unnecessary and time-consuming when it's MEMINIT_EARLY context. Init page count in reserve_bootmem_region when in MEMINIT_EARLY context, and check the page count before reset it. At the same time, the INIT_LIST_HEAD in reserve_bootmem_region isn't need, as it already done in __init_single_page. The following data was tested on an x86 machine with 190GB of RAM. before: free_low_memory_core_early() 341ms after: free_low_memory_core_early() 285ms Signed-off-by: Yajun Deng --- v3: same with v2. v2: check page count instead of check context before reset it. v1: https://lore.kernel.org/all/20230922070923.355656-1-yajun.deng@linux.dev/ --- mm/mm_init.c | 18 +++++++++++++----- mm/page_alloc.c | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 07fe7e489769..af1b3e7b0f52 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -718,7 +718,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) if (zone_spans_pfn(zone, pfn)) break; } - __init_single_page(pfn_to_page(pfn), pfn, zid, nid, INIT_PAGE_COUNT); + __init_single_page(pfn_to_page(pfn), pfn, zid, nid, 0); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} @@ -756,8 +756,8 @@ void __meminit reserve_bootmem_region(phys_addr_t start, init_reserved_page(start_pfn, nid); - /* Avoid false-positive PageTail() */ - INIT_LIST_HEAD(&page->lru); + /* Set page count for the reserved region */ + init_page_count(page); /* * no need for atomic set_bit because the struct @@ -888,9 +888,17 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone } page = pfn_to_page(pfn); - __init_single_page(page, pfn, zone, nid, INIT_PAGE_COUNT); - if (context == MEMINIT_HOTPLUG) + + /* If the context is MEMINIT_EARLY, we will set page count and + * mark page reserved in reserve_bootmem_region, the free region + * wouldn't have page count and we will check the pages count + * in __free_pages_core. + */ + __init_single_page(page, pfn, zone, nid, 0); + if (context == MEMINIT_HOTPLUG) { + init_page_count(page); __SetPageReserved(page); + } /* * Usually, we want to mark the pageblock MIGRATE_MOVABLE, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 06be8821d833..b868caabe8dc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1285,18 +1285,22 @@ void __free_pages_core(struct page *page, unsigned int order) unsigned int loop; /* - * When initializing the memmap, __init_single_page() sets the refcount - * of all pages to 1 ("allocated"/"not free"). We have to set the - * refcount of all involved pages to 0. + * When initializing the memmap, memmap_init_range sets the refcount + * of all pages to 1 ("reserved" and "free") in hotplug context. We + * have to set the refcount of all involved pages to 0. Otherwise, + * we don't do it, as reserve_bootmem_region only set the refcount on + * reserve region ("reserved") in early context. */ - prefetchw(p); - for (loop = 0; loop < (nr_pages - 1); loop++, p++) { - prefetchw(p + 1); + if (page_count(page)) { + prefetchw(p); + for (loop = 0; loop < (nr_pages - 1); loop++, p++) { + prefetchw(p + 1); + __ClearPageReserved(p); + set_page_count(p, 0); + } __ClearPageReserved(p); set_page_count(p, 0); } - __ClearPageReserved(p); - set_page_count(p, 0); atomic_long_add(nr_pages, &page_zone(page)->managed_pages);