mm-memory-failure-convert-free_raw_hwp_pages-to-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory-failure: convert free_raw_hwp_pages() to folios
has been removed from the -mm tree. Its filename was
mm-memory-failure-convert-free_raw_hwp_pages-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 free_raw_hwp_pages() to folios
Date: Thu, 12 Jan 2023 14:46:04 -0600
Change free_raw_hwp_pages() to folio_free_raw_hwp(), converts two users of hugetlb specific page macro users to their folio equivalents.
---
mm/memory-failure.c renamed from mm/memory-failure.c~mm-memory-failure-convert-free_raw_hwp_pages-to-folios +12 -10
@@ -1766,23 +1766,23 @@ static int hugetlb_set_page_hwpoison(strreturn ret; } -static unsigned long free_raw_hwp_pages (struct page *hpage,bool move_flag) +static unsigned long folio_free_raw_hwp (struct folio *folio,bool move_flag) {/* -* HPageVmemmapOptimized hugepages can't be freed because struct +* hugetlb_vmemmap_optimized hugepages can't be freed because struct * pages for tail pages are required but they don't exist. */ -if (move_flag &&HPageVmemmapOptimized (hpage)) +if (move_flag &&folio_test_hugetlb_vmemmap_optimized (folio))return 0 ;/* -* HPageRawHwpUnreliable hugepages shouldn't be unpoisoned by +* hugetlb_raw_hwp_unreliable hugepages shouldn't be unpoisoned by * definition. */ -if (HPageRawHwpUnreliable (hpage)) +if (folio_test_hugetlb_raw_hwp_unreliable (folio))return 0 ; -return __free_raw_hwp_pages (hpage, move_flag); +return __free_raw_hwp_pages (&folio->page, move_flag); }void folio_clear_hugetlb_hwpoison (struct folio *folio)
@@ -1790,7 +1790,7 @@ void folio_clear_hugetlb_hwpoison(structif (folio_test_hugetlb_raw_hwp_unreliable (folio))return ;folio_clear_hwpoison (folio); -free_raw_hwp_pages (&folio->page, true); +folio_free_raw_hwp (folio, true); }/*
@@ -1929,7 +1929,7 @@ static inline int try_memory_failure_hugreturn 0 ; } -static inline unsigned long free_raw_hwp_pages (struct page *hpage,bool flag) +static inline unsigned long folio_free_raw_hwp (struct folio *folio,bool flag) {return 0 ; }
@@ -2336,6 +2336,7 @@ core_initcall(memory_failure_init);int unpoison_memory (unsigned long pfn) {struct page *page; +struct folio *folio;struct page *p;int ret = -EBUSY ;unsigned long count =1 ;
@@ -2348,6 +2349,7 @@ int unpoison_memory(unsigned long pfn) p =pfn_to_page (pfn); page =compound_head (p); + folio =page_folio (p);mutex_lock (&mf_mutex);
@@ -2389,7 +2391,7 @@ int unpoison_memory(unsigned long pfn)if (!ret) {if (PageHuge (p)) { huge = true; - count =free_raw_hwp_pages (page, false); + count =folio_free_raw_hwp (folio, false);if (count ==0 ) { ret = -EBUSY ; goto unlock_mutex;
@@ -2405,7 +2407,7 @@ int unpoison_memory(unsigned long pfn) }else {if (PageHuge (p)) { huge = true; - count =free_raw_hwp_pages (page, false); + count =folio_free_raw_hwp (folio, false);if (count ==0 ) { ret = -EBUSY ;put_page (page);
_
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