From nobody Wed Dec 17 15:54:18 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 F0C98EE49A5 for ; Sat, 19 Aug 2023 10:55:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231407AbjHSKzK (ORCPT ); Sat, 19 Aug 2023 06:55:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231315AbjHSKzK (ORCPT ); Sat, 19 Aug 2023 06:55:10 -0400 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4731C38E5B for ; Sat, 19 Aug 2023 03:52:56 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R741e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0Vq58.Sy_1692442365; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vq58.Sy_1692442365) by smtp.aliyun-inc.com; Sat, 19 Aug 2023 18:52:46 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, shy828301@gmail.com, david@redhat.com, ying.huang@intel.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] mm: migrate: change to return the number of pages migrated successfully Date: Sat, 19 Aug 2023 18:52:37 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: 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" Change the migrate_misplaced_page() to return the number of pages migrated successfully, which is used to calculate how many pages are failed to migrate for batch migration. Signed-off-by: Baolin Wang --- mm/huge_memory.c | 7 ++++--- mm/memory.c | 5 +++-- mm/migrate.c | 5 +---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 53a9d63cfb1e..a9c454160984 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1494,11 +1494,12 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *v= mf) unsigned long haddr =3D vmf->address & HPAGE_PMD_MASK; int page_nid =3D NUMA_NO_NODE; int target_nid, last_cpupid =3D (-1 & LAST_CPUPID_MASK); - bool migrated =3D false, writable =3D false; + bool writable =3D false; int flags =3D 0; pg_data_t *pgdat; int isolated; LIST_HEAD(migratepages); + int nr_successed =3D 0; =20 vmf->ptl =3D pmd_lock(vma->vm_mm, vmf->pmd); if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) { @@ -1551,8 +1552,8 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) } =20 list_add(&page->lru, &migratepages); - migrated =3D migrate_misplaced_page(&migratepages, vma, page_nid, target_= nid); - if (migrated) { + nr_successed =3D migrate_misplaced_page(&migratepages, vma, page_nid, tar= get_nid); + if (nr_successed) { flags |=3D TNF_MIGRATED; page_nid =3D target_nid; } else { diff --git a/mm/memory.c b/mm/memory.c index 973403a83797..edfd2d528e7e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4780,7 +4780,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) pte_t pte, old_pte; int flags =3D 0; pg_data_t *pgdat; - int isolated; + int isolated, nr_succeeded; LIST_HEAD(migratepages); =20 /* @@ -4861,7 +4861,8 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) =20 list_add(&page->lru, &migratepages); /* Migrate to the requested node */ - if (migrate_misplaced_page(&migratepages, vma, page_nid, target_nid)) { + nr_succeeded =3D migrate_misplaced_page(&migratepages, vma, page_nid, tar= get_nid); + if (nr_succeeded) { page_nid =3D target_nid; flags |=3D TNF_MIGRATED; } else { diff --git a/mm/migrate.c b/mm/migrate.c index 93d359471b95..45f92376ba6f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2523,7 +2523,6 @@ int migrate_misplaced_page(struct list_head *migratep= ages, struct vm_area_struct int source_nid, int target_nid) { pg_data_t *pgdat =3D NODE_DATA(target_nid); - int migrated =3D 1; int nr_remaining; unsigned int nr_succeeded; =20 @@ -2533,8 +2532,6 @@ int migrate_misplaced_page(struct list_head *migratep= ages, struct vm_area_struct if (nr_remaining) { if (!list_empty(migratepages)) putback_movable_pages(migratepages); - - migrated =3D 0; } if (nr_succeeded) { count_vm_numa_events(NUMA_PAGE_MIGRATE, nr_succeeded); @@ -2543,7 +2540,7 @@ int migrate_misplaced_page(struct list_head *migratep= ages, struct vm_area_struct nr_succeeded); } BUG_ON(!list_empty(migratepages)); - return migrated; + return nr_succeeded; } #endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_NUMA */ --=20 2.39.3