From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toshi Kani Subject: [PATCH v3 07/17] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM Date: Tue, 5 Jan 2016 11:54:31 -0700 Message-ID: <1452020081-26534-7-git-send-email-toshi.kani@hpe.com> References: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Return-path: In-Reply-To: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Sender: owner-linux-mm@kvack.org To: akpm@linux-foundation.org, bp@alien8.de Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dave Young , kexec@lists.infradead.org, Toshi Kani List-Id: linux-arch.vger.kernel.org Set IORESOURCE_SYSTEM_RAM to 'flags' and IORES_DESC_CRASH_KERNEL to 'desc' of "Crash kernel" resource ranges, which are child nodes of System RAM. Change crash_shrink_memory() to set IORESOURCE_SYSTEM_RAM for a System RAM range. Change kexec_add_buffer() to call walk_iomem_res() with IORESOURCE_SYSTEM_RAM type for "Crash kernel". Cc: Andrew Morton Cc: Dave Young Cc: kexec@lists.infradead.org Signed-off-by: Toshi Kani --- kernel/kexec_core.c | 8 +++++--- kernel/kexec_file.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 11b64a6..80bff05 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -66,13 +66,15 @@ struct resource crashk_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; struct resource crashk_low_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; int kexec_should_crash(struct task_struct *p) @@ -934,7 +936,7 @@ int crash_shrink_memory(unsigned long new_size) ram_res->start = end; ram_res->end = crashk_res.end; - ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM; + ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM; ram_res->name = "System RAM"; crashk_res.end = end - 1; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index b70ada0..c245085 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -523,7 +523,7 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, /* Walk the RAM ranges and allocate a suitable range for the buffer */ if (image->type == KEXEC_TYPE_CRASH) ret = walk_iomem_res("Crash kernel", - IORESOURCE_MEM | IORESOURCE_BUSY, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, crashk_res.start, crashk_res.end, kbuf, locate_mem_hole_callback); else -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g4t3426.houston.hp.com ([15.201.208.54]:56664 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752203AbcAESze (ORCPT ); Tue, 5 Jan 2016 13:55:34 -0500 From: Toshi Kani Subject: [PATCH v3 07/17] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM Date: Tue, 5 Jan 2016 11:54:31 -0700 Message-ID: <1452020081-26534-7-git-send-email-toshi.kani@hpe.com> In-Reply-To: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> References: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: akpm@linux-foundation.org, bp@alien8.de Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dave Young , kexec@lists.infradead.org, Toshi Kani Message-ID: <20160105185431.bxaSP-zJ3VNKFc3AVknBmH8gHzijuCyiTMcNnHlTY6A@z> Set IORESOURCE_SYSTEM_RAM to 'flags' and IORES_DESC_CRASH_KERNEL to 'desc' of "Crash kernel" resource ranges, which are child nodes of System RAM. Change crash_shrink_memory() to set IORESOURCE_SYSTEM_RAM for a System RAM range. Change kexec_add_buffer() to call walk_iomem_res() with IORESOURCE_SYSTEM_RAM type for "Crash kernel". Cc: Andrew Morton Cc: Dave Young Cc: kexec@lists.infradead.org Signed-off-by: Toshi Kani --- kernel/kexec_core.c | 8 +++++--- kernel/kexec_file.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c index 11b64a6..80bff05 100644 --- a/kernel/kexec_core.c +++ b/kernel/kexec_core.c @@ -66,13 +66,15 @@ struct resource crashk_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; struct resource crashk_low_res = { .name = "Crash kernel", .start = 0, .end = 0, - .flags = IORESOURCE_BUSY | IORESOURCE_MEM + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, + .desc = IORES_DESC_CRASH_KERNEL }; int kexec_should_crash(struct task_struct *p) @@ -934,7 +936,7 @@ int crash_shrink_memory(unsigned long new_size) ram_res->start = end; ram_res->end = crashk_res.end; - ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM; + ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM; ram_res->name = "System RAM"; crashk_res.end = end - 1; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index b70ada0..c245085 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -523,7 +523,7 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, /* Walk the RAM ranges and allocate a suitable range for the buffer */ if (image->type == KEXEC_TYPE_CRASH) ret = walk_iomem_res("Crash kernel", - IORESOURCE_MEM | IORESOURCE_BUSY, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, crashk_res.start, crashk_res.end, kbuf, locate_mem_hole_callback); else