mm-memory-failure-convert-try_memory_failure_hugetlb-to-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory-failure: convert try_memory_failure_hugetlb() to folios
has been removed from the -mm tree. Its filename was
mm-memory-failure-convert-try_memory_failure_hugetlb-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 try_memory_failure_hugetlb() to folios
Date: Thu, 12 Jan 2023 14:46:02 -0600
Use a struct folio rather than a head page in try_memory_failure_hugetlb. This converts one user of SetHPageMigratable to the folio equivalent.
---
mm/memory-failure.c renamed from mm/memory-failure.c~mm-memory-failure-convert-try_memory_failure_hugetlb-to-folios +13 -13
@@ -1860,7 +1860,7 @@ static int try_memory_failure_hugetlb(un {int res;struct page *p =pfn_to_page (pfn); -struct page *head; +struct folio *folio;unsigned long page_flags;bool migratable_cleared = false;
@@ -1873,8 +1873,8 @@ retry: }else if (res == -EHWPOISON ) {pr_err ("%#lx: already hardware poisoned\n" , pfn);if (flags &MF_ACTION_REQUIRED ) { - head =compound_head (p); - res =kill_accessing_process (current,page_to_pfn (head), flags); + folio =page_folio (p); + res =kill_accessing_process (current,folio_pfn (folio), flags); }return res; }else if (res == -EBUSY ) {
@@ -1885,16 +1885,16 @@ retry:return action_result (pfn,MF_MSG_UNKNOWN ,MF_IGNORED ); } - head =compound_head (p); -lock_page (head); + folio =page_folio (p); +folio_lock (folio);if (hwpoison_filter (p)) { -hugetlb_clear_page_hwpoison (head); +hugetlb_clear_page_hwpoison (&folio->page);if (migratable_cleared) -SetHPageMigratable (head); -unlock_page (head); +folio_set_hugetlb_migratable (folio); +folio_unlock (folio);if (res ==1 ) -put_page (head); +folio_put (folio);return -EOPNOTSUPP ; }
@@ -1903,7 +1903,7 @@ retry:* or demotion can be prevented by PageHWPoison flag. */ if (res ==0 ) { -unlock_page (head); +folio_unlock (folio);if (__page_handle_poison (p) >=0 ) {page_ref_inc (p); res =MF_RECOVERED ;
@@ -1913,10 +1913,10 @@ retry:return action_result (pfn,MF_MSG_FREE_HUGE , res); } - page_flags = head->flags; + page_flags = folio->flags; -if (!hwpoison_user_mappings (p, pfn, flags, head)) { -unlock_page (head); +if (!hwpoison_user_mappings (p, pfn, flags, &folio->page)) { +folio_unlock (folio);return action_result (pfn,MF_MSG_UNMAP_FAILED ,MF_IGNORED ); }
_
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