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

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

[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")

Signed-off-by: Libo Chen <libo.chen@oracle.com>
---
 tools/testing/ktest/ktest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index cb16d2aac51c..54188ee16c48 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -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";
-- 
2.27.0

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

[Steven Rostedt]

On Fri, 20 Nov 2020 18:12:43 -0800
Libo Chen <libo.chen@oracle.com> 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.
> 
> 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


> 
> Signed-off-by: Libo Chen <libo.chen@oracle.com>
> ---
>  tools/testing/ktest/ktest.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
> index cb16d2aac51c..54188ee16c48 100755
> --- a/tools/testing/ktest/ktest.pl
> +++ b/tools/testing/ktest/ktest.pl
> @@ -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";

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

[Steven Rostedt]

On Fri, 20 Nov 2020 23:12:17 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:

> On Fri, 20 Nov 2020 18:12:43 -0800
> Libo Chen <libo.chen@oracle.com> 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.
> > 
> > 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.
> 

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

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

[Masayoshi Mizuma]

On Fri, Nov 20, 2020 at 06:12:43PM -0800, Libo Chen 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.
> 
> 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")
> 
> Signed-off-by: Libo Chen <libo.chen@oracle.com>

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

Please feel free to add:

	Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

Thanks!
Masa

> ---
>  tools/testing/ktest/ktest.pl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
> index cb16d2aac51c..54188ee16c48 100755
> --- a/tools/testing/ktest/ktest.pl
> +++ b/tools/testing/ktest/ktest.pl
> @@ -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";
> -- 
> 2.27.0
> 

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

[Steven Rostedt]

On Sun, 29 Nov 2020 20:32:56 -0500
Masayoshi Mizuma <msys.mizuma@gmail.com> wrote:

> On Fri, Nov 20, 2020 at 06:12:43PM -0800, Libo Chen 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.
> > 
> > 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")
> > 
> > Signed-off-by: Libo Chen <libo.chen@oracle.com>  
> 
> Thank you for the fix!
> I tested the patch with fedora33. It works well.
> 
> Please feel free to add:
> 
> 	Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
> 
>

Thanks.

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

-- Steve

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

[Libo Chen]

On 11/30/20 7:25 PM, Steven Rostedt wrote:

> On Sun, 29 Nov 2020 20:32:56 -0500
> Masayoshi Mizuma <msys.mizuma@gmail.com> wrote:
>
>> On Fri, Nov 20, 2020 at 06:12:43PM -0800, Libo Chen 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.
>>>
>>> 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")
>>>
>>> Signed-off-by: Libo Chen <libo.chen@oracle.com>
>> Thank you for the fix!
>> I tested the patch with fedora33. It works well.
>>
>> Please feel free to add:
>>
>> 	Tested-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
>>
>>
> 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

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

[Steven Rostedt]

On Thu, 10 Dec 2020 15:09:46 -0800
Libo Chen <libo.chen@oracle.com> 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

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

[Libo Chen]

On 12/10/20 4:45 PM, Steven Rostedt wrote:

> On Thu, 10 Dec 2020 15:09:46 -0800
> Libo Chen <libo.chen@oracle.com> 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

Thanks Steven! It looks like Linus has taken it.


Libo