| Message ID | 153453843169.1010.11894303551198228940.stgit@hbathini.in.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a58183138cb72059a0c278f8370a47f41dae9afa |
| Headers | show |
| Series | powerpc/fadump: cleanup crash memory ranges support | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
On Fri, 2018-08-17 at 20:40:56 UTC, Hari Bathini wrote: > Commit 1bd6a1c4b80a ("powerpc/fadump: handle crash memory ranges array > index overflow") changed crash memory ranges to a dynamic array that > is reallocated on-demand with krealloc(). The relevant header for this > call was not included. The kernel compiles though. But be cautious and > add the header anyway. > > Also, memory allocation logic in fadump_add_crash_memory() takes care > of memory allocation for crash memory ranges in all scenarios. Drop > unnecessary memory allocation in fadump_setup_crash_memory_ranges(). > > Fixes: 1bd6a1c4b80a ("powerpc/fadump: handle crash memory ranges array index overflow") > Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> > Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/a58183138cb72059a0c278f8370a47 cheers
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index 986ec47..a711d22 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -34,6 +34,7 @@ #include <linux/crash_dump.h> #include <linux/kobject.h> #include <linux/sysfs.h> +#include <linux/slab.h> #include <asm/debugfs.h> #include <asm/page.h> @@ -1019,13 +1020,6 @@ static int fadump_setup_crash_memory_ranges(void) pr_debug("Setup crash memory ranges.\n"); crash_mem_ranges = 0; - /* allocate memory for crash memory ranges for the first time */ - if (!max_crash_mem_ranges) { - ret = allocate_crash_memory_ranges(); - if (ret) - return ret; - } - /* * add the first memory chunk (RMA_START through boot_memory_size) as * a separate memory chunk. The reason is, at the time crash firmware
Commit 1bd6a1c4b80a ("powerpc/fadump: handle crash memory ranges array index overflow") changed crash memory ranges to a dynamic array that is reallocated on-demand with krealloc(). The relevant header for this call was not included. The kernel compiles though. But be cautious and add the header anyway. Also, memory allocation logic in fadump_add_crash_memory() takes care of memory allocation for crash memory ranges in all scenarios. Drop unnecessary memory allocation in fadump_setup_crash_memory_ranges(). Fixes: 1bd6a1c4b80a ("powerpc/fadump: handle crash memory ranges array index overflow") Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> --- * Actually posted a V3 with this changes but V2 made it! - https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=59839 arch/powerpc/kernel/fadump.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)