The patch titled Subject: powernv/memtrace: always online added memory blocks has been added to the -mm tree. Its filename is powernv-memtrace-always-online-added-memory-blocks.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/powernv-memtrace-always-online-added-memory-blocks.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/powernv-memtrace-always-online-added-memory-blocks.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: David Hildenbrand <david@xxxxxxxxxx> To: linux-kernel@xxxxxxxxxxxxxxx Cc: linux-mm@xxxxxxxxx, linuxppc-dev@xxxxxxxxxxxxxxxx, linux-hyperv@xxxxxxxxxxxxxxx, David Hildenbrand <david@xxxxxxxxxx>, Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>, Paul Mackerras <paulus@xxxxxxxxx>, Michael Ellerman <mpe@xxxxxxxxxxxxxx>, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Michal Hocko <mhocko@xxxxxxxxxx>, Oscar Salvador <osalvador@xxxxxxx>, "Rafael J. Wysocki" <rafael@xxxxxxxxxx>, Baoquan He <bhe@xxxxxxxxxx>, Wei Yang <richard.weiyang@xxxxxxxxx> Subject: [PATCH v2 4/8] powernv/memtrace: always online added memory blocks Date: Tue, 17 Mar 2020 11:49:38 +0100 Let's always try to online the re-added memory blocks. In case add_memory() already onlined the added memory blocks, the first device_online() call will fail and stop processing the remaining memory blocks. This avoids manually having to check memhp_auto_online. Note: PPC always onlines all hotplugged memory directly from the kernel as well - something that is handled by user space on other architectures. Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx> Cc: Baoquan He <bhe@xxxxxxxxxx> Cc: Wei Yang <richard.weiyang@xxxxxxxxx> Cc: linuxppc-dev@xxxxxxxxxxxxxxxx Signed-off-by: David Hildenbrand <david@xxxxxxxxxx> --- arch/powerpc/platforms/powernv/memtrace.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c index d6d64f8718e6..13b369d2cc45 100644 --- a/arch/powerpc/platforms/powernv/memtrace.c +++ b/arch/powerpc/platforms/powernv/memtrace.c @@ -231,16 +231,10 @@ static int memtrace_online(void) continue; } - /* - * If kernel isn't compiled with the auto online option - * we need to online the memory ourselves. - */ - if (!memhp_auto_online) { - lock_device_hotplug(); - walk_memory_blocks(ent->start, ent->size, NULL, - online_mem_block); - unlock_device_hotplug(); - } + lock_device_hotplug(); + walk_memory_blocks(ent->start, ent->size, NULL, + online_mem_block); + unlock_device_hotplug(); /* * Memory was added successfully so clean up references to it -- 2.24.1 Patches currently in -mm which might be from david@xxxxxxxxxx are drivers-base-memoryc-cache-memory-blocks-in-xarray-to-accelerate-lookup-fix.patch virtio-balloon-switch-back-to-oom-handler-for-virtio_balloon_f_deflate_on_oom.patch drivers-base-memoryc-indicate-all-memory-blocks-as-removable.patch drivers-base-memoryc-drop-section_count.patch drivers-base-memoryc-drop-pages_correctly_probed.patch mm-page_extc-drop-pfn_present-check-when-onlining.patch mm-memory_hotplug-simplify-calculation-of-number-of-pages-in-__remove_pages.patch mm-memory_hotplug-cleanup-__add_pages.patch drivers-base-memory-rename-mmop_online_keep-to-mmop_online.patch drivers-base-memory-map-mmop_offline-to-0.patch drivers-base-memory-store-mapping-between-mmop_-and-string-in-an-array.patch powernv-memtrace-always-online-added-memory-blocks.patch hv_balloon-dont-check-for-memhp_auto_online-manually.patch mm-memory_hotplug-unexport-memhp_auto_online.patch mm-memory_hotplug-convert-memhp_auto_online-to-store-an-online_type.patch mm-memory_hotplug-allow-to-specify-a-default-online_type.patch