iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm: memory-failure: make put_ref_page() more useful

Browse Source 
Pass pfn/flags to put_ref_page(), then check MF_COUNT_INCREASED and drop
refcount to make the code look cleaner.

Link: https://lkml.kernel.org/r/20221021084611.53765-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kefeng Wang 2022-10-21 16:46:09 +08:00 committed by Andrew Morton
parent f39556bc25
commit b5f1fc98c6
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mm/memory-failure.c
View File

@ -1910,17 +1910,25 @@ static inline unsigned long free_raw_hwp_pages(struct page *hpage, bool flag)
} }
#endif /* CONFIG_HUGETLB_PAGE */ #endif /* CONFIG_HUGETLB_PAGE */
/* Drop the extra refcount in case we come from madvise() */
static void put_ref_page(unsigned long pfn, int flags)
{
struct page *page;
if (!(flags & MF_COUNT_INCREASED))
return;
page = pfn_to_page(pfn);
if (page)
put_page(page);
}
static int memory_failure_dev_pagemap(unsigned long pfn, int flags, static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
struct dev_pagemap *pgmap) struct dev_pagemap *pgmap)
{ {
struct page *page = pfn_to_page(pfn);
int rc = -ENXIO; int rc = -ENXIO;
if (flags & MF_COUNT_INCREASED) put_ref_page(pfn, flags);
/*
* Drop the extra refcount in case we come from madvise().
*/
put_page(page);
/* device metadata space is not recoverable */ /* device metadata space is not recoverable */
if (!pgmap_pfn_valid(pgmap, pfn)) if (!pgmap_pfn_valid(pgmap, pfn))
@ -2513,12 +2521,6 @@ static int soft_offline_in_use_page(struct page *page)
return ret; return ret;
} }
static void put_ref_page(struct page *page)
{
if (page)
put_page(page);
}
/** /**
* soft_offline_page - Soft offline a page. * soft_offline_page - Soft offline a page.
* @pfn: pfn to soft-offline * @pfn: pfn to soft-offline
@ -2547,19 +2549,17 @@ int soft_offline_page(unsigned long pfn, int flags)
{ {
int ret; int ret;
bool try_again = true; bool try_again = true;
struct page *page, *ref_page = NULL; struct page *page;
WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED)); WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED));
if (!pfn_valid(pfn)) if (!pfn_valid(pfn))
return -ENXIO; return -ENXIO;
if (flags & MF_COUNT_INCREASED)
ref_page = pfn_to_page(pfn);
/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */ /* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
page = pfn_to_online_page(pfn); page = pfn_to_online_page(pfn);
if (!page) { if (!page) {
put_ref_page(ref_page); put_ref_page(pfn, flags);
return -EIO; return -EIO;
} }
@ -2567,7 +2567,7 @@ int soft_offline_page(unsigned long pfn, int flags)
if (PageHWPoison(page)) { if (PageHWPoison(page)) {
pr_info("%s: %#lx page already poisoned\n", __func__, pfn); pr_info("%s: %#lx page already poisoned\n", __func__, pfn);
put_ref_page(ref_page); put_ref_page(pfn, flags);
mutex_unlock(&mf_mutex); mutex_unlock(&mf_mutex);
return 0; return 0;
} }