Skip to content

Commit

Permalink
mm: memory-hotplug: check folio ref count first in do_migrate_range
Browse files Browse the repository at this point in the history
If a folio has an increased reference count, folio_try_get() will acquire
it, perform necessary operations, and then release it.  In the case of a
poisoned folio without an elevated reference count (which is unlikely for
memory-failure), folio_try_get() will simply bypass it.

Therefore, relocate the folio_try_get() function, responsible for checking
and acquiring this reference count at first.

Link: https://lkml.kernel.org/r/20250217014329.3610326-3-mawupeng1@huawei.com
Signed-off-by: Ma Wupeng <mawupeng1@huawei.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Ma Wupeng authored and Andrew Morton committed Mar 6, 2025
1 parent b81679b commit 773b9a6
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -1822,27 +1822,21 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
if (folio_test_large(folio))
pfn = folio_pfn(folio) + folio_nr_pages(folio) - 1;

/*
* HWPoison pages have elevated reference counts so the migration would
* fail on them. It also doesn't make any sense to migrate them in the
* first place. Still try to unmap such a page in case it is still mapped
* (keep the unmap as the catch all safety net).
*/
if (!folio_try_get(folio))
continue;

if (unlikely(page_folio(page) != folio))
goto put_folio;

if (folio_test_hwpoison(folio) ||
(folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) {
if (WARN_ON(folio_test_lru(folio)))
folio_isolate_lru(folio);
if (folio_mapped(folio))
unmap_poisoned_folio(folio, pfn, false);

continue;
}

if (!folio_try_get(folio))
continue;

if (unlikely(page_folio(page) != folio))
goto put_folio;
}

if (!isolate_folio_to_list(folio, &source)) {
if (__ratelimit(&migrate_rs)) {
Expand Down

0 comments on commit 773b9a6

Please sign in to comment.