| Message ID | 20220905062137.1455537-4-naoya.horiguchi@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm, hwpoison: improve handling workload related to hugetlb and memory_hotplug | expand |
On 2022/9/5 14:21, Naoya Horiguchi wrote: > From: Naoya Horiguchi <naoya.horiguchi@nec.com> > > No functional change. > > Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com> > --- > arch/parisc/kernel/pdt.c | 2 +- > include/linux/mm.h | 2 +- > mm/memory-failure.c | 16 ++++++++-------- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c > index fdc880e2575a..80943a00e245 100644 > --- a/arch/parisc/kernel/pdt.c > +++ b/arch/parisc/kernel/pdt.c > @@ -231,7 +231,7 @@ void __init pdc_pdt_init(void) > > /* mark memory page bad */ > memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); > - num_poisoned_pages_inc(); > + num_poisoned_pages_inc(addr >> PAGE_SHIFT); > } > } > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index b81dd600e51a..6316973afd1d 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3203,7 +3203,7 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) > return 0; > } It seems declaration of num_poisoned_pages_inc() is still missing in this patch. With that fixed: Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Thanks, Miaohe Lin > > -static inline void num_poisoned_pages_inc() > +static inline void num_poisoned_pages_inc(unsigned long pfn) > { > } > #endif > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index b6236c721f54..7dd4e403e634 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -74,17 +74,17 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); > > static bool hw_memory_failure __read_mostly = false; > > -static inline void num_poisoned_pages_inc(void) > +static inline void num_poisoned_pages_inc(unsigned long pfn) > { > atomic_long_inc(&num_poisoned_pages); > } > > -static inline void num_poisoned_pages_dec(void) > +static inline void num_poisoned_pages_dec(unsigned long pfn) > { > atomic_long_dec(&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); > } > @@ -130,7 +130,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo > if (release) > put_page(page); > page_ref_inc(page); > - num_poisoned_pages_inc(); > + num_poisoned_pages_inc(page_to_pfn(page)); > > return true; > } > @@ -1196,7 +1196,7 @@ static void action_result(unsigned long pfn, enum mf_action_page_type type, > { > 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", > pfn, action_page_types[type], action_name[result]); > } > @@ -1743,7 +1743,7 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page) > llist_add(&raw_hwp->node, head); > /* the first error event will be counted in action_result(). */ > if (ret) > - num_poisoned_pages_inc(); > + num_poisoned_pages_inc(page_to_pfn(page)); > } else { > /* > * Failed to save raw error info. We no longer trace all > @@ -2408,7 +2408,7 @@ int unpoison_memory(unsigned long pfn) > unlock_mutex: > mutex_unlock(&mf_mutex); > if (!ret || freeit) { > - num_poisoned_pages_sub(count); > + num_poisoned_pages_sub(pfn, count); > unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", > page_to_pfn(p), &unpoison_rs); > } > @@ -2625,7 +2625,7 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) > > for (i = 0; i < nr_pages; i++) { > if (PageHWPoison(&memmap[i])) { > - num_poisoned_pages_dec(); > + num_poisoned_pages_dec(page_to_pfn(&memmap[i])); > ClearPageHWPoison(&memmap[i]); > } > } >
diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index fdc880e2575a..80943a00e245 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -231,7 +231,7 @@ void __init pdc_pdt_init(void) /* mark memory page bad */ memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(addr >> PAGE_SHIFT); } } diff --git a/include/linux/mm.h b/include/linux/mm.h index b81dd600e51a..6316973afd1d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3203,7 +3203,7 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) return 0; } -static inline void num_poisoned_pages_inc() +static inline void num_poisoned_pages_inc(unsigned long pfn) { } #endif diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b6236c721f54..7dd4e403e634 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -74,17 +74,17 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); static bool hw_memory_failure __read_mostly = false; -static inline void num_poisoned_pages_inc(void) +static inline void num_poisoned_pages_inc(unsigned long pfn) { atomic_long_inc(&num_poisoned_pages); } -static inline void num_poisoned_pages_dec(void) +static inline void num_poisoned_pages_dec(unsigned long pfn) { atomic_long_dec(&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); } @@ -130,7 +130,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo if (release) put_page(page); page_ref_inc(page); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); return true; } @@ -1196,7 +1196,7 @@ static void action_result(unsigned long pfn, enum mf_action_page_type type, { 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", pfn, action_page_types[type], action_name[result]); } @@ -1743,7 +1743,7 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page) llist_add(&raw_hwp->node, head); /* the first error event will be counted in action_result(). */ if (ret) - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); } else { /* * Failed to save raw error info. We no longer trace all @@ -2408,7 +2408,7 @@ int unpoison_memory(unsigned long pfn) unlock_mutex: mutex_unlock(&mf_mutex); if (!ret || freeit) { - num_poisoned_pages_sub(count); + num_poisoned_pages_sub(pfn, count); unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", page_to_pfn(p), &unpoison_rs); } @@ -2625,7 +2625,7 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) for (i = 0; i < nr_pages; i++) { if (PageHWPoison(&memmap[i])) { - num_poisoned_pages_dec(); + num_poisoned_pages_dec(page_to_pfn(&memmap[i])); ClearPageHWPoison(&memmap[i]); } }