mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm/memory-failure: convert hugetlb_clear_page_hwpoison to folios 

Change hugetlb_clear_page_hwpoison() to folio_clear_hugetlb_hwpoison() by
changing the function to take in a folio.  This converts one use of
ClearPageHWPoison and HPageRawHwpUnreliable to their folio equivalents.

Link: https://lkml.kernel.org/r/20230112204608.80136-4-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Sidhartha Kumar 2023-01-12 14:46:03 -06:00 committed by Andrew Morton
parent bc1cfde194
commit 2ff6cecee6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/hugetlb.h
View File

@ -878,9 +878,9 @@ extern int dissolve_free_huge_pages(unsigned long start_pfn,
unsigned long end_pfn);
#ifdef CONFIG_MEMORY_FAILURE
extern void hugetlb_clear_page_hwpoison(struct page *hpage);
extern void folio_clear_hugetlb_hwpoison(struct folio *folio);
#else
static inline void hugetlb_clear_page_hwpoison(struct page *hpage)
static inline void folio_clear_hugetlb_hwpoison(struct folio *folio)
{
}
#endif

2
mm/hugetlb.c
View File

@ -1731,7 +1731,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
* which makes any healthy subpages reusable.
*/
if (unlikely(folio_test_hwpoison(folio)))
hugetlb_clear_page_hwpoison(&folio->page);
folio_clear_hugetlb_hwpoison(folio);
for (i = 0; i < pages_per_huge_page(h); i++) {
subpage = folio_page(folio, i);

10
mm/memory-failure.c
View File

@ -1785,12 +1785,12 @@ static unsigned long free_raw_hwp_pages(struct page *hpage, bool move_flag)
return __free_raw_hwp_pages(hpage, move_flag);
}
void hugetlb_clear_page_hwpoison(struct page *hpage)
void folio_clear_hugetlb_hwpoison(struct folio *folio)
{
if (HPageRawHwpUnreliable(hpage))
if (folio_test_hugetlb_raw_hwp_unreliable(folio))
return;
ClearPageHWPoison(hpage);
free_raw_hwp_pages(hpage, true);
folio_clear_hwpoison(folio);
free_raw_hwp_pages(&folio->page, true);
}
/*
@ -1889,7 +1889,7 @@ retry:
folio_lock(folio);
if (hwpoison_filter(p)) {
hugetlb_clear_page_hwpoison(&folio->page);
folio_clear_hugetlb_hwpoison(folio);
if (migratable_cleared)
folio_set_hugetlb_migratable(folio);
folio_unlock(folio);