From 70b690547d5ea1a3d135a4cc39cd1e08246d0c3a Mon Sep 17 00:00:00 2001

From: Philipp Rudo <prudo@linux.ibm.com>

Date: Tue, 12 May 2020 19:39:56 +0200

Subject: [PATCH] s390/kexec_file: fix initrd location for kdump kernel

References: bsc#1166340 ltc#184171

Patch-mainline: v5.7-rc7

Git-commit: 70b690547d5ea1a3d135a4cc39cd1e08246d0c3a

initrd_start must not point at the location the initrd is loaded into

the crashkernel memory but at the location it will be after the

crashkernel memory is swapped with the memory at 0.

Fixes: ee337f5469fd ("s390/kexec_file: Add crash support to image loader")

Reported-by: Lianbo Jiang <lijiang@redhat.com>

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>

Tested-by: Lianbo Jiang <lijiang@redhat.com>

Link: https://lore.kernel.org/r/20200512193956.15ae3f23@laptop2-ibm.local

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/s390/kernel/machine_kexec_file.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c

index 8415ae7d2a23..f9e4baa64b67 100644

--- a/arch/s390/kernel/machine_kexec_file.c

+++ b/arch/s390/kernel/machine_kexec_file.c

@@ -151,7 +151,7 @@ static int kexec_file_add_initrd(struct kimage *image,

 		buf.mem += crashk_res.start;

 	buf.memsz = buf.bufsz;

-	data->parm->initrd_start = buf.mem;

+	data->parm->initrd_start = data->memsz;

 	data->parm->initrd_size = buf.memsz;

 	data->memsz += buf.memsz;

-- 

2.26.2