linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, David Hildenbrand <david@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v1 1/2] mm/migrate: make migrate_misplaced_folio() return 0 on success
Date: Thu, 20 Jun 2024 23:29:34 +0200	[thread overview]
Message-ID: <20240620212935.656243-2-david@redhat.com> (raw)
In-Reply-To: <20240620212935.656243-1-david@redhat.com>

Let's just return 0 on success, which is less confusing.

... especially because we got it wrong in the migrate.h stub where we
have "return -EAGAIN; /* can't migrate now */" instead of "return 0;".
Likely this wrong return value doesn't currently matter, but it
certainly adds confusion.

We'll add migrate_misplaced_folio_prepare() next, where we want to use
the same "return 0 on success" approach, so let's just clean this up.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 mm/huge_memory.c | 5 ++---
 mm/memory.c      | 2 +-
 mm/migrate.c     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 0fffaa58a47a..fc27dabcd8e3 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1652,7 +1652,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)
 	unsigned long haddr = vmf->address & HPAGE_PMD_MASK;
 	int nid = NUMA_NO_NODE;
 	int target_nid, last_cpupid = (-1 & LAST_CPUPID_MASK);
-	bool migrated = false, writable = false;
+	bool writable = false;
 	int flags = 0;
 
 	vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd);
@@ -1696,8 +1696,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)
 	spin_unlock(vmf->ptl);
 	writable = false;
 
-	migrated = migrate_misplaced_folio(folio, vma, target_nid);
-	if (migrated) {
+	if (!migrate_misplaced_folio(folio, vma, target_nid)) {
 		flags |= TNF_MIGRATED;
 		nid = target_nid;
 	} else {
diff --git a/mm/memory.c b/mm/memory.c
index 00728ea95583..118660de5bcc 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5354,7 +5354,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf)
 	ignore_writable = true;
 
 	/* Migrate to the requested node */
-	if (migrate_misplaced_folio(folio, vma, target_nid)) {
+	if (!migrate_misplaced_folio(folio, vma, target_nid)) {
 		nid = target_nid;
 		flags |= TNF_MIGRATED;
 	} else {
diff --git a/mm/migrate.c b/mm/migrate.c
index 781979567f64..0307b54879a0 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2629,11 +2629,11 @@ int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,
 					    nr_succeeded);
 	}
 	BUG_ON(!list_empty(&migratepages));
-	return isolated;
+	return isolated ? 0 : -EAGAIN;
 
 out:
 	folio_put(folio);
-	return 0;
+	return -EAGAIN;
 }
 #endif /* CONFIG_NUMA_BALANCING */
 #endif /* CONFIG_NUMA */
-- 
2.45.2



  reply	other threads:[~2024-06-20 21:29 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-20 21:29 [PATCH v1 0/2] mm/migrate: move NUMA hinting fault folio isolation + checks under PTL David Hildenbrand
2024-06-20 21:29 ` David Hildenbrand [this message]
2024-06-21  1:40   ` [PATCH v1 1/2] mm/migrate: make migrate_misplaced_folio() return 0 on success Zi Yan
2024-06-21  3:39   ` Baolin Wang
2024-07-01  7:36   ` Huang, Ying
2024-07-01  7:44     ` David Hildenbrand
2024-06-20 21:29 ` [PATCH v1 2/2] mm/migrate: move NUMA hinting fault folio isolation + checks under PTL David Hildenbrand
2024-06-21  2:05   ` Zi Yan
2024-06-21  7:32     ` David Hildenbrand
2024-06-21  4:07   ` Baolin Wang
2024-06-21  7:31     ` David Hildenbrand
2024-06-21 13:44   ` Zi Yan
2024-06-21 20:18     ` David Hildenbrand
2024-06-21 20:48       ` Zi Yan
2024-06-26 16:49         ` David Hildenbrand
2024-06-26 17:37           ` Zi Yan
2024-07-01  8:32             ` Huang, Ying
2024-07-01 13:50               ` Zi Yan
2024-07-01 14:03                 ` David Hildenbrand
2024-07-01 14:04                   ` Zi Yan
2024-06-21 17:47   ` Donet Tom
2024-06-21 20:14     ` David Hildenbrand
2024-06-26 16:22   ` David Hildenbrand
2024-06-27  6:00     ` Donet Tom

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240620212935.656243-2-david@redhat.com \
    --to=david@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).