GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm/hwpoison: pass pfn to num_poisoned_pages_*()

Browse source 
No functional change.

Link: https://lkml.kernel.org/r/20221024062012.1520887-4-naoya.horiguchi@linux.dev
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Naoya Horiguchi 2022-10-24 15:20:11 +09:00 • committed by Andrew Morton
parent d027122d83
commit a46c9304b4
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/parisc/kernel/pdt.c
View file

@ -231,7 +231,7 @@ void __init pdc_pdt_init(void)
/* mark memory page bad */ /* mark memory page bad */
memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE);
num_poisoned_pages_inc(); num_poisoned_pages_inc(addr >> PAGE_SHIFT);
} }
} }

4
include/linux/mm.h
View file

@ -3279,7 +3279,7 @@ extern int soft_offline_page(unsigned long pfn, int flags);
#ifdef CONFIG_MEMORY_FAILURE #ifdef CONFIG_MEMORY_FAILURE
extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,
bool *migratable_cleared); bool *migratable_cleared);
extern void num_poisoned_pages_inc(void); extern void num_poisoned_pages_inc(unsigned long pfn);
#else #else
static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,
bool *migratable_cleared) bool *migratable_cleared)
@ -3287,7 +3287,7 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,
return 0; return 0;
} }
static inline void num_poisoned_pages_inc(void) static inline void num_poisoned_pages_inc(unsigned long pfn)
{ {
} }
#endif #endif

14
mm/memory-failure.c
View file

@ -74,12 +74,12 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
static bool hw_memory_failure __read_mostly = false; static bool hw_memory_failure __read_mostly = false;
inline void num_poisoned_pages_inc(void) inline void num_poisoned_pages_inc(unsigned long pfn)
{ {
atomic_long_inc(&num_poisoned_pages); atomic_long_inc(&num_poisoned_pages);
} }
static inline void num_poisoned_pages_sub(long i) static inline void num_poisoned_pages_sub(unsigned long pfn, long i)
{ {
atomic_long_sub(i, &num_poisoned_pages); atomic_long_sub(i, &num_poisoned_pages);
} }
@ -125,7 +125,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo
if (release) if (release)
put_page(page); put_page(page);
page_ref_inc(page); page_ref_inc(page);
num_poisoned_pages_inc(); num_poisoned_pages_inc(page_to_pfn(page));
return true; return true;
} }
@ -1194,7 +1194,7 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type,
{ {
trace_memory_failure_event(pfn, type, result); trace_memory_failure_event(pfn, type, result);
num_poisoned_pages_inc(); num_poisoned_pages_inc(pfn);
pr_err("%#lx: recovery action for %s: %s\n", pr_err("%#lx: recovery action for %s: %s\n",
pfn, action_page_types[type], action_name[result]); pfn, action_page_types[type], action_name[result]);
@ -1741,7 +1741,7 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page)
llist_add(&raw_hwp->node, head); llist_add(&raw_hwp->node, head);
/* the first error event will be counted in action_result(). */ /* the first error event will be counted in action_result(). */
if (ret) if (ret)
num_poisoned_pages_inc(); num_poisoned_pages_inc(page_to_pfn(page));
} else { } else {
/* /*
* Failed to save raw error info. We no longer trace all * Failed to save raw error info. We no longer trace all
@ -2414,7 +2414,7 @@ int unpoison_memory(unsigned long pfn)
unlock_mutex: unlock_mutex:
mutex_unlock(&mf_mutex); mutex_unlock(&mf_mutex);
if (!ret || freeit) { if (!ret || freeit) {
num_poisoned_pages_sub(count); num_poisoned_pages_sub(pfn, count);
unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n",
page_to_pfn(p), &unpoison_rs); page_to_pfn(p), &unpoison_rs);
} }
@ -2630,5 +2630,5 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
} }
} }
if (total) if (total)
num_poisoned_pages_sub(total); num_poisoned_pages_sub(0, total);
} }