On Wed, 14 Aug 2019 23:47:24 +0200 David Hildenbrand <david@xxxxxxxxxx> wrote:
> >> --- a/mm/memory_hotplug.c
> >> +++ b/mm/memory_hotplug.c
> >> @@ -646,6 +646,9 @@ static int online_pages_range(unsigned long start_pfn, unsigned long nr_pages,
> >> */
> >> for (pfn = start_pfn; pfn < end_pfn; pfn += 1ul << order) {
> >> order = min(MAX_ORDER - 1, get_order(PFN_PHYS(end_pfn - pfn)));
> >> + /* __free_pages_core() wants pfns to be aligned to the order */
> >> + if (unlikely(!IS_ALIGNED(pfn, 1ul << order)))
> >> + order = 0;
> >> (*online_page_callback)(pfn_to_page(pfn), order);
> >> }
> >
> > We aren't sure if this occurs, but if it does, we silently handle it.
> >
> > It seems a reasonable defensive thing to do, but should we add a
> > WARN_ON_ONCE() so that we get to find out about it? If we get such a
> > report then we can remove the WARN_ON_ONCE() and add an illuminating
> > comment.
> >
> >
>
> Makes sense, do you want to add the WARN_ON_ONCE() or shall I resend?
--- a/mm/memory_hotplug.c~mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix
+++ a/mm/memory_hotplug.c
@@ -647,7 +647,7 @@ static int online_pages_range(unsigned l
for (pfn = start_pfn; pfn < end_pfn; pfn += 1ul << order) {
order = min(MAX_ORDER - 1, get_order(PFN_PHYS(end_pfn - pfn)));
/* __free_pages_core() wants pfns to be aligned to the order */
- if (unlikely(!IS_ALIGNED(pfn, 1ul << order)))
+ if (WARN_ON_ONCE(!IS_ALIGNED(pfn, 1ul << order)))
order = 0;
(*online_page_callback)(pfn_to_page(pfn), order);
}
_
