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: 13398608 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 4A8E2E81810 for ; Tue, 26 Sep 2023 02:34:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0F046B0188; Mon, 25 Sep 2023 22:34:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BDDF6B0189; Mon, 25 Sep 2023 22:34:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 885336B018A; Mon, 25 Sep 2023 22:34:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 789346B0188 for ; Mon, 25 Sep 2023 22:34:22 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 478DBC085B for ; Tue, 26 Sep 2023 02:34:22 +0000 (UTC) X-FDA: 81277179564.18.A3E11D4 Received: from out-193.mta0.migadu.com (out-193.mta0.migadu.com [91.218.175.193]) by imf22.hostedemail.com (Postfix) with ESMTP id 8D2ADC000B for ; Tue, 26 Sep 2023 02:34:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PNjKmnQw; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.193 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695695660; 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=O4gdwyymXhv1akvvXy7XdiAE7b0Qw7mzBDzL0vbfvGE=; b=UjVde2qMFxJox+2JB3CP/3uj6R9vWLw2yCPAtfy9h4+ExqR8/J075s/utzxzl11sriq1US d24GkqznyiKd5FGZHfm7VFd1ekM/cQHR/RU/cglBamTQZSPxcbhtWBLnv6GfiifTNGJ8h/ k8RA9oXpDWf2eoD4/rhq9tx+kkOJwaQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PNjKmnQw; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf22.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.193 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695695660; a=rsa-sha256; cv=none; b=j4j5XXRjFEEhmOLCxMpaipI4bRhCH3L9xEXq1bcnt/a2thk/ljVr4u+wiCmyPDHSs3RO/8 pAisnmPRDCy6lMsOi2XcnK+Lc1JmudfiMqRy9siSZdD+igtkIxvM2LN6g8ar2qTe5h+2vW sCh1L/bAr+ZpDIRhHtl93uyJrwbFVC0= 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-Rspamd-Queue-Id: 8D2ADC000B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: qeqp5ykigt9agezk9ewz1b7h14o8juiq X-HE-Tag: 1695695660-641256 X-HE-Meta: U2FsdGVkX19R7/mYAF4Jg+g5b3dnvxzhvWy3/4qLMruUWFndbHw3LBtDTOGAwt8IH6wh2DWAD1OxVqa2Io86KsCY8Fx5wgDB1KuK6nrnhhIIIywNr1nD8soB5V3wvDV4SixvTfb9KTiIxo5jrNApo1RvcoRBgXUTRY/R2FlhOwJ1ubaBVDxET29mNkr0w8Li4m0OKKWGVNx/auRzYDi14dmNGXfqOQDplLu6l1NE1nBNnLUYnfyI0xoWZJziWNrOl/ur0OBBt1xh2VXfrrCigbwecVtdz80DBApM86+1ChWKicKtGYpBBJ5R7yj8dKARDa1OBoDP0ZILsNzsXMIxVCj/4pxa0pyoXTlfMpjQU/nfWIJpRNKtLmRVQRySU+EZc/QFnIWi86iXC7zvF2kupa0liZak5NhULIMUUjsw6lxFFW6uiRc5jGrGbqcfneyD+D58Sjw98PN2fYITM4A8oM9W/Ovq7ZxVqUOy7y3vNdK46uTuxopPRNay0789e59OGKo5ijk76ilE2LtDGgzKcmLl/AiLrFhrc95VPZiRWIbLQBEYUMKyWJd+sF6fnuxX8hAXLPtpS3VH7fdil/X0icm8duA47PZcAbtt8Z2kfsx4wKiJvm0b93PCikHeHHI/plIjVODgwkaZt87x+oTZUGUYeC+Km+3NJKUrOMCCKq9ELW7DTz8rD7ruhMfah6YLLB4HtQQEdHVjzpRvOd8YauGDSBp53dUkBK3M8bQyCVPWvScbvoZbMWn1EsmXdYLjdtKK78e3F5eGFF7YloIwZxJXAnIswD94gck1NlGHI7RTVktbG00cIYi4lh1pdnCCM1tqzW3mse3krWzAwumwLYOCMsMcRwsXfx6KbpqOxbuFl4l6fgXjvYY6NuxM9EvstqsrDBW+aDvSfWj7JKKhqG1rj5IW3MLRi6PkAKr6ne/QvzQMr8rTr4+FAx33kqtyy4jqgZWC2PNXvJA77FE lvDndeZv cU1eJ24nafdylePnNiTCvZ3aXQ28aUeib4H3nnbnsHS6SINlUD4yHIMR6xC/hzdtRL1ZXVuOMYHsfyXdc8Vw3A5auOg6qYsrIUw0yZ23Ryk7GnOb0pWkkOI/0ABQixIdWRX1MvzaIOA5zQ0rU9YLwTz/nA7k/R6bznBTM5EnIdw+9oARw9IZnivBjmQ== 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 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);