* [PATCH v4 0/2] powerpc/pseries: Implement indexed-count hotplug memory management
@ 2016-08-01 17:19 Sahil Mehta
2016-08-01 17:21 ` [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add Sahil Mehta
2016-08-01 17:23 ` [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove Sahil Mehta
0 siblings, 2 replies; 6+ messages in thread
From: Sahil Mehta @ 2016-08-01 17:19 UTC (permalink / raw)
To: linuxppc-dev
Indexed-count memory management allows addition and removal of contiguous
lmb blocks with a single command. When compared to the series of calls
previously required to manage contiguous blocks, indexed-count decreases
command frequency and reduces risk of buffer overflow.
Changes in v2:
--------------
-[PATCH 1/2]: -remove potential memory leak when parsing command
-use u32s drc_index and count instead of u32 ic[]
in dlpar_memory
-[PATCH 2/2]: -use u32s drc_index and count instead of u32 ic[]
in dlpar_memory
Changes in v3:
--------------
-[PATCH 1/2]: -add logic to handle invalid drc_index input
-update indexed-count trigger to follow naming convention
-update dlpar_memory to follow kernel if-else style
-[PATCH 2/2]: -add logic to handle invalid drc_index input
Changes in v4:
--------------
-[PATCH 1/2]: -add logic to handle kstrdup failure
-add logic to handle invalid command format
-Sahil Mehta
---
include/asm/rtas.h | 2
platforms/pseries/dlpar.c | 48 ++++++++
platforms/pseries/hotplug-memory.c | 200 +++++++++++++++++++++++++++++++++++--
3 files changed, 237 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add
2016-08-01 17:19 [PATCH v4 0/2] powerpc/pseries: Implement indexed-count hotplug memory management Sahil Mehta
@ 2016-08-01 17:21 ` Sahil Mehta
2016-08-02 20:19 ` Nathan Fontenot
2016-08-01 17:23 ` [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove Sahil Mehta
1 sibling, 1 reply; 6+ messages in thread
From: Sahil Mehta @ 2016-08-01 17:21 UTC (permalink / raw)
To: linuxppc-dev
Indexed-count add for memory hotplug guarantees that a contiguous block
of <count> lmbs beginning at a specified <index> will be assigned (NOT
that <count> lmbs will be added). Because of Qemu's per-DIMM memory
management, the addition of a contiguous block of memory currently
requires a series of individual calls. Indexed-count add reduces
this series into a single call.
Signed-off-by: Sahil Mehta <smehta@linux.vnet.ibm.com>
---
v2: -remove potential memory leak when parsing command
-use u32s drc_index and count instead of u32 ic[]
in dlpar_memory
v3: -add logic to handle invalid drc_index input
-update indexed-count trigger to follow naming convention
-update dlpar_memory to follow kernel if-else style
v4: -add logic to handle kstrdup failure
-add logic to handle invalid command format
arch/powerpc/include/asm/rtas.h | 2
arch/powerpc/platforms/pseries/dlpar.c | 46 +++++++++-
arch/powerpc/platforms/pseries/hotplug-memory.c | 110 +++++++++++++++++++++--
3 files changed, 146 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 51400ba..088ea75 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -307,6 +307,7 @@ struct pseries_hp_errorlog {
union {
__be32 drc_index;
__be32 drc_count;
+ __be32 indexed_count[2];
char drc_name[1];
} _drc_u;
};
@@ -322,6 +323,7 @@ struct pseries_hp_errorlog {
#define PSERIES_HP_ELOG_ID_DRC_NAME 1
#define PSERIES_HP_ELOG_ID_DRC_INDEX 2
#define PSERIES_HP_ELOG_ID_DRC_COUNT 3
+#define PSERIES_HP_ELOG_ID_DRC_IC 4
struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
uint16_t section_id);
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 2b93ae8..17d3108 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -345,11 +345,17 @@ static int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)
switch (hp_elog->id_type) {
case PSERIES_HP_ELOG_ID_DRC_COUNT:
hp_elog->_drc_u.drc_count =
- be32_to_cpu(hp_elog->_drc_u.drc_count);
+ be32_to_cpu(hp_elog->_drc_u.drc_count);
break;
case PSERIES_HP_ELOG_ID_DRC_INDEX:
hp_elog->_drc_u.drc_index =
- be32_to_cpu(hp_elog->_drc_u.drc_index);
+ be32_to_cpu(hp_elog->_drc_u.drc_index);
+ break;
+ case PSERIES_HP_ELOG_ID_DRC_IC:
+ hp_elog->_drc_u.indexed_count[0] =
+ be32_to_cpu(hp_elog->_drc_u.indexed_count[0]);
+ hp_elog->_drc_u.indexed_count[1] =
+ be32_to_cpu(hp_elog->_drc_u.indexed_count[1]);
}
switch (hp_elog->resource) {
@@ -409,7 +415,41 @@ static ssize_t dlpar_store(struct class *class, struct class_attribute *attr,
goto dlpar_store_out;
}
- if (!strncmp(arg, "index", 5)) {
+ if (!strncmp(arg, "indexed-count", 13)) {
+ u32 index, count;
+ char *cstr, *istr;
+
+ hp_elog->id_type = PSERIES_HP_ELOG_ID_DRC_IC;
+ arg += strlen("indexed-count ");
+
+ cstr = kstrdup(arg, GFP_KERNEL);
+ if (!cstr) {
+ rc = -EINVAL;
+ pr_err("kstrudup failed before parse : \"%s\"\n", buf);
+ goto dlpar_store_out;
+ }
+
+ istr = strchr(cstr, ' ');
+ if (!istr) {
+ rc = -EINVAL;
+ pr_err("Invalid indexed-count command : \"%s\"\n", buf);
+ goto dlpar_store_out;
+ }
+
+ *istr++ = '\0';
+
+ if (kstrtou32(cstr, 0, &count) || kstrtou32(istr, 0, &index)) {
+ rc = -EINVAL;
+ pr_err("Invalid index or count : \"%s\"\n", buf);
+ kfree(cstr);
+ goto dlpar_store_out;
+ }
+
+ kfree(cstr);
+
+ hp_elog->_drc_u.indexed_count[0] = cpu_to_be32(count);
+ hp_elog->_drc_u.indexed_count[1] = cpu_to_be32(index);
+ } else if (!strncmp(arg, "index", 5)) {
u32 index;
hp_elog->id_type = PSERIES_HP_ELOG_ID_DRC_INDEX;
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 2ce1385..2d4ceb3 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -701,6 +701,89 @@ static int dlpar_memory_add_by_index(u32 drc_index, struct property *prop)
return rc;
}
+static int dlpar_memory_add_by_ic(u32 lmbs_to_add, u32 drc_index,
+ struct property *prop)
+{
+ struct of_drconf_cell *lmbs;
+ u32 num_lmbs, *p;
+ int i, rc, start_lmb_found;
+ int lmbs_available = 0, start_index = 0, end_index;
+
+ pr_info("Attempting to hot-add %u LMB(s) at index %x\n",
+ lmbs_to_add, drc_index);
+
+ if (lmbs_to_add == 0)
+ return -EINVAL;
+
+ p = prop->value;
+ num_lmbs = *p++;
+ lmbs = (struct of_drconf_cell *)p;
+ start_lmb_found = 0;
+
+ /* Navigate to drc_index */
+ while (start_index < num_lmbs) {
+ if (lmbs[start_index].drc_index == drc_index) {
+ start_lmb_found = 1;
+ break;
+ }
+
+ start_index++;
+ }
+
+ if (!start_lmb_found)
+ return -EINVAL;
+
+ end_index = start_index + lmbs_to_add;
+
+ /* Validate that there are enough LMBs to satisfy the request */
+ for (i = start_index; i < end_index; i++) {
+ if (lmbs[i].flags & DRCONF_MEM_RESERVED)
+ break;
+
+ lmbs_available++;
+ }
+
+ if (lmbs_available < lmbs_to_add)
+ return -EINVAL;
+
+ for (i = start_index; i < end_index; i++) {
+ if (lmbs[i].flags & DRCONF_MEM_ASSIGNED)
+ continue;
+
+ rc = dlpar_add_lmb(&lmbs[i]);
+ if (rc)
+ break;
+
+ lmbs[i].reserved = 1;
+ }
+
+ if (rc) {
+ pr_err("Memory indexed-count-add failed, removing any added LMBs\n");
+
+ for (i = start_index; i < end_index; i++) {
+ if (!lmbs[i].reserved)
+ continue;
+
+ rc = dlpar_remove_lmb(&lmbs[i]);
+ if (rc)
+ pr_err("Failed to remove LMB, drc index %x\n",
+ be32_to_cpu(lmbs[i].drc_index));
+ }
+ rc = -EINVAL;
+ } else {
+ for (i = start_index; i < end_index; i++) {
+ if (!lmbs[i].reserved)
+ continue;
+
+ pr_info("Memory at %llx (drc index %x) was hot-added\n",
+ lmbs[i].base_addr, lmbs[i].drc_index);
+ lmbs[i].reserved = 0;
+ }
+ }
+
+ return rc;
+}
+
int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
{
struct device_node *dn;
@@ -708,9 +791,6 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
u32 count, drc_index;
int rc;
- count = hp_elog->_drc_u.drc_count;
- drc_index = hp_elog->_drc_u.drc_index;
-
lock_device_hotplug();
dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
@@ -727,20 +807,32 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
switch (hp_elog->action) {
case PSERIES_HP_ELOG_ACTION_ADD:
- if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)
+ if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
+ count = hp_elog->_drc_u.drc_count;
rc = dlpar_memory_add_by_count(count, prop);
- else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)
+ } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
+ drc_index = hp_elog->_drc_u.drc_index;
rc = dlpar_memory_add_by_index(drc_index, prop);
- else
+ } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
+ count = hp_elog->_drc_u.indexed_count[0];
+ drc_index = hp_elog->_drc_u.indexed_count[1];
+ rc = dlpar_memory_add_by_ic(count, drc_index, prop);
+ } else {
rc = -EINVAL;
+ }
+
break;
case PSERIES_HP_ELOG_ACTION_REMOVE:
- if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT)
+ if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_COUNT) {
+ count = hp_elog->_drc_u.drc_count;
rc = dlpar_memory_remove_by_count(count, prop);
- else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX)
+ } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
+ drc_index = hp_elog->_drc_u.drc_index;
rc = dlpar_memory_remove_by_index(drc_index, prop);
- else
+ } else {
rc = -EINVAL;
+ }
+
break;
default:
pr_err("Invalid action (%d) specified\n", hp_elog->action);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove
2016-08-01 17:19 [PATCH v4 0/2] powerpc/pseries: Implement indexed-count hotplug memory management Sahil Mehta
2016-08-01 17:21 ` [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add Sahil Mehta
@ 2016-08-01 17:23 ` Sahil Mehta
2016-08-02 20:20 ` Nathan Fontenot
2016-08-23 23:03 ` Michael Roth
1 sibling, 2 replies; 6+ messages in thread
From: Sahil Mehta @ 2016-08-01 17:23 UTC (permalink / raw)
To: linuxppc-dev
Indexed-count remove for memory hotplug guarantees that a contiguous block
of <count> lmbs beginning at a specified <index> will be unassigned (NOT
that <count> lmbs will be removed). Because of Qemu's per-DIMM memory
management, the removal of a contiguous block of memory currently
requires a series of individual calls. Indexed-count remove reduces
this series into a single call.
Signed-off-by: Sahil Mehta <smehta@linux.vnet.ibm.com>
---
v2: -use u32s drc_index and count instead of u32 ic[]
in dlpar_memory
v3: -add logic to handle invalid drc_index input
v4: -none
arch/powerpc/platforms/pseries/hotplug-memory.c | 90 +++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 2d4ceb3..dd5eb38 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -503,6 +503,92 @@ static int dlpar_memory_remove_by_index(u32 drc_index, struct property *prop)
return rc;
}
+static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
+ struct property *prop)
+{
+ struct of_drconf_cell *lmbs;
+ u32 num_lmbs, *p;
+ int i, rc, start_lmb_found;
+ int lmbs_available = 0, start_index = 0, end_index;
+
+ pr_info("Attempting to hot-remove %u LMB(s) at %x\n",
+ lmbs_to_remove, drc_index);
+
+ if (lmbs_to_remove == 0)
+ return -EINVAL;
+
+ p = prop->value;
+ num_lmbs = *p++;
+ lmbs = (struct of_drconf_cell *)p;
+ start_lmb_found = 0;
+
+ /* Navigate to drc_index */
+ while (start_index < num_lmbs) {
+ if (lmbs[start_index].drc_index == drc_index) {
+ start_lmb_found = 1;
+ break;
+ }
+
+ start_index++;
+ }
+
+ if (!start_lmb_found)
+ return -EINVAL;
+
+ end_index = start_index + lmbs_to_remove;
+
+ /* Validate that there are enough LMBs to satisfy the request */
+ for (i = start_index; i < end_index; i++) {
+ if (lmbs[i].flags & DRCONF_MEM_RESERVED)
+ break;
+
+ lmbs_available++;
+ }
+
+ if (lmbs_available < lmbs_to_remove)
+ return -EINVAL;
+
+ for (i = 0; i < end_index; i++) {
+ if (!(lmbs[i].flags & DRCONF_MEM_ASSIGNED))
+ continue;
+
+ rc = dlpar_remove_lmb(&lmbs[i]);
+ if (rc)
+ break;
+
+ lmbs[i].reserved = 1;
+ }
+
+ if (rc) {
+ pr_err("Memory indexed-count-remove failed, adding any removed LMBs\n");
+
+ for (i = start_index; i < end_index; i++) {
+ if (!lmbs[i].reserved)
+ continue;
+
+ rc = dlpar_add_lmb(&lmbs[i]);
+ if (rc)
+ pr_err("Failed to add LMB, drc index %x\n",
+ be32_to_cpu(lmbs[i].drc_index));
+
+ lmbs[i].reserved = 0;
+ }
+ rc = -EINVAL;
+ } else {
+ for (i = start_index; i < end_index; i++) {
+ if (!lmbs[i].reserved)
+ continue;
+
+ pr_info("Memory at %llx (drc index %x) was hot-removed\n",
+ lmbs[i].base_addr, lmbs[i].drc_index);
+
+ lmbs[i].reserved = 0;
+ }
+ }
+
+ return rc;
+}
+
#else
static inline int pseries_remove_memblock(unsigned long base,
unsigned int memblock_size)
@@ -829,6 +915,10 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
} else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_INDEX) {
drc_index = hp_elog->_drc_u.drc_index;
rc = dlpar_memory_remove_by_index(drc_index, prop);
+ } else if (hp_elog->id_type == PSERIES_HP_ELOG_ID_DRC_IC) {
+ count = hp_elog->_drc_u.indexed_count[0];
+ drc_index = hp_elog->_drc_u.indexed_count[1];
+ rc = dlpar_memory_remove_by_ic(count, drc_index, prop);
} else {
rc = -EINVAL;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add
2016-08-01 17:21 ` [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add Sahil Mehta
@ 2016-08-02 20:19 ` Nathan Fontenot
0 siblings, 0 replies; 6+ messages in thread
From: Nathan Fontenot @ 2016-08-02 20:19 UTC (permalink / raw)
To: Sahil Mehta, linuxppc-dev
On 08/01/2016 12:21 PM, Sahil Mehta wrote:
> Indexed-count add for memory hotplug guarantees that a contiguous block
> of <count> lmbs beginning at a specified <index> will be assigned (NOT
> that <count> lmbs will be added). Because of Qemu's per-DIMM memory
> management, the addition of a contiguous block of memory currently
> requires a series of individual calls. Indexed-count add reduces
> this series into a single call.
>
> Signed-off-by: Sahil Mehta <smehta@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
> ---
> v2: -remove potential memory leak when parsing command
> -use u32s drc_index and count instead of u32 ic[]
> in dlpar_memory
> v3: -add logic to handle invalid drc_index input
> -update indexed-count trigger to follow naming convention
> -update dlpar_memory to follow kernel if-else style
> v4: -add logic to handle kstrdup failure
> -add logic to handle invalid command format
>
> arch/powerpc/include/asm/rtas.h | 2
> arch/powerpc/platforms/pseries/dlpar.c | 46 +++++++++-
> arch/powerpc/platforms/pseries/hotplug-memory.c | 110 +++++++++++++++++++++--
> 3 files changed, 146 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove
2016-08-01 17:23 ` [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove Sahil Mehta
@ 2016-08-02 20:20 ` Nathan Fontenot
2016-08-23 23:03 ` Michael Roth
1 sibling, 0 replies; 6+ messages in thread
From: Nathan Fontenot @ 2016-08-02 20:20 UTC (permalink / raw)
To: Sahil Mehta, linuxppc-dev
On 08/01/2016 12:23 PM, Sahil Mehta wrote:
> Indexed-count remove for memory hotplug guarantees that a contiguous block
> of <count> lmbs beginning at a specified <index> will be unassigned (NOT
> that <count> lmbs will be removed). Because of Qemu's per-DIMM memory
> management, the removal of a contiguous block of memory currently
> requires a series of individual calls. Indexed-count remove reduces
> this series into a single call.
>
> Signed-off-by: Sahil Mehta <smehta@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
> ---
> v2: -use u32s drc_index and count instead of u32 ic[]
> in dlpar_memory
> v3: -add logic to handle invalid drc_index input
> v4: -none
>
> arch/powerpc/platforms/pseries/hotplug-memory.c | 90 +++++++++++++++++++++++
> 1 file changed, 90 insertions(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove
2016-08-01 17:23 ` [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove Sahil Mehta
2016-08-02 20:20 ` Nathan Fontenot
@ 2016-08-23 23:03 ` Michael Roth
1 sibling, 0 replies; 6+ messages in thread
From: Michael Roth @ 2016-08-23 23:03 UTC (permalink / raw)
To: Sahil Mehta, linuxppc-dev
Quoting Sahil Mehta (2016-08-01 12:23:16)
> Indexed-count remove for memory hotplug guarantees that a contiguous block
> of <count> lmbs beginning at a specified <index> will be unassigned (NOT
> that <count> lmbs will be removed). Because of Qemu's per-DIMM memory
> management, the removal of a contiguous block of memory currently
> requires a series of individual calls. Indexed-count remove reduces
> this series into a single call.
> =
> Signed-off-by: Sahil Mehta <smehta@linux.vnet.ibm.com>
> ---
> v2: -use u32s drc_index and count instead of u32 ic[]
> in dlpar_memory
> v3: -add logic to handle invalid drc_index input
> v4: -none
> =
> arch/powerpc/platforms/pseries/hotplug-memory.c | 90 +++++++++++++++++=
++++++
> 1 file changed, 90 insertions(+)
> =
> diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/power=
pc/platforms/pseries/hotplug-memory.c
> index 2d4ceb3..dd5eb38 100644
> --- a/arch/powerpc/platforms/pseries/hotplug-memory.c
> +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
> @@ -503,6 +503,92 @@ static int dlpar_memory_remove_by_index(u32 drc_inde=
x, struct property *prop)
> return rc;
> }
> =
> +static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index,
> + struct property *prop)
> +{
> + struct of_drconf_cell *lmbs;
> + u32 num_lmbs, *p;
> + int i, rc, start_lmb_found;
> + int lmbs_available =3D 0, start_index =3D 0, end_index;
> +
> + pr_info("Attempting to hot-remove %u LMB(s) at %x\n",
> + lmbs_to_remove, drc_index);
> +
> + if (lmbs_to_remove =3D=3D 0)
> + return -EINVAL;
> +
> + p =3D prop->value;
> + num_lmbs =3D *p++;
> + lmbs =3D (struct of_drconf_cell *)p;
> + start_lmb_found =3D 0;
> +
> + /* Navigate to drc_index */
> + while (start_index < num_lmbs) {
> + if (lmbs[start_index].drc_index =3D=3D drc_index) {
> + start_lmb_found =3D 1;
> + break;
> + }
> +
> + start_index++;
> + }
> +
> + if (!start_lmb_found)
> + return -EINVAL;
> +
> + end_index =3D start_index + lmbs_to_remove;
> +
> + /* Validate that there are enough LMBs to satisfy the request */
> + for (i =3D start_index; i < end_index; i++) {
> + if (lmbs[i].flags & DRCONF_MEM_RESERVED)
> + break;
> +
> + lmbs_available++;
> + }
> +
> + if (lmbs_available < lmbs_to_remove)
> + return -EINVAL;
> +
> + for (i =3D 0; i < end_index; i++) {
Shouldn't this be i =3D start_index? Otherwise it seems we'd attempt to
satisfy the request using LMBs outside of the requested range.
> + if (!(lmbs[i].flags & DRCONF_MEM_ASSIGNED))
> + continue;
> +
> + rc =3D dlpar_remove_lmb(&lmbs[i]);
> + if (rc)
> + break;
> +
> + lmbs[i].reserved =3D 1;
> + }
> +
> + if (rc) {
> + pr_err("Memory indexed-count-remove failed, adding any re=
moved LMBs\n");
> +
> + for (i =3D start_index; i < end_index; i++) {
> + if (!lmbs[i].reserved)
> + continue;
> +
> + rc =3D dlpar_add_lmb(&lmbs[i]);
> + if (rc)
> + pr_err("Failed to add LMB, drc index %x\n=
",
> + be32_to_cpu(lmbs[i].drc_index));
> +
> + lmbs[i].reserved =3D 0;
> + }
> + rc =3D -EINVAL;
> + } else {
> + for (i =3D start_index; i < end_index; i++) {
> + if (!lmbs[i].reserved)
> + continue;
> +
> + pr_info("Memory at %llx (drc index %x) was hot-re=
moved\n",
> + lmbs[i].base_addr, lmbs[i].drc_index);
> +
> + lmbs[i].reserved =3D 0;
> + }
> + }
> +
> + return rc;
> +}
> +
> #else
> static inline int pseries_remove_memblock(unsigned long base,
> unsigned int memblock_size)
> @@ -829,6 +915,10 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
> } else if (hp_elog->id_type =3D=3D PSERIES_HP_ELOG_ID_DRC=
_INDEX) {
> drc_index =3D hp_elog->_drc_u.drc_index;
> rc =3D dlpar_memory_remove_by_index(drc_index, pr=
op);
> + } else if (hp_elog->id_type =3D=3D PSERIES_HP_ELOG_ID_DRC=
_IC) {
> + count =3D hp_elog->_drc_u.indexed_count[0];
> + drc_index =3D hp_elog->_drc_u.indexed_count[1];
> + rc =3D dlpar_memory_remove_by_ic(count, drc_index=
, prop);
> } else {
> rc =3D -EINVAL;
> }
> =
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-08-23 23:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-01 17:19 [PATCH v4 0/2] powerpc/pseries: Implement indexed-count hotplug memory management Sahil Mehta
2016-08-01 17:21 ` [PATCH v4 1/2] powerpc/pseries: Implement indexed-count hotplug memory add Sahil Mehta
2016-08-02 20:19 ` Nathan Fontenot
2016-08-01 17:23 ` [PATCH v4 2/2] powerpc/pseries: Implement indexed-count hotplug memory remove Sahil Mehta
2016-08-02 20:20 ` Nathan Fontenot
2016-08-23 23:03 ` Michael Roth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).