[PATCH] arm64: kexec_file: print appropriate variable

[PATCH] arm64: kexec_file: print appropriate variable

[Łukasz Stelmach]

Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index b40c3b0def92..2776bdaa83a5 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
 	image->arch.dtb_mem = kbuf.mem;
 
 	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			kbuf.mem, dtb_len, dtb_len);
+			kbuf.mem, dtb_len, kbuf.memsz);
 
 	return 0;
 
-- 
2.25.0

[PATCH] arm64: kexec_file: print appropriate variable

[Łukasz Stelmach]

Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index b40c3b0def92..2776bdaa83a5 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
 	image->arch.dtb_mem = kbuf.mem;
 
 	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			kbuf.mem, dtb_len, dtb_len);
+			kbuf.mem, dtb_len, kbuf.memsz);
 
 	return 0;
 
-- 
2.25.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Will Deacon]

On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

-ENOCOMMITMSG

> ---
>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index b40c3b0def92..2776bdaa83a5 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>  	image->arch.dtb_mem = kbuf.mem;
>  
>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -			kbuf.mem, dtb_len, dtb_len);
> +			kbuf.mem, dtb_len, kbuf.memsz);

I guess it would make sense to use kbuf.bufsz instead of dtb_len too.
(assuming this is useful to somebody?)

Will

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Will Deacon]

On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

-ENOCOMMITMSG

> ---
>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index b40c3b0def92..2776bdaa83a5 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>  	image->arch.dtb_mem = kbuf.mem;
>  
>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -			kbuf.mem, dtb_len, dtb_len);
> +			kbuf.mem, dtb_len, kbuf.memsz);

I guess it would make sense to use kbuf.bufsz instead of dtb_len too.
(assuming this is useful to somebody?)

Will

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Mark Rutland]

On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")

This commit ID is bogus (doesn't exist in mainline or the arm64 tree).

The upstream commit ID seems to be: 52b2a8af7436044cfcb27e4b0f72c2ce1f3890da

As will said, this needs a commit message. Please explain what you think
is wrong here.

Also, when sending a fix, *please* Cc the author of the original patch.

I've added parties relevant to the original patch (Takahiro and James).

> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index b40c3b0def92..2776bdaa83a5 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>  	image->arch.dtb_mem = kbuf.mem;
>  
>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -			kbuf.mem, dtb_len, dtb_len);
> +			kbuf.mem, dtb_len, kbuf.memsz);

It's worth noting that we follow the same pattern repeatedly in this
file, so if you think this instance is wrong you should consider whether
the others are correct.

Earlier in this file we have:

|	pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
|		 image->arch.elf_headers_mem, headers_sz, headers_sz)

|	pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
|		 initrd_load_addr, initrd_len, initrd_len);

... and it looks like x86 does similar in kexec-bzimage64.c, for some
sort of consistency with the old kexec logging.

If <foo>_len and kbuf.memsz can differ, we should log that in all cases.
If not, we should remove the redundant logging.

Thanks,
Mark.

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Mark Rutland]

On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")

This commit ID is bogus (doesn't exist in mainline or the arm64 tree).

The upstream commit ID seems to be: 52b2a8af7436044cfcb27e4b0f72c2ce1f3890da

As will said, this needs a commit message. Please explain what you think
is wrong here.

Also, when sending a fix, *please* Cc the author of the original patch.

I've added parties relevant to the original patch (Takahiro and James).

> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index b40c3b0def92..2776bdaa83a5 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>  	image->arch.dtb_mem = kbuf.mem;
>  
>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -			kbuf.mem, dtb_len, dtb_len);
> +			kbuf.mem, dtb_len, kbuf.memsz);

It's worth noting that we follow the same pattern repeatedly in this
file, so if you think this instance is wrong you should consider whether
the others are correct.

Earlier in this file we have:

|	pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
|		 image->arch.elf_headers_mem, headers_sz, headers_sz)

|	pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
|		 initrd_load_addr, initrd_len, initrd_len);

... and it looks like x86 does similar in kexec-bzimage64.c, for some
sort of consistency with the old kexec logging.

If <foo>_len and kbuf.memsz can differ, we should log that in all cases.
If not, we should remove the redundant logging.

Thanks,
Mark.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Lukasz Stelmach]

[-- Attachment #1: Type: text/plain, Size: 2300 bytes --]

It was <2020-04-30 czw 12:19>, when Mark Rutland wrote:
> On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
>> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
>
> This commit ID is bogus (doesn't exist in mainline or the arm64 tree).
>
> The upstream commit ID seems to be: 52b2a8af7436044cfcb27e4b0f72c2ce1f3890da

Fixing.

> As will said, this needs a commit message. Please explain what you think
> is wrong here.

Fixing.

> Also, when sending a fix, *please* Cc the author of the original patch.
>
> I've added parties relevant to the original patch (Takahiro and James).

Thank you.

>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
>> index b40c3b0def92..2776bdaa83a5 100644
>> --- a/arch/arm64/kernel/machine_kexec_file.c
>> +++ b/arch/arm64/kernel/machine_kexec_file.c
>> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>>  	image->arch.dtb_mem = kbuf.mem;
>>  
>>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
>> -			kbuf.mem, dtb_len, dtb_len);
>> +			kbuf.mem, dtb_len, kbuf.memsz);
>
> It's worth noting that we follow the same pattern repeatedly in this
> file, so if you think this instance is wrong you should consider whether
> the others are correct.
>
> Earlier in this file we have:
>
> |	pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> |		 image->arch.elf_headers_mem, headers_sz, headers_sz)
>
> |	pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> |		 initrd_load_addr, initrd_len, initrd_len);

Fixing.

> ... and it looks like x86 does similar in kexec-bzimage64.c, for some
> sort of consistency with the old kexec logging.

When I fix it for x86, should I combine changes in one patch or prepare
two separate patches?

> If <foo>_len and kbuf.memsz can differ, we should log that in all cases.
> If not, we should remove the redundant logging.

Yes, memsz is page-aligned in kexec_add_buffer();

Kind regards,
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH] arm64: kexec_file: print appropriate variable

[Lukasz Stelmach]

[-- Attachment #1.1: Type: text/plain, Size: 2300 bytes --]

It was <2020-04-30 czw 12:19>, when Mark Rutland wrote:
> On Thu, Apr 30, 2020 at 12:50:34PM +0200, Łukasz Stelmach wrote:
>> Fixes: 4312057681929 ("arm64: kexec_file: load initrd and device-tree")
>
> This commit ID is bogus (doesn't exist in mainline or the arm64 tree).
>
> The upstream commit ID seems to be: 52b2a8af7436044cfcb27e4b0f72c2ce1f3890da

Fixing.

> As will said, this needs a commit message. Please explain what you think
> is wrong here.

Fixing.

> Also, when sending a fix, *please* Cc the author of the original patch.
>
> I've added parties relevant to the original patch (Takahiro and James).

Thank you.

>> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
>> ---
>>  arch/arm64/kernel/machine_kexec_file.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
>> index b40c3b0def92..2776bdaa83a5 100644
>> --- a/arch/arm64/kernel/machine_kexec_file.c
>> +++ b/arch/arm64/kernel/machine_kexec_file.c
>> @@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
>>  	image->arch.dtb_mem = kbuf.mem;
>>  
>>  	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
>> -			kbuf.mem, dtb_len, dtb_len);
>> +			kbuf.mem, dtb_len, kbuf.memsz);
>
> It's worth noting that we follow the same pattern repeatedly in this
> file, so if you think this instance is wrong you should consider whether
> the others are correct.
>
> Earlier in this file we have:
>
> |	pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> |		 image->arch.elf_headers_mem, headers_sz, headers_sz)
>
> |	pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> |		 initrd_load_addr, initrd_len, initrd_len);

Fixing.

> ... and it looks like x86 does similar in kexec-bzimage64.c, for some
> sort of consistency with the old kexec logging.

When I fix it for x86, should I combine changes in one patch or prepare
two separate patches?

> If <foo>_len and kbuf.memsz can differ, we should log that in all cases.
> If not, we should remove the redundant logging.

Yes, memsz is page-aligned in kexec_add_buffer();

Kind regards,
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v2 0/2] Make memory size reporting in kexec_file_load() accurate

[Łukasz Stelmach]

Calling kexec_add_buffer() page-alligns the value of kbuf.memsz, so it
is not same as the requested value. Hence both bufsz and memsz should
after kexec_add_buffer() is called should be be reported separately.

Łukasz Stelmach (2):
  arm64: kexec_file: print appropriate variable
  x86: kexec_file: print appropriate variable

 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 arch/x86/kernel/crash.c                | 2 +-
 arch/x86/kernel/kexec-bzimage64.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.25.0

[PATCH v2 0/2] Make memory size reporting in kexec_file_load() accurate

[Łukasz Stelmach]

Calling kexec_add_buffer() page-alligns the value of kbuf.memsz, so it
is not same as the requested value. Hence both bufsz and memsz should
after kexec_add_buffer() is called should be be reported separately.

Łukasz Stelmach (2):
  arm64: kexec_file: print appropriate variable
  x86: kexec_file: print appropriate variable

 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 arch/x86/kernel/crash.c                | 2 +-
 arch/x86/kernel/kexec-bzimage64.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.25.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v2 1/2] arm64: kexec_file: print appropriate variable

[Łukasz Stelmach]

The value of kbuf->memsz may be different than kbuf->bufsz after calling
kexec_add_buffer(). Hence both values should be logged.

Fixes: 52b2a8af74360 ("arm64: kexec_file: load initrd and device-tree")
Fixes: 3751e728cef29 ("arm64: kexec_file: add crash dump support")
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: James Morse <james.morse@arm.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index b40c3b0def92..5ebb21b859b4 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -284,7 +284,7 @@ int load_other_segments(struct kimage *image,
 		image->arch.elf_headers_sz = headers_sz;
 
 		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			 image->arch.elf_headers_mem, headers_sz, headers_sz);
+			 image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load initrd */
@@ -305,7 +305,7 @@ int load_other_segments(struct kimage *image,
 		initrd_load_addr = kbuf.mem;
 
 		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-				initrd_load_addr, initrd_len, initrd_len);
+				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load dtb */
@@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
 	image->arch.dtb_mem = kbuf.mem;
 
 	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			kbuf.mem, dtb_len, dtb_len);
+			kbuf.mem, kbuf.bufsz, kbuf.memsz);
 
 	return 0;
 
-- 
2.25.0

[PATCH v2 1/2] arm64: kexec_file: print appropriate variable

[Łukasz Stelmach]

The value of kbuf->memsz may be different than kbuf->bufsz after calling
kexec_add_buffer(). Hence both values should be logged.

Fixes: 52b2a8af74360 ("arm64: kexec_file: load initrd and device-tree")
Fixes: 3751e728cef29 ("arm64: kexec_file: add crash dump support")
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: James Morse <james.morse@arm.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index b40c3b0def92..5ebb21b859b4 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -284,7 +284,7 @@ int load_other_segments(struct kimage *image,
 		image->arch.elf_headers_sz = headers_sz;
 
 		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			 image->arch.elf_headers_mem, headers_sz, headers_sz);
+			 image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load initrd */
@@ -305,7 +305,7 @@ int load_other_segments(struct kimage *image,
 		initrd_load_addr = kbuf.mem;
 
 		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-				initrd_load_addr, initrd_len, initrd_len);
+				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load dtb */
@@ -332,7 +332,7 @@ int load_other_segments(struct kimage *image,
 	image->arch.dtb_mem = kbuf.mem;
 
 	pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			kbuf.mem, dtb_len, dtb_len);
+			kbuf.mem, kbuf.bufsz, kbuf.memsz);
 
 	return 0;
 
-- 
2.25.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v2 2/2] x86: kexec_file: print appropriate variable

[Łukasz Stelmach]

The value of kbuf->memsz may be different than kbuf->bufsz after calling
kexec_add_buffer(). Hence both values should be logged.

Fixes: ec2b9bfaac44e ("kexec_file: Change kexec_add_buffer to take kexec_buf as argument.")
Fixes: 27f48d3e633be ("kexec-bzImage64: support for loading bzImage using 64bit entry")
Fixes: dd5f726076cc7 ("kexec: support for kexec on panic using new system call")
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/x86/kernel/crash.c           | 2 +-
 arch/x86/kernel/kexec-bzimage64.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index fd87b59452a3..d408e5b536fa 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -420,7 +420,7 @@ int crash_load_segments(struct kimage *image)
 	}
 	image->arch.elf_load_addr = kbuf.mem;
 	pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.bufsz);
+		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
 
 	return ret;
 }
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index db6578d45157..420393c58a73 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -434,7 +434,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 		goto out_free_params;
 	bootparam_load_addr = kbuf.mem;
 	pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-		 bootparam_load_addr, kbuf.bufsz, kbuf.bufsz);
+		 bootparam_load_addr, kbuf.bufsz, kbuf.memsz);
 
 	/* Load kernel */
 	kbuf.buffer = kernel + kern16_size;
@@ -464,7 +464,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 		initrd_load_addr = kbuf.mem;
 
 		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-				initrd_load_addr, initrd_len, initrd_len);
+				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
 
 		setup_initrd(params, initrd_load_addr, initrd_len);
 	}
-- 
2.25.0

[PATCH v2 2/2] x86: kexec_file: print appropriate variable

[Łukasz Stelmach]

The value of kbuf->memsz may be different than kbuf->bufsz after calling
kexec_add_buffer(). Hence both values should be logged.

Fixes: ec2b9bfaac44e ("kexec_file: Change kexec_add_buffer to take kexec_buf as argument.")
Fixes: 27f48d3e633be ("kexec-bzImage64: support for loading bzImage using 64bit entry")
Fixes: dd5f726076cc7 ("kexec: support for kexec on panic using new system call")
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 arch/x86/kernel/crash.c           | 2 +-
 arch/x86/kernel/kexec-bzimage64.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index fd87b59452a3..d408e5b536fa 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -420,7 +420,7 @@ int crash_load_segments(struct kimage *image)
 	}
 	image->arch.elf_load_addr = kbuf.mem;
 	pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.bufsz);
+		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
 
 	return ret;
 }
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index db6578d45157..420393c58a73 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -434,7 +434,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 		goto out_free_params;
 	bootparam_load_addr = kbuf.mem;
 	pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-		 bootparam_load_addr, kbuf.bufsz, kbuf.bufsz);
+		 bootparam_load_addr, kbuf.bufsz, kbuf.memsz);
 
 	/* Load kernel */
 	kbuf.buffer = kernel + kern16_size;
@@ -464,7 +464,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 		initrd_load_addr = kbuf.mem;
 
 		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-				initrd_load_addr, initrd_len, initrd_len);
+				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
 
 		setup_initrd(params, initrd_load_addr, initrd_len);
 	}
-- 
2.25.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v2 2/2] x86: kexec_file: print appropriate variable

[Lukasz Stelmach]

[-- Attachment #1: Type: text/plain, Size: 2461 bytes --]

It was <2020-04-30 czw 18:31>, when Łukasz Stelmach wrote:
> The value of kbuf->memsz may be different than kbuf->bufsz after calling
> kexec_add_buffer(). Hence both values should be logged.
>
> Fixes: ec2b9bfaac44e ("kexec_file: Change kexec_add_buffer to take kexec_buf as argument.")
> Fixes: 27f48d3e633be ("kexec-bzImage64: support for loading bzImage using 64bit entry")
> Fixes: dd5f726076cc7 ("kexec: support for kexec on panic using new system call")
> Cc: Vivek Goyal <vgoyal@redhat.com>
> Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
>  arch/x86/kernel/crash.c           | 2 +-
>  arch/x86/kernel/kexec-bzimage64.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
> index fd87b59452a3..d408e5b536fa 100644
> --- a/arch/x86/kernel/crash.c
> +++ b/arch/x86/kernel/crash.c
> @@ -420,7 +420,7 @@ int crash_load_segments(struct kimage *image)
>  	}
>  	image->arch.elf_load_addr = kbuf.mem;
>  	pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.bufsz);
> +		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  	return ret;
>  }
> diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
> index db6578d45157..420393c58a73 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -434,7 +434,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
>  		goto out_free_params;
>  	bootparam_load_addr = kbuf.mem;
>  	pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -		 bootparam_load_addr, kbuf.bufsz, kbuf.bufsz);
> +		 bootparam_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  	/* Load kernel */
>  	kbuf.buffer = kernel + kern16_size;
> @@ -464,7 +464,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
>  		initrd_load_addr = kbuf.mem;
>  
>  		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -				initrd_load_addr, initrd_len, initrd_len);
> +				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  		setup_initrd(params, initrd_load_addr, initrd_len);
>  	}

Ping? Any chance this patch follows its arm64 counterpart into mainline?

Kind regards,
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH v2 2/2] x86: kexec_file: print appropriate variable

[Lukasz Stelmach]

[-- Attachment #1.1: Type: text/plain, Size: 2461 bytes --]

It was <2020-04-30 czw 18:31>, when Łukasz Stelmach wrote:
> The value of kbuf->memsz may be different than kbuf->bufsz after calling
> kexec_add_buffer(). Hence both values should be logged.
>
> Fixes: ec2b9bfaac44e ("kexec_file: Change kexec_add_buffer to take kexec_buf as argument.")
> Fixes: 27f48d3e633be ("kexec-bzImage64: support for loading bzImage using 64bit entry")
> Fixes: dd5f726076cc7 ("kexec: support for kexec on panic using new system call")
> Cc: Vivek Goyal <vgoyal@redhat.com>
> Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
> Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
> ---
>  arch/x86/kernel/crash.c           | 2 +-
>  arch/x86/kernel/kexec-bzimage64.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
> index fd87b59452a3..d408e5b536fa 100644
> --- a/arch/x86/kernel/crash.c
> +++ b/arch/x86/kernel/crash.c
> @@ -420,7 +420,7 @@ int crash_load_segments(struct kimage *image)
>  	}
>  	image->arch.elf_load_addr = kbuf.mem;
>  	pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.bufsz);
> +		 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  	return ret;
>  }
> diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
> index db6578d45157..420393c58a73 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -434,7 +434,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
>  		goto out_free_params;
>  	bootparam_load_addr = kbuf.mem;
>  	pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -		 bootparam_load_addr, kbuf.bufsz, kbuf.bufsz);
> +		 bootparam_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  	/* Load kernel */
>  	kbuf.buffer = kernel + kern16_size;
> @@ -464,7 +464,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
>  		initrd_load_addr = kbuf.mem;
>  
>  		pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
> -				initrd_load_addr, initrd_len, initrd_len);
> +				initrd_load_addr, kbuf.bufsz, kbuf.memsz);
>  
>  		setup_initrd(params, initrd_load_addr, initrd_len);
>  	}

Ping? Any chance this patch follows its arm64 counterpart into mainline?

Kind regards,
-- 
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v2 0/2] Make memory size reporting in kexec_file_load() accurate

[Will Deacon]

On Thu, 30 Apr 2020 18:31:40 +0200, =?UTF-8?q?=C5=81ukasz=20Stelmach?= wrote:
> Calling kexec_add_buffer() page-alligns the value of kbuf.memsz, so it
> is not same as the requested value. Hence both bufsz and memsz should
> after kexec_add_buffer() is called should be be reported separately.
> 
> Łukasz Stelmach (2):
>   arm64: kexec_file: print appropriate variable
>   x86: kexec_file: print appropriate variable
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/2] arm64: kexec_file: print appropriate variable
      https://git.kernel.org/arm64/c/51075e0cb759
[2/2] x86: kexec_file: print appropriate variable
      (not applied)

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev

Re: [PATCH v2 0/2] Make memory size reporting in kexec_file_load() accurate

[Will Deacon]

On Thu, 30 Apr 2020 18:31:40 +0200, =?UTF-8?q?=C5=81ukasz=20Stelmach?= wrote:
> Calling kexec_add_buffer() page-alligns the value of kbuf.memsz, so it
> is not same as the requested value. Hence both bufsz and memsz should
> after kexec_add_buffer() is called should be be reported separately.
> 
> Łukasz Stelmach (2):
>   arm64: kexec_file: print appropriate variable
>   x86: kexec_file: print appropriate variable
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/2] arm64: kexec_file: print appropriate variable
      https://git.kernel.org/arm64/c/51075e0cb759
[2/2] x86: kexec_file: print appropriate variable
      (not applied)

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel