mm-memory-failure-convert-__get_huge_page_for_hwpoison-to-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory-failure: convert __get_huge_page_for_hwpoison() to folios
has been removed from the -mm tree. Its filename was
mm-memory-failure-convert-__get_huge_page_for_hwpoison-to-folios.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Sidhartha Kumar <[email protected]>
Subject: mm/memory-failure: convert __get_huge_page_for_hwpoison() to folios
Date: Thu, 12 Jan 2023 14:46:01 -0600
Patch series "convert hugepage memory failure functions to folios".
This series contains a 1:1 straightforward page to folio conversion for memory failure functions which deal with huge pages. I renamed a few functions to fit with how other folio operating functions are named. These include:
hugetlb_clear_page_hwpoison -> folio_clear_hugetlb_hwpoison free_raw_hwp_pages -> folio_free_raw_hwp __free_raw_hwp_pages -> __folio_free_raw_hwp hugetlb_set_page_hwpoison -> folio_set_hugetlb_hwpoison
The goal of this series was to reduce users of the hugetlb specific page flag macros which take in a page so users are protected by the compiler to make sure they are operating on a head page.
This patch (of 8):
Use a folio throughout the function rather than using a head page. This also reduces the users of the page version of hugetlb specific page flags.
---
mm/memory-failure.c renamed from mm/memory-failure.c~mm-memory-failure-convert-__get_huge_page_for_hwpoison-to-folios +10 -10
@@ -1807,20 +1807,20 @@ int __get_huge_page_for_hwpoison(unsigne bool *migratable_cleared) {struct page *page =pfn_to_page (pfn); -struct page *head =compound_head (page); +struct folio *folio =page_folio (page);int ret =2 ;/* fallback to normal page handling */ bool count_increased = false; -if (!PageHeadHuge (head)) +if (!folio_test_hugetlb (folio)) goto out;if (flags &MF_COUNT_INCREASED ) { ret =1 ; count_increased = true; - }else if (HPageFreed (head)) { + }else if (folio_test_hugetlb_freed (folio)) { ret =0 ; - }else if (HPageMigratable (head)) { - ret =get_page_unless_zero (head); + }else if (folio_test_hugetlb_migratable (folio)) { + ret =folio_try_get (folio);if (ret) count_increased = true; }else {
@@ -1829,24 +1829,24 @@ int __get_huge_page_for_hwpoison(unsigne goto out; } -if (hugetlb_set_page_hwpoison (head, page)) { +if (hugetlb_set_page_hwpoison (&folio->page, page)) { ret = -EHWPOISON ; goto out; }/* -* Clearing HPageMigratable for hwpoisoned hugepages to prevent them +* Clearing hugetlb_migratable for hwpoisoned hugepages to prevent them * from being migrated by memory hotremove. */ -if (count_increased &&HPageMigratable (head)) { -ClearHPageMigratable (head); +if (count_increased &&folio_test_hugetlb_migratable (folio)) { +folio_clear_hugetlb_migratable (folio); *migratable_cleared = true; }return ret; out:if (count_increased) -put_page (head); +folio_put (folio);return ret; }
_
Patches currently in -mm which might be from [email protected] are
mm-hugetlb-convert-isolate_hugetlb-to-folios.patch mm-hugetlb-convert-__update_and_free_page-to-folios.patch mm-hugetlb-convert-dequeue_hugetlb_page-functions-to-folios.patch mm-hugetlb-convert-alloc_surplus_huge_page-to-folios.patch mm-hugetlb-increase-use-of-folios-in-alloc_huge_page.patch mm-hugetlb-convert-alloc_migrate_huge_page-to-folios.patch mm-hugetlb-convert-restore_reserve_on_error-to-folios.patch mm-hugetlb-convert-demote_free_huge_page-to-folios.patch mm-hugetlb-convert-hugetlb_install_page-to-folios.patch mm-hugetlb-convert-hugetlbfs_pagecache_present-to-folios.patch mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio.patch mm-hugetlb-convert-hugetlb-fault-paths-to-use-alloc_hugetlb_folio.patch mm-hugetlb-convert-restore_reserve_on_error-to-take-in-a-folio.patch mm-hugetlb-convert-hugetlb_add_to_page_cache-to-take-in-a-folio.patch mm-hugetlb-convert-hugetlb_wp-to-take-in-a-folio.patch documentation-mm-update-hugetlbfs-documentation-to-mention-alloc_hugetlb_folio.patch