Commit 163e7921 authored by Daniel Henrique Barboza's avatar Daniel Henrique Barboza Committed by Michael Ellerman

powerpc/pseries: break early in dlpar_memory_remove_by_count() loops

After marking the LMBs as reserved depending on dlpar_remove_lmb() rc,
we evaluate whether we need to add the LMBs back or if we can release
the LMB DRCs. In both cases, a for_each_drmem_lmb() loop without a break
condition is used. This means that we're going to cycle through all LMBs
of the partition even after we're done with what we were going to do.

This patch adds break conditions in both loops to avoid this. The
'lmbs_removed' variable was renamed to 'lmbs_reserved', and it's now
being decremented each time a lmb reservation is removed, indicating
that the operation we're doing (adding back LMBs or releasing DRCs) is
completed.
Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210512202809.95363-4-danielhb413@gmail.com
parent 2ad216b4
...@@ -402,7 +402,7 @@ static int dlpar_remove_lmb(struct drmem_lmb *lmb) ...@@ -402,7 +402,7 @@ static int dlpar_remove_lmb(struct drmem_lmb *lmb)
static int dlpar_memory_remove_by_count(u32 lmbs_to_remove) static int dlpar_memory_remove_by_count(u32 lmbs_to_remove)
{ {
struct drmem_lmb *lmb; struct drmem_lmb *lmb;
int lmbs_removed = 0; int lmbs_reserved = 0;
int lmbs_available = 0; int lmbs_available = 0;
int rc; int rc;
...@@ -436,12 +436,12 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove) ...@@ -436,12 +436,12 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove)
*/ */
drmem_mark_lmb_reserved(lmb); drmem_mark_lmb_reserved(lmb);
lmbs_removed++; lmbs_reserved++;
if (lmbs_removed == lmbs_to_remove) if (lmbs_reserved == lmbs_to_remove)
break; break;
} }
if (lmbs_removed != lmbs_to_remove) { if (lmbs_reserved != lmbs_to_remove) {
pr_err("Memory hot-remove failed, adding LMB's back\n"); pr_err("Memory hot-remove failed, adding LMB's back\n");
for_each_drmem_lmb(lmb) { for_each_drmem_lmb(lmb) {
...@@ -454,6 +454,10 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove) ...@@ -454,6 +454,10 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove)
lmb->drc_index); lmb->drc_index);
drmem_remove_lmb_reservation(lmb); drmem_remove_lmb_reservation(lmb);
lmbs_reserved--;
if (lmbs_reserved == 0)
break;
} }
rc = -EINVAL; rc = -EINVAL;
...@@ -467,6 +471,10 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove) ...@@ -467,6 +471,10 @@ static int dlpar_memory_remove_by_count(u32 lmbs_to_remove)
lmb->base_addr); lmb->base_addr);
drmem_remove_lmb_reservation(lmb); drmem_remove_lmb_reservation(lmb);
lmbs_reserved--;
if (lmbs_reserved == 0)
break;
} }
rc = 0; rc = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment