s390x: Cleanup and maintenance 4
cover s390x: Cleanup and maintenance 4
A few small cleanups and two patches that I forgot to upstream which have now been rebased onto the machine.h library functions.
Janosch Frank (8):
s390x: css: Skip if we're not run by qemu
s390x: diag308: Only test subcode 2 under QEMU
s390x: pfmf: Initialize pfmf_r1 union on declaration
s390x: snippets: asm: Add license and copyright headers
s390x: pv-diags: Cleanup includes
s390x: css: Cleanup includes
s390x: iep: Cleanup includes
s390x: mvpg: Cleanup includes
s390x/css.c | 17 ++++++---- s390x/diag308.c | 15 ++++++++- s390x/iep.c | 3 +- s390x/mvpg.c | 3 -- s390x/pfmf.c | 39 +++++++++++----------- s390x/pv-diags.c | 17 ++-------- s390x/snippets/asm/snippet-pv-diag-288.S | 9 +++++ s390x/snippets/asm/snippet-pv-diag-500.S | 9 +++++ s390x/snippets/asm/snippet-pv-diag-yield.S | 9 +++++ 9 files changed, 74 insertions(+), 47 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/8 s390x: css: Skip if we're not run by qemu
There's no guarantee that we even find a device at the address we're testing for if we're not running under QEMU.
--- s390x/css.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
s390x/css.c +9 -1
@@ -15,6 +15,7 @@#include <interrupt.h> #include <asm/arch_def.h> #include <alloc_page.h> +#include <hardware.h> #include <malloc_io.h> #include <css.h>
@@ -641,6 +642,12 @@ int main(int argc, char *argv[]) {int i; +/* There's no guarantee where our devices are without qemu */ +if (detect_host () !=HOST_IS_KVM &&detect_host () !=HOST_IS_TCG ) { +report_skip ("Not running under QEMU" ); + goto done; + } +report_prefix_push ("Channel Subsystem" );enable_io_isc (0x80 >>IO_SCH_ISC );for (i =0 ; tests[i].name; i++) {
@@ -648,7 +655,8 @@ int main(int argc, char *argv[]) tests[i].func ();report_prefix_pop (); } -report_prefix_pop (); +done: +report_prefix_pop ();return report_summary (); }
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 1/8] s390x: css: Skip if we're not run by qemu
Quoted 21 lines · Janosch Frank
There's no guarantee that we even find a device at the address we're testing for if we're not running under QEMU.
Signed-off-by Janosch Frank <[email protected]>--- s390x/css.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)s390x/css.c +1
-0@@ -15,6 +15,7 @@#include <interrupt.h> #include <asm/arch_def.h> #include <alloc_page.h> +#include <hardware.h> #include <malloc_io.h> #include <css.h>
s390x/css.c int main(int argc, char *argv[]) · line 651
Quoted 10 lines
s390x/css.c +6
-0@@ -641,6 +642,12 @@ int main(int argc, char *argv[]) {int i; +/* There's no guarantee where our devices are without qemu */ +if (detect_host () !=HOST_IS_KVM &&detect_host () !=HOST_IS_TCG ) { +report_skip ("Not running under QEMU" ); + goto done; + } +report_prefix_push ("Channel Subsystem" );
Prefix gets pushed after the if-statement (where you jump to "done" via goto) ...
s390x/css.c int main(int argc, char *argv[]) · line 660
Quoted 10 lines
s390x/css.c +2
-1enable_io_isc (0x80 >>IO_SCH_ISC );for (i =0 ; tests[i].name; i++) {@@ -648,7 +655,8 @@ int main(int argc, char *argv[]) tests[i].func ();report_prefix_pop (); } -report_prefix_pop (); +done: +report_prefix_pop ();
... but here it gets popped in the case of "goto done", too. ==> Please either move the if-statement or the "done" label.
Thomas
Quoted 2 lines
s390x/css.c +0
-0return report_summary (); }
Re: [kvm-unit-tests PATCH 1/8] s390x: css: Skip if we're not run by qemu
In reply to Janosch FrankQuoted 21 lines · On Tue, 5 Apr 2022 07:52:18 +0000 Janosch Frank <[email protected]> wrote:
There's no guarantee that we even find a device at the address we're testing for if we're not running under QEMU.
Signed-off-by Janosch Frank <[email protected]>--- s390x/css.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)s390x/css.c +1
-0@@ -15,6 +15,7 @@#include <interrupt.h> #include <asm/arch_def.h> #include <alloc_page.h> +#include <hardware.h> #include <malloc_io.h> #include <css.h>
s390x/css.c int main(int argc, char *argv[]) · line 646
Quoted 5 lines
s390x/css.c +2
-0@@ -641,6 +642,12 @@ int main(int argc, char *argv[]) {int i; +/* There's no guarantee where our devices are without qemu */ +if (detect_host () !=HOST_IS_KVM &&detect_host () !=HOST_IS_TCG ) {
you could also do !host_is_kvm() && !host_is_tcg() , I think it's more readable, but I do not have strong opinions regarding that
s390x/css.c int main(int argc, char *argv[]) · line 651
Quoted 5 lines
s390x/css.c +4
-0+report_skip ("Not running under QEMU" ); + goto done; + } +report_prefix_push ("Channel Subsystem" );
the prefix push should probably go before the if
Quoted 12 lines
s390x/css.c +2
-1enable_io_isc (0x80 >>IO_SCH_ISC );for (i =0 ; tests[i].name; i++) {@@ -648,7 +655,8 @@ int main(int argc, char *argv[]) tests[i].func ();report_prefix_pop (); } -report_prefix_pop (); +done: +report_prefix_pop ();return report_summary (); }
PATCH 2/8 s390x: diag308: Only test subcode 2 under QEMU
In reply to Janosch FrankOther hypervisors might implement it and therefore not send a specification exception.
--- s390x/diag308.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
s390x/diag308.c +14 -1
@@ -8,6 +8,7 @@#include <libcflat.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <hardware.h> /* The diagnose calls should be blocked in problem state */ static void test_priv (void )
@@ -75,7 +76,7 @@ static void test_subcode6(void)/* Unsupported subcodes should generate a specification exception */ static void test_unsupported_subcode (void ) { -int subcodes[] = {2 ,0x101 ,0xffff ,0x10001 ,-1 }; +int subcodes[] = {0x101 ,0xffff ,0x10001 ,-1 };int idx;for (idx =0 ; idx <ARRAY_SIZE (subcodes); idx++) {
@@ -85,6 +86,18 @@ static void test_unsupported_subcode(void)check_pgm_int_code (PGM_INT_CODE_SPECIFICATION );report_prefix_pop (); } + +/* +* Subcode 2 is not available under QEMU but might be on other +* hypervisors. +*/ +if (detect_host () !=HOST_IS_TCG &&detect_host () !=HOST_IS_KVM ) { +report_prefix_pushf ("0x%04x" ,2 ); +expect_pgm_int (); + asmvolatile ("diag %0,%1,0x308" ::"d" (0 ),"d" (2 )); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + } } static struct {
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 2/8] s390x: diag308: Only test subcode 2 under QEMU
Quoted 30 lines · Janosch Frank
Other hypervisors might implement it and therefore not send a specification exception.
Signed-off-by Janosch Frank <[email protected]>--- s390x/diag308.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)s390x/diag308.c +2
-1@@ -8,6 +8,7 @@#include <libcflat.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <hardware.h> /* The diagnose calls should be blocked in problem state */ static void test_priv (void )@@ -75,7 +76,7 @@ static void test_subcode6(void)/* Unsupported subcodes should generate a specification exception */ static void test_unsupported_subcode (void ) { -int subcodes[] = {2 ,0x101 ,0xffff ,0x10001 ,-1 }; +int subcodes[] = {0x101 ,0xffff ,0x10001 ,-1 };int idx;for (idx =0 ; idx <ARRAY_SIZE (subcodes); idx++) {
s390x/diag308.c static void test_unsupported_subcode(void) · line 94
Quoted 9 lines
s390x/diag308.c +6
-0@@ -85,6 +86,18 @@ static void test_unsupported_subcode(void)check_pgm_int_code (PGM_INT_CODE_SPECIFICATION );report_prefix_pop (); } + +/* +* Subcode 2 is not available under QEMU but might be on other +* hypervisors. +*/ +if (detect_host () !=HOST_IS_TCG &&detect_host () !=HOST_IS_KVM ) {
Shouldn't this be rather the other way round instead?
if (detect_host() == HOST_IS_TCG || detect_host() == HOST_IS_KVM)
?
... anyway, since you already used a similar if-clause in your first patch, it might make sense to add a helper function a la host_is_qemu() to check whether we're running on QEMU or not.
s390x/diag308.c static void test_unsupported_subcode(void) · line 95
Quoted 1 line
s390x/diag308.c +1
-0+report_prefix_pushf ("0x%04x" ,2 );
report_prefix_pushf("0x02") ?s390x/diag308.c static void test_unsupported_subcode(void) · line 101
Quoted 6 lines
s390x/diag308.c +5
-0+expect_pgm_int (); + asmvolatile ("diag %0,%1,0x308" ::"d" (0 ),"d" (2 )); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + } }
Thomas
Re: [kvm-unit-tests PATCH 2/8] s390x: diag308: Only test subcode 2 under QEMU
Quoted 43 lines · Thomas Huth
Quoted 30 lines · Janosch Frank
Other hypervisors might implement it and therefore not send a specification exception.
Signed-off-by Janosch Frank <[email protected]>--- s390x/diag308.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)s390x/diag308.c +2
-1@@ -8,6 +8,7 @@#include <libcflat.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <hardware.h> /* The diagnose calls should be blocked in problem state */ static void test_priv (void )@@ -75,7 +76,7 @@ static void test_subcode6(void)/* Unsupported subcodes should generate a specification exception */ static void test_unsupported_subcode (void ) { -int subcodes[] = {2 ,0x101 ,0xffff ,0x10001 ,-1 }; +int subcodes[] = {0x101 ,0xffff ,0x10001 ,-1 };int idx;for (idx =0 ; idx <ARRAY_SIZE (subcodes); idx++) {s390x/diag308.c static void test_unsupported_subcode(void) · line 94
Quoted 9 lines
s390x/diag308.c +6
-0@@ -85,6 +86,18 @@ static void test_unsupported_subcode(void)check_pgm_int_code (PGM_INT_CODE_SPECIFICATION );report_prefix_pop (); } + +/* +* Subcode 2 is not available under QEMU but might be on other +* hypervisors. +*/ +if (detect_host () !=HOST_IS_TCG &&detect_host () !=HOST_IS_KVM ) {Shouldn't this be rather the other way round instead?
Quoted 3 lines
if (detect_host() == HOST_IS_TCG || detect_host() == HOST_IS_KVM)?
The css if checks if we are under QEMU, this one checks if we're not under QEMU.
Quoted 4 lines
... anyway, since you already used a similar if-clause in your first patch, it might make sense to add a helper function a la
host_is_qemu()to check whether we're running on QEMU or not.
Will do
Quoted 14 lines
s390x/diag308.c static void test_unsupported_subcode(void) · line 95
Quoted 2 lines
s390x/diag308.c +1
-0+report_prefix_pushf ("0x%04x" ,2 );report_prefix_pushf("0x02") ?s390x/diag308.c static void test_unsupported_subcode(void) · line 101
Quoted 6 lines
s390x/diag308.c +5
-0+expect_pgm_int (); + asmvolatile ("diag %0,%1,0x308" ::"d" (0 ),"d" (2 )); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); + } }Thomas
Re: [kvm-unit-tests PATCH 2/8] s390x: diag308: Only test subcode 2 under QEMU
Quoted 42 lines · Janosch Frank
Quoted 41 lines · Thomas Huth
Quoted 28 lines · Janosch Frank
Other hypervisors might implement it and therefore not send a specification exception.
Signed-off-by Janosch Frank <[email protected]>---
s390x/diag308.c| 15 ++++++++++++++-1 file changed, 14 insertions(+), 1 deletion(-)s390x/diag308.c +2
-1@@ -8,6 +8,7 @@ #include <libcflat.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <hardware.h> /* The diagnose calls should be blocked in problem state */ static void test_priv(void)@@ -75,7 +76,7 @@ static void test_subcode6(void) /* Unsupported subcodes should generate a specification exception */ static void test_unsupported_subcode(void) { - int subcodes[] = { 2, 0x101, 0xffff, 0x10001, -1 }; + int subcodes[] = { 0x101, 0xffff, 0x10001, -1 }; int idx; for (idx = 0; idx < ARRAY_SIZE(subcodes); idx++) {s390x/diag308.c static void test_unsupported_subcode(void) · line 94
Quoted 9 lines
s390x/diag308.c +6
-0@@ -85,6 +86,18 @@ static void test_unsupported_subcode(void) check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); report_prefix_pop(); } + + /* + * Subcode 2 is not available under QEMU but might be on other + * hypervisors. + */ + if (detect_host() != HOST_IS_TCG && detect_host() != HOST_IS_KVM) {Shouldn't this be rather the other way round instead?
Quoted 5 lines
Quoted 3 lines
if (
detect_host()==HOST_IS_TCG||detect_host()==HOST_IS_KVM)?
The css if checks if we are under QEMU, this one checks if we're not under QEMU.
but ...
Quoted 4 lines
Quoted 4 lines
s390x/diag308.c static void test_unsupported_subcode(void) · line 98
Quoted 4 lines
s390x/diag308.c +3
-0+ expect_pgm_int(); + asm volatile ("diag %0,%1,0x308" :: "d"(0), "d"(2)); + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION);
... don't we want to check here whether the diag causes a spec exception if we are *under* QEMU here? /me feels confused now.
Thomas
Re: [kvm-unit-tests PATCH 2/8] s390x: diag308: Only test subcode 2 under QEMU
Quoted 53 lines · Thomas Huth
Quoted 42 lines · Janosch Frank
Quoted 41 lines · Thomas Huth
Quoted 28 lines · Janosch Frank
Other hypervisors might implement it and therefore not send a specification exception.
Signed-off-by Janosch Frank <[email protected]>--- s390x/diag308.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)s390x/diag308.c +2
-1@@ -8,6 +8,7 @@ #include <libcflat.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> +#include <hardware.h> /* The diagnose calls should be blocked in problem state */ static void test_priv(void)@@ -75,7 +76,7 @@ static void test_subcode6(void) /* Unsupported subcodes should generate a specification exception */ static void test_unsupported_subcode(void) { - int subcodes[] = { 2, 0x101, 0xffff, 0x10001, -1 }; + int subcodes[] = { 0x101, 0xffff, 0x10001, -1 }; int idx; for (idx = 0; idx < ARRAY_SIZE(subcodes); idx++) {s390x/diag308.c static void test_unsupported_subcode(void) · line 94
Quoted 9 lines
s390x/diag308.c +6
-0@@ -85,6 +86,18 @@ static void test_unsupported_subcode(void) check_pgm_int_code(PGM_INT_CODE_SPECIFICATION); report_prefix_pop(); } + + /* + * Subcode 2 is not available under QEMU but might be on other + * hypervisors. + */ + if (detect_host() != HOST_IS_TCG && detect_host() != HOST_IS_KVM) {Shouldn't this be rather the other way round instead?
Quoted 6 lines
Quoted 3 lines
if (
detect_host()==HOST_IS_TCG||detect_host()==HOST_IS_KVM)?
The css if checks if we are under QEMU, this one checks if we're not under QEMU.
but ...
Quoted 1 line
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
s390x/diag308.c static void test_unsupported_subcode(void) · line 98
Quoted 3 lines
s390x/diag308.c +3
-0+ expect_pgm_int(); + asm volatile ("diag %0,%1,0x308" :: "d"(0), "d"(2)); + check_pgm_int_code(PGM_INT_CODE_SPECIFICATION);... don't we want to check here whether the diag causes a spec exception if we are *under* QEMU here?
/me feels confused now.
Seems like it's me who's confused today
Anyway, I'll clean that up.
Quoted 3 lines
Thomas
PATCH 3/8 s390x: pfmf: Initialize pfmf_r1 union on declaration
In reply to Janosch FrankLet's make this test look a bit nicer.
--- s390x/pfmf.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
s390x/pfmf.c +19 -20
@@ -28,7 +28,11 @@ static void test_priv(void)static void test_4k_key (void ) { -union pfmf_r1 r1; +union pfmf_r1 r1 = { + .reg.sk =1 , + .reg.fsc =PFMF_FSC_4K , + .reg.key =0x30 , + };union skey skey;report_prefix_push ("4K" );
@@ -36,10 +40,6 @@ static void test_4k_key(void)report_skip ("storage key removal facility is active" ); goto out; } - r1.val =0 ; - r1.reg.sk =1 ; - r1.reg.fsc =PFMF_FSC_4K ; - r1.reg.key =0x30 ;pfmf (r1.val, pagebuf); skey.val =get_storage_key (pagebuf); skey.val &=SKEY_ACC |SKEY_FP ;
@@ -52,18 +52,19 @@ static void test_1m_key(void) {int i;bool rp = true; -union pfmf_r1 r1;union skey skey; +union pfmf_r1 r1 = { + .reg.fsc =PFMF_FSC_1M , + .reg.key =0x30 , + .reg.sk =1 , + };report_prefix_push ("1M" );if (test_facility (169 )) {report_skip ("storage key removal facility is active" ); goto out; } - r1.val =0 ; - r1.reg.sk =1 ; - r1.reg.fsc =PFMF_FSC_1M ; - r1.reg.key =0x30 ; +pfmf (r1.val, pagebuf);for (i =0 ; i <256 ; i++) { skey.val =get_storage_key (pagebuf + i *PAGE_SIZE );
@@ -80,11 +81,10 @@ out:static void test_4k_clear (void ) { -union pfmf_r1 r1; - - r1.val =0 ; - r1.reg.cf =1 ; - r1.reg.fsc =PFMF_FSC_4K ; +union pfmf_r1 r1 = { + .reg.cf =1 , + .reg.fsc =PFMF_FSC_4K , + };report_prefix_push ("4K" );memset (pagebuf,42 ,PAGE_SIZE );
@@ -97,13 +97,12 @@ static void test_4k_clear(void)static void test_1m_clear (void ) {int i; -union pfmf_r1 r1; +union pfmf_r1 r1 = { + .reg.cf =1 , + .reg.fsc =PFMF_FSC_1M , + };unsigned long sum =0 ; - r1.val =0 ; - r1.reg.cf =1 ; - r1.reg.fsc =PFMF_FSC_1M ; -report_prefix_push ("1M" );memset (pagebuf,42 ,PAGE_SIZE *256 );pfmf (r1.val, pagebuf);
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 3/8] s390x: pfmf: Initialize pfmf_r1 union on declaration
Quoted 6 lines · Janosch Frank
Let's make this test look a bit nicer.
Signed-off-by Janosch Frank <[email protected]>--- s390x/pfmf.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
Re: [kvm-unit-tests PATCH 3/8] s390x: pfmf: Initialize pfmf_r1 union on declaration
In reply to Janosch FrankQuoted 3 lines · On Tue, 5 Apr 2022 07:52:20 +0000 Janosch Frank <[email protected]> wrote:
Let's make this test look a bit nicer.
Signed-off-by Janosch Frank <[email protected]>
Quoted 91 lines
--- s390x/pfmf.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)s390x/pfmf.c +19
-20@@ -28,7 +28,11 @@ static void test_priv(void)static void test_4k_key (void ) { -union pfmf_r1 r1; +union pfmf_r1 r1 = { + .reg.sk =1 , + .reg.fsc =PFMF_FSC_4K , + .reg.key =0x30 , + };union skey skey;report_prefix_push ("4K" );@@ -36,10 +40,6 @@ static void test_4k_key(void)report_skip ("storage key removal facility is active" ); goto out; } - r1.val =0 ; - r1.reg.sk =1 ; - r1.reg.fsc =PFMF_FSC_4K ; - r1.reg.key =0x30 ;pfmf (r1.val, pagebuf); skey.val =get_storage_key (pagebuf); skey.val &=SKEY_ACC |SKEY_FP ;@@ -52,18 +52,19 @@ static void test_1m_key(void) {int i;bool rp = true; -union pfmf_r1 r1;union skey skey; +union pfmf_r1 r1 = { + .reg.fsc =PFMF_FSC_1M , + .reg.key =0x30 , + .reg.sk =1 , + };report_prefix_push ("1M" );if (test_facility (169 )) {report_skip ("storage key removal facility is active" ); goto out; } - r1.val =0 ; - r1.reg.sk =1 ; - r1.reg.fsc =PFMF_FSC_1M ; - r1.reg.key =0x30 ; +pfmf (r1.val, pagebuf);for (i =0 ; i <256 ; i++) { skey.val =get_storage_key (pagebuf + i *PAGE_SIZE );@@ -80,11 +81,10 @@ out:static void test_4k_clear (void ) { -union pfmf_r1 r1; - - r1.val =0 ; - r1.reg.cf =1 ; - r1.reg.fsc =PFMF_FSC_4K ; +union pfmf_r1 r1 = { + .reg.cf =1 , + .reg.fsc =PFMF_FSC_4K , + };report_prefix_push ("4K" );memset (pagebuf,42 ,PAGE_SIZE );@@ -97,13 +97,12 @@ static void test_4k_clear(void)static void test_1m_clear (void ) {int i; -union pfmf_r1 r1; +union pfmf_r1 r1 = { + .reg.cf =1 , + .reg.fsc =PFMF_FSC_1M , + };unsigned long sum =0 ; - r1.val =0 ; - r1.reg.cf =1 ; - r1.reg.fsc =PFMF_FSC_1M ; -report_prefix_push ("1M" );memset (pagebuf,42 ,PAGE_SIZE *256 );pfmf (r1.val, pagebuf);
PATCH 4/8 s390x: snippets: asm: Add license and copyright headers
In reply to Janosch FrankTime for some cleanup of the snippets to make them look like any other test file.
--- s390x/snippets/asm/snippet-pv-diag-288.S | 9 +++++++++ s390x/snippets/asm/snippet-pv-diag-500.S | 9 +++++++++ s390x/snippets/asm/snippet-pv-diag-yield.S | 9 +++++++++ 3 files changed, 27 insertions(+)
s390x/snippets/asm/snippet-pv-diag-288.S +9 -0
@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x288 snippet used for PV interception testing. + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ #include <asm/asm-offsets.h> .section .text
s390x/snippets/asm/snippet-pv-diag-500.S +9 -0
@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x500 snippet used for PV interception tests + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ #include <asm/asm-offsets.h> .section .text
s390x/snippets/asm/snippet-pv-diag-yield.S +9 -0
@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x44 and 0x9c snippet used for PV interception tests + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ .section .text xgr %r0, %r0
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 4/8] s390x: snippets: asm: Add license and copyright headers
Quoted 4 lines · On Tue, 5 Apr 2022 07:52:21 +0000 Janosch Frank <[email protected]> wrote:
Time for some cleanup of the snippets to make them look like any other test file.
Signed-off-by Janosch Frank <[email protected]>
Quoted 57 lines
--- s390x/snippets/asm/snippet-pv-diag-288.S | 9 +++++++++ s390x/snippets/asm/snippet-pv-diag-500.S | 9 +++++++++ s390x/snippets/asm/snippet-pv-diag-yield.S | 9 +++++++++ 3 files changed, 27 insertions(+)s390x/snippets/asm/snippet-pv-diag-288.S +9
-0@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x288 snippet used for PV interception testing. + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ #include <asm/asm-offsets.h> .section .texts390x/snippets/asm/snippet-pv-diag-500.S +9
-0@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x500 snippet used for PV interception tests + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ #include <asm/asm-offsets.h> .section .texts390x/snippets/asm/snippet-pv-diag-yield.S +9
-0@@ -1,3 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Diagnose 0x44 and 0x9c snippet used for PV interception tests + * + * Copyright (c) 2021 IBM Corp + * + * Authors: + * Janosch Frank <[email protected]> + */ .section .text xgr %r0, %r0
PATCH 5/8 s390x: pv-diags: Cleanup includes
In reply to Janosch FrankThis file has way too much includes. Time to remove some.
--- s390x/pv-diags.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
s390x/pv-diags.c +2 -15
@@ -8,23 +8,10 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> -#include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> -#include <asm/interrupt.h> -#include <asm/pgtable.h> -#include <mmu.h> -#include <asm/page.h> -#include <asm/facility.h> -#include <asm/mem.h> -#include <asm/sigp.h> -#include <smp.h> -#include <alloc_page.h> -#include <vmalloc.h> -#include <sclp.h> #include <snippet.h> #include <sie.h> -#include <uv.h> -#include <asm/uv.h> +#include <sclp.h> +#include <asm/facility.h> static struct vm vm;
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 5/8] s390x: pv-diags: Cleanup includes
Quoted 3 lines · On Tue, 5 Apr 2022 07:52:22 +0000 Janosch Frank <[email protected]> wrote:
This file has way too much includes. Time to remove some.
Signed-off-by Janosch Frank <[email protected]>
Quoted 34 lines
--- s390x/pv-diags.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)s390x/pv-diags.c +2
-15@@ -8,23 +8,10 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> -#include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> -#include <asm/interrupt.h> -#include <asm/pgtable.h> -#include <mmu.h> -#include <asm/page.h> -#include <asm/facility.h> -#include <asm/mem.h> -#include <asm/sigp.h> -#include <smp.h> -#include <alloc_page.h> -#include <vmalloc.h> -#include <sclp.h> #include <snippet.h> #include <sie.h> -#include <uv.h> -#include <asm/uv.h> +#include <sclp.h> +#include <asm/facility.h> static struct vm vm;
Re: [kvm-unit-tests PATCH 5/8] s390x: pv-diags: Cleanup includes
In reply to Janosch FrankQuoted 24 lines · Janosch Frank
This file has way too much includes. Time to remove some.
Signed-off-by Janosch Frank <[email protected]>--- s390x/pv-diags.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)s390x/pv-diags.c +0
-9@@ -8,23 +8,10 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> -#include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> -#include <asm/interrupt.h> -#include <asm/pgtable.h> -#include <mmu.h> -#include <asm/page.h> -#include <asm/facility.h> -#include <asm/mem.h> -#include <asm/sigp.h>
s390x/pv-diags.c line 14
Quoted 10 lines
s390x/pv-diags.c +2
-6-#include <smp.h> -#include <alloc_page.h> -#include <vmalloc.h> -#include <sclp.h> #include <snippet.h> #include <sie.h> -#include <uv.h> -#include <asm/uv.h> +#include <sclp.h> +#include <asm/facility.h>
Wow, how did we end up with that huge list? Copy-n-paste from other files?
Re: [kvm-unit-tests PATCH 5/8] s390x: pv-diags: Cleanup includes
Quoted 29 lines · Thomas Huth
Quoted 28 lines · Janosch Frank
This file has way too much includes. Time to remove some.
Signed-off-by Janosch Frank <[email protected]>--- s390x/pv-diags.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)s390x/pv-diags.c +0
-13@@ -8,23 +8,10 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> -#include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> -#include <asm/interrupt.h> -#include <asm/pgtable.h> -#include <mmu.h> -#include <asm/page.h> -#include <asm/facility.h> -#include <asm/mem.h> -#include <asm/sigp.h> -#include <smp.h> -#include <alloc_page.h> -#include <vmalloc.h> -#include <sclp.h>
Quoted 9 lines
s390x/pv-diags.c line 14
Quoted 6 lines
s390x/pv-diags.c +2
-2#include <snippet.h> #include <sie.h> -#include <uv.h> -#include <asm/uv.h> +#include <sclp.h> +#include <asm/facility.h> Wow, how did we end up with that huge list? Copy-n-paste from other files?
Yes, and lots of work to get it working in the first place which pulled in headers which weren't removed later once they were unused.
That's one of the reasons why I suggested the templates to you :-)
Quoted 1 line
Reviewed-by Thomas Huth <[email protected]>
Thanks
PATCH 6/8 s390x: css: Cleanup includes
In reply to Janosch FrankMost includes were related to allocation but that's done in the io allocation library so having them in the test doesn't make sense.
--- s390x/css.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
s390x/css.c +3 -6
@@ -9,17 +9,14 @@*/ #include <libcflat.h> -#include <alloc_phys.h> -#include <asm/page.h> -#include <string.h> #include <interrupt.h> -#include <asm/arch_def.h> -#include <alloc_page.h> #include <hardware.h> +#include <asm/arch_def.h> +#include <asm/page.h> +#include <malloc_io.h> #include <css.h> -#include <asm/barrier.h> #define DEFAULT_CU_TYPE 0x3832/* virtio-ccw */ static unsigned long cu_type =DEFAULT_CU_TYPE ;
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 6/8] s390x: css: Cleanup includes
Quoted 4 lines · On Tue, 5 Apr 2022 07:52:23 +0000 Janosch Frank <[email protected]> wrote:
Most includes were related to allocation but that's done in the io allocation library so having them in the test doesn't make sense.
Signed-off-by Janosch Frank <[email protected]>
Quoted 29 lines
--- s390x/css.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)s390x/css.c +3
-6@@ -9,17 +9,14 @@*/ #include <libcflat.h> -#include <alloc_phys.h> -#include <asm/page.h> -#include <string.h> #include <interrupt.h> -#include <asm/arch_def.h> -#include <alloc_page.h> #include <hardware.h> +#include <asm/arch_def.h> +#include <asm/page.h> +#include <malloc_io.h> #include <css.h> -#include <asm/barrier.h> #define DEFAULT_CU_TYPE 0x3832/* virtio-ccw */ static unsigned long cu_type =DEFAULT_CU_TYPE ;
PATCH 7/8 s390x: iep: Cleanup includes
In reply to Janosch FrankWe don't use barriers so let's remove the include.
--- s390x/iep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
s390x/iep.c +1 -2
@@ -9,11 +9,10 @@*/ #include <libcflat.h> #include <vmalloc.h> +#include <mmu.h> #include <asm/facility.h> #include <asm/interrupt.h> -#include <mmu.h> #include <asm/pgtable.h> -#include <asm-generic/barrier.h> static void test_iep (void ) {
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 7/8] s390x: iep: Cleanup includes
Quoted 3 lines · On Tue, 5 Apr 2022 07:52:24 +0000 Janosch Frank <[email protected]> wrote:
We don't use barriers so let's remove the include.
Signed-off-by Janosch Frank <[email protected]>
Quoted 21 lines
--- s390x/iep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)s390x/iep.c +1
-2@@ -9,11 +9,10 @@*/ #include <libcflat.h> #include <vmalloc.h> +#include <mmu.h> #include <asm/facility.h> #include <asm/interrupt.h> -#include <mmu.h> #include <asm/pgtable.h> -#include <asm-generic/barrier.h> static void test_iep (void ) {
PATCH 8/8 s390x: mvpg: Cleanup includes
In reply to Janosch FrankTime to remove unneeded includes.
--- s390x/mvpg.c | 3 --- 1 file changed, 3 deletions(-)
s390x/mvpg.c +0 -3
@@ -9,15 +9,12 @@*/ #include <libcflat.h> #include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> #include <asm/interrupt.h> #include <asm/pgtable.h> #include <mmu.h> #include <asm/page.h> #include <asm/facility.h> #include <asm/mem.h> -#include <asm/sigp.h> -#include <smp.h> #include <alloc_page.h> #include <bitops.h> #include <hardware.h>
Signature · 1 line
2.32.0
Re: [kvm-unit-tests PATCH 8/8] s390x: mvpg: Cleanup includes
Quoted 3 lines · On Tue, 5 Apr 2022 07:52:25 +0000 Janosch Frank <[email protected]> wrote:
Time to remove unneeded includes.
Signed-off-by Janosch Frank <[email protected]>
Quoted 24 lines
--- s390x/mvpg.c | 3 --- 1 file changed, 3 deletions(-)s390x/mvpg.c +0
-3@@ -9,15 +9,12 @@*/ #include <libcflat.h> #include <asm/asm-offsets.h> -#include <asm-generic/barrier.h> #include <asm/interrupt.h> #include <asm/pgtable.h> #include <mmu.h> #include <asm/page.h> #include <asm/facility.h> #include <asm/mem.h> -#include <asm/sigp.h> -#include <smp.h> #include <alloc_page.h> #include <bitops.h> #include <hardware.h>