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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72A23C433B4 for ; Mon, 10 May 2021 23:25:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 11225615FF for ; Mon, 10 May 2021 23:25:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11225615FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9D15C8E0002; Mon, 10 May 2021 19:25:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95A438E0001; Mon, 10 May 2021 19:25:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FBC08E0002; Mon, 10 May 2021 19:25:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id 5F3838E0001 for ; Mon, 10 May 2021 19:25:08 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1AB018249980 for ; Mon, 10 May 2021 23:25:08 +0000 (UTC) X-FDA: 78126904296.15.8C8850F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 1B842E0011C4 for ; Mon, 10 May 2021 23:24:38 +0000 (UTC) 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=TeUuXq9To8lgcl1o5k4sCzqTpRU5GNmM8WZRtq2XAHM=; b=i7uMGqhjU70AcV3rLCnq7FFUGZ Xaas7OmrkB8xq7IRzd5gsQXfdaop46lQO1e+iWm84pCZsW/JAxRLTbOZYIVvfadTMGJ3BWGps0AZC JxH6zk/zdtQF4fnctsrEw+hQmEZjM1XTRy0pDjJXwwDQG2cR6REdmIbdoE1w3ZNUuyGZxs7UQ6zVW ldWxgUcAN7z9CNHSsc3yw3E7IHsomSOi2ardBJ1+RMnm36srL6GaIru8abEGso82zISVoMuUdGpQE 9eKlzCzbHLxV/squSMK3iYBK7HhQPgpQDya+D87qFKhki5y/Vdoy55lW1VpPtfIE+QvCY6iCO6RY8 9drN44qw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lgFFf-006gOK-8T; Mon, 10 May 2021 23:24:06 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/3] mm/migrate: Add folio_migrate_copy Date: Tue, 11 May 2021 00:23:08 +0100 Message-Id: <20210510232308.1592750-4-willy@infradead.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210510232308.1592750-1-willy@infradead.org> References: <20210510232308.1592750-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1B842E0011C4 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=i7uMGqhj; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam04 X-Stat-Signature: xsmzgpxuonuecgedkcdcajhmd39ab69t Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf30; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620689078-828048 Content-Transfer-Encoding: quoted-printable 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: Combine the THP, hugetlb and base page routines together into a simple loop. It does iterate the pages backwards, but real CPUs can prefetch a backwards walk. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/migrate.h | 1 + mm/folio-compat.c | 6 ++++ mm/migrate.c | 68 ++++++++--------------------------------- 3 files changed, 19 insertions(+), 56 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 7993faffa46d..cb67692e659a 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -52,6 +52,7 @@ extern int migrate_huge_page_move_mapping(struct addres= s_space *mapping, extern int migrate_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page, int extra_count); void folio_migrate_flags(struct folio *newfolio, struct folio *folio); +void folio_migrate_copy(struct folio *newfolio, struct folio *folio); int folio_migrate_mapping(struct address_space *mapping, struct folio *newfolio, struct folio *folio, int extra_count); #else diff --git a/mm/folio-compat.c b/mm/folio-compat.c index f0ac904d396f..316c912e49e0 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -76,4 +76,10 @@ void migrate_page_states(struct page *newpage, struct = page *page) folio_migrate_flags(page_folio(newpage), page_folio(page)); } EXPORT_SYMBOL(migrate_page_states); + +void migrate_page_copy(struct page *newpage, struct page *page) +{ + folio_migrate_copy(page_folio(newpage), page_folio(page)); +} +EXPORT_SYMBOL(migrate_page_copy); #endif diff --git a/mm/migrate.c b/mm/migrate.c index 38006cdece60..ee1220d6b40a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -529,54 +529,6 @@ int migrate_huge_page_move_mapping(struct address_sp= ace *mapping, return MIGRATEPAGE_SUCCESS; } =20 -/* - * Gigantic pages are so large that we do not guarantee that page++ poin= ter - * arithmetic will work across the entire page. We need something more - * specialized. - */ -static void __copy_gigantic_page(struct page *dst, struct page *src, - int nr_pages) -{ - int i; - struct page *dst_base =3D dst; - struct page *src_base =3D src; - - for (i =3D 0; i < nr_pages; ) { - cond_resched(); - copy_highpage(dst, src); - - i++; - dst =3D mem_map_next(dst, dst_base, i); - src =3D mem_map_next(src, src_base, i); - } -} - -static void copy_huge_page(struct page *dst, struct page *src) -{ - int i; - int nr_pages; - - if (PageHuge(src)) { - /* hugetlbfs page */ - struct hstate *h =3D page_hstate(src); - nr_pages =3D pages_per_huge_page(h); - - if (unlikely(nr_pages > MAX_ORDER_NR_PAGES)) { - __copy_gigantic_page(dst, src, nr_pages); - return; - } - } else { - /* thp page */ - BUG_ON(!PageTransHuge(src)); - nr_pages =3D thp_nr_pages(src); - } - - for (i =3D 0; i < nr_pages; i++) { - cond_resched(); - copy_highpage(dst + i, src + i); - } -} - /* * Copy the flags and some other ancillary information */ @@ -650,16 +602,20 @@ void folio_migrate_flags(struct folio *newfolio, st= ruct folio *folio) } EXPORT_SYMBOL(folio_migrate_flags); =20 -void migrate_page_copy(struct page *newpage, struct page *page) +void folio_migrate_copy(struct folio *newfolio, struct folio *folio) { - if (PageHuge(page) || PageTransHuge(page)) - copy_huge_page(newpage, page); - else - copy_highpage(newpage, page); + unsigned int i =3D folio_nr_pages(folio) - 1; =20 - migrate_page_states(newpage, page); + copy_highpage(folio_page(newfolio, i), folio_page(folio, i)); + while (i-- > 0) { + cond_resched(); + /* folio_page() handles discontinuities in memmap */ + copy_highpage(folio_page(newfolio, i), folio_page(folio, i)); + } + + folio_migrate_flags(newfolio, folio); } -EXPORT_SYMBOL(migrate_page_copy); +EXPORT_SYMBOL(folio_migrate_copy); =20 /************************************************************ * Migration functions @@ -687,7 +643,7 @@ int migrate_page(struct address_space *mapping, return rc; =20 if (mode !=3D MIGRATE_SYNC_NO_COPY) - migrate_page_copy(newpage, page); + folio_migrate_copy(newfolio, folio); else folio_migrate_flags(newfolio, folio); return MIGRATEPAGE_SUCCESS; --=20 2.30.2