From patchwork Tue Aug 22 00:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13360022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 814A8EE4996 for ; Tue, 22 Aug 2023 00:54:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 203E028000C; Mon, 21 Aug 2023 20:54:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B5FF28000B; Mon, 21 Aug 2023 20:54:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0538428000C; Mon, 21 Aug 2023 20:54:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E639028000B for ; Mon, 21 Aug 2023 20:54:17 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B35C0120133 for ; Tue, 22 Aug 2023 00:54:17 +0000 (UTC) X-FDA: 81149919354.08.4707B63 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf13.hostedemail.com (Postfix) with ESMTP id 859DE20003 for ; Tue, 22 Aug 2023 00:54:14 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692665655; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4QgFgSjJ3qaZoWytVxyqoyhuxJGCk4xYZPpkdBoY63c=; b=769FAXI4Rq3yb5Cc5YxqjUADymiBA03s4acS5sioydtDpece1LGBRFBaXHyugO7slzmsU4 tRM3dLAG+Be2nAk5mRCOeO1Z/SFNChuDr1IKrXJGpyhupEUlestfapaNnZctikJ1xGAaeq dLK8Z8Wg4F37dJ4Qmg3+0YHPQJI21qs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692665655; a=rsa-sha256; cv=none; b=HYwDWIgZkvxpBfiDT3Q2ikEi1WT4TNyXIppIeZdUbWJJwB0n0Qr471fnkDHquk9BHhFflL /Nq3ldBVPWp6f4/ylJgN6wMNoOKmwCt9FKx7lq2gaR9XssjXuSCohYvp+vNWwhTBEv6ATp g5TU7A4oqfwrjDnlDxZDu/eFxn2cp7o= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0VqK0DPh_1692665649; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VqK0DPh_1692665649) by smtp.aliyun-inc.com; Tue, 22 Aug 2023 08:54:10 +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 v2 2/4] mm: migrate: move the numamigrate_isolate_page() into do_numa_page() Date: Tue, 22 Aug 2023 08:53:50 +0800 Message-Id: <9ff2a9e3e644103a08b9b84b76b39bbd4c60020b.1692665449.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 859DE20003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: p4czqcfpchktqzxpdn3whzt3z1z8e9s8 X-HE-Tag: 1692665654-332884 X-HE-Meta: U2FsdGVkX1+9rffwx7p3hczEQtfzvM/pDqj9yJR/A5FRG3LxK8a3voID4Z6YK9/pcXCfYu4smE+i9W2OX+4CjPZg4+fihUVe21sksZLTDjTvX8esTctI5tHfCsdsa20Emi/sVvO02SDAv9SxARdyqj53lbRvpwntS+NJLKJq4vnUEIpWhmvw0QFC/yJcCreba9zW+H1QP8beHXpfGlVIHzZ07TkmWAHE5tNi/kZNDqqEGooAJnWOWUpE0EnGLB8p5qNQvhzfWYekpsryXP1E9Uo7F5pSfrRsC6tbU0iD+KgoNrarBF1DJbx7/WbIOFoYwbFlkqkvV2RcnPdGmXxd9HP9njxxMZmV0rOAbpMtjgP1sNWTOnvQefgMuanJOSahLEgqfq+wBJULU3kykU/LiKu6iGX3xZzCiuQBt8C69mCvVI+J+d3y9VdF8jEVnc1qyTxI/05XrcDE3jd1Ui58abcU5MIMdTleVMZfpM0zXxMy2gibmmRtyTUE3R/ZtVDSDx8fqAMjKLB5A1bi9I4xxfHFErWpJMJUfF6C4C5VreQiMnlSIeI4zTfgitH+clf33vDa11UbyiQUsATmGlDXiLa8gjdWmt8kYZaLhmtnDiofqKW4yft/5Lo2UaVpr7qQ8uOTgA36pdH6awurhke/gVE8kNEsHEHhGrmjgN7Gf6bmL2ot/izcBSr/ZFCQtih8i4t+QTSsc9IKJrjSFAkwiOBGdsEuo37U/CygBPnVtMNFLoTUC5MRHDmU0jVqAmsTEr4QZkdLkz91FGnwUiZzEAkqtBelhrDbNUnEgaruHKS1g51pkqDUhmFZJraUS7z7PNKYJJ38f3uzHXFHyNiojTTKPDM2aQSBiXj6l5Ux3ZcAri3DQ7DhhLOUj38tNbz8efGAbPWyvOtPHRgUMC74xkSQ/BeVhM10bVJk7iISclDURn+cv2+tBxT2XjhB7SWye0sPJ9deeWt0bnmiTUY xmsSfNV9 tn6/4sMySwxB20EYjhIfnUIUBrToOtkQkTcefHHOmtUzcziYypApHSUFiuGib5wSiATJ6hQqa+BhK1pT8bnhZa/XXpKlP/9JxP1oKIpJLk5XKE3gicT6UOeEyDS6CmvjuygCe2sDb695JFO4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Move the numamigrate_isolate_page() into do_numa_page() to simplify the migrate_misplaced_page(), which now only focuses on page migration, and it also serves as a preparation for supporting batch migration for migrate_misplaced_page(). While we are at it, change the numamigrate_isolate_page() to boolean type to make the return value more clear. Signed-off-by: Baolin Wang --- include/linux/migrate.h | 6 ++++++ mm/huge_memory.c | 7 +++++++ mm/memory.c | 7 +++++++ mm/migrate.c | 22 +++++++--------------- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 711dd9412561..ddcd62ec2c12 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -144,12 +144,18 @@ const struct movable_operations *page_movable_ops(struct page *page) #ifdef CONFIG_NUMA_BALANCING int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, int node); +bool numamigrate_isolate_page(pg_data_t *pgdat, struct page *page); #else static inline int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, int node) { return -EAGAIN; /* can't migrate now */ } + +static inline bool numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) +{ + return false; +} #endif /* CONFIG_NUMA_BALANCING */ #ifdef CONFIG_MIGRATION diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 4a9b34a89854..07149ead11e4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1496,6 +1496,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) int target_nid, last_cpupid = (-1 & LAST_CPUPID_MASK); bool migrated = false, writable = false; int flags = 0; + pg_data_t *pgdat; vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd); if (unlikely(!pmd_same(oldpmd, *vmf->pmd))) { @@ -1545,6 +1546,12 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) goto migrate_fail; } + pgdat = NODE_DATA(target_nid); + if (!numamigrate_isolate_page(pgdat, page)) { + put_page(page); + goto migrate_fail; + } + migrated = migrate_misplaced_page(page, vma, target_nid); if (migrated) { flags |= TNF_MIGRATED; diff --git a/mm/memory.c b/mm/memory.c index fc6f6b7a70e1..4e451b041488 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4769,6 +4769,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) int target_nid; pte_t pte, old_pte; int flags = 0; + pg_data_t *pgdat; /* * The "pte" at this point cannot be used safely without @@ -4844,6 +4845,12 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) goto migrate_fail; } + pgdat = NODE_DATA(target_nid); + if (!numamigrate_isolate_page(pgdat, page)) { + put_page(page); + goto migrate_fail; + } + /* Migrate to the requested node */ if (migrate_misplaced_page(page, vma, target_nid)) { page_nid = target_nid; diff --git a/mm/migrate.c b/mm/migrate.c index 9cc98fb1d6ec..0b2b69a2a7ab 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2478,7 +2478,7 @@ static struct folio *alloc_misplaced_dst_folio(struct folio *src, return __folio_alloc_node(gfp, order, nid); } -static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) +bool numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) { int nr_pages = thp_nr_pages(page); int order = compound_order(page); @@ -2496,11 +2496,11 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) break; } wakeup_kswapd(pgdat->node_zones + z, 0, order, ZONE_MOVABLE); - return 0; + return false; } if (!isolate_lru_page(page)) - return 0; + return false; mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + page_is_file_lru(page), nr_pages); @@ -2511,7 +2511,7 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) * disappearing underneath us during migration. */ put_page(page); - return 1; + return true; } /* @@ -2523,16 +2523,12 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, int node) { pg_data_t *pgdat = NODE_DATA(node); - int isolated; + int migrated = 1; int nr_remaining; unsigned int nr_succeeded; LIST_HEAD(migratepages); int nr_pages = thp_nr_pages(page); - isolated = numamigrate_isolate_page(pgdat, page); - if (!isolated) - goto out; - list_add(&page->lru, &migratepages); nr_remaining = migrate_pages(&migratepages, alloc_misplaced_dst_folio, NULL, node, MIGRATE_ASYNC, @@ -2544,7 +2540,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, page_is_file_lru(page), -nr_pages); putback_lru_page(page); } - isolated = 0; + migrated = 0; } if (nr_succeeded) { count_vm_numa_events(NUMA_PAGE_MIGRATE, nr_succeeded); @@ -2553,11 +2549,7 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, nr_succeeded); } BUG_ON(!list_empty(&migratepages)); - return isolated; - -out: - put_page(page); - return 0; + return migrated; } #endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_NUMA */