From mboxrd@z Thu Jan 1 00:00:00 1970 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 AEB3FCE7B0D for ; Thu, 28 Sep 2023 08:33:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E3136B020C; Thu, 28 Sep 2023 04:33:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 491788D0053; Thu, 28 Sep 2023 04:33:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 359058D0038; Thu, 28 Sep 2023 04:33:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 21F056B020C for ; Thu, 28 Sep 2023 04:33:34 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E6538B38AD for ; Thu, 28 Sep 2023 08:33:33 +0000 (UTC) X-FDA: 81285342306.28.5FE643B Received: from out-193.mta1.migadu.com (out-193.mta1.migadu.com [95.215.58.193]) by imf12.hostedemail.com (Postfix) with ESMTP id 3AC3C40014 for ; Thu, 28 Sep 2023 08:33:31 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=kD+0cIrc; spf=pass (imf12.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.193 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695890012; a=rsa-sha256; cv=none; b=rqEzuhwLalqIzlqCsUpUaGOnK7EA2sen7BXN0KBhK0PuRinJg+raByzsG2jMB+bpWk1/d4 l2bSJWYqxccrYN8j+4RiEIs8GGGSlZ3OJ0f+jCgIl7RCEdif8JLo2Pf1fyZQAkcnpPm7ij c/pOlkEbu6fOebqAmu1/I4/l8S+kdZo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=kD+0cIrc; spf=pass (imf12.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.193 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695890012; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ndlAl8gJAsCJFziL9ZoiYCvbtGWSUdy/2eJ3c8tKLfc=; b=TUMLMEMZIGHu5HXB4a1xh4Y1gjrBWubyzJN4o6lEgIP69JEaG+LIcugE6Pdx+rT2LKgimZ sRfnCF6BoffKJjSRpfa/dYhNvVczHKh/G4+jwDmFJjPuYEMIDNWXjmy08fO0n5VIVqFpNX wpnv5eHCrAMZDvEVzvDqAv9kdxeJebQ= 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=1695890010; 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=ndlAl8gJAsCJFziL9ZoiYCvbtGWSUdy/2eJ3c8tKLfc=; b=kD+0cIrcyrKB+aJyxLSjWuKmqwjEtTcPvS0npgUQL52e/BYI8KXumtAqoIhegDCdsBbYLR hFZmDWKtYoGTJzn7Pku3pXqZWZolRVBlIpRtc4b2qCpuq6AFE/E1cJRBaX4b+1jmzFzh+/ PwR4EQ9JkBr9mXbwk97moOWb1xqaYAA= 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 v4 2/2] mm: Init page count in reserve_bootmem_region when MEMINIT_EARLY Date: Thu, 28 Sep 2023 16:33:02 +0800 Message-Id: <20230928083302.386202-3-yajun.deng@linux.dev> In-Reply-To: <20230928083302.386202-1-yajun.deng@linux.dev> References: <20230928083302.386202-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3AC3C40014 X-Stat-Signature: xkncjz14mhaoykd99u1yn9r771pbsqfu X-Rspam-User: X-HE-Tag: 1695890011-116933 X-HE-Meta: U2FsdGVkX1/l9R5L+742LOPsd7UwSD2GnRgDqbpF2hWh88ZXnb/784149S/Adkc/3eRLi4dJIC67boyncW9Ac1oIUQmHRw4N0QyVFX0eOphbO+P20QAyHhHvWuWrpxl74V8gYgbitm/jjCZCJEhYM+seCZTkBeFdLSbf15Eyq17269yL24KjrLAOzBbW5xc71z4sT7yyQS1wQ7XsA1V35I38h9y+8muQ3AYKOAvaUOA6Y9CWxOuINZoZiDnEx99wGkJEzUJWwF/tOC6O89RGCUo+ZP0tIRX08Jk7pR5cQdaOJuAPdqPcO6bze41A491pbncGBYzQ9c//bX3ACQXNlyaRoGbrpHeQoVhjnhjGHHU92SLUC7GlSAYCbg2v0u7JArcfaR9ubA22Dy00jgpP1PnP9MZUKporoCqW5k2K/n205X8kuJWtdNrJCAHGxJzilw1e39UGxMZdKO/TF1mDEX/szUfO7SBXXb/Cz99tvhVhgQ7Mcnd5j8ZqKHeuqqMlVGiq7tF++6WcmM52KH9WQyPMEQ0BRflMW+fBqCvuVs8Qikouzipdy5MC4TIvecRFEuiaN7kRDKFCI2xoOZFA9uqTlKYK0uhKRzuMmqtoxZfOdZHAw0FU6GpnxIzMMhD1ESJfLiDmeDuDe2NxVuyN6IfvSwdshLUoC7uBY5jh/0lGj3vHe0kjhj2kdW4q3OWvDtlSsp5931g1q+ukunTZmvH6bMJ91cSP1BOZlGN2F0PK2JrRtATcXKuqwu4hppY6GLvsd+5CC39PU/lRIE50LeIFU35CBC3ObSeNO6JY4nifa45lryUvrM6vje6xf/P9Mi2p89mKVmKGP1QuT0gOT6CuFTxuL0/vdzhXRxwBFI8SM8Rz6Y4Gtd+rOlt8AAVFxpEQPObHq/lGbZsV/spr3n/2jDsBXf+fp36YDWcEOsDyc4WrBiHKYGNCMGs8MNUaz/xNGlTvP7W9QLVw++b z5qxHcML WjeF9GrRjP6eSh/enj+GflWNnFFbqr6mIHExT3RrdROY5rRYdBOVeZVon6lRLZPI8ujEHbXqorDcCaCsazUz91yrh0Cx8hjGv78s6WrLbJgMXY6YsjX9L8HHl9tpdJFjAYmze3kg1Igc3d4AbJuLCgYpXhuExZNYxyPg4Rf8AVuOMvw5dBpq2uggLkg== 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: memmap_init_range() would init 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 --- v4: same with v2. 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 9716c8a7ade9..3ab8861e1ef3 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); + /* Init page count for 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 init 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); -- 2.25.1