Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a085d07 authored by Toshi Kani's avatar Toshi Kani Committed by Ingo Molnar
Browse files

kexec: Set IORESOURCE_SYSTEM_RAM for System RAM 



Set proper ioresource flags and types for crash kernel
reservation areas.

Signed-off-by: default avatarToshi Kani <toshi.kani@hpe.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarDave Young <dyoung@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Minfei Huang <mnfhuang@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: kexec@lists.infradead.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mm <linux-mm@kvack.org>
Link: http://lkml.kernel.org/r/1453841853-11383-8-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 35d98e93

kernel/kexec_core.c

+5 −3
Original line number Diff line number Diff line
@@ -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)
@@ -959,7 +961,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;

kernel/kexec_file.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,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