From nobody Mon Sep 15 05:47:49 2025 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 527A1C67871 for ; Mon, 16 Jan 2023 06:31:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231978AbjAPGbW (ORCPT ); Mon, 16 Jan 2023 01:31:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231933AbjAPGbO (ORCPT ); Mon, 16 Jan 2023 01:31:14 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B462335A0 for ; Sun, 15 Jan 2023 22:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850673; x=1705386673; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kyA2nwu/iDvX1f1gFBqUt2qOO7JRIRhIbEkDSdv9gqU=; b=L3yCq1UbxZ37t8+u+q9zsJy4r6GZ8Gc2J081eco8RB5in8vAeXgqYHu4 XM0vIXUnyfBN9Of5oAJlN0P43kTpiukgwuJaNjvAcp2+XWnYJb7Sh1+e/ 4cS7vKQyIoFwH6JQLFQ4YLy82jlpuTbIEJkHAlWonqytXfSBkY50JRLg9 QvNC92WURoN0MZWk83FeLgpV16wZkdbH7BHK9Xk5yKGtzzZfxevGQaO6N H7uPYU1BmJe8Y4wAr+l88TbJ5et9QzNeCfInArkpNTuBikE0bpkDDvn5G CVIUuA8RC5hSmeS6oOQOQKol1FY/g9Vgp6QFSljqYqUyQQsyB+Hd2emat g==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892124" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892124" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:13 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286591" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286591" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:10 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Alistair Popple , Zi Yan , Baolin Wang , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , haoxin , Minchan Kim Subject: [PATCH -v3 1/9] migrate_pages: organize stats with struct migrate_pages_stats Date: Mon, 16 Jan 2023 14:30:49 +0800 Message-Id: <20230116063057.653862-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" Define struct migrate_pages_stats to organize the various statistics in migrate_pages(). This makes it easier to collect and consume the statistics in multiple functions. This will be needed in the following patches in the series. Signed-off-by: "Huang, Ying" Reviewed-by: Alistair Popple Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a4d3fc65085f..ef388a9e4747 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1396,6 +1396,16 @@ static inline int try_split_folio(struct folio *foli= o, struct list_head *split_f return rc; } =20 +struct migrate_pages_stats { + int nr_succeeded; /* Normal and large folios migrated successfully, in + units of base pages */ + int nr_failed_pages; /* Normal and large folios failed to be migrated, in + units of base pages. Untried folios aren't counted */ + int nr_thp_succeeded; /* THP migrated successfully */ + int nr_thp_failed; /* THP failed to be migrated */ + int nr_thp_split; /* THP split before migrating */ +}; + /* * migrate_pages - migrate the folios specified in a list, to the free fol= ios * supplied as the target for the page migration @@ -1430,13 +1440,8 @@ int migrate_pages(struct list_head *from, new_page_t= get_new_page, 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; @@ -1446,9 +1451,11 @@ int migrate_pages(struct list_head *from, new_page_t= get_new_page, LIST_HEAD(split_folios); bool nosplit =3D (reason =3D=3D MR_NUMA_MISPLACED); bool no_split_folio_counting =3D false; + struct migrate_pages_stats stats; =20 trace_mm_migrate_pages_start(mode, reason); =20 + memset(&stats, 0, sizeof(stats)); split_folio_migration: for (pass =3D 0; pass < 10 && (retry || large_retry); pass++) { retry =3D 0; @@ -1502,9 +1509,9 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, /* Large folio migration is unsupported */ if (is_large) { nr_large_failed++; - nr_thp_failed +=3D is_thp; + stats.nr_thp_failed +=3D is_thp; if (!try_split_folio(folio, &split_folios)) { - nr_thp_split +=3D is_thp; + stats.nr_thp_split +=3D is_thp; break; } /* Hugetlb migration is unsupported */ @@ -1512,7 +1519,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, nr_failed++; } =20 - nr_failed_pages +=3D nr_pages; + stats.nr_failed_pages +=3D nr_pages; list_move_tail(&folio->lru, &ret_folios); break; case -ENOMEM: @@ -1522,13 +1529,13 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, */ if (is_large) { nr_large_failed++; - nr_thp_failed +=3D is_thp; + stats.nr_thp_failed +=3D is_thp; /* Large folio NUMA faulting doesn't split to retry. */ if (!nosplit) { int ret =3D try_split_folio(folio, &split_folios); =20 if (!ret) { - nr_thp_split +=3D is_thp; + stats.nr_thp_split +=3D is_thp; break; } else if (reason =3D=3D MR_LONGTERM_PIN && ret =3D=3D -EAGAIN) { @@ -1546,7 +1553,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, nr_failed++; } =20 - nr_failed_pages +=3D nr_pages + nr_retry_pages; + stats.nr_failed_pages +=3D nr_pages + nr_retry_pages; /* * There might be some split folios of fail-to-migrate large * folios left in split_folios list. Move them back to migration @@ -1556,7 +1563,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, 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; + stats.nr_thp_failed +=3D thp_retry; goto out; case -EAGAIN: if (is_large) { @@ -1568,8 +1575,8 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, nr_retry_pages +=3D nr_pages; break; case MIGRATEPAGE_SUCCESS: - nr_succeeded +=3D nr_pages; - nr_thp_succeeded +=3D is_thp; + stats.nr_succeeded +=3D nr_pages; + stats.nr_thp_succeeded +=3D is_thp; break; default: /* @@ -1580,20 +1587,20 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, */ if (is_large) { nr_large_failed++; - nr_thp_failed +=3D is_thp; + stats.nr_thp_failed +=3D is_thp; } else if (!no_split_folio_counting) { nr_failed++; } =20 - nr_failed_pages +=3D nr_pages; + stats.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; + stats.nr_thp_failed +=3D thp_retry; + stats.nr_failed_pages +=3D nr_retry_pages; /* * Try to migrate split folios of fail-to-migrate large folios, no * nr_failed counting in this round, since all split folios of a @@ -1626,16 +1633,17 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, if (list_empty(from)) rc =3D 0; =20 - count_vm_events(PGMIGRATE_SUCCESS, nr_succeeded); - count_vm_events(PGMIGRATE_FAIL, nr_failed_pages); - count_vm_events(THP_MIGRATION_SUCCESS, nr_thp_succeeded); - count_vm_events(THP_MIGRATION_FAIL, nr_thp_failed); - count_vm_events(THP_MIGRATION_SPLIT, nr_thp_split); - trace_mm_migrate_pages(nr_succeeded, nr_failed_pages, nr_thp_succeeded, - nr_thp_failed, nr_thp_split, mode, reason); + count_vm_events(PGMIGRATE_SUCCESS, stats.nr_succeeded); + count_vm_events(PGMIGRATE_FAIL, stats.nr_failed_pages); + count_vm_events(THP_MIGRATION_SUCCESS, stats.nr_thp_succeeded); + count_vm_events(THP_MIGRATION_FAIL, stats.nr_thp_failed); + count_vm_events(THP_MIGRATION_SPLIT, stats.nr_thp_split); + trace_mm_migrate_pages(stats.nr_succeeded, stats.nr_failed_pages, + stats.nr_thp_succeeded, stats.nr_thp_failed, + stats.nr_thp_split, mode, reason); =20 if (ret_succeeded) - *ret_succeeded =3D nr_succeeded; + *ret_succeeded =3D stats.nr_succeeded; =20 return rc; } --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 DBB9CC67871 for ; Mon, 16 Jan 2023 06:31:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjAPGb1 (ORCPT ); Mon, 16 Jan 2023 01:31:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231855AbjAPGbS (ORCPT ); Mon, 16 Jan 2023 01:31:18 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7047135B5 for ; Sun, 15 Jan 2023 22:31:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850677; x=1705386677; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sxKVJOynzeHGd0H1WzmILRO/OkDsGqFssjhGSWPRnS4=; b=EBvdNR+iWNXoKWtxVGtVRW1TYPjgl/HUcIi+UY2DbbbJjSVSHApJCkPP ai0F7EmHB5hLi28V25nXgHdBtwwxyCE3Z8+HDXH5/XZrpKtvtRd85zMHV uG9LcUCrwBpv2bARIgRU/kgujeBe+K8Mm4SOYG5KqQqhO3n8OhGBBRkcX XuSjgRvNozulXpoN1LpDxz/EGCZAA8xbHpvx6RDGhvukJQxODUhVcO2Ff 91McXeF+ahf67PIdXBJJbs8LemPBO1XEaSI5hUElMPlE8Eqj44EzvyBsh hxIP/QzFcBh3mfeaeaFXLOMqI1QUhV4xq4jUXrDpymzqEL44Wy0BA3Bcz Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892138" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892138" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:16 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286606" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286606" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:13 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Baolin Wang , Zi Yan , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 2/9] migrate_pages: separate hugetlb folios migration Date: Mon, 16 Jan 2023 14:30:50 +0800 Message-Id: <20230116063057.653862-3-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" This is a preparation patch to batch the folio unmapping and moving for the non-hugetlb folios. Based on that we can batch the TLB shootdown during the folio migration and make it possible to use some hardware accelerator for the folio copying. In this patch the hugetlb folios and non-hugetlb folios migration is separated in migrate_pages() to make it easy to change the non-hugetlb folios migration implementation. Signed-off-by: "Huang, Ying" Reviewed-by: Baolin Wang Cc: Zi Yan Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 141 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 119 insertions(+), 22 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index ef388a9e4747..be7f37523463 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1396,6 +1396,8 @@ static inline int try_split_folio(struct folio *folio= , struct list_head *split_f return rc; } =20 +#define NR_MAX_MIGRATE_PAGES_RETRY 10 + struct migrate_pages_stats { int nr_succeeded; /* Normal and large folios migrated successfully, in units of base pages */ @@ -1406,6 +1408,95 @@ struct migrate_pages_stats { int nr_thp_split; /* THP split before migrating */ }; =20 +/* + * Returns the number of hugetlb folios that were not migrated, or an erro= r code + * after NR_MAX_MIGRATE_PAGES_RETRY attempts or if no hugetlb folios are m= ovable + * any more because the list has become empty or no retryable hugetlb foli= os + * exist any more. It is caller's responsibility to call putback_movable_p= ages() + * only if ret !=3D 0. + */ +static int migrate_hugetlbs(struct list_head *from, new_page_t get_new_pag= e, + free_page_t put_new_page, unsigned long private, + enum migrate_mode mode, int reason, + struct migrate_pages_stats *stats, + struct list_head *ret_folios) +{ + int retry =3D 1; + int nr_failed =3D 0; + int nr_retry_pages =3D 0; + int pass =3D 0; + struct folio *folio, *folio2; + int rc, nr_pages; + + for (pass =3D 0; pass < NR_MAX_MIGRATE_PAGES_RETRY && retry; pass++) { + retry =3D 0; + nr_retry_pages =3D 0; + + list_for_each_entry_safe(folio, folio2, from, lru) { + if (!folio_test_hugetlb(folio)) + continue; + + nr_pages =3D folio_nr_pages(folio); + + cond_resched(); + + rc =3D unmap_and_move_huge_page(get_new_page, + put_new_page, private, + &folio->page, pass > 2, mode, + reason, ret_folios); + /* + * The rules are: + * Success: 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_folios list + */ + switch(rc) { + case -ENOSYS: + /* Hugetlb migration is unsupported */ + nr_failed++; + stats->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 folios, just exit. + */ + stats->nr_failed_pages +=3D nr_pages + nr_retry_pages; + return -ENOMEM; + case -EAGAIN: + retry++; + nr_retry_pages +=3D nr_pages; + break; + case MIGRATEPAGE_SUCCESS: + stats->nr_succeeded +=3D nr_pages; + break; + default: + /* + * Permanent failure (-EBUSY, etc.): + * unlike -EAGAIN case, the failed folio is + * removed from migration folio list and not + * retried in the next outer loop. + */ + nr_failed++; + stats->nr_failed_pages +=3D nr_pages; + break; + } + } + } + /* + * nr_failed is number of hugetlb folios failed to be migrated. After + * NR_MAX_MIGRATE_PAGES_RETRY attempts, give up and count retried hugetlb + * folios as failed. + */ + nr_failed +=3D retry; + stats->nr_failed_pages +=3D nr_retry_pages; + + return nr_failed; +} + /* * migrate_pages - migrate the folios specified in a list, to the free fol= ios * supplied as the target for the page migration @@ -1422,10 +1513,10 @@ struct migrate_pages_stats { * @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 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. + * The function returns after NR_MAX_MIGRATE_PAGES_RETRY 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_p= ages() + * only if ret !=3D 0. * * 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 @@ -1439,7 +1530,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, int retry =3D 1; int large_retry =3D 1; int thp_retry =3D 1; - int nr_failed =3D 0; + int nr_failed; int nr_retry_pages =3D 0; int nr_large_failed =3D 0; int pass =3D 0; @@ -1456,38 +1547,45 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, trace_mm_migrate_pages_start(mode, reason); =20 memset(&stats, 0, sizeof(stats)); + rc =3D migrate_hugetlbs(from, get_new_page, put_new_page, private, mode, = reason, + &stats, &ret_folios); + if (rc < 0) + goto out; + nr_failed =3D rc; + split_folio_migration: - for (pass =3D 0; pass < 10 && (retry || large_retry); pass++) { + for (pass =3D 0; + pass < NR_MAX_MIGRATE_PAGES_RETRY && (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(folio, folio2, from, lru) { + /* Retried hugetlb folios will be kept in list */ + if (folio_test_hugetlb(folio)) { + list_move_tail(&folio->lru, &ret_folios); + continue; + } + /* * Large folio statistics is based on the source large * folio. Capture required information that might get * lost during migration. */ - is_large =3D folio_test_large(folio) && !folio_test_hugetlb(folio); + is_large =3D folio_test_large(folio); is_thp =3D is_large && folio_test_pmd_mappable(folio); nr_pages =3D folio_nr_pages(folio); + cond_resched(); =20 - if (folio_test_hugetlb(folio)) - rc =3D unmap_and_move_huge_page(get_new_page, - 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, folio, pass > 2, mode, - reason, &ret_folios); + rc =3D unmap_and_move(get_new_page, put_new_page, + private, folio, pass > 2, mode, + reason, &ret_folios); /* * The rules are: - * Success: non hugetlb folio will be freed, hugetlb - * folio will be put back + * Success: folio will be freed * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * -ENOSYS: stay on the from list @@ -1514,7 +1612,6 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, stats.nr_thp_split +=3D is_thp; break; } - /* Hugetlb migration is unsupported */ } else if (!no_split_folio_counting) { nr_failed++; } @@ -1608,8 +1705,8 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, */ if (!list_empty(&split_folios)) { /* - * Move non-migrated folios (after 10 retries) to ret_folios - * to avoid migrating them again. + * Move non-migrated folios (after NR_MAX_MIGRATE_PAGES_RETRY + * retries) to ret_folios to avoid migrating them again. */ list_splice_init(from, &ret_folios); list_splice_init(&split_folios, from); --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 BF0C8C46467 for ; Mon, 16 Jan 2023 06:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232057AbjAPGbj (ORCPT ); Mon, 16 Jan 2023 01:31:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbjAPGb3 (ORCPT ); Mon, 16 Jan 2023 01:31:29 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFBF34EDD for ; Sun, 15 Jan 2023 22:31:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850680; x=1705386680; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Uhl+HDmcN3nt7HY4v6GOQD1fVaDhzluLCdJxO2iis+Y=; b=DYZ4WCkQM9SXlB1hqkfVoFYnhgVr7lsqo0FwCqYtvRO/QbjIo4wxWmQM R6OwfyLf028CRcgjzdrcjd6pdrqNz1Hk1aOqRaDXVRYrnAqgZdFnyn5gM qmmPwMj7CtttOjLivy3wIHgXIsvYfb5jNd+boBQ/fF8ZLMJYAwZCdKUbZ l7tB7ay5PlELQsLybF2Lj+4gFFLjztZvCRvNcRxzHLgGiLOgKzhMEVXpK pzg5fIwUBl8S8ODgJlIk95jJHGeNc+NfiM5NFjXjgjHiIL5mGVW/vPZCI kT6hIonO/OWG/dK5nwzxIvcnIUv25dv+16hRlqrdkU94q9UgefjaZ/N9N Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892150" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892150" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:20 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286645" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286645" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:17 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Baolin Wang , Zi Yan , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 3/9] migrate_pages: restrict number of pages to migrate in batch Date: Mon, 16 Jan 2023 14:30:51 +0800 Message-Id: <20230116063057.653862-4-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" This is a preparation patch to batch the folio unmapping and moving for non-hugetlb folios. If we had batched the folio unmapping, all folios to be migrated would be unmapped before copying the contents and flags of the folios. If the folios that were passed to migrate_pages() were too many in unit of pages, the execution of the processes would be stopped for too long time, thus too long latency. For example, migrate_pages() syscall will call migrate_pages() with all folios of a process. To avoid this possible issue, in this patch, we restrict the number of pages to be migrated to be no more than HPAGE_PMD_NR. That is, the influence is at the same level of THP migration. Signed-off-by: "Huang, Ying" Reviewed-by: Baolin Wang Cc: Zi Yan Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 174 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 106 insertions(+), 68 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index be7f37523463..9a667039c34c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1396,6 +1396,11 @@ static inline int try_split_folio(struct folio *foli= o, struct list_head *split_f return rc; } =20 +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define NR_MAX_BATCHED_MIGRATION HPAGE_PMD_NR +#else +#define NR_MAX_BATCHED_MIGRATION 512 +#endif #define NR_MAX_MIGRATE_PAGES_RETRY 10 =20 struct migrate_pages_stats { @@ -1497,40 +1502,15 @@ static int migrate_hugetlbs(struct list_head *from,= new_page_t get_new_page, return nr_failed; } =20 -/* - * 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 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 - * 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 NR_MAX_MIGRATE_PAGES_RETRY 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_p= ages() - * only if ret !=3D 0. - * - * 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, +static int migrate_pages_batch(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) + enum migrate_mode mode, int reason, struct list_head *ret_folios, + struct migrate_pages_stats *stats) { int retry =3D 1; int large_retry =3D 1; int thp_retry =3D 1; - int nr_failed; + int nr_failed =3D 0; int nr_retry_pages =3D 0; int nr_large_failed =3D 0; int pass =3D 0; @@ -1538,20 +1518,9 @@ int migrate_pages(struct list_head *from, new_page_t= get_new_page, bool is_thp =3D false; 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_split_folio_counting =3D false; - struct migrate_pages_stats stats; - - trace_mm_migrate_pages_start(mode, reason); - - memset(&stats, 0, sizeof(stats)); - rc =3D migrate_hugetlbs(from, get_new_page, put_new_page, private, mode, = reason, - &stats, &ret_folios); - if (rc < 0) - goto out; - nr_failed =3D rc; =20 split_folio_migration: for (pass =3D 0; @@ -1563,12 +1532,6 @@ int migrate_pages(struct list_head *from, new_page_t= get_new_page, nr_retry_pages =3D 0; =20 list_for_each_entry_safe(folio, folio2, from, lru) { - /* Retried hugetlb folios will be kept in list */ - if (folio_test_hugetlb(folio)) { - list_move_tail(&folio->lru, &ret_folios); - continue; - } - /* * Large folio statistics is based on the source large * folio. Capture required information that might get @@ -1582,15 +1545,14 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, =20 rc =3D unmap_and_move(get_new_page, put_new_page, private, folio, pass > 2, mode, - reason, &ret_folios); + reason, ret_folios); /* * The rules are: * Success: folio will be freed * -EAGAIN: stay on the from list * -ENOMEM: stay on the from list * -ENOSYS: stay on the from list - * Other errno: put on ret_folios list then splice to - * from list + * Other errno: put on ret_folios list */ switch(rc) { /* @@ -1607,17 +1569,17 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, /* Large folio migration is unsupported */ if (is_large) { nr_large_failed++; - stats.nr_thp_failed +=3D is_thp; + stats->nr_thp_failed +=3D is_thp; if (!try_split_folio(folio, &split_folios)) { - stats.nr_thp_split +=3D is_thp; + stats->nr_thp_split +=3D is_thp; break; } } else if (!no_split_folio_counting) { nr_failed++; } =20 - stats.nr_failed_pages +=3D nr_pages; - list_move_tail(&folio->lru, &ret_folios); + stats->nr_failed_pages +=3D nr_pages; + list_move_tail(&folio->lru, ret_folios); break; case -ENOMEM: /* @@ -1626,13 +1588,13 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, */ if (is_large) { nr_large_failed++; - stats.nr_thp_failed +=3D is_thp; + stats->nr_thp_failed +=3D is_thp; /* Large folio NUMA faulting doesn't split to retry. */ if (!nosplit) { int ret =3D try_split_folio(folio, &split_folios); =20 if (!ret) { - stats.nr_thp_split +=3D is_thp; + stats->nr_thp_split +=3D is_thp; break; } else if (reason =3D=3D MR_LONGTERM_PIN && ret =3D=3D -EAGAIN) { @@ -1650,17 +1612,17 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, nr_failed++; } =20 - stats.nr_failed_pages +=3D nr_pages + nr_retry_pages; + stats->nr_failed_pages +=3D nr_pages + nr_retry_pages; /* * There might be some split folios of fail-to-migrate large - * folios left in split_folios list. Move them back to migration + * folios left in split_folios list. Move them to ret_folios * list so that they could be put back to the right list by * the caller otherwise the folio refcnt will be leaked. */ - list_splice_init(&split_folios, from); + list_splice_init(&split_folios, ret_folios); /* nr_failed isn't updated for not used */ nr_large_failed +=3D large_retry; - stats.nr_thp_failed +=3D thp_retry; + stats->nr_thp_failed +=3D thp_retry; goto out; case -EAGAIN: if (is_large) { @@ -1672,8 +1634,8 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, nr_retry_pages +=3D nr_pages; break; case MIGRATEPAGE_SUCCESS: - stats.nr_succeeded +=3D nr_pages; - stats.nr_thp_succeeded +=3D is_thp; + stats->nr_succeeded +=3D nr_pages; + stats->nr_thp_succeeded +=3D is_thp; break; default: /* @@ -1684,20 +1646,20 @@ int migrate_pages(struct list_head *from, new_page_= t get_new_page, */ if (is_large) { nr_large_failed++; - stats.nr_thp_failed +=3D is_thp; + stats->nr_thp_failed +=3D is_thp; } else if (!no_split_folio_counting) { nr_failed++; } =20 - stats.nr_failed_pages +=3D nr_pages; + stats->nr_failed_pages +=3D nr_pages; break; } } } nr_failed +=3D retry; nr_large_failed +=3D large_retry; - stats.nr_thp_failed +=3D thp_retry; - stats.nr_failed_pages +=3D nr_retry_pages; + stats->nr_thp_failed +=3D thp_retry; + stats->nr_failed_pages +=3D nr_retry_pages; /* * Try to migrate split folios of fail-to-migrate large folios, no * nr_failed counting in this round, since all split folios of a @@ -1708,7 +1670,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, * Move non-migrated folios (after NR_MAX_MIGRATE_PAGES_RETRY * retries) to ret_folios to avoid migrating them again. */ - list_splice_init(from, &ret_folios); + list_splice_init(from, ret_folios); list_splice_init(&split_folios, from); no_split_folio_counting =3D true; retry =3D 1; @@ -1716,6 +1678,82 @@ int migrate_pages(struct list_head *from, new_page_t= get_new_page, } =20 rc =3D nr_failed + nr_large_failed; +out: + return rc; +} + +/* + * 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 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 + * 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 NR_MAX_MIGRATE_PAGES_RETRY 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_p= ages() + * only if ret !=3D 0. + * + * 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 rc, rc_gather; + int nr_pages; + struct folio *folio, *folio2; + LIST_HEAD(folios); + LIST_HEAD(ret_folios); + struct migrate_pages_stats stats; + + trace_mm_migrate_pages_start(mode, reason); + + memset(&stats, 0, sizeof(stats)); + + rc_gather =3D migrate_hugetlbs(from, get_new_page, put_new_page, private, + mode, reason, &stats, &ret_folios); + if (rc_gather < 0) + goto out; +again: + nr_pages =3D 0; + list_for_each_entry_safe(folio, folio2, from, lru) { + /* Retried hugetlb folios will be kept in list */ + if (folio_test_hugetlb(folio)) { + list_move_tail(&folio->lru, &ret_folios); + continue; + } + + nr_pages +=3D folio_nr_pages(folio); + if (nr_pages > NR_MAX_BATCHED_MIGRATION) + break; + } + if (nr_pages > NR_MAX_BATCHED_MIGRATION) + list_cut_before(&folios, from, &folio->lru); + else + list_splice_init(from, &folios); + rc =3D migrate_pages_batch(&folios, get_new_page, put_new_page, private, + mode, reason, &ret_folios, &stats); + list_splice_tail_init(&folios, &ret_folios); + if (rc < 0) { + rc_gather =3D rc; + goto out; + } + rc_gather +=3D rc; + if (!list_empty(from)) + goto again; out: /* * Put the permanent failure folio back to migration list, they @@ -1728,7 +1766,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, * are migrated successfully. */ if (list_empty(from)) - rc =3D 0; + rc_gather =3D 0; =20 count_vm_events(PGMIGRATE_SUCCESS, stats.nr_succeeded); count_vm_events(PGMIGRATE_FAIL, stats.nr_failed_pages); @@ -1742,7 +1780,7 @@ int migrate_pages(struct list_head *from, new_page_t = get_new_page, if (ret_succeeded) *ret_succeeded =3D stats.nr_succeeded; =20 - return rc; + return rc_gather; } =20 struct page *alloc_migration_target(struct page *page, unsigned long priva= te) --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 1BCD7C46467 for ; Mon, 16 Jan 2023 06:31:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231845AbjAPGbs (ORCPT ); Mon, 16 Jan 2023 01:31:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231964AbjAPGbe (ORCPT ); Mon, 16 Jan 2023 01:31:34 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4952DA271 for ; Sun, 15 Jan 2023 22:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850684; x=1705386684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=owp2StX07FtXCpFgHDVBdQMId5O0fSuu5EeccMqJEM0=; b=Wm4J3j2ftVSSv5u7iglRlkvpzvZlVfz7JZ/QKb767dNJ2fznCbd1ELFT FVETVX21C3RNzWuLYHsJE0eyBQVrFHgP83AH8/Lu2Weo6wpo6ku5YZLzB OKrof6et4YBzVJahZ6pjB3Si6V00ggFnJjSMilhpcfiC7jRMVqoa2ipUO m/lYzjFUPxFKsBSyove62ROBQVv4Jz79xRbPfTpoCMkAVKKJK/sHfrvih JYEZAjGqeSfSrgVKocKiKgzyiGTDead5HeowQbkbk5vcbGF5uQOVyQBRe DQ8cbIuLgeE/JqzAnlnIbdMqgaPYWecIB1hTv86+ZwxvhKvvM5T/Wvu5g A==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892163" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892163" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:23 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286654" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286654" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:20 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Baolin Wang , Zi Yan , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 4/9] migrate_pages: split unmap_and_move() to _unmap() and _move() Date: Mon, 16 Jan 2023 14:30:52 +0800 Message-Id: <20230116063057.653862-5-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" This is a preparation patch to batch the folio unmapping and moving. In this patch, unmap_and_move() is split to migrate_folio_unmap() and migrate_folio_move(). So, we can batch _unmap() and _move() in different loops later. To pass some information between unmap and move, the original unused dst->mapping and dst->private are used. Signed-off-by: "Huang, Ying" Reviewed-by: Baolin Wang Cc: Zi Yan Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- include/linux/migrate.h | 1 + mm/migrate.c | 170 ++++++++++++++++++++++++++++++---------- 2 files changed, 130 insertions(+), 41 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 3ef77f52a4f0..7376074f2e1e 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -18,6 +18,7 @@ struct migration_target_control; * - zero on page migration success; */ #define MIGRATEPAGE_SUCCESS 0 +#define MIGRATEPAGE_UNMAP 1 =20 /** * struct movable_operations - Driver page migration diff --git a/mm/migrate.c b/mm/migrate.c index 9a667039c34c..0428449149f4 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1009,11 +1009,53 @@ static int move_to_new_folio(struct folio *dst, str= uct folio *src, return rc; } =20 -static int __unmap_and_move(struct folio *src, struct folio *dst, +/* + * To record some information during migration, we uses some unused + * fields (mapping and private) of struct folio of the newly allocated + * destination folio. This is safe because nobody is using them + * except us. + */ +static void __migrate_folio_record(struct folio *dst, + unsigned long page_was_mapped, + struct anon_vma *anon_vma) +{ + dst->mapping =3D (void *)anon_vma; + dst->private =3D (void *)page_was_mapped; +} + +static void __migrate_folio_extract(struct folio *dst, + int *page_was_mappedp, + struct anon_vma **anon_vmap) +{ + *anon_vmap =3D (void *)dst->mapping; + *page_was_mappedp =3D (unsigned long)dst->private; + dst->mapping =3D NULL; + dst->private =3D NULL; +} + +/* Cleanup src folio upon migration success */ +static void migrate_folio_done(struct folio *src, + enum migrate_reason reason) +{ + /* + * Compaction can migrate also non-LRU pages which are + * not accounted to NR_ISOLATED_*. They can be recognized + * as __PageMovable + */ + 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)); + + if (reason !=3D MR_MEMORY_FAILURE) + /* We release the page in page_handle_poison. */ + folio_put(src); +} + +static int __migrate_folio_unmap(struct folio *src, struct folio *dst, int force, enum migrate_mode mode) { int rc =3D -EAGAIN; - bool page_was_mapped =3D false; + int page_was_mapped =3D 0; struct anon_vma *anon_vma =3D NULL; bool is_lru =3D !__PageMovable(&src->page); =20 @@ -1089,8 +1131,8 @@ static int __unmap_and_move(struct folio *src, struct= folio *dst, goto out_unlock; =20 if (unlikely(!is_lru)) { - rc =3D move_to_new_folio(dst, src, mode); - goto out_unlock_both; + __migrate_folio_record(dst, page_was_mapped, anon_vma); + return MIGRATEPAGE_UNMAP; } =20 /* @@ -1115,11 +1157,42 @@ static int __unmap_and_move(struct folio *src, stru= ct folio *dst, VM_BUG_ON_FOLIO(folio_test_anon(src) && !folio_test_ksm(src) && !anon_vma, src); try_to_migrate(src, 0); - page_was_mapped =3D true; + page_was_mapped =3D 1; } =20 - if (!folio_mapped(src)) - rc =3D move_to_new_folio(dst, src, mode); + if (!folio_mapped(src)) { + __migrate_folio_record(dst, page_was_mapped, anon_vma); + return MIGRATEPAGE_UNMAP; + } + + if (page_was_mapped) + remove_migration_ptes(src, src, false); + +out_unlock_both: + folio_unlock(dst); +out_unlock: + /* Drop an anon_vma reference if we took one */ + if (anon_vma) + put_anon_vma(anon_vma); + folio_unlock(src); +out: + + return rc; +} + +static int __migrate_folio_move(struct folio *src, struct folio *dst, + enum migrate_mode mode) +{ + int rc; + int page_was_mapped =3D 0; + struct anon_vma *anon_vma =3D NULL; + bool is_lru =3D !__PageMovable(&src->page); + + __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); + + rc =3D move_to_new_folio(dst, src, mode); + if (unlikely(!is_lru)) + goto out_unlock_both; =20 /* * When successful, push dst to LRU immediately: so that if it @@ -1142,12 +1215,10 @@ static int __unmap_and_move(struct folio *src, stru= ct folio *dst, =20 out_unlock_both: folio_unlock(dst); -out_unlock: /* Drop an anon_vma reference if we took one */ if (anon_vma) put_anon_vma(anon_vma); folio_unlock(src); -out: /* * If migration is successful, decrease refcount of dst, * which will not free the page because new page owner increased @@ -1159,19 +1230,15 @@ static int __unmap_and_move(struct folio *src, stru= ct folio *dst, return rc; } =20 -/* - * 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 folio *src, - int force, enum migrate_mode mode, - enum migrate_reason reason, - struct list_head *ret) +/* Obtain the lock on page, remove all ptes. */ +static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, + unsigned long private, struct folio *src, + struct folio **dstp, int force, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret) { struct folio *dst; - int rc =3D MIGRATEPAGE_SUCCESS; + int rc =3D MIGRATEPAGE_UNMAP; struct page *newpage =3D NULL; =20 if (!thp_migration_supported() && folio_test_transhuge(src)) @@ -1182,20 +1249,50 @@ static int unmap_and_move(new_page_t get_new_page, folio_clear_active(src); folio_clear_unevictable(src); /* free_pages_prepare() will clear PG_isolated. */ - goto out; + list_del(&src->lru); + migrate_folio_done(src, reason); + return MIGRATEPAGE_SUCCESS; } =20 newpage =3D get_new_page(&src->page, private); if (!newpage) return -ENOMEM; dst =3D page_folio(newpage); + *dstp =3D dst; =20 dst->private =3D NULL; - rc =3D __unmap_and_move(src, dst, force, mode); + rc =3D __migrate_folio_unmap(src, dst, force, mode); + if (rc =3D=3D MIGRATEPAGE_UNMAP) + return rc; + + /* + * A page that has not been migrated will have kept its + * references and be restored. + */ + /* restore the folio to right list. */ + if (rc !=3D -EAGAIN) + list_move_tail(&src->lru, ret); + + if (put_new_page) + put_new_page(&dst->page, private); + else + folio_put(dst); + + return rc; +} + +/* Migrate the folio to the newly allocated folio in dst. */ +static int migrate_folio_move(free_page_t put_new_page, unsigned long priv= ate, + struct folio *src, struct folio *dst, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret) +{ + int rc; + + rc =3D __migrate_folio_move(src, dst, mode); if (rc =3D=3D MIGRATEPAGE_SUCCESS) set_page_owner_migrate_reason(&dst->page, reason); =20 -out: if (rc !=3D -EAGAIN) { /* * A folio that has been migrated has all references @@ -1211,20 +1308,7 @@ static int unmap_and_move(new_page_t get_new_page, * we want to retry. */ if (rc =3D=3D MIGRATEPAGE_SUCCESS) { - /* - * Compaction can migrate also non-LRU folios which are - * not accounted to NR_ISOLATED_*. They can be recognized - * as __folio_test_movable - */ - 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)); - - if (reason !=3D MR_MEMORY_FAILURE) - /* - * We release the folio in page_handle_poison. - */ - folio_put(src); + migrate_folio_done(src, reason); } else { if (rc !=3D -EAGAIN) list_add_tail(&src->lru, ret); @@ -1516,7 +1600,7 @@ static int migrate_pages_batch(struct list_head *from= , new_page_t get_new_page, int pass =3D 0; bool is_large =3D false; bool is_thp =3D false; - struct folio *folio, *folio2; + struct folio *folio, *folio2, *dst =3D NULL; int rc, nr_pages; LIST_HEAD(split_folios); bool nosplit =3D (reason =3D=3D MR_NUMA_MISPLACED); @@ -1543,9 +1627,13 @@ static int migrate_pages_batch(struct list_head *fro= m, new_page_t get_new_page, =20 cond_resched(); =20 - rc =3D unmap_and_move(get_new_page, put_new_page, - private, folio, pass > 2, mode, - reason, ret_folios); + rc =3D migrate_folio_unmap(get_new_page, put_new_page, private, + folio, &dst, pass > 2, mode, + reason, ret_folios); + if (rc =3D=3D MIGRATEPAGE_UNMAP) + rc =3D migrate_folio_move(put_new_page, private, + folio, dst, mode, + reason, ret_folios); /* * The rules are: * Success: folio will be freed --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 96CCCC46467 for ; Mon, 16 Jan 2023 06:31:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232059AbjAPGbx (ORCPT ); Mon, 16 Jan 2023 01:31:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231897AbjAPGbj (ORCPT ); Mon, 16 Jan 2023 01:31:39 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC890BB90 for ; Sun, 15 Jan 2023 22:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850687; x=1705386687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2La8Np+Radhjz09NHg913SidfNnKYzsWmL+WkrdLqG4=; b=QCs4IeS0aOXeoJ+DbvKE0UvKOEvaslHXmNtkCAA3nRdNEYivXvI4uQkR o2MJN38G7r8y/azlVdT7IBU7a4atcdwCNdPwNSJ/0xfohsPDoPiCt1lUe A+JpKCplk4WluJBAtuNUGB3Tqk2su4D2grMA0wE6GTYyJG9JhRKFpxsk/ K9DczbvwUYmJfBpICI6IMpBK2sQ/Ym3RBUjRQTqaMQersaK9P6pWVTnh5 xB2moDQvGR0Msjr3SLY/XpLf51yLOAYp8oqI+h7asu8/4W6Y+xVhq9KZC xhP5ADmVp3pyir8AP/vByutIveBxbpu5q+PD4/DQHY/7bD6uwSOWBP1IR g==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892175" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892175" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:27 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286664" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286664" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:24 -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 , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 5/9] migrate_pages: batch _unmap and _move Date: Mon, 16 Jan 2023 14:30:53 +0800 Message-Id: <20230116063057.653862-6-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" In this patch the _unmap and _move stage of the folio migration is batched. That for, previously, it is, for each folio _unmap() _move() Now, it is, for each folio _unmap() for each folio _move() Based on this, we can batch the TLB flushing and use some hardware accelerator to copy folios between batched _unmap and batched _move stages. Signed-off-by: "Huang, Ying" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 207 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 183 insertions(+), 24 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 0428449149f4..143d96775b4d 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1033,6 +1033,33 @@ static void __migrate_folio_extract(struct folio *ds= t, dst->private =3D NULL; } =20 +/* Restore the source folio to the original state upon failure */ +static void migrate_folio_undo_src(struct folio *src, + int page_was_mapped, + struct anon_vma *anon_vma, + struct list_head *ret) +{ + if (page_was_mapped) + remove_migration_ptes(src, src, false); + /* Drop an anon_vma reference if we took one */ + if (anon_vma) + put_anon_vma(anon_vma); + folio_unlock(src); + list_move_tail(&src->lru, ret); +} + +/* Restore the destination folio to the original state upon failure */ +static void migrate_folio_undo_dst(struct folio *dst, + free_page_t put_new_page, + unsigned long private) +{ + folio_unlock(dst); + if (put_new_page) + put_new_page(&dst->page, private); + else + folio_put(dst); +} + /* Cleanup src folio upon migration success */ static void migrate_folio_done(struct folio *src, enum migrate_reason reason) @@ -1052,7 +1079,7 @@ static void migrate_folio_done(struct folio *src, } =20 static int __migrate_folio_unmap(struct folio *src, struct folio *dst, - int force, enum migrate_mode mode) + int force, bool force_lock, enum migrate_mode mode) { int rc =3D -EAGAIN; int page_was_mapped =3D 0; @@ -1079,6 +1106,17 @@ static int __migrate_folio_unmap(struct folio *src, = struct folio *dst, if (current->flags & PF_MEMALLOC) goto out; =20 + /* + * We have locked some folios, to avoid deadlock, we cannot + * lock the folio synchronously. Go out to process (and + * unlock) all the locked folios. Then we can lock the folio + * synchronously. + */ + if (!force_lock) { + rc =3D -EDEADLOCK; + goto out; + } + folio_lock(src); } =20 @@ -1191,6 +1229,10 @@ static int __migrate_folio_move(struct folio *src, s= truct folio *dst, __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); =20 rc =3D move_to_new_folio(dst, src, mode); + + if (rc !=3D -EAGAIN) + list_del(&dst->lru); + if (unlikely(!is_lru)) goto out_unlock_both; =20 @@ -1209,6 +1251,11 @@ static int __migrate_folio_move(struct folio *src, s= truct folio *dst, lru_add_drain(); } =20 + if (rc =3D=3D -EAGAIN) { + __migrate_folio_record(dst, page_was_mapped, anon_vma); + return rc; + } + if (page_was_mapped) remove_migration_ptes(src, rc =3D=3D MIGRATEPAGE_SUCCESS ? dst : src, false); @@ -1233,7 +1280,7 @@ static int __migrate_folio_move(struct folio *src, st= ruct folio *dst, /* Obtain the lock on page, remove all ptes. */ static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, unsigned long private, struct folio *src, - struct folio **dstp, int force, + struct folio **dstp, int force, bool force_lock, enum migrate_mode mode, enum migrate_reason reason, struct list_head *ret) { @@ -1261,7 +1308,7 @@ static int migrate_folio_unmap(new_page_t get_new_pag= e, free_page_t put_new_page *dstp =3D dst; =20 dst->private =3D NULL; - rc =3D __migrate_folio_unmap(src, dst, force, mode); + rc =3D __migrate_folio_unmap(src, dst, force, force_lock, mode); if (rc =3D=3D MIGRATEPAGE_UNMAP) return rc; =20 @@ -1270,7 +1317,7 @@ static int migrate_folio_unmap(new_page_t get_new_pag= e, free_page_t put_new_page * references and be restored. */ /* restore the folio to right list. */ - if (rc !=3D -EAGAIN) + if (rc !=3D -EAGAIN && rc !=3D -EDEADLOCK) list_move_tail(&src->lru, ret); =20 if (put_new_page) @@ -1309,9 +1356,8 @@ static int migrate_folio_move(free_page_t put_new_pag= e, unsigned long private, */ if (rc =3D=3D MIGRATEPAGE_SUCCESS) { migrate_folio_done(src, reason); - } else { - if (rc !=3D -EAGAIN) - list_add_tail(&src->lru, ret); + } else if (rc !=3D -EAGAIN) { + list_add_tail(&src->lru, ret); =20 if (put_new_page) put_new_page(&dst->page, private); @@ -1591,7 +1637,7 @@ static int migrate_pages_batch(struct list_head *from= , new_page_t get_new_page, enum migrate_mode mode, int reason, struct list_head *ret_folios, struct migrate_pages_stats *stats) { - int retry =3D 1; + int retry; int large_retry =3D 1; int thp_retry =3D 1; int nr_failed =3D 0; @@ -1600,13 +1646,19 @@ static int migrate_pages_batch(struct list_head *fr= om, new_page_t get_new_page, int pass =3D 0; bool is_large =3D false; bool is_thp =3D false; - struct folio *folio, *folio2, *dst =3D NULL; - int rc, nr_pages; + struct folio *folio, *folio2, *dst =3D NULL, *dst2; + int rc, rc_saved, nr_pages; LIST_HEAD(split_folios); + LIST_HEAD(unmap_folios); + LIST_HEAD(dst_folios); bool nosplit =3D (reason =3D=3D MR_NUMA_MISPLACED); bool no_split_folio_counting =3D false; + bool force_lock; =20 -split_folio_migration: +retry: + rc_saved =3D 0; + force_lock =3D true; + retry =3D 1; for (pass =3D 0; pass < NR_MAX_MIGRATE_PAGES_RETRY && (retry || large_retry); pass++) { @@ -1628,16 +1680,15 @@ static int migrate_pages_batch(struct list_head *fr= om, new_page_t get_new_page, cond_resched(); =20 rc =3D migrate_folio_unmap(get_new_page, put_new_page, private, - folio, &dst, pass > 2, mode, - reason, ret_folios); - if (rc =3D=3D MIGRATEPAGE_UNMAP) - rc =3D migrate_folio_move(put_new_page, private, - folio, dst, mode, - reason, ret_folios); + folio, &dst, pass > 2, force_lock, + mode, reason, ret_folios); /* * The rules are: * Success: folio will be freed + * Unmap: folio will be put on unmap_folios list, + * dst folio put on dst_folios list * -EAGAIN: stay on the from list + * -EDEADLOCK: stay on the from list * -ENOMEM: stay on the from list * -ENOSYS: stay on the from list * Other errno: put on ret_folios list @@ -1672,7 +1723,7 @@ static int migrate_pages_batch(struct list_head *from= , new_page_t get_new_page, case -ENOMEM: /* * When memory is low, don't bother to try to migrate - * other folios, just exit. + * other folios, move unmapped folios, then exit. */ if (is_large) { nr_large_failed++; @@ -1711,7 +1762,19 @@ static int migrate_pages_batch(struct list_head *fro= m, new_page_t get_new_page, /* nr_failed isn't updated for not used */ nr_large_failed +=3D large_retry; stats->nr_thp_failed +=3D thp_retry; - goto out; + rc_saved =3D rc; + if (list_empty(&unmap_folios)) + goto out; + else + goto move; + case -EDEADLOCK: + /* + * The folio cannot be locked for potential deadlock. + * Go move (and unlock) all locked folios. Then we can + * try again. + */ + rc_saved =3D rc; + goto move; case -EAGAIN: if (is_large) { large_retry++; @@ -1725,6 +1788,15 @@ static int migrate_pages_batch(struct list_head *fro= m, new_page_t get_new_page, stats->nr_succeeded +=3D nr_pages; stats->nr_thp_succeeded +=3D is_thp; break; + case MIGRATEPAGE_UNMAP: + /* + * We have locked some folios, don't force lock + * to avoid deadlock. + */ + force_lock =3D false; + list_move_tail(&folio->lru, &unmap_folios); + list_add_tail(&dst->lru, &dst_folios); + break; default: /* * Permanent failure (-EBUSY, etc.): @@ -1748,12 +1820,95 @@ static int migrate_pages_batch(struct list_head *fr= om, new_page_t get_new_page, nr_large_failed +=3D large_retry; stats->nr_thp_failed +=3D thp_retry; stats->nr_failed_pages +=3D nr_retry_pages; +move: + retry =3D 1; + for (pass =3D 0; + pass < NR_MAX_MIGRATE_PAGES_RETRY && (retry || large_retry); + pass++) { + retry =3D 0; + large_retry =3D 0; + thp_retry =3D 0; + nr_retry_pages =3D 0; + + dst =3D list_first_entry(&dst_folios, struct folio, lru); + dst2 =3D list_next_entry(dst, lru); + list_for_each_entry_safe(folio, folio2, &unmap_folios, lru) { + is_large =3D folio_test_large(folio); + is_thp =3D is_large && folio_test_pmd_mappable(folio); + nr_pages =3D folio_nr_pages(folio); + + cond_resched(); + + rc =3D migrate_folio_move(put_new_page, private, + folio, dst, mode, + reason, ret_folios); + /* + * The rules are: + * Success: folio will be freed + * -EAGAIN: stay on the unmap_folios list + * Other errno: put on ret_folios list + */ + switch(rc) { + case -EAGAIN: + if (is_large) { + large_retry++; + thp_retry +=3D is_thp; + } else if (!no_split_folio_counting) { + retry++; + } + nr_retry_pages +=3D nr_pages; + break; + case MIGRATEPAGE_SUCCESS: + stats->nr_succeeded +=3D nr_pages; + stats->nr_thp_succeeded +=3D is_thp; + break; + default: + if (is_large) { + nr_large_failed++; + stats->nr_thp_failed +=3D is_thp; + } else if (!no_split_folio_counting) { + nr_failed++; + } + + stats->nr_failed_pages +=3D nr_pages; + break; + } + dst =3D dst2; + dst2 =3D list_next_entry(dst, lru); + } + } + nr_failed +=3D retry; + nr_large_failed +=3D large_retry; + stats->nr_thp_failed +=3D thp_retry; + stats->nr_failed_pages +=3D nr_retry_pages; + + if (rc_saved) + rc =3D rc_saved; + else + rc =3D nr_failed + nr_large_failed; +out: + /* Cleanup remaining folios */ + dst =3D list_first_entry(&dst_folios, struct folio, lru); + dst2 =3D list_next_entry(dst, lru); + list_for_each_entry_safe(folio, folio2, &unmap_folios, lru) { + int page_was_mapped =3D 0; + struct anon_vma *anon_vma =3D NULL; + + __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); + migrate_folio_undo_src(folio, page_was_mapped, anon_vma, + ret_folios); + list_del(&dst->lru); + migrate_folio_undo_dst(dst, put_new_page, private); + dst =3D dst2; + dst2 =3D list_next_entry(dst, lru); + } + /* * 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(&split_folios)) { + if (rc >=3D 0 && !list_empty(&split_folios)) { /* * Move non-migrated folios (after NR_MAX_MIGRATE_PAGES_RETRY * retries) to ret_folios to avoid migrating them again. @@ -1761,12 +1916,16 @@ static int migrate_pages_batch(struct list_head *fr= om, new_page_t get_new_page, list_splice_init(from, ret_folios); list_splice_init(&split_folios, from); no_split_folio_counting =3D true; - retry =3D 1; - goto split_folio_migration; + goto retry; } =20 - rc =3D nr_failed + nr_large_failed; -out: + /* + * We have unlocked all locked folios, so we can force lock now, let's + * try again. + */ + if (rc =3D=3D -EDEADLOCK) + goto retry; + return rc; } =20 --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 33AAEC46467 for ; Mon, 16 Jan 2023 06:32:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232133AbjAPGcN (ORCPT ); Mon, 16 Jan 2023 01:32:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232036AbjAPGbl (ORCPT ); Mon, 16 Jan 2023 01:31:41 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F290CC20 for ; Sun, 15 Jan 2023 22:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850691; x=1705386691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IWllhTG0GdPmuukl+DFwxPlkS3OUSn/9WM3n7s2+yfw=; b=SFWFKENIEL3uQKI9o5Fen69fU3t59O6a+kK41TKS/9OrxkD+DI/SnLZW ptVwnxXXD+vQZgtVzOyzfr0Rn5AZiRRgQgtGXNjlcnCva/e4Pe6PEDK54 09QbHXZVi0J81e80unhnp+tRVu7qjHliVtB6xR8EbQJT6qwNoRkY8W+/C W6Qm2ioC6PPLi4zdryhEDHjkL6diN3hqbYfngwoix/LG6qmaah/BECb/J FhFrzI0BUs2uk6SI8Kvmn/B2XoVTTqsBBsPSXUS+GAEcWBRtXzGILeOKo Lw76Y+zOQ50x1xoU4349MPepuqzZLu2ZhFLorV25Tjf30AO7+T6xQpdU4 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892192" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892192" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:30 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286676" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286676" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:27 -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 , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 6/9] migrate_pages: move migrate_folio_unmap() Date: Mon, 16 Jan 2023 14:30:54 +0800 Message-Id: <20230116063057.653862-7-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" Just move the position of the functions. There's no any functionality change. This is to make it easier to review the next patch via putting code near its position in the next patch. Signed-off-by: "Huang, Ying" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 143d96775b4d..a25966233923 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1218,6 +1218,57 @@ static int __migrate_folio_unmap(struct folio *src, = struct folio *dst, return rc; } =20 +/* Obtain the lock on page, remove all ptes. */ +static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, + unsigned long private, struct folio *src, + struct folio **dstp, int force, bool force_lock, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret) +{ + struct folio *dst; + int rc =3D MIGRATEPAGE_UNMAP; + struct page *newpage =3D NULL; + + if (!thp_migration_supported() && folio_test_transhuge(src)) + return -ENOSYS; + + 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. */ + list_del(&src->lru); + migrate_folio_done(src, reason); + return MIGRATEPAGE_SUCCESS; + } + + newpage =3D get_new_page(&src->page, private); + if (!newpage) + return -ENOMEM; + dst =3D page_folio(newpage); + *dstp =3D dst; + + dst->private =3D NULL; + rc =3D __migrate_folio_unmap(src, dst, force, force_lock, mode); + if (rc =3D=3D MIGRATEPAGE_UNMAP) + return rc; + + /* + * A page that has not been migrated will have kept its + * references and be restored. + */ + /* restore the folio to right list. */ + if (rc !=3D -EAGAIN && rc !=3D -EDEADLOCK) + list_move_tail(&src->lru, ret); + + if (put_new_page) + put_new_page(&dst->page, private); + else + folio_put(dst); + + return rc; +} + static int __migrate_folio_move(struct folio *src, struct folio *dst, enum migrate_mode mode) { @@ -1277,57 +1328,6 @@ static int __migrate_folio_move(struct folio *src, s= truct folio *dst, return rc; } =20 -/* Obtain the lock on page, remove all ptes. */ -static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, - unsigned long private, struct folio *src, - struct folio **dstp, int force, bool force_lock, - enum migrate_mode mode, enum migrate_reason reason, - struct list_head *ret) -{ - struct folio *dst; - int rc =3D MIGRATEPAGE_UNMAP; - struct page *newpage =3D NULL; - - if (!thp_migration_supported() && folio_test_transhuge(src)) - return -ENOSYS; - - 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. */ - list_del(&src->lru); - migrate_folio_done(src, reason); - return MIGRATEPAGE_SUCCESS; - } - - newpage =3D get_new_page(&src->page, private); - if (!newpage) - return -ENOMEM; - dst =3D page_folio(newpage); - *dstp =3D dst; - - dst->private =3D NULL; - rc =3D __migrate_folio_unmap(src, dst, force, force_lock, mode); - if (rc =3D=3D MIGRATEPAGE_UNMAP) - return rc; - - /* - * A page that has not been migrated will have kept its - * references and be restored. - */ - /* restore the folio to right list. */ - if (rc !=3D -EAGAIN && rc !=3D -EDEADLOCK) - list_move_tail(&src->lru, ret); - - if (put_new_page) - put_new_page(&dst->page, private); - else - folio_put(dst); - - return rc; -} - /* Migrate the folio to the newly allocated folio in dst. */ static int migrate_folio_move(free_page_t put_new_page, unsigned long priv= ate, struct folio *src, struct folio *dst, --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 640CDC46467 for ; Mon, 16 Jan 2023 06:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232027AbjAPGcb (ORCPT ); Mon, 16 Jan 2023 01:32:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231956AbjAPGbw (ORCPT ); Mon, 16 Jan 2023 01:31:52 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFC6365BB for ; Sun, 15 Jan 2023 22:31:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850694; x=1705386694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c08JPciVGbfSOCD62Qp15TGPybC907KLoZLpS/qN1Zg=; b=JEyOnmkCuANGG2LCuyl4NVOstnYxK0llZZoVMb+WERDBqvMDYwSvAp9U 7rYwKsT+iWuqBt3uOCUsgosJmB7Dl0AXnjcvAOWo8+BAbIUaFUgse5jZ0 NX54hBWk+rzKRVtFBbhK8VCYzpl6QtUta0+FQtIzxcZiSyUDJid7YF3U3 dFnrsPou2WcB2w8d7xA9ccSJMWL7PbmrfimKv5r81MaO312DMNwxvBVh4 s3xUVJ3lrgebe4bp/ggCwELvdMOeunUQ4w4ZSNhYi3+EnzLtzsFgq3thT abm0uRZXSn1twfiEUDQk9dGr8wG3NxPZkwaXe76AnJ8CoEdBqP5IE3/7j g==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892210" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892210" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:34 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286692" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286692" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:30 -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 , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 7/9] migrate_pages: share more code between _unmap and _move Date: Mon, 16 Jan 2023 14:30:55 +0800 Message-Id: <20230116063057.653862-8-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" This is a code cleanup patch to reduce the duplicated code between the _unmap and _move stages of migrate_pages(). No functionality change is expected. Signed-off-by: "Huang, Ying" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 205 +++++++++++++++++++++------------------------------ 1 file changed, 82 insertions(+), 123 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a25966233923..ef9f126e21ed 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1037,6 +1037,7 @@ static void __migrate_folio_extract(struct folio *dst, static void migrate_folio_undo_src(struct folio *src, int page_was_mapped, struct anon_vma *anon_vma, + bool locked, struct list_head *ret) { if (page_was_mapped) @@ -1044,16 +1045,20 @@ static void migrate_folio_undo_src(struct folio *sr= c, /* Drop an anon_vma reference if we took one */ if (anon_vma) put_anon_vma(anon_vma); - folio_unlock(src); - list_move_tail(&src->lru, ret); + if (locked) + folio_unlock(src); + if (ret) + list_move_tail(&src->lru, ret); } =20 /* Restore the destination folio to the original state upon failure */ static void migrate_folio_undo_dst(struct folio *dst, + bool locked, free_page_t put_new_page, unsigned long private) { - folio_unlock(dst); + if (locked) + folio_unlock(dst); if (put_new_page) put_new_page(&dst->page, private); else @@ -1078,13 +1083,42 @@ static void migrate_folio_done(struct folio *src, folio_put(src); } =20 -static int __migrate_folio_unmap(struct folio *src, struct folio *dst, - int force, bool force_lock, enum migrate_mode mode) +/* Obtain the lock on page, remove all ptes. */ +static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, + unsigned long private, struct folio *src, + struct folio **dstp, int force, bool force_lock, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret) { + struct folio *dst; int rc =3D -EAGAIN; + struct page *newpage =3D NULL; int page_was_mapped =3D 0; struct anon_vma *anon_vma =3D NULL; bool is_lru =3D !__PageMovable(&src->page); + bool locked =3D false; + bool dst_locked =3D false; + + if (!thp_migration_supported() && folio_test_transhuge(src)) + return -ENOSYS; + + 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. */ + list_del(&src->lru); + migrate_folio_done(src, reason); + return MIGRATEPAGE_SUCCESS; + } + + newpage =3D get_new_page(&src->page, private); + if (!newpage) + return -ENOMEM; + dst =3D page_folio(newpage); + *dstp =3D dst; + + dst->private =3D NULL; =20 if (!folio_trylock(src)) { if (!force || mode =3D=3D MIGRATE_ASYNC) @@ -1119,6 +1153,7 @@ static int __migrate_folio_unmap(struct folio *src, s= truct folio *dst, =20 folio_lock(src); } + locked =3D true; =20 if (folio_test_writeback(src)) { /* @@ -1133,10 +1168,10 @@ static int __migrate_folio_unmap(struct folio *src,= struct folio *dst, break; default: rc =3D -EBUSY; - goto out_unlock; + goto out; } if (!force) - goto out_unlock; + goto out; folio_wait_writeback(src); } =20 @@ -1166,7 +1201,8 @@ static int __migrate_folio_unmap(struct folio *src, s= truct folio *dst, * This is much like races on refcount of oldpage: just don't BUG(). */ if (unlikely(!folio_trylock(dst))) - goto out_unlock; + goto out; + dst_locked =3D true; =20 if (unlikely(!is_lru)) { __migrate_folio_record(dst, page_was_mapped, anon_vma); @@ -1188,7 +1224,7 @@ static int __migrate_folio_unmap(struct folio *src, s= truct folio *dst, if (!src->mapping) { if (folio_test_private(src)) { try_to_free_buffers(src); - goto out_unlock_both; + goto out; } } else if (folio_mapped(src)) { /* Establish migration ptes */ @@ -1203,74 +1239,26 @@ static int __migrate_folio_unmap(struct folio *src,= struct folio *dst, return MIGRATEPAGE_UNMAP; } =20 - if (page_was_mapped) - remove_migration_ptes(src, src, false); - -out_unlock_both: - folio_unlock(dst); -out_unlock: - /* Drop an anon_vma reference if we took one */ - if (anon_vma) - put_anon_vma(anon_vma); - folio_unlock(src); out: - - return rc; -} - -/* Obtain the lock on page, remove all ptes. */ -static int migrate_folio_unmap(new_page_t get_new_page, free_page_t put_ne= w_page, - unsigned long private, struct folio *src, - struct folio **dstp, int force, bool force_lock, - enum migrate_mode mode, enum migrate_reason reason, - struct list_head *ret) -{ - struct folio *dst; - int rc =3D MIGRATEPAGE_UNMAP; - struct page *newpage =3D NULL; - - if (!thp_migration_supported() && folio_test_transhuge(src)) - return -ENOSYS; - - 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. */ - list_del(&src->lru); - migrate_folio_done(src, reason); - return MIGRATEPAGE_SUCCESS; - } - - newpage =3D get_new_page(&src->page, private); - if (!newpage) - return -ENOMEM; - dst =3D page_folio(newpage); - *dstp =3D dst; - - dst->private =3D NULL; - rc =3D __migrate_folio_unmap(src, dst, force, force_lock, mode); - if (rc =3D=3D MIGRATEPAGE_UNMAP) - return rc; - /* * A page that has not been migrated will have kept its * references and be restored. */ /* restore the folio to right list. */ - if (rc !=3D -EAGAIN && rc !=3D -EDEADLOCK) - list_move_tail(&src->lru, ret); + if (rc =3D=3D -EAGAIN || rc =3D=3D -EDEADLOCK) + ret =3D NULL; =20 - if (put_new_page) - put_new_page(&dst->page, private); - else - folio_put(dst); + migrate_folio_undo_src(src, page_was_mapped, anon_vma, locked, ret); + migrate_folio_undo_dst(dst, dst_locked, put_new_page, private); =20 return rc; } =20 -static int __migrate_folio_move(struct folio *src, struct folio *dst, - enum migrate_mode mode) +/* Migrate the folio to the newly allocated folio in dst. */ +static int migrate_folio_move(free_page_t put_new_page, unsigned long priv= ate, + struct folio *src, struct folio *dst, + enum migrate_mode mode, enum migrate_reason reason, + struct list_head *ret) { int rc; int page_was_mapped =3D 0; @@ -1280,9 +1268,10 @@ static int __migrate_folio_move(struct folio *src, s= truct folio *dst, __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); =20 rc =3D move_to_new_folio(dst, src, mode); + if (rc) + goto out; =20 - if (rc !=3D -EAGAIN) - list_del(&dst->lru); + list_del(&dst->lru); =20 if (unlikely(!is_lru)) goto out_unlock_both; @@ -1296,75 +1285,45 @@ static int __migrate_folio_move(struct folio *src, = struct folio *dst, * unsuccessful, and other cases when a page has been temporarily * isolated from the unevictable LRU: but this case is the easiest. */ - if (rc =3D=3D MIGRATEPAGE_SUCCESS) { - folio_add_lru(dst); - if (page_was_mapped) - lru_add_drain(); - } - - if (rc =3D=3D -EAGAIN) { - __migrate_folio_record(dst, page_was_mapped, anon_vma); - return rc; - } + folio_add_lru(dst); + if (page_was_mapped) + lru_add_drain(); =20 if (page_was_mapped) - remove_migration_ptes(src, - rc =3D=3D MIGRATEPAGE_SUCCESS ? dst : src, false); + remove_migration_ptes(src, dst, false); =20 out_unlock_both: folio_unlock(dst); - /* Drop an anon_vma reference if we took one */ - if (anon_vma) - put_anon_vma(anon_vma); - folio_unlock(src); + set_page_owner_migrate_reason(&dst->page, reason); /* * If migration is successful, decrease refcount of dst, * which will not free the page because new page owner increased * refcounter. */ - if (rc =3D=3D MIGRATEPAGE_SUCCESS) - folio_put(dst); - - return rc; -} - -/* Migrate the folio to the newly allocated folio in dst. */ -static int migrate_folio_move(free_page_t put_new_page, unsigned long priv= ate, - struct folio *src, struct folio *dst, - enum migrate_mode mode, enum migrate_reason reason, - struct list_head *ret) -{ - int rc; - - rc =3D __migrate_folio_move(src, dst, mode); - if (rc =3D=3D MIGRATEPAGE_SUCCESS) - set_page_owner_migrate_reason(&dst->page, reason); - - if (rc !=3D -EAGAIN) { - /* - * 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(&src->lru); - } + folio_put(dst); =20 /* - * If migration is successful, releases reference grabbed during - * isolation. Otherwise, restore the folio to right list unless - * we want to retry. + * A page that has been migrated has all references removed + * and will be freed. */ - if (rc =3D=3D MIGRATEPAGE_SUCCESS) { - migrate_folio_done(src, reason); - } else if (rc !=3D -EAGAIN) { - list_add_tail(&src->lru, ret); + list_del(&src->lru); + /* Drop an anon_vma reference if we took one */ + if (anon_vma) + put_anon_vma(anon_vma); + folio_unlock(src); + migrate_folio_done(src, reason); =20 - if (put_new_page) - put_new_page(&dst->page, private); - else - folio_put(dst); + return rc; +out: + if (rc =3D=3D -EAGAIN) { + __migrate_folio_record(dst, page_was_mapped, anon_vma); + return rc; } =20 + migrate_folio_undo_src(src, page_was_mapped, anon_vma, true, ret); + list_del(&dst->lru); + migrate_folio_undo_dst(dst, true, put_new_page, private); + return rc; } =20 @@ -1896,9 +1855,9 @@ static int migrate_pages_batch(struct list_head *from= , new_page_t get_new_page, =20 __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); migrate_folio_undo_src(folio, page_was_mapped, anon_vma, - ret_folios); + true, ret_folios); list_del(&dst->lru); - migrate_folio_undo_dst(dst, put_new_page, private); + migrate_folio_undo_dst(dst, true, put_new_page, private); dst =3D dst2; dst2 =3D list_next_entry(dst, lru); } --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 AEBFDC54EBE for ; Mon, 16 Jan 2023 06:32:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232071AbjAPGcg (ORCPT ); Mon, 16 Jan 2023 01:32:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231882AbjAPGcH (ORCPT ); Mon, 16 Jan 2023 01:32:07 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 115DAF767 for ; Sun, 15 Jan 2023 22:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850698; x=1705386698; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U4IhIonWVHM0uB5EvKcM6XxvZcENTz+r12d4PtYOG2c=; b=ZVch+r3As2FWyuGdHV5IhCZmtmHXKNnhKhA2eu4oBy6MH91+HAGPZXIi RJB3sLE+41mikK8vsbosGytjeaGmFc7PS+hf7Qy/byEyw5lGWmEclBkbq qeuka8uf8UnYMbguBkcv+v3+5FKAxGVn1EKL7Ce8JmTD4We4nFHwyxp+R LoZjYmmyS/Lbdo+i81jpcyiK60tByH2oZiWSPpqU0Wfn/g/Q928YB0a/B LiMe3NIJMbcpCSsCBInvoLi7ns+lDsgzIRCOaY1hxybVGyAOQRPyjXmcO IOolWhJhsUpbsTt6lmuctNlvDDpC3tKYQqaHVQgoVerY6BWnAa3HnDfD/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892232" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892232" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:37 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286701" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286701" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:34 -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 , Bharata B Rao , Alistair Popple , haoxin , Minchan Kim Subject: [PATCH -v3 8/9] migrate_pages: batch flushing TLB Date: Mon, 16 Jan 2023 14:30:56 +0800 Message-Id: <20230116063057.653862-9-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" The TLB flushing will cost quite some CPU cycles during the folio migration in some situations. For example, when migrate a folio of a process with multiple active threads that run on multiple CPUs. After batching the _unmap and _move in migrate_pages(), the TLB flushing can be batched easily with the existing TLB flush batching mechanism. This patch implements that. We use the following test case to test the patch. On a 2-socket Intel server, - Run pmbench memory accessing benchmark - Run `migratepages` to migrate pages of pmbench between node 0 and node 1 back and forth. With the patch, the TLB flushing IPI reduces 99.1% during the test and the number of pages migrated successfully per second increases 291.7%. NOTE: TLB flushing is batched only for normal folios, not for THP folios. Because the overhead of TLB flushing for THP folios is much lower than that for normal folios (about 1/512 on x86 platform). Signed-off-by: "Huang, Ying" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 4 +++- mm/rmap.c | 20 +++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index ef9f126e21ed..8ccb61c49188 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1230,7 +1230,7 @@ static int migrate_folio_unmap(new_page_t get_new_pag= e, free_page_t put_new_page /* Establish migration ptes */ VM_BUG_ON_FOLIO(folio_test_anon(src) && !folio_test_ksm(src) && !anon_vma, src); - try_to_migrate(src, 0); + try_to_migrate(src, TTU_BATCH_FLUSH); page_was_mapped =3D 1; } =20 @@ -1780,6 +1780,8 @@ static int migrate_pages_batch(struct list_head *from= , new_page_t get_new_page, stats->nr_thp_failed +=3D thp_retry; stats->nr_failed_pages +=3D nr_retry_pages; move: + try_to_unmap_flush(); + retry =3D 1; for (pass =3D 0; pass < NR_MAX_MIGRATE_PAGES_RETRY && (retry || large_retry); diff --git a/mm/rmap.c b/mm/rmap.c index b616870a09be..2e125f3e462e 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1976,7 +1976,21 @@ static bool try_to_migrate_one(struct folio *folio, = struct vm_area_struct *vma, } else { flush_cache_page(vma, address, pte_pfn(*pvmw.pte)); /* Nuke the page table entry. */ - pteval =3D ptep_clear_flush(vma, address, pvmw.pte); + if (should_defer_flush(mm, flags)) { + /* + * We clear the PTE but do not flush so potentially + * a remote CPU could still be writing to the folio. + * If the entry was previously clean then the + * architecture must guarantee that a clear->dirty + * transition on a cached TLB entry is written through + * and traps if the PTE is unmapped. + */ + pteval =3D ptep_get_and_clear(mm, address, pvmw.pte); + + set_tlb_ubc_flush_pending(mm, pte_dirty(pteval)); + } else { + pteval =3D ptep_clear_flush(vma, address, pvmw.pte); + } } =20 /* Set the dirty flag on the folio now the pte is gone. */ @@ -2148,10 +2162,10 @@ void try_to_migrate(struct folio *folio, enum ttu_f= lags flags) =20 /* * Migration always ignores mlock and only supports TTU_RMAP_LOCKED and - * TTU_SPLIT_HUGE_PMD and TTU_SYNC flags. + * TTU_SPLIT_HUGE_PMD, TTU_SYNC, and TTU_BATCH_FLUSH flags. */ if (WARN_ON_ONCE(flags & ~(TTU_RMAP_LOCKED | TTU_SPLIT_HUGE_PMD | - TTU_SYNC))) + TTU_SYNC | TTU_BATCH_FLUSH))) return; =20 if (folio_is_zone_device(folio) && --=20 2.35.1 From nobody Mon Sep 15 05:47:49 2025 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 AD7D2C54EBE for ; Mon, 16 Jan 2023 06:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232114AbjAPGcr (ORCPT ); Mon, 16 Jan 2023 01:32:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231855AbjAPGcK (ORCPT ); Mon, 16 Jan 2023 01:32:10 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B4324EDD for ; Sun, 15 Jan 2023 22:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850701; x=1705386701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3J9a3YKiHmKyIA98tevHEicLgJhEATSgMLt7yTqcfnY=; b=UOZiXzIFZmarHiv1iwJrS7zikIqIYdQmT34BJQx3BBhU92M59ZG99/ns MF8YB7fhQmh5xePrEqaBzb6QrZ4JAc4KqDdubkQ6pIjPeniw2K+n7kHij Ezam8xh8Ry0FfYgs40xN97bnTI8NxPVv9MT74x/PGcXBGwwDuSpsQVknv 5okv4ehJHuiPmmyi6C2wVqdrK2yTGnqRDKnG6hwQEDQWhEs/SjsRax2+x vnWeHC8Wq/O14f74aWBE81kthdVbxL0FFyQ0nKe+rthU+MtWwQFcGk4rV 4xO5Ujujvpf7NYfX4rdbP6PzfSvThv1aTslKtOcvgNeRz/Kl8MqeLTJIn w==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892244" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892244" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:40 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286715" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286715" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:37 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Alistair Popple , Zi Yan , Yang Shi , Baolin Wang , Oscar Salvador , Matthew Wilcox , Bharata B Rao , haoxin , Minchan Kim Subject: [PATCH -v3 9/9] migrate_pages: move THP/hugetlb migration support check to simplify code Date: Mon, 16 Jan 2023 14:30:57 +0800 Message-Id: <20230116063057.653862-10-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-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" This is a code cleanup patch, no functionality change is expected. After the change, the line number reduces especially in the long migrate_pages_batch(). Signed-off-by: "Huang, Ying" Suggested-by: Alistair Popple Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 83 +++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 8ccb61c49188..9d390368cf3f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1099,9 +1099,6 @@ static int migrate_folio_unmap(new_page_t get_new_pag= e, free_page_t put_new_page bool locked =3D false; bool dst_locked =3D false; =20 - if (!thp_migration_supported() && folio_test_transhuge(src)) - return -ENOSYS; - if (folio_ref_count(src) =3D=3D 1) { /* Folio was freed from under us. So we are done. */ folio_clear_active(src); @@ -1358,16 +1355,6 @@ static int unmap_and_move_huge_page(new_page_t get_n= ew_page, struct anon_vma *anon_vma =3D NULL; struct address_space *mapping =3D NULL; =20 - /* - * Migratability of hugepages depends on architectures and their size. - * This check is necessary because some callers of hugepage migration - * like soft offline and memory hotremove don't walk through page - * tables or check whether the hugepage is pmd-based or not before - * kicking migration. - */ - if (!hugepage_migration_supported(page_hstate(hpage))) - return -ENOSYS; - if (folio_ref_count(src) =3D=3D 1) { /* page was freed from under us. So we are done. */ putback_active_hugepage(hpage); @@ -1534,6 +1521,20 @@ static int migrate_hugetlbs(struct list_head *from, = new_page_t get_new_page, =20 cond_resched(); =20 + /* + * Migratability of hugepages depends on architectures and + * their size. This check is necessary because some callers + * of hugepage migration like soft offline and memory + * hotremove don't walk through page tables or check whether + * the hugepage is pmd-based or not before kicking migration. + */ + if (!hugepage_migration_supported(folio_hstate(folio))) { + nr_failed++; + stats->nr_failed_pages +=3D nr_pages; + list_move_tail(&folio->lru, ret_folios); + continue; + } + rc =3D unmap_and_move_huge_page(get_new_page, put_new_page, private, &folio->page, pass > 2, mode, @@ -1543,16 +1544,9 @@ static int migrate_hugetlbs(struct list_head *from, = new_page_t get_new_page, * Success: 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_folios list */ switch(rc) { - case -ENOSYS: - /* Hugetlb migration is unsupported */ - nr_failed++; - stats->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 @@ -1638,6 +1632,28 @@ static int migrate_pages_batch(struct list_head *fro= m, new_page_t get_new_page, =20 cond_resched(); =20 + /* + * Large folio migration might be unsupported or + * the allocation might be failed so we should retry + * on the same folio with the large folio split + * to normal folios. + * + * Split folios are put in split_folios, and + * we will migrate them after the rest of the + * list is processed. + */ + if (!thp_migration_supported() && is_thp) { + nr_large_failed++; + stats->nr_thp_failed++; + if (!try_split_folio(folio, &split_folios)) { + stats->nr_thp_split++; + continue; + } + stats->nr_failed_pages +=3D nr_pages; + list_move_tail(&folio->lru, ret_folios); + continue; + } + rc =3D migrate_folio_unmap(get_new_page, put_new_page, private, folio, &dst, pass > 2, force_lock, mode, reason, ret_folios); @@ -1649,36 +1665,9 @@ static int migrate_pages_batch(struct list_head *fro= m, new_page_t get_new_page, * -EAGAIN: stay on the from list * -EDEADLOCK: stay on the from list * -ENOMEM: stay on the from list - * -ENOSYS: stay on the from list * Other errno: put on ret_folios list */ switch(rc) { - /* - * 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. - * - * Split folios are put in split_folios, and - * we will migrate them after the rest of the - * list is processed. - */ - case -ENOSYS: - /* Large folio migration is unsupported */ - if (is_large) { - nr_large_failed++; - stats->nr_thp_failed +=3D is_thp; - if (!try_split_folio(folio, &split_folios)) { - stats->nr_thp_split +=3D is_thp; - break; - } - } else if (!no_split_folio_counting) { - nr_failed++; - } - - stats->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 --=20 2.35.1