From patchwork Tue Feb 27 17:42:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13574242 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 4305CC5478C for ; Tue, 27 Feb 2024 17:49:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C3FD194000E; Tue, 27 Feb 2024 12:49:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BEE5294000A; Tue, 27 Feb 2024 12:49:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB58494000E; Tue, 27 Feb 2024 12:49:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9B64794000A for ; Tue, 27 Feb 2024 12:49:40 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 73D00402E8 for ; Tue, 27 Feb 2024 17:49:40 +0000 (UTC) X-FDA: 81838321320.11.53E0D05 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 052ADC0014 for ; Tue, 27 Feb 2024 17:49:38 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HsfOVIQK; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709056179; 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=JS2zWSxA9BHMVin23i/d0wNgroAnOrkk1liM0VEFQ4o=; b=ZdpCzMk7q8qv08OIzFxXS2FsqMcZnqdofC8AfZdzQIglG103qP0BADg/vulu3xAIekbd9T pjB5box36bcGjUC/5MPPVszLHe7krFJsbGQuSdxM1SwmPW7VOEe5WJgu0iFGWr8KXvOfAm oAPA5gZArLzfqPdcwjLaLpvXKQ2Bvss= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HsfOVIQK; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709056179; a=rsa-sha256; cv=none; b=J0lqQ7QtyXshS0euQUylm/jOnexcpLTsWQSVFnnFkt1mAMEE83SpjqVZ+7yZ9bMyZFThwe QwS7UGcVfPFTskIYQC6TvZjZ6XpK6M2FoYxqz0HXUHQAoEpzcvlqZp2eqifq4dPR+X79D1 oqxFlNep/s1P94yWZNrnoeoOvPYFWXc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=JS2zWSxA9BHMVin23i/d0wNgroAnOrkk1liM0VEFQ4o=; b=HsfOVIQKWyC+Rn+0o/6cyT8msq AM39rApF5sFTGBeNN24uLfQYSO3tdLsSbeptoezM/K5z1IEiV7hDLdiv+t5xEDLd3J1pM9Chjw6FC nDzssZOplts/RbWv0O5uHLFAnI3OaGykJCMRbp+sjWcVEylkYjQU3vb/iuQFSyMXAviJeRPP/jwD6 qY8qspuf0I4fZUBzlkzA1s+xx1FeHzNIW1skY4go9/0G6S122vbVjfspYHlykXOJZwiXt070Ix8NV RaLVKdSuZPZakKmuHAOmPvAtje2gZZDAOr6yuMDNL4XZHeQvinny5TAOcVwTX4sS0Ga7x3yLQ5Bpy /Zi2V6OQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rf1Tm-00000002yqu-0RXL; Tue, 27 Feb 2024 17:42:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Ryan Roberts Subject: [PATCH v3 02/18] mm: Convert free_unref_page_list() to use folios Date: Tue, 27 Feb 2024 17:42:36 +0000 Message-ID: <20240227174254.710559-3-willy@infradead.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240227174254.710559-1-willy@infradead.org> References: <20240227174254.710559-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 052ADC0014 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 6kwtw6iqi7jk5ryref7w9eds76xgcc79 X-HE-Tag: 1709056178-380765 X-HE-Meta: U2FsdGVkX1+D7XfAEiO/Zw9ieksmYSADe4TPDFFxsLYknK8jWGq35CMua/T683/8y12CVp6SKBMhl3VuMWBT0EtteAdcGsoXB6uyq9jtYB7pRoeENYOTjLUkG7KbFhlcPmiJ0Tl3RJc/MaLF6ljS36hIo9VJXuCIQ4pbOY5oKc6X3N008IA3SJ0cizda6gCdCgQAD2zXX5537seFlsAngrKfuUGowVCVZ4lVIMjPe6/3oldribmqrZxM0axyB2ta0U7WJF6CRTCDAUwjp6PtehgNeaS81U4o2Sc0Gbellh3z0nhEdlOH/ZbwtaqOama/yaKBgDK1/kGu/DUlTQqWccQoRhl2p7AC0gRNqYjKyrRMtgljMyOkvVruvc8v8dbbwIPbh92f1bhUUuamRStBu3O/GQuVkovH/fn6wBeRpxzjw13lxxL5h0p8N+2caKdDSzQAcf+tefr2XISnMZFHggZBpqhDwuPjZIVgNHYUtuX/hYCpINTruYQhQdTggjC1Yf0ypJxEnMs2s3jD7fWglmscPb0zqdeGioRgVryHPNUDZb6L6GDySPwekZVervqMhjtw5sfd9+e9cfaimo/X+HxW70/nC1u6yB4UkUfX/E1KkCReTB5AzUCMymI0H4sj9R9H1aSYTfnXz66EZP36aIXYZLDEHp8QZE5noOe2sIyWlaGJDb27sRXM3GV9EhFNDzCQ1QOdBYrFjc0dYxV40aBgnKBLZc/2P7czgvXMinNW91BWLiNz0eAGbShaCZ+QMqWrSOAeRWRREb6hR2T8giIggXUW6NhkS/F9SJKCLEB4noQT4kZPTbtrb8dtZua98w6m8SxhPigLBqq1E8FkUEJkl0O9WWgJHPXuYq+9Lj9XaYPRFgiaYtizKRNo+lGUxpcDDq6kJ6r1vnpsuxIiwi0wLyvhQ0ne 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: Most of its callees are not yet ready to accept a folio, but we know all of the pages passed in are actually folios because they're linked through ->lru. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Ryan Roberts --- mm/page_alloc.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 96839b210abe..24798531fe98 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2556,17 +2556,17 @@ void free_unref_page(struct page *page, unsigned int order) void free_unref_page_list(struct list_head *list) { unsigned long __maybe_unused UP_flags; - struct page *page, *next; + struct folio *folio, *next; struct per_cpu_pages *pcp = NULL; struct zone *locked_zone = NULL; int batch_count = 0; int migratetype; /* Prepare pages for freeing */ - list_for_each_entry_safe(page, next, list, lru) { - unsigned long pfn = page_to_pfn(page); - if (!free_unref_page_prepare(page, pfn, 0)) { - list_del(&page->lru); + list_for_each_entry_safe(folio, next, list, lru) { + unsigned long pfn = folio_pfn(folio); + if (!free_unref_page_prepare(&folio->page, pfn, 0)) { + list_del(&folio->lru); continue; } @@ -2574,24 +2574,25 @@ void free_unref_page_list(struct list_head *list) * Free isolated pages directly to the allocator, see * comment in free_unref_page. */ - migratetype = get_pcppage_migratetype(page); + migratetype = get_pcppage_migratetype(&folio->page); if (unlikely(is_migrate_isolate(migratetype))) { - list_del(&page->lru); - free_one_page(page_zone(page), page, pfn, 0, migratetype, FPI_NONE); + list_del(&folio->lru); + free_one_page(folio_zone(folio), &folio->page, pfn, + 0, migratetype, FPI_NONE); continue; } } - list_for_each_entry_safe(page, next, list, lru) { - struct zone *zone = page_zone(page); + list_for_each_entry_safe(folio, next, list, lru) { + struct zone *zone = folio_zone(folio); - list_del(&page->lru); - migratetype = get_pcppage_migratetype(page); + list_del(&folio->lru); + migratetype = get_pcppage_migratetype(&folio->page); /* * Either different zone requiring a different pcp lock or * excessive lock hold times when freeing a large list of - * pages. + * folios. */ if (zone != locked_zone || batch_count == SWAP_CLUSTER_MAX) { if (pcp) { @@ -2602,15 +2603,16 @@ void free_unref_page_list(struct list_head *list) batch_count = 0; /* - * trylock is necessary as pages may be getting freed + * trylock is necessary as folios may be getting freed * from IRQ or SoftIRQ context after an IO completion. */ pcp_trylock_prepare(UP_flags); pcp = pcp_spin_trylock(zone->per_cpu_pageset); if (unlikely(!pcp)) { pcp_trylock_finish(UP_flags); - free_one_page(zone, page, page_to_pfn(page), - 0, migratetype, FPI_NONE); + free_one_page(zone, &folio->page, + folio_pfn(folio), 0, + migratetype, FPI_NONE); locked_zone = NULL; continue; } @@ -2624,8 +2626,8 @@ void free_unref_page_list(struct list_head *list) if (unlikely(migratetype >= MIGRATE_PCPTYPES)) migratetype = MIGRATE_MOVABLE; - trace_mm_page_free_batched(page); - free_unref_page_commit(zone, pcp, page, migratetype, 0); + trace_mm_page_free_batched(&folio->page); + free_unref_page_commit(zone, pcp, &folio->page, migratetype, 0); batch_count++; }