| From 7878da14fdd7b011c9b0fc58a50aabd673d14195 Mon Sep 17 00:00:00 2001 |
| From: Pingfan Liu <kernelfans@gmail.com> |
| Date: Fri, 10 Jan 2020 12:54:02 +0800 |
| Subject: [PATCH] powerpc/pseries: Advance pfn if section is not present in |
| lmb_is_removable() |
| |
| commit fbee6ba2dca30d302efe6bddb3a886f5e964a257 upstream. |
| |
| In lmb_is_removable(), if a section is not present, it should continue |
| to test the rest of the sections in the block. But the current code |
| fails to do so. |
| |
| Fixes: 51925fb3c5c9 ("powerpc/pseries: Implement memory hotplug remove in the kernel") |
| Cc: stable@vger.kernel.org # v4.1+ |
| Signed-off-by: Pingfan Liu <kernelfans@gmail.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/1578632042-12415-1-git-send-email-kernelfans@gmail.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c |
| index 46d0d35b9ca4..249664ce220c 100644 |
| --- a/arch/powerpc/platforms/pseries/hotplug-memory.c |
| +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c |
| @@ -360,8 +360,10 @@ static bool lmb_is_removable(struct drmem_lmb *lmb) |
| |
| for (i = 0; i < scns_per_block; i++) { |
| pfn = PFN_DOWN(phys_addr); |
| - if (!pfn_present(pfn)) |
| + if (!pfn_present(pfn)) { |
| + phys_addr += MIN_MEMORY_BLOCK_SIZE; |
| continue; |
| + } |
| |
| rc &= is_mem_section_removable(pfn, PAGES_PER_SECTION); |
| phys_addr += MIN_MEMORY_BLOCK_SIZE; |
| -- |
| 2.7.4 |
| |
