[kvm-unit-tests PATCH v2 0/3] Misc maintenance fixes 2022-04

[kvm-unit-tests PATCH v2 0/3] Misc maintenance fixes 2022-04

[Nico Boehr]

Changelog from v1:
----
* tprot: Change system include to lib include in commit message

Misc small fixes, which I previously sent as:
- [kvm-unit-tests PATCH v1 1/3] s390x: epsw: fix report_pop_prefix() when
  running under non-QEMU
- [kvm-unit-tests PATCH v1 2/3] s390x: tprot: use system include for mmu.h
- [kvm-unit-tests PATCH v1 3/3] s390x: smp: make stop stopped cpu look the same
  as the running case

I broke the threading when I sent the patches, so Janosch asked me to
resend this as a new series.

Nico Boehr (3):
  s390x: epsw: fix report_pop_prefix() when running under non-QEMU
  s390x: tprot: use lib include for mmu.h
  s390x: smp: make stop stopped cpu look the same as the running case

 s390x/epsw.c  | 4 ++--
 s390x/smp.c   | 5 +++--
 s390x/tprot.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.31.1

[kvm-unit-tests PATCH v2 1/3] s390x: epsw: fix report_pop_prefix() when running under non-QEMU

[Nico Boehr]

When we don't run in QEMU, we didn't push a prefix, hence pop won't work. Fix
this by pushing the prefix before the QEMU check.

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
---
 s390x/epsw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/s390x/epsw.c b/s390x/epsw.c
index 5b73f4b3db6c..d8090d95a486 100644
--- a/s390x/epsw.c
+++ b/s390x/epsw.c
@@ -97,13 +97,13 @@ static void test_epsw(void)
 
 int main(int argc, char **argv)
 {
+	report_prefix_push("epsw");
+
 	if (!host_is_kvm() && !host_is_tcg()) {
 		report_skip("Not running under QEMU");
 		goto done;
 	}
 
-	report_prefix_push("epsw");
-
 	test_epsw();
 
 done:
-- 
2.31.1

[kvm-unit-tests PATCH v2 2/3] s390x: tprot: use lib include for mmu.h

[Nico Boehr]

mmu.h should come from the library includes

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/tprot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s390x/tprot.c b/s390x/tprot.c
index 460a0db7ffcf..760e7ecdf914 100644
--- a/s390x/tprot.c
+++ b/s390x/tprot.c
@@ -12,7 +12,7 @@
 #include <bitops.h>
 #include <asm/pgtable.h>
 #include <asm/interrupt.h>
-#include "mmu.h"
+#include <mmu.h>
 #include <vmalloc.h>
 #include <sclp.h>
 
-- 
2.31.1

[kvm-unit-tests PATCH v2 3/3] s390x: smp: make stop stopped cpu look the same as the running case

[Nico Boehr]

Adjust the stop stopped CPU case such that it looks the same as the stop running
CPU case: use the nowait variant, handle the error code in the same way and make
the report messages look the same.

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/smp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/s390x/smp.c b/s390x/smp.c
index 5257852c35a7..de3aba71c956 100644
--- a/s390x/smp.c
+++ b/s390x/smp.c
@@ -144,8 +144,9 @@ static void test_stop(void)
 	report(smp_cpu_stopped(1), "cpu stopped");
 
 	report_prefix_push("stop stopped CPU");
-	report(!smp_cpu_stop(1), "STOP succeeds");
-	report(smp_cpu_stopped(1), "CPU is stopped");
+	rc = smp_cpu_stop_nowait(1);
+	report(!rc, "return code");
+	report(smp_cpu_stopped(1), "cpu stopped");
 	report_prefix_pop();
 
 	report_prefix_pop();
-- 
2.31.1

Re: [kvm-unit-tests PATCH v2 0/3] Misc maintenance fixes 2022-04

[Claudio Imbrenda]

On Thu, 21 Apr 2022 10:50:18 +0200
Nico Boehr <nrb@linux.ibm.com> wrote:

> Changelog from v1:
> ----
> * tprot: Change system include to lib include in commit message
> 
> Misc small fixes, which I previously sent as:
> - [kvm-unit-tests PATCH v1 1/3] s390x: epsw: fix report_pop_prefix() when
>   running under non-QEMU
> - [kvm-unit-tests PATCH v1 2/3] s390x: tprot: use system include for mmu.h
> - [kvm-unit-tests PATCH v1 3/3] s390x: smp: make stop stopped cpu look the same
>   as the running case
> 
> I broke the threading when I sent the patches, so Janosch asked me to
> resend this as a new series.

thanks, queued

> 
> Nico Boehr (3):
>   s390x: epsw: fix report_pop_prefix() when running under non-QEMU
>   s390x: tprot: use lib include for mmu.h
>   s390x: smp: make stop stopped cpu look the same as the running case
> 
>  s390x/epsw.c  | 4 ++--
>  s390x/smp.c   | 5 +++--
>  s390x/tprot.c | 2 +-
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 

Re: [kvm-unit-tests PATCH v1 2/3] s390x: tprot: use system include for mmu.h

[Thomas Huth]

On 12/04/2022 11.29, Nico Boehr wrote:
> mmu.h should come from the system includes

Maybe: s/system/lib/

> 
> Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
> ---
>   s390x/tprot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/s390x/tprot.c b/s390x/tprot.c
> index 460a0db7ffcf..760e7ecdf914 100644
> --- a/s390x/tprot.c
> +++ b/s390x/tprot.c
> @@ -12,7 +12,7 @@
>   #include <bitops.h>
>   #include <asm/pgtable.h>
>   #include <asm/interrupt.h>
> -#include "mmu.h"
> +#include <mmu.h>
>   #include <vmalloc.h>
>   #include <sclp.h>
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>

[kvm-unit-tests PATCH v2 2/3] s390x: tprot: use lib include for mmu.h

[Nico Boehr]

mmu.h should come from the library includes

Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 s390x/tprot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s390x/tprot.c b/s390x/tprot.c
index 460a0db7ffcf..760e7ecdf914 100644
--- a/s390x/tprot.c
+++ b/s390x/tprot.c
@@ -12,7 +12,7 @@
 #include <bitops.h>
 #include <asm/pgtable.h>
 #include <asm/interrupt.h>
-#include "mmu.h"
+#include <mmu.h>
 #include <vmalloc.h>
 #include <sclp.h>
 
-- 
2.31.1

Re: [kvm-unit-tests PATCH v2 2/3] s390x: tprot: use lib include for mmu.h

[Janosch Frank]

On 4/12/22 13:40, Nico Boehr wrote:
> mmu.h should come from the library includes
> 
> Signed-off-by: Nico Boehr <nrb@linux.ibm.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

> ---
>   s390x/tprot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/s390x/tprot.c b/s390x/tprot.c
> index 460a0db7ffcf..760e7ecdf914 100644
> --- a/s390x/tprot.c
> +++ b/s390x/tprot.c
> @@ -12,7 +12,7 @@
>   #include <bitops.h>
>   #include <asm/pgtable.h>
>   #include <asm/interrupt.h>
> -#include "mmu.h"
> +#include <mmu.h>
>   #include <vmalloc.h>
>   #include <sclp.h>
>