Re: [PATCH v3 1/2] powerpc/pseries: Implement indexed-count hotplug memory add
On 07/25/2016 12:40 PM, Sahil Mehta wrote:
> Indexed-count add for memory hotplug guarantees that a contiguous block
> of lmbs beginning at a specified will be assigned (NOT
> that 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
> ---
> 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
>
> arch/powerpc/include/asm/rtas.h |2
> arch/powerpc/platforms/pseries/dlpar.c | 34 ++-
> arch/powerpc/platforms/pseries/hotplug-memory.c | 110
> +--
> 3 files changed, 134 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];
> chardrc_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_IC4
>
> 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..6dbd13c 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,29 @@ 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);
> + istr = strchr(cstr, ' ');
> + *istr++ = '\0';
This block should have some additional error checking. It is possible for
kstrdup to return
NULL, and it is possible that the arg string does not contain a space
character. Either of
these would result in dereferencing a NULL pointer.
-Nathan
> +
> + 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 propert
[PATCH v3 1/2] powerpc/pseries: Implement indexed-count hotplug memory add
Indexed-count add for memory hotplug guarantees that a contiguous block
of lmbs beginning at a specified will be assigned (NOT
that 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
---
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
arch/powerpc/include/asm/rtas.h |2
arch/powerpc/platforms/pseries/dlpar.c | 34 ++-
arch/powerpc/platforms/pseries/hotplug-memory.c | 110 +--
3 files changed, 134 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];
chardrc_name[1];
} _drc_u;
};
@@ -322,6 +323,7 @@ struct pseries_hp_errorlog {
#define PSERIES_HP_ELOG_ID_DRC_NAME1
#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..6dbd13c 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,29 @@ 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);
+ istr = strchr(cstr, ' ');
+ *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++;
+
