From nobody Thu Apr 9 00:16:51 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F27B1C4332F for ; Wed, 9 Nov 2022 01:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229523AbiKIBYJ (ORCPT ); Tue, 8 Nov 2022 20:24:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbiKIBYE (ORCPT ); Tue, 8 Nov 2022 20:24:04 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C57055E9ED for ; Tue, 8 Nov 2022 17:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667957043; x=1699493043; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yoCjLY5a568iSDEpolTlkW/LjTBOESOZ2uhJ1D8VbnI=; b=YydOWPO9z3R0X+Sq97cSIh0pZNyFb1frpE6ElNB8Pm0OaQDcdNJ9dTJm 0ja2eZhF22Dbtk3JE/Wzu2zxOArBt4jUMp3xu6Ac22EEGLKTYV4Pqz2Wk 21c0eEbyNCavliL5Du8MtO4otrGunHsyKSJkxbILHw47cdhvS9Yc0QvYH ZlBBETLhSrr0ZbckDcR1B8D5Ph3Arxmtr2Tt34Ob3mUSeSUkJPdiYj8P0 kZ1Lni1FpXVZO7dy2Shs+seY6FKIiU5OXXxej+JBuIAFw+4aoC6IPuhe+ UG3+D6Gi8O8HZrsXusdtTVmFfOPYIkUlgPR/U5K8tXkoBjgZkwqE+v3yk Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="298374467" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="298374467" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 17:24:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="881731723" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="881731723" Received: from yhuang6-mobl2.sh.intel.com ([10.238.6.69]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 17:23:58 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Yang Shi , Zi Yan , Matthew Wilcox , Baolin Wang , Oscar Salvador Subject: [PATCH -V2 1/2] migrate: convert unmap_and_move() to use folios Date: Wed, 9 Nov 2022 09:23:47 +0800 Message-Id: <20221109012348.93849-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221109012348.93849-1-ying.huang@intel.com> References: <20221109012348.93849-1-ying.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Quite straightforward, the page functions are converted to corresponding folio functions. Same for comments. Signed-off-by: "Huang, Ying" Reviewed-by: Yang Shi Reviewed-by: Zi Yan Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Baolin Wang Cc: Oscar Salvador --- mm/migrate.c | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 4aea647a0180..eed8082664f2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1150,79 +1150,79 @@ static int __unmap_and_move(struct folio *src, stru= ct folio *dst, } =20 /* - * Obtain the lock on page, remove all ptes and migrate the page - * to the newly allocated page in newpage. + * Obtain the lock on folio, remove all ptes and migrate the folio + * to the newly allocated folio in dst. */ static int unmap_and_move(new_page_t get_new_page, free_page_t put_new_page, - unsigned long private, struct page *page, + unsigned long private, struct folio *src, int force, enum migrate_mode mode, enum migrate_reason reason, struct list_head *ret) { - struct folio *dst, *src =3D page_folio(page); + struct folio *dst; int rc =3D MIGRATEPAGE_SUCCESS; struct page *newpage =3D NULL; =20 - if (!thp_migration_supported() && PageTransHuge(page)) + if (!thp_migration_supported() && folio_test_transhuge(src)) return -ENOSYS; =20 - if (page_count(page) =3D=3D 1) { - /* Page was freed from under us. So we are done. */ - ClearPageActive(page); - ClearPageUnevictable(page); + if (folio_ref_count(src) =3D=3D 1) { + /* Folio was freed from under us. So we are done. */ + folio_clear_active(src); + folio_clear_unevictable(src); /* free_pages_prepare() will clear PG_isolated. */ goto out; } =20 - newpage =3D get_new_page(page, private); + newpage =3D get_new_page(&src->page, private); if (!newpage) return -ENOMEM; dst =3D page_folio(newpage); =20 - newpage->private =3D 0; + dst->private =3D 0; rc =3D __unmap_and_move(src, dst, force, mode); if (rc =3D=3D MIGRATEPAGE_SUCCESS) - set_page_owner_migrate_reason(newpage, reason); + set_page_owner_migrate_reason(&dst->page, reason); =20 out: if (rc !=3D -EAGAIN) { /* - * A page that has been migrated has all references - * removed and will be freed. A page that has not been + * A folio that has been migrated has all references + * removed and will be freed. A folio that has not been * migrated will have kept its references and be restored. */ - list_del(&page->lru); + list_del(&src->lru); } =20 /* * If migration is successful, releases reference grabbed during - * isolation. Otherwise, restore the page to right list unless + * isolation. Otherwise, restore the folio to right list unless * we want to retry. */ if (rc =3D=3D MIGRATEPAGE_SUCCESS) { /* - * Compaction can migrate also non-LRU pages which are + * Compaction can migrate also non-LRU folios which are * not accounted to NR_ISOLATED_*. They can be recognized - * as __PageMovable + * as __folio_test_movable */ - if (likely(!__PageMovable(page))) - mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + - page_is_file_lru(page), -thp_nr_pages(page)); + if (likely(!__folio_test_movable(src))) + mod_node_page_state(folio_pgdat(src), NR_ISOLATED_ANON + + folio_is_file_lru(src), -folio_nr_pages(src)); =20 if (reason !=3D MR_MEMORY_FAILURE) /* - * We release the page in page_handle_poison. + * We release the folio in page_handle_poison. */ - put_page(page); + folio_put(src); } else { if (rc !=3D -EAGAIN) - list_add_tail(&page->lru, ret); + list_add_tail(&src->lru, ret); =20 if (put_new_page) - put_new_page(newpage, private); + put_new_page(&dst->page, private); else - put_page(newpage); + folio_put(dst); } =20 return rc; @@ -1459,7 +1459,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, &ret_pages); else rc =3D unmap_and_move(get_new_page, put_new_page, - private, page, pass > 2, mode, + private, page_folio(page), pass > 2, mode, reason, &ret_pages); /* * The rules are: --=20 2.35.1 From nobody Thu Apr 9 00:16:51 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3875C433FE for ; Wed, 9 Nov 2022 01:24:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbiKIBYN (ORCPT ); Tue, 8 Nov 2022 20:24:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229854AbiKIBYG (ORCPT ); Tue, 8 Nov 2022 20:24:06 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01FDC5EFA8 for ; Tue, 8 Nov 2022 17:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667957045; x=1699493045; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MsjtziYQ+UZEvmg+xXZfnXrSP/L1eZFlxuzHKGo0q18=; b=PP4KP2kzbv0PUxDrgyBIbMgIQY7IEmEuTqTKEIP8oqjJbUAwp99a1DHF t8adsmrE0hNhmFV+X1550g4EgP9fCHyQtqgcbN7pUBoesDPjcBI3ZxLI2 POxwEE9dKOSWGAAFFDUNSaaBu071xMfVqoKyjjEHg1oH+TZnzxoPos8M/ vhyk5u8Fa9VpHO1bFdITmx2JqKn8kaB9KJUGMqnc98puDZPz0zZEJOgZc 5KKf/XgB2GSRFJ+SIGMT0CrhDo7UqFTYX180QHxs5BbE7fHFrkthKGhvt zInEfnGYS094foajiIeDobfVf/tae01IO9lxn580Q+X0Xgn6u38++vjgf A==; X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="298374475" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="298374475" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 17:24:04 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="881731739" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="881731739" Received: from yhuang6-mobl2.sh.intel.com ([10.238.6.69]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 17:24:01 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Zi Yan , Yang Shi , Baolin Wang , Oscar Salvador , Matthew Wilcox Subject: [PATCH -V2 2/2] migrate: convert migrate_pages() to use folios Date: Wed, 9 Nov 2022 09:23:48 +0800 Message-Id: <20221109012348.93849-3-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221109012348.93849-1-ying.huang@intel.com> References: <20221109012348.93849-1-ying.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Quite straightforward, the page functions are converted to corresponding folio functions. Same for comments. THP specific code are converted to be large folio. Signed-off-by: "Huang, Ying" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Reviewed-by: Baolin Wang Tested-by: Baolin Wang --- mm/migrate.c | 210 +++++++++++++++++++++++++++------------------------ 1 file changed, 112 insertions(+), 98 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index eed8082664f2..8e4088aab27a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1373,231 +1373,245 @@ static int unmap_and_move_huge_page(new_page_t ge= t_new_page, return rc; } =20 -static inline int try_split_thp(struct page *page, struct list_head *split= _pages) +static inline int try_split_folio(struct folio *folio, struct list_head *s= plit_folios) { int rc; =20 - lock_page(page); - rc =3D split_huge_page_to_list(page, split_pages); - unlock_page(page); + folio_lock(folio); + rc =3D split_folio_to_list(folio, split_folios); + folio_unlock(folio); if (!rc) - list_move_tail(&page->lru, split_pages); + list_move_tail(&folio->lru, split_folios); =20 return rc; } =20 /* - * migrate_pages - migrate the pages specified in a list, to the free pages + * migrate_pages - migrate the folios specified in a list, to the free fol= ios * supplied as the target for the page migration * - * @from: The list of pages to be migrated. - * @get_new_page: The function used to allocate free pages to be used - * as the target of the page migration. - * @put_new_page: The function used to free target pages if migration + * @from: The list of folios to be migrated. + * @get_new_page: The function used to allocate free folios to be used + * as the target of the folio migration. + * @put_new_page: The function used to free target folios if migration * fails, or NULL if no special handling is necessary. * @private: Private data to be passed on to get_new_page() * @mode: The migration mode that specifies the constraints for - * page migration, if any. - * @reason: The reason for page migration. - * @ret_succeeded: Set to the number of normal pages migrated successfully= if + * folio migration, if any. + * @reason: The reason for folio migration. + * @ret_succeeded: Set to the number of folios migrated successfully if * the caller passes a non-NULL pointer. * - * The function returns after 10 attempts or if no pages are movable any m= ore - * because the list has become empty or no retryable pages exist any more. - * It is caller's responsibility to call putback_movable_pages() to return= pages + * The function returns after 10 attempts or if no folios are movable any = more + * because the list has become empty or no retryable folios exist any more. + * It is caller's responsibility to call putback_movable_pages() to return= folios * to the LRU or free list only if ret !=3D 0. * - * Returns the number of {normal page, THP, hugetlb} that were not migrate= d, or - * an error code. The number of THP splits will be considered as the numbe= r of - * non-migrated THP, no matter how many subpages of the THP are migrated s= uccessfully. + * Returns the number of {normal folio, large folio, hugetlb} that were not + * migrated, or an error code. The number of large folio splits will be + * considered as the number of non-migrated large folio, no matter how many + * split folios of the large folio are migrated successfully. */ int migrate_pages(struct list_head *from, new_page_t get_new_page, free_page_t put_new_page, unsigned long private, enum migrate_mode mode, int reason, unsigned int *ret_succeeded) { int retry =3D 1; + int large_retry =3D 1; int thp_retry =3D 1; int nr_failed =3D 0; int nr_failed_pages =3D 0; int nr_retry_pages =3D 0; int nr_succeeded =3D 0; int nr_thp_succeeded =3D 0; + int nr_large_failed =3D 0; int nr_thp_failed =3D 0; int nr_thp_split =3D 0; int pass =3D 0; + bool is_large =3D false; bool is_thp =3D false; - struct page *page; - struct page *page2; - int rc, nr_subpages; - LIST_HEAD(ret_pages); - LIST_HEAD(thp_split_pages); + struct folio *folio, *folio2; + int rc, nr_pages; + LIST_HEAD(ret_folios); + LIST_HEAD(split_folios); bool nosplit =3D (reason =3D=3D MR_NUMA_MISPLACED); - bool no_subpage_counting =3D false; + bool no_split_folio_counting =3D false; =20 trace_mm_migrate_pages_start(mode, reason); =20 -thp_subpage_migration: - for (pass =3D 0; pass < 10 && (retry || thp_retry); pass++) { +split_folio_migration: + for (pass =3D 0; pass < 10 && (retry || large_retry); pass++) { retry =3D 0; + large_retry =3D 0; thp_retry =3D 0; nr_retry_pages =3D 0; =20 - list_for_each_entry_safe(page, page2, from, lru) { + list_for_each_entry_safe(folio, folio2, from, lru) { /* - * THP statistics is based on the source huge page. - * Capture required information that might get lost - * during migration. + * Large folio statistics is based on the source large + * folio. Capture required information that might get + * lost during migration. */ - is_thp =3D PageTransHuge(page) && !PageHuge(page); - nr_subpages =3D compound_nr(page); + is_large =3D folio_test_large(folio) && !folio_test_hugetlb(folio); + is_thp =3D is_large && folio_test_pmd_mappable(folio); + nr_pages =3D folio_nr_pages(folio); cond_resched(); =20 - if (PageHuge(page)) + if (folio_test_hugetlb(folio)) rc =3D unmap_and_move_huge_page(get_new_page, - put_new_page, private, page, - pass > 2, mode, reason, - &ret_pages); + put_new_page, private, + &folio->page, pass > 2, mode, + reason, + &ret_folios); else rc =3D unmap_and_move(get_new_page, put_new_page, - private, page_folio(page), pass > 2, mode, - reason, &ret_pages); + private, folio, pass > 2, mode, + reason, &ret_folios); /* * The rules are: - * Success: non hugetlb page will be freed, hugetlb - * page will be put back + * Success: non hugetlb folio will be freed, hugetlb + * folio will be put back * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * -ENOSYS: stay on the from list - * Other errno: put on ret_pages list then splice to + * Other errno: put on ret_folios list then splice to * from list */ switch(rc) { /* - * THP migration might be unsupported or the - * allocation could've failed so we should - * retry on the same page with the THP split - * to base pages. + * Large folio migration might be unsupported or + * the allocation could've failed so we should retry + * on the same folio with the large folio split + * to normal folios. * - * Sub-pages are put in thp_split_pages, and + * Split folios are put in split_folios, and * we will migrate them after the rest of the * list is processed. */ case -ENOSYS: - /* THP migration is unsupported */ - if (is_thp) { - nr_thp_failed++; - if (!try_split_thp(page, &thp_split_pages)) { - nr_thp_split++; + /* Large folio migration is unsupported */ + if (is_large) { + nr_large_failed++; + nr_thp_failed +=3D is_thp; + if (!try_split_folio(folio, &split_folios)) { + nr_thp_split +=3D is_thp; break; } /* Hugetlb migration is unsupported */ - } else if (!no_subpage_counting) { + } else if (!no_split_folio_counting) { nr_failed++; } =20 - nr_failed_pages +=3D nr_subpages; - list_move_tail(&page->lru, &ret_pages); + nr_failed_pages +=3D nr_pages; + list_move_tail(&folio->lru, &ret_folios); break; case -ENOMEM: /* * When memory is low, don't bother to try to migrate - * other pages, just exit. + * other folios, just exit. */ - if (is_thp) { - nr_thp_failed++; - /* THP NUMA faulting doesn't split THP to retry. */ + if (is_large) { + nr_large_failed++; + nr_thp_failed +=3D is_thp; + /* Large folio NUMA faulting doesn't split to retry. */ if (!nosplit) { - int ret =3D try_split_thp(page, &thp_split_pages); + int ret =3D try_split_folio(folio, &split_folios); =20 if (!ret) { - nr_thp_split++; + nr_thp_split +=3D is_thp; break; } else if (reason =3D=3D MR_LONGTERM_PIN && ret =3D=3D -EAGAIN) { /* - * Try again to split THP to mitigate - * the failure of longterm pinning. + * Try again to split large folio to + * mitigate the failure of longterm pinning. */ - thp_retry++; - nr_retry_pages +=3D nr_subpages; + large_retry++; + thp_retry +=3D is_thp; + nr_retry_pages +=3D nr_pages; break; } } - } else if (!no_subpage_counting) { + } else if (!no_split_folio_counting) { nr_failed++; } =20 - nr_failed_pages +=3D nr_subpages + nr_retry_pages; + nr_failed_pages +=3D nr_pages + nr_retry_pages; /* - * There might be some subpages of fail-to-migrate THPs - * left in thp_split_pages list. Move them back to migration + * There might be some split folios of fail-to-migrate large + * folios left in split_folios list. Move them back to migration * list so that they could be put back to the right list by - * the caller otherwise the page refcnt will be leaked. + * the caller otherwise the folio refcnt will be leaked. */ - list_splice_init(&thp_split_pages, from); + list_splice_init(&split_folios, from); /* nr_failed isn't updated for not used */ + nr_large_failed +=3D large_retry; nr_thp_failed +=3D thp_retry; goto out; case -EAGAIN: - if (is_thp) - thp_retry++; - else if (!no_subpage_counting) + if (is_large) { + large_retry++; + thp_retry +=3D is_thp; + } else if (!no_split_folio_counting) { retry++; - nr_retry_pages +=3D nr_subpages; + } + nr_retry_pages +=3D nr_pages; break; case MIGRATEPAGE_SUCCESS: - nr_succeeded +=3D nr_subpages; - if (is_thp) - nr_thp_succeeded++; + nr_succeeded +=3D nr_pages; + nr_thp_succeeded +=3D is_thp; break; default: /* * Permanent failure (-EBUSY, etc.): - * unlike -EAGAIN case, the failed page is - * removed from migration page list and not + * unlike -EAGAIN case, the failed folio is + * removed from migration folio list and not * retried in the next outer loop. */ - if (is_thp) - nr_thp_failed++; - else if (!no_subpage_counting) + if (is_large) { + nr_large_failed++; + nr_thp_failed +=3D is_thp; + } else if (!no_split_folio_counting) { nr_failed++; + } =20 - nr_failed_pages +=3D nr_subpages; + nr_failed_pages +=3D nr_pages; break; } } } nr_failed +=3D retry; + nr_large_failed +=3D large_retry; nr_thp_failed +=3D thp_retry; nr_failed_pages +=3D nr_retry_pages; /* - * Try to migrate subpages of fail-to-migrate THPs, no nr_failed - * counting in this round, since all subpages of a THP is counted - * as 1 failure in the first round. + * Try to migrate split folios of fail-to-migrate large folios, no + * nr_failed counting in this round, since all split folios of a + * large folio is counted as 1 failure in the first round. */ - if (!list_empty(&thp_split_pages)) { + if (!list_empty(&split_folios)) { /* - * Move non-migrated pages (after 10 retries) to ret_pages + * Move non-migrated folios (after 10 retries) to ret_folios * to avoid migrating them again. */ - list_splice_init(from, &ret_pages); - list_splice_init(&thp_split_pages, from); - no_subpage_counting =3D true; + list_splice_init(from, &ret_folios); + list_splice_init(&split_folios, from); + no_split_folio_counting =3D true; retry =3D 1; - goto thp_subpage_migration; + goto split_folio_migration; } =20 - rc =3D nr_failed + nr_thp_failed; + rc =3D nr_failed + nr_large_failed; out: /* - * Put the permanent failure page back to migration list, they + * Put the permanent failure folio back to migration list, they * will be put back to the right list by the caller. */ - list_splice(&ret_pages, from); + list_splice(&ret_folios, from); =20 /* - * Return 0 in case all subpages of fail-to-migrate THPs are - * migrated successfully. + * Return 0 in case all split folios of fail-to-migrate large folios + * are migrated successfully. */ if (list_empty(from)) rc =3D 0; --=20 2.35.1