[Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Julien Olivain]

For release announce, see [1].

This commit removes the package patch, which is now included in this
new version.

The license hash also changed, due to a FSF address update. See [2].
This commit also adds a comment in the hash file about the pgp
signature check.

[1] https://lists.infradead.org/pipermail/kexec/2024-July/030452.html
[2] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=f53bcef5063c70960b2b8eb8990722d5c9d1b99e

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 ...uilding-on-x86_64-with-binutils-2-41.patch | 94 -------------------
 package/kexec/kexec.hash                      |  6 +-
 package/kexec/kexec.mk                        |  2 +-
 3 files changed, 5 insertions(+), 97 deletions(-)
 delete mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch

diff --git a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch
deleted file mode 100644
index ae44c21fe1..0000000000
--- a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001
-From: Michel Lind <salimma@fedoraproject.org>
-Date: Tue, 30 Jan 2024 04:14:31 -0600
-Subject: Fix building on x86_64 with binutils 2.41
-
-Newer versions of the GNU assembler (observed with binutils 2.41) will
-complain about the ".arch i386" in files assembled with "as --64",
-with the message "Error: 64bit mode not supported on 'i386'".
-
-Fix by moving ".arch i386" below the relevant ".code32" directive, so
-that the assembler is no longer expecting 64-bit instructions to be used
-by the time that the ".arch i386" directive is encountered.
-
-Based on similar iPXE fix:
-https://github.com/ipxe/ipxe/commit/6ca597eee
-
-Signed-off-by: Michel Lind <michel@michel-slm.name>
-Signed-off-by: Simon Horman <horms@kernel.org>
-Upstream: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=328de8e00e298f00d7ba6b25dc3950147e9642e6
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- purgatory/arch/i386/entry32-16-debug.S | 2 +-
- purgatory/arch/i386/entry32-16.S       | 2 +-
- purgatory/arch/i386/entry32.S          | 2 +-
- purgatory/arch/i386/setup-x86.S        | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S
-index 5167944d..12e11649 100644
---- a/purgatory/arch/i386/entry32-16-debug.S
-+++ b/purgatory/arch/i386/entry32-16-debug.S
-@@ -25,10 +25,10 @@
- 	.globl entry16_debug_pre32
- 	.globl entry16_debug_first32
- 	.globl entry16_debug_old_first32
--	.arch i386
- 	.balign 16
- entry16_debug:
- 	.code32
-+	.arch i386
- 	/* Compute where I am running at (assumes esp valid) */
- 	call	1f
- 1:	popl	%ebx
-diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S
-index c051aab0..eace0958 100644
---- a/purgatory/arch/i386/entry32-16.S
-+++ b/purgatory/arch/i386/entry32-16.S
-@@ -20,10 +20,10 @@
- #undef i386	
- 	.text
- 	.globl entry16, entry16_regs
--	.arch i386
- 	.balign 16
- entry16:
- 	.code32
-+	.arch i386
- 	/* Compute where I am running at (assumes esp valid) */
- 	call	1f
- 1:	popl	%ebx
-diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S
-index f7a494f1..8ce9e316 100644
---- a/purgatory/arch/i386/entry32.S
-+++ b/purgatory/arch/i386/entry32.S
-@@ -20,10 +20,10 @@
- #undef i386
- 
- 	.text
--	.arch	i386
- 	.globl entry32, entry32_regs
- entry32:
- 	.code32
-+	.arch	i386
- 
- 	/* Setup a gdt that should that is generally usefully */
- 	lgdt	%cs:gdt
-diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S
-index 201bb2cb..a212eed4 100644
---- a/purgatory/arch/i386/setup-x86.S
-+++ b/purgatory/arch/i386/setup-x86.S
-@@ -21,10 +21,10 @@
- #undef i386
- 
- 	.text
--	.arch	i386
- 	.globl purgatory_start
- purgatory_start:
- 	.code32
-+	.arch	i386
- 
- 	/* Load a gdt so I know what the segment registers are */
- 	lgdt	%cs:gdt
--- 
-cgit 1.2.3-korg
-
diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash
index cfa8790bb1..91496c06fc 100644
--- a/package/kexec/kexec.hash
+++ b/package/kexec/kexec.hash
@@ -1,4 +1,6 @@
 # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
-sha256  d2f0ef872f39e2fe4b1b01feb62b0001383207239b9f8041f98a95564161d053  kexec-tools-2.0.28.tar.xz
+# After checking pgp signature with key:
+# B8868C80BA62A1FFFAF5FDA9632D3A06589DA6B1
+sha256  67b1ac503aade45a54db0bc79228a8830a35d5d4f83cee932cff3e7a81a4a9ec  kexec-tools-2.0.29.tar.xz
 # locally calculated
-sha256  fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7  COPYING
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 1fd8c0f0ab..5f798b6a3f 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KEXEC_VERSION = 2.0.28
+KEXEC_VERSION = 2.0.29
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 KEXEC_LICENSE = GPL-2.0
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Thomas Petazzoni via buildroot]

On Fri, 19 Jul 2024 19:37:23 +0200
Julien Olivain <ju.o@free.fr> wrote:

> For release announce, see [1].
> 
> This commit removes the package patch, which is now included in this
> new version.
> 
> The license hash also changed, due to a FSF address update. See [2].
> This commit also adds a comment in the hash file about the pgp
> signature check.
> 
> [1] https://lists.infradead.org/pipermail/kexec/2024-July/030452.html
> [2] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=f53bcef5063c70960b2b8eb8990722d5c9d1b99e
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
>  ...uilding-on-x86_64-with-binutils-2-41.patch | 94 -------------------
>  package/kexec/kexec.hash                      |  6 +-
>  package/kexec/kexec.mk                        |  2 +-
>  3 files changed, 5 insertions(+), 97 deletions(-)
>  delete mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Thomas Petazzoni via buildroot]

Hello Julien,

On Fri, 19 Jul 2024 19:37:23 +0200
Julien Olivain <ju.o@free.fr> wrote:

> For release announce, see [1].
> 
> This commit removes the package patch, which is now included in this
> new version.
> 
> The license hash also changed, due to a FSF address update. See [2].
> This commit also adds a comment in the hash file about the pgp
> signature check.
> 
> [1] https://lists.infradead.org/pipermail/kexec/2024-July/030452.html
> [2] https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=f53bcef5063c70960b2b8eb8990722d5c9d1b99e
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
>  ...uilding-on-x86_64-with-binutils-2-41.patch | 94 -------------------
>  package/kexec/kexec.hash                      |  6 +-
>  package/kexec/kexec.mk                        |  2 +-
>  3 files changed, 5 insertions(+), 97 deletions(-)
>  delete mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch

Not sure if it's related to this bump or not, but our kexec test case
is failing:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/7391792961

Could you perhaps have a look?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Julien Olivain]

Hi Thomas,

On 22/07/2024 15:13, Thomas Petazzoni wrote:
> Hello Julien,
> 
> On Fri, 19 Jul 2024 19:37:23 +0200
> Julien Olivain <ju.o@free.fr> wrote:
> 
>> For release announce, see [1].
>> 
>> This commit removes the package patch, which is now included in this
>> new version.
>> 
>> The license hash also changed, due to a FSF address update. See [2].
>> This commit also adds a comment in the hash file about the pgp
>> signature check.
>> 
>> [1] https://lists.infradead.org/pipermail/kexec/2024-July/030452.html
>> [2] 
>> https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=f53bcef5063c70960b2b8eb8990722d5c9d1b99e
>> 
>> Signed-off-by: Julien Olivain <ju.o@free.fr>
>> ---
>>  ...uilding-on-x86_64-with-binutils-2-41.patch | 94 
>> -------------------
>>  package/kexec/kexec.hash                      |  6 +-
>>  package/kexec/kexec.mk                        |  2 +-
>>  3 files changed, 5 insertions(+), 97 deletions(-)
>>  delete mode 100644 
>> package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch
> 
> Not sure if it's related to this bump or not, but our kexec test case
> is failing:
> 
>   https://gitlab.com/buildroot.org/buildroot/-/jobs/7391792961
> 
> Could you perhaps have a look?

Unfortunately, I cannot reproduce this issue.

I tested many configurations:
- at the runtime test failure (commit 6282b4ec),
- before the kexec-2.0.29 bump (commit acdcc4c~1),
- at the kexec-2.0.29 bump (commit acdcc4c),

I did those test on idle host and loaded host, inside the Docker image
and outside (on Fedora 40). I never set a timeout_multiplier.

In all cases, the test succeed (in idle host cases) or sometimes
failed with a clean timeout (on highly loaded host).

My guess right now is that this execution happened on a very loaded
runner. The failed job reports 27 minutes of build/execution. As a
reference, this test succeed in ~6 mins on my idle laptop.

This slow execution might trigger an actual kexec-tools or kernel
bug/corner case.

To better debug those tricky situations, I would suggest to add few
extra info in the runtime test run log. Namely, the number of cpus of
the runner, the system load at the time of the test startup, and the
value of the timeout_multiplier used for the execution. Something
like adding in support/testing/infra/emulator.py, in boot() :

     self.logfile.write(f"> host cpu count: {os.cpu_count()}\n")
     ldavg = os.getloadavg()
     ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}"
     self.logfile.write(f"> host loadavg: {ldavg_str}\n")
     self.logfile.write(f"> timeout multiplier: 
{self.timeout_multiplier}\n")

just before the line:

     self.logfile.write("> starting qemu with '%s'\n" % " 
".join(qemu_cmd))

What do you think?  If you agree, I can send a patch for this.

Before continuing debugging, I would like to see other executions
in the CI.

My current ideas to improve this test are:
- check upstream kernel for kexec fixes / bumping the test kernel
   (I did not see anything obvious, right now),
- and/or add qemu emulator cpus,
- and/or add sleep/pause time (incl. the timeout_multiplier
   in the test.

I would like to avoid the using kexec -i/--no-checks option to skip
those memory integrity checks (even if I suspect a sha256 computation
might have taken a bit longer than expected leading to this incorrect
hash).

> Thanks!
> 
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Thomas Petazzoni via buildroot]

Hello Julien,

On Sun, 28 Jul 2024 15:09:38 +0200
Julien Olivain <ju.o@free.fr> wrote:

> Unfortunately, I cannot reproduce this issue.
> 
> I tested many configurations:
> - at the runtime test failure (commit 6282b4ec),
> - before the kexec-2.0.29 bump (commit acdcc4c~1),
> - at the kexec-2.0.29 bump (commit acdcc4c),
> 
> I did those test on idle host and loaded host, inside the Docker image
> and outside (on Fedora 40). I never set a timeout_multiplier.
> 
> In all cases, the test succeed (in idle host cases) or sometimes
> failed with a clean timeout (on highly loaded host).
> 
> My guess right now is that this execution happened on a very loaded
> runner. The failed job reports 27 minutes of build/execution. As a
> reference, this test succeed in ~6 mins on my idle laptop.

Thanks for having investigated this!

> This slow execution might trigger an actual kexec-tools or kernel
> bug/corner case.
> 
> To better debug those tricky situations, I would suggest to add few
> extra info in the runtime test run log. Namely, the number of cpus of
> the runner, the system load at the time of the test startup, and the
> value of the timeout_multiplier used for the execution. Something
> like adding in support/testing/infra/emulator.py, in boot() :
> 
>      self.logfile.write(f"> host cpu count: {os.cpu_count()}\n")  
>      ldavg = os.getloadavg()
>      ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}"
>      self.logfile.write(f"> host loadavg: {ldavg_str}\n")
>      self.logfile.write(f"> timeout multiplier:   
> {self.timeout_multiplier}\n")
> 
> just before the line:
> 
>      self.logfile.write("> starting qemu with '%s'\n" % "   
> ".join(qemu_cmd))
> 
> What do you think?  If you agree, I can send a patch for this.

Makes sense to me, so feel free to send a patch for this.

> Before continuing debugging, I would like to see other executions
> in the CI.

From what I can see, the previous runs of our test cases in the CI did
not encountered any issue with the Kexec test, so it could indeed be a
spurious issue.

Did you know that you can also run the runtime test cases in Gitlab CI
on your side? You need a Gitlab account of course, then fork the
Buildroot repo in your Gitlab account, and push a branch to your Gitlab
Buildroot repo that has a name like this:
whateveryouwant-tests.package.test_kexec.TestKexec and tada, it will
run the kexec test in Gitlab CI. This is documented at "22.7.3. Runtime
tests and Gitlab CI"
in https://buildroot.org/downloads/manual/manual.html.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Julien Olivain]

Hi Thomas,

On 28/07/2024 16:19, Thomas Petazzoni wrote:
> Hello Julien,
> 
> On Sun, 28 Jul 2024 15:09:38 +0200
> Julien Olivain <ju.o@free.fr> wrote:

[...]

>> Before continuing debugging, I would like to see other executions
>> in the CI.
> 
> From what I can see, the previous runs of our test cases in the CI did
> not encountered any issue with the Kexec test, so it could indeed be a
> spurious issue.
> 
> Did you know that you can also run the runtime test cases in Gitlab CI
> on your side? You need a Gitlab account of course, then fork the
> Buildroot repo in your Gitlab account, and push a branch to your Gitlab
> Buildroot repo that has a name like this:
> whateveryouwant-tests.package.test_kexec.TestKexec and tada, it will
> run the kexec test in Gitlab CI. This is documented at "22.7.3. Runtime
> tests and Gitlab CI"
> in https://buildroot.org/downloads/manual/manual.html.

Yes, I was aware of this functionality (from the manual). I quickly
tried it a while back, and was not able to make it work. At that time,
I thought this CI was limited to paid users, or gitlab users having
their own runners (which I don't have), or Buildroot maintainers
(i.e. project members).

Reading your explanation here, and reading again the Buildroot
documentation at:
https://nightly.buildroot.org/manual.html#_runtime_tests_and_gitlab_ci
I now understand I should be able start CI jobs on my own.

I tested again (a bit harder this time) with this Kexec runtime test
as you described. After resolving few (GitLab) issues I was finally
able to make it work. For example:
https://gitlab.com/jolivain/buildroot/-/jobs/7455292795

I will propose some Buildroot documentation updates. I hope this
will help more users to use this nice feature. Specifically:

- write explicitly this CI works with a "Free" gitlab user account.

- add a note to make sure "GitLab Instance Runners" are enabled
   in the forked project. In my case, they were disabled.

- add a note about setting the job timeout. In my case, it was
   set to "1h", which was too short in many cases. Right now, I've
   set 4h for simple tests.

- document all the other recognized branch name formats by the script:
https://gitlab.com/buildroot.org/buildroot/-/blob/2024.05.1/support/scripts/generate-gitlab-ci-yml?ref_type=tags#L60

Thanks!

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/kexec: bump to version 2.0.29

[Thomas Petazzoni via buildroot]

Hello Julien,

On Sun, 04 Aug 2024 19:34:50 +0200
Julien Olivain <ju.o@free.fr> wrote:

> Yes, I was aware of this functionality (from the manual). I quickly
> tried it a while back, and was not able to make it work. At that time,
> I thought this CI was limited to paid users, or gitlab users having
> their own runners (which I don't have), or Buildroot maintainers
> (i.e. project members).
> 
> Reading your explanation here, and reading again the Buildroot
> documentation at:
> https://nightly.buildroot.org/manual.html#_runtime_tests_and_gitlab_ci
> I now understand I should be able start CI jobs on my own.
> 
> I tested again (a bit harder this time) with this Kexec runtime test
> as you described. After resolving few (GitLab) issues I was finally
> able to make it work. For example:
> https://gitlab.com/jolivain/buildroot/-/jobs/7455292795

Nice!

> I will propose some Buildroot documentation updates. I hope this
> will help more users to use this nice feature. Specifically:
> 
> - write explicitly this CI works with a "Free" gitlab user account.
> 
> - add a note to make sure "GitLab Instance Runners" are enabled
>    in the forked project. In my case, they were disabled.
> 
> - add a note about setting the job timeout. In my case, it was
>    set to "1h", which was too short in many cases. Right now, I've
>    set 4h for simple tests.
> 
> - document all the other recognized branch name formats by the script:
> https://gitlab.com/buildroot.org/buildroot/-/blob/2024.05.1/support/scripts/generate-gitlab-ci-yml?ref_type=tags#L60

Such updates to the documentation would definitely be welcome for sure!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot