Skip to contentSkip to conversation

ktest.pl: Fix incorrect reboot for grub2bls

PATCH In review Libo Chen 3 participants 8 messages Nov 21, 2020 – Dec 11, 2020 Ktest

lore
Share & tools
lore

Libo Chen

author
#0 lore raw

PATCH 1/1 ktest.pl: Fix incorrect reboot for grub2bls

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")
---
 tools/testing/ktest/ktest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/ktest/ktest.pl +1 -1
index cb16d2aac51c..54188ee16c48 100755
@@ -2040,7 +2040,7 @@ sub reboot_to {
 
     if ($reboot_type eq "grub") {
 	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
-    } elsif ($reboot_type eq "grub2") {
+    } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) {
 	run_ssh "$grub_reboot $grub_number";
     } elsif ($reboot_type eq "syslinux") {
 	run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path";
Signature · 1 line
2.27.0
maintainer
#1 lore raw
Quoted 10 lines · On Fri, 20 Nov 2020 18:12:43 -0800 Libo Chen <[email protected]> wrote:

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Quoted 5 lines

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")

I was just thinking a couple of hours ago if anyone uses ktest.pl, and if so, how come I haven't received any patches for it ;-)

Anyway, I'll take a look at this next week, and it may be a while before it gets into the kernel, as I like to run updates for a few weeks on my systems (as I use it to build all my kernels), before I push it upstream.

Thanks!

-- Steve

Quoted 19 lines
---
 tools/testing/ktest/ktest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/ktest/ktest.pl +1 -1
index cb16d2aac51c..54188ee16c48 100755
@@ -2040,7 +2040,7 @@ sub reboot_to {
 
     if ($reboot_type eq "grub") {
 	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
-    } elsif ($reboot_type eq "grub2") {
+    } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) {
 	run_ssh "$grub_reboot $grub_number";
     } elsif ($reboot_type eq "syslinux") {
 	run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path";
maintainer
#2 lore raw
Quoted 19 lines · On Fri, 20 Nov 2020 23:12:17 -0500 Steven Rostedt <[email protected]> wrote:
Quoted 10 lines · On Fri, 20 Nov 2020 18:12:43 -0800 Libo Chen <[email protected]> wrote:

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Quoted 5 lines

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")
Quoted 8 lines

I was just thinking a couple of hours ago if anyone uses ktest.pl, and if so, how come I haven't received any patches for it ;-)

Anyway, I'll take a look at this next week, and it may be a while before it gets into the kernel, as I like to run updates for a few weeks on my systems (as I use it to build all my kernels), before I push it upstream.

Well, I didn't quite get to it this week, and I'm taking the rest of the week off. Hopefully, I'll be able to look at it when I get back.

Thanks!

-- Steve

Tested-by on v1 1/1
#3 lore raw
In reply to Libo Chen
Quoted 10 lines · Libo Chen

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Quoted 7 lines

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")

Thank you for the fix!
I tested the patch with fedora33. It works well.

Please feel free to add:

Thanks!
Masa

Quoted 20 lines
---
 tools/testing/ktest/ktest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/ktest/ktest.pl +1 -1
index cb16d2aac51c..54188ee16c48 100755
@@ -2040,7 +2040,7 @@ sub reboot_to {
 
     if ($reboot_type eq "grub") {
 	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
-    } elsif ($reboot_type eq "grub2") {
+    } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) {
 	run_ssh "$grub_reboot $grub_number";
     } elsif ($reboot_type eq "syslinux") {
 	run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path";
Signature · 1 line
2.27.0
maintainer
#4 lore raw
Quoted 17 lines · On Sun, 29 Nov 2020 20:32:56 -0500 Masayoshi Mizuma <[email protected]>…
Quoted 16 lines · Libo Chen

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")
Quoted 10 lines
Quoted 1 line

Thank you for the fix!
I tested the patch with fedora33. It works well.

Please feel free to add:

Thanks.

I may push this upstream by the end of the week.

-- Steve

author
#5 lore raw
Quoted 26 lines · Steven Rostedt
Quoted 23 lines · On Sun, 29 Nov 2020 20:32:56 -0500 Masayoshi Mizuma <[email protected]>…
Quoted 10 lines · Libo Chen

This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel.

The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot.

Quoted 7 lines

Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel.

Fixes ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")

Thank you for the fix!
I tested the patch with fedora33. It works well.

Please feel free to add:

Quoted 8 lines
Quoted 3 lines

Thanks.

I may push this upstream by the end of the week.

-- Steve

(Mistakenly sent the last one privately so resend it now)

Hi Steven,

Just wanna check in and check on the status of it.

Thanks,

Libo

maintainer
#6 lore raw
Quoted 4 lines · On Thu, 10 Dec 2020 15:09:46 -0800 Libo Chen <[email protected]> wrote:

Hi Steven,

Just wanna check in and check on the status of it.

I have it applied in my local repo (even in my for-next, which I forgot to push :-p)

I've been testing it on all my build machines along with my own patches.

Anyway, it's in my queue (with two of my own patches) that I was thinking of pushing to Linus during the next merge window. But I can send your patch now, and see if he's willing to take it.

Thanks for pinging me.

-- Steve

author
#7 lore raw
Quoted 13 lines · Steven Rostedt
Quoted 4 lines · On Thu, 10 Dec 2020 15:09:46 -0800 Libo Chen <[email protected]> wrote:

Hi Steven,

Just wanna check in and check on the status of it.

I have it applied in my local repo (even in my for-next, which I forgot to push :-p)

I've been testing it on all my build machines along with my own patches.

Quoted 7 lines

Anyway, it's in my queue (with two of my own patches) that I was thinking of pushing to Linus during the next merge window. But I can send your patch now, and see if he's willing to take it.

Thanks for pinging me.

-- Steve

Thanks Steven! It looks like Linus has taken it.

Libo