s390x: Cleanup and maintenance 2
cover s390x: Cleanup and maintenance 2
Here are a few more fixes and cleanups that improve readability and architectural compliance.
Janosch Frank (9):
s390x: uv: Tolerate 0x100 query return code
s390x: pfmf: Fix 1MB handling
s390x: uv-host: Fence a destroy cpu test on z15
lib: s390x: uv: Fix share return value and print
lib: s390x: uv: Add UVC_ERR_DEBUG switch
lib: s390x: Print PGM code as hex
s390x: Makefile: Remove snippet flatlib linking
s390x: Add sthyi cc==0 r2+1 verification
s390x: skrf: Fix tprot assembly
lib/s390x/asm/arch_def.h | 14 ++++++++++++++ lib/s390x/asm/uv.h | 21 +++++++++++++-------- lib/s390x/interrupt.c | 2 +- s390x/Makefile | 2 +- s390x/pfmf.c | 10 ++++++++-- s390x/skrf.c | 2 +- s390x/sthyi.c | 20 +++++++++++--------- s390x/uv-guest.c | 4 ++-- s390x/uv-host.c | 13 ++++++++----- 9 files changed, 59 insertions(+), 29 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/9 s390x: uv: Tolerate 0x100 query return code
RC 0x100 is not an error but a notice that we could have gotten more data from the Ultravisor if we had asked for it. So let's tolerate them in our tests.
--- s390x/uv-guest.c | 4 ++-- s390x/uv-host.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
s390x/uv-guest.c +2 -2
@@ -70,8 +70,8 @@ static void test_query(void)report (cc ==1 && uvcb.header.rc ==UVC_RC_INV_LEN ,"length" ); uvcb.header.len =sizeof (uvcb); - cc =uv_call (0 , (u64)&uvcb); -report (cc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +uv_call (0 , (u64)&uvcb); +report (uvcb.header.rc ==UVC_RC_EXECUTED || uvcb.header.rc ==0x100 ,"successful query" );/* * These bits have been introduced with the very first
s390x/uv-host.c +1 -1
@@ -401,7 +401,7 @@ static void test_query(void) uvcb_qui.header.len =sizeof (uvcb_qui);uv_call (0 , (uint64_t )&uvcb_qui); -report (uvcb_qui.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +report (uvcb_qui.header.rc ==UVC_RC_EXECUTED || uvcb_qui.header.rc ==0x100 ,"successful query" );for (i =0 ; cmds[i].name; i++)report (uv_query_test_call (cmds[i].call_bit),"%s" , cmds[i].name);
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 1/9] s390x: uv: Tolerate 0x100 query return code
Quoted 15 lines · On Wed, 22 Sep 2021 07:18:03 +0000 Janosch Frank <[email protected]> wrote:
RC
0x100is not an error but a notice that we could have gotten more data from the Ultravisor if we had asked for it. So let's tolerate them in our tests.Signed-off-by Janosch Frank <[email protected]>--- s390x/uv-guest.c | 4 ++-- s390x/uv-host.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)s390x/uv-guest.c +0
-0
s390x/uv-guest.c static void test_query(void) · line 75
Quoted 8 lines
s390x/uv-guest.c +2
-2@@ -70,8 +70,8 @@ static void test_query(void)report (cc ==1 && uvcb.header.rc ==UVC_RC_INV_LEN ,"length" ); uvcb.header.len =sizeof (uvcb); - cc =uv_call (0 , (u64)&uvcb); -report (cc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +uv_call (0 , (u64)&uvcb); +report (uvcb.header.rc ==UVC_RC_EXECUTED || uvcb.header.rc ==0x100 ,"successful query" );
if you want to be even more pedantic:
report(cc == 0 && uvcb.header.rc == UVC_RC_EXECUTED || cc == 1 && uvcb.header.rc == 0x100, ...
s390x/uv-host.c static void test_query(void) · line 404
Quoted 13 lines
s390x/uv-guest.c +0
-0/* * These bits have been introduced with the very first s390x/uv-host.c +1
-1@@ -401,7 +401,7 @@ static void test_query(void) uvcb_qui.header.len =sizeof (uvcb_qui);uv_call (0 , (uint64_t )&uvcb_qui); -report (uvcb_qui.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +report (uvcb_qui.header.rc ==UVC_RC_EXECUTED || uvcb_qui.header.rc ==0x100 ,"successful query" );
same here
Quoted 3 lines
s390x/uv-host.c +0
-0for (i =0 ; cmds[i].name; i++)report (uv_query_test_call (cmds[i].call_bit),"%s" , cmds[i].name);
Re: [kvm-unit-tests PATCH 1/9] s390x: uv: Tolerate 0x100 query return code
Quoted 28 lines · Claudio Imbrenda
Quoted 15 lines · On Wed, 22 Sep 2021 07:18:03 +0000 Janosch Frank <[email protected]> wrote:
RC
0x100is not an error but a notice that we could have gotten more data from the Ultravisor if we had asked for it. So let's tolerate them in our tests.Signed-off-by Janosch Frank <[email protected]>--- s390x/uv-guest.c | 4 ++-- s390x/uv-host.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)s390x/uv-guest.c +0
-0s390x/uv-guest.c static void test_query(void) · line 75
Quoted 8 lines
s390x/uv-guest.c +2
-2@@ -70,8 +70,8 @@ static void test_query(void)report (cc ==1 && uvcb.header.rc ==UVC_RC_INV_LEN ,"length" ); uvcb.header.len =sizeof (uvcb); - cc =uv_call (0 , (u64)&uvcb); -report (cc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +uv_call (0 , (u64)&uvcb); +report (uvcb.header.rc ==UVC_RC_EXECUTED || uvcb.header.rc ==0x100 ,"successful query" );if you want to be even more pedantic:
Quoted 2 lines
report(cc == 0 && uvcb.header.rc == UVC_RC_EXECUTED || cc == 1 && uvcb.header.rc == 0x100, ...
Yeah I pondered about that but at the end I chose to drop the cc check
Quoted 21 lines
Quoted 9 lines
s390x/uv-guest.c +0
-0/* * These bits have been introduced with the very first s390x/uv-host.c +0
-0s390x/uv-host.c static void test_query(void) · line 404
Quoted 5 lines
s390x/uv-host.c +1
-1@@ -401,7 +401,7 @@ static void test_query(void) uvcb_qui.header.len =sizeof (uvcb_qui);uv_call (0 , (uint64_t )&uvcb_qui); -report (uvcb_qui.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +report (uvcb_qui.header.rc ==UVC_RC_EXECUTED || uvcb_qui.header.rc ==0x100 ,"successful query" );same here
Quoted 3 lines
s390x/uv-host.c +0
-0for (i =0 ; cmds[i].name; i++)report (uv_query_test_call (cmds[i].call_bit),"%s" , cmds[i].name);
Re: [kvm-unit-tests PATCH 1/9] s390x: uv: Tolerate 0x100 query return code
Quoted 32 lines · Janosch Frank
Quoted 28 lines · Claudio Imbrenda
Quoted 15 lines · On Wed, 22 Sep 2021 07:18:03 +0000 Janosch Frank <[email protected]> wrote:
RC
0x100is not an error but a notice that we could have gotten more data from the Ultravisor if we had asked for it. So let's tolerate them in our tests.Signed-off-by Janosch Frank <[email protected]>--- s390x/uv-guest.c | 4 ++-- s390x/uv-host.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)s390x/uv-guest.c +0
-0s390x/uv-guest.c static void test_query(void) · line 75
Quoted 8 lines
s390x/uv-guest.c +2
-2@@ -70,8 +70,8 @@ static void test_query(void)report (cc ==1 && uvcb.header.rc ==UVC_RC_INV_LEN ,"length" ); uvcb.header.len =sizeof (uvcb); - cc =uv_call (0 , (u64)&uvcb); -report (cc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"successful query" ); +uv_call (0 , (u64)&uvcb); +report (uvcb.header.rc ==UVC_RC_EXECUTED || uvcb.header.rc ==0x100 ,"successful query" );if you want to be even more pedantic:
Quoted 2 lines
report(cc == 0 && uvcb.header.rc == UVC_RC_EXECUTED || cc == 1 && uvcb.header.rc == 0x100, ...
Quoted 1 line
Yeah I pondered about that but at the end I chose to drop the cc check
Well, but we're in the kvm-unit-tests here where we check for the exact behavior of the system ... so I'd vote for keeping/extening the cc checking, even if it's more code to read in the end.
Thomas
PATCH 2/9 s390x: pfmf: Fix 1MB handling
In reply to Janosch FrankOn everything larger than 4k pfmf will update the address in GR2 when it's interrupted so we should loop on pfmf and not trust that it doesn't get interrupted.
--- s390x/pfmf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
s390x/pfmf.c +8 -2
@@ -54,6 +54,7 @@ static void test_1m_key(void)bool rp = true;union pfmf_r1 r1;union skey skey; +void *addr = pagebuf;report_prefix_push ("1M" );if (test_facility (169 )) {
@@ -64,7 +65,9 @@ static void test_1m_key(void) r1.reg.sk =1 ; r1.reg.fsc =PFMF_FSC_1M ; r1.reg.key =0x30 ; -pfmf (r1.val, pagebuf); +do { + addr =pfmf (r1.val, addr); + }while ((uintptr_t )addr != (uintptr_t )pagebuf +HPAGE_SIZE );for (i =0 ; i <256 ; i++) { skey.val =get_storage_key (pagebuf + i *PAGE_SIZE ); skey.val &=SKEY_ACC |SKEY_FP ;
@@ -99,6 +102,7 @@ static void test_1m_clear(void)int i;union pfmf_r1 r1;unsigned long sum =0 ; +void *addr = pagebuf; r1.val =0 ; r1.reg.cf =1 ;
@@ -106,7 +110,9 @@ static void test_1m_clear(void)report_prefix_push ("1M" );memset (pagebuf,42 ,PAGE_SIZE *256 ); -pfmf (r1.val, pagebuf); +do { + addr =pfmf (r1.val, addr); + }while ((uintptr_t )addr != (uintptr_t )pagebuf +HPAGE_SIZE );for (i =0 ; i <PAGE_SIZE *256 ; i++) sum |= pagebuf[i];report (!sum,"clear memory" );
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 2/9] s390x: pfmf: Fix 1MB handling
Quoted 5 lines · On Wed, 22 Sep 2021 07:18:04 +0000 Janosch Frank <[email protected]> wrote:
On everything larger than 4k pfmf will update the address in GR2 when it's interrupted so we should loop on pfmf and not trust that it doesn't get interrupted.
Signed-off-by Janosch Frank <[email protected]>
Quoted 46 lines
--- s390x/pfmf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)s390x/pfmf.c +8
-2@@ -54,6 +54,7 @@ static void test_1m_key(void)bool rp = true;union pfmf_r1 r1;union skey skey; +void *addr = pagebuf;report_prefix_push ("1M" );if (test_facility (169 )) {@@ -64,7 +65,9 @@ static void test_1m_key(void) r1.reg.sk =1 ; r1.reg.fsc =PFMF_FSC_1M ; r1.reg.key =0x30 ; -pfmf (r1.val, pagebuf); +do { + addr =pfmf (r1.val, addr); + }while ((uintptr_t )addr != (uintptr_t )pagebuf +HPAGE_SIZE );for (i =0 ; i <256 ; i++) { skey.val =get_storage_key (pagebuf + i *PAGE_SIZE ); skey.val &=SKEY_ACC |SKEY_FP ;@@ -99,6 +102,7 @@ static void test_1m_clear(void)int i;union pfmf_r1 r1;unsigned long sum =0 ; +void *addr = pagebuf; r1.val =0 ; r1.reg.cf =1 ;@@ -106,7 +110,9 @@ static void test_1m_clear(void)report_prefix_push ("1M" );memset (pagebuf,42 ,PAGE_SIZE *256 ); -pfmf (r1.val, pagebuf); +do { + addr =pfmf (r1.val, addr); + }while ((uintptr_t )addr != (uintptr_t )pagebuf +HPAGE_SIZE );for (i =0 ; i <PAGE_SIZE *256 ; i++) sum |= pagebuf[i];report (!sum,"clear memory" );
Re: [kvm-unit-tests PATCH 2/9] s390x: pfmf: Fix 1MB handling
In reply to Janosch FrankQuoted 8 lines · Janosch Frank
On everything larger than 4k pfmf will update the address in GR2 when it's interrupted so we should loop on pfmf and not trust that it doesn't get interrupted.
Signed-off-by Janosch Frank <[email protected]>--- s390x/pfmf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Re: [kvm-unit-tests PATCH 2/9] s390x: pfmf: Fix 1MB handling
Quoted 5 lines · Thomas Huth
Quoted 4 lines · Janosch Frank
On everything larger than 4k pfmf will update the address in GR2 when it's interrupted so we should loop on pfmf and not trust that it doesn't get interrupted.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Janosch Frank <[email protected]>--- s390x/pfmf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)Acked-by Thomas Huth <[email protected]>
I had another discussion with the people that told me to change this and after some starring at the documentation we found out this won't fix anything because it's not a problem. FW will update GR2 and back off the PSW when it has been interrupted so it effectively loops itself.
So I'm dropping this patch
PATCH 3/9 s390x: uv-host: Fence a destroy cpu test on z15
In reply to Janosch FrankFirmware will not give us the expected return code on z15 so let's fence it for the z15 machine generation.
--- lib/s390x/asm/arch_def.h | 14 ++++++++++++++ s390x/uv-host.c | 11 +++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)
lib/s390x/asm/arch_def.h +14 -0
@@ -219,6 +219,20 @@ static inline unsigned short stap(void)return cpu_address; } +#define MACHINE_Z15A 0x8561 +#define MACHINE_Z15B 0x8562 + +static inline uint16_t get_machine_id (void ) +{ +uint64_t cpuid; + + asmvolatile ("stidp %0" :"=Q" (cpuid)); + cpuid = cpuid >>16 ; + cpuid &=0xffff ; + +return cpuid; +} +static inline int tprot (unsigned long addr) {int cc;
s390x/uv-host.c +7 -4
@@ -111,6 +111,7 @@ static void test_config_destroy(void)static void test_cpu_destroy (void ) {int rc; +uint16_t machineid =get_machine_id ();struct uv_cb_nodata uvcb = { .header.len =sizeof (uvcb), .header.cmd =UVC_CMD_DESTROY_SEC_CPU ,
@@ -125,10 +126,12 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len +=8 ; - uvcb.handle +=1 ; - rc =uv_call (0 , (uint64_t )&uvcb); -report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); - uvcb.handle -=1 ; +if (machineid !=MACHINE_Z15A && machineid !=MACHINE_Z15B ) { + uvcb.handle +=1 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); + uvcb.handle -=1 ; + } rc =uv_call (0 , (uint64_t )&uvcb);report (rc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"success" );
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 3/9] s390x: uv-host: Fence a destroy cpu test on z15
Quoted 4 lines · On Wed, 22 Sep 2021 07:18:05 +0000 Janosch Frank <[email protected]> wrote:
Firmware will not give us the expected return code on z15 so let's fence it for the z15 machine generation.
Signed-off-by Janosch Frank <[email protected]>
Quoted 59 lines
--- lib/s390x/asm/arch_def.h | 14 ++++++++++++++ s390x/uv-host.c | 11 +++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)lib/s390x/asm/arch_def.h +14
-0@@ -219,6 +219,20 @@ static inline unsigned short stap(void)return cpu_address; } +#define MACHINE_Z15A 0x8561 +#define MACHINE_Z15B 0x8562 + +static inline uint16_t get_machine_id (void ) +{ +uint64_t cpuid; + + asmvolatile ("stidp %0" :"=Q" (cpuid)); + cpuid = cpuid >>16 ; + cpuid &=0xffff ; + +return cpuid; +} +static inline int tprot (unsigned long addr) {int cc;s390x/uv-host.c +7
-4@@ -111,6 +111,7 @@ static void test_config_destroy(void)static void test_cpu_destroy (void ) {int rc; +uint16_t machineid =get_machine_id ();struct uv_cb_nodata uvcb = { .header.len =sizeof (uvcb), .header.cmd =UVC_CMD_DESTROY_SEC_CPU ,@@ -125,10 +126,12 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len +=8 ; - uvcb.handle +=1 ; - rc =uv_call (0 , (uint64_t )&uvcb); -report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); - uvcb.handle -=1 ; +if (machineid !=MACHINE_Z15A && machineid !=MACHINE_Z15B ) { + uvcb.handle +=1 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); + uvcb.handle -=1 ; + } rc =uv_call (0 , (uint64_t )&uvcb);report (rc ==0 && uvcb.header.rc ==UVC_RC_EXECUTED ,"success" );
Re: [kvm-unit-tests PATCH 3/9] s390x: uv-host: Fence a destroy cpu test on z15
In reply to Janosch FrankQuoted 50 lines · Janosch Frank
Firmware will not give us the expected return code on z15 so let's fence it for the z15 machine generation.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 14 ++++++++++++++ s390x/uv-host.c | 11 +++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)lib/s390x/asm/arch_def.h +14
-0@@ -219,6 +219,20 @@ static inline unsigned short stap(void)return cpu_address; } +#define MACHINE_Z15A 0x8561 +#define MACHINE_Z15B 0x8562 + +static inline uint16_t get_machine_id (void ) +{ +uint64_t cpuid; + + asmvolatile ("stidp %0" :"=Q" (cpuid)); + cpuid = cpuid >>16 ; + cpuid &=0xffff ; + +return cpuid; +} +static inline int tprot (unsigned long addr) {int cc;s390x/uv-host.c +1
-0@@ -111,6 +111,7 @@ static void test_config_destroy(void)static void test_cpu_destroy (void ) {int rc; +uint16_t machineid =get_machine_id ();struct uv_cb_nodata uvcb = { .header.len =sizeof (uvcb), .header.cmd =UVC_CMD_DESTROY_SEC_CPU ,@@ -125,10 +126,12 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len +=8 ;
s390x/uv-host.c static void test_cpu_destroy(void) · line 134
Quoted 10 lines
s390x/uv-host.c +6
-4- uvcb.handle +=1 ; - rc =uv_call (0 , (uint64_t )&uvcb); -report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); - uvcb.handle -=1 ; +if (machineid !=MACHINE_Z15A && machineid !=MACHINE_Z15B ) { + uvcb.handle +=1 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); + uvcb.handle -=1 ; + }
So this is a bug in the firmware? Any chance that it will still get fixed for the z15? If so, would it make sense to turn this into a report_xfail() instead?
Thomas
Re: [kvm-unit-tests PATCH 3/9] s390x: uv-host: Fence a destroy cpu test on z15
Quoted 66 lines · Thomas Huth
Quoted 50 lines · Janosch Frank
Firmware will not give us the expected return code on z15 so let's fence it for the z15 machine generation.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 14 ++++++++++++++ s390x/uv-host.c | 11 +++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)lib/s390x/asm/arch_def.h +14
-0@@ -219,6 +219,20 @@ static inline unsigned short stap(void)return cpu_address; } +#define MACHINE_Z15A 0x8561 +#define MACHINE_Z15B 0x8562 + +static inline uint16_t get_machine_id (void ) +{ +uint64_t cpuid; + + asmvolatile ("stidp %0" :"=Q" (cpuid)); + cpuid = cpuid >>16 ; + cpuid &=0xffff ; + +return cpuid; +} +static inline int tprot (unsigned long addr) {int cc;s390x/uv-host.c +1
-0@@ -111,6 +111,7 @@ static void test_config_destroy(void)static void test_cpu_destroy (void ) {int rc; +uint16_t machineid =get_machine_id ();struct uv_cb_nodata uvcb = { .header.len =sizeof (uvcb), .header.cmd =UVC_CMD_DESTROY_SEC_CPU ,@@ -125,10 +126,12 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len +=8 ;s390x/uv-host.c static void test_cpu_destroy(void) · line 134
Quoted 10 lines
s390x/uv-host.c +6
-4- uvcb.handle +=1 ; - rc =uv_call (0 , (uint64_t )&uvcb); -report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); - uvcb.handle -=1 ; +if (machineid !=MACHINE_Z15A && machineid !=MACHINE_Z15B ) { + uvcb.handle +=1 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_CHANDLE ,"invalid handle" ); + uvcb.handle -=1 ; + }So this is a bug in the firmware? Any chance that it will still get fixed for the z15? If so, would it make sense to turn this into a
report_xfail()instead?
Quoted 2 lines
Thomas
No, a xfail will not help here.
Thomas Huth
Acked-byRe: [kvm-unit-tests PATCH 3/9] s390x: uv-host: Fence a destroy cpu test on z15
Quoted 20 lines · Janosch Frank
Quoted 19 lines · Thomas Huth
Quoted 18 lines · Janosch Frank
Firmware will not give us the expected return code on z15 so let's fence it for the z15 machine generation.
Signed-off-by Janosch Frank <[email protected]>---
lib/s390x/asm/arch_def.h| 14 ++++++++++++++
s390x/uv-host.c | 11 +++++++----2 files changed, 21 insertions(+), 4 deletions(-)lib/s390x/asm/arch_def.h +2
-0@@ -219,6 +219,20 @@ static inline unsigned short stap(void) return cpu_address; } +#define MACHINE_Z15A 0x8561 +#define MACHINE_Z15B 0x8562
Quoted 8 lines
Quoted 8 lines
lib/s390x/asm/arch_def.h static inline unsigned short stap(void) · line 231
Quoted 8 lines
lib/s390x/asm/arch_def.h +8
-0+ +static inline uint16_t get_machine_id (void ) +{ + uint64_t cpuid; + + asm volatile("stidp %0" : "=Q" (cpuid)); + cpuid = cpuid >> 16; + cpuid &= 0xffff;
You could skip the masking line since the function returns an uint61_t anyway.
Quoted 39 lines
Quoted 39 lines
Quoted 24 lines
lib/s390x/asm/arch_def.h +4
-0+ + return cpuid; +} + static inline int tprot(unsigned long addr) { int cc;s390x/uv-host.c +1
-2@@ -111,6 +111,7 @@ static void test_config_destroy(void) static void test_cpu_destroy(void) { int rc; + uint16_t machineid = get_machine_id(); struct uv_cb_nodata uvcb = { .header.len = sizeof(uvcb), .header.cmd = UVC_CMD_DESTROY_SEC_CPU,@@ -125,10 +126,12 @@ static void test_cpu_destroy(void) "hdr invalid length"); uvcb.header.len += 8; - uvcb.handle += 1; - rc = uv_call(0, (uint64_t)&uvcb);s390x/uv-host.c static void test_cpu_destroy(void) · line 135
Quoted 10 lines
s390x/uv-host.c +6
-2- report(rc == 1 && uvcb.header.rc == UVC_RC_INV_CHANDLE, "invalid handle"); - uvcb.handle -= 1; + if (machineid != MACHINE_Z15A && machineid != MACHINE_Z15B) { + uvcb.handle += 1; + rc = uv_call(0, (uint64_t)&uvcb); + report(rc == 1 && uvcb.header.rc == UVC_RC_INV_CHANDLE, "invalid handle"); + uvcb.handle -= 1; + }So this is a bug in the firmware? Any chance that it will still get fixed for the z15? If so, would it make sense to turn this into a
report_xfail()instead?
Quoted 4 lines
Quoted 2 lines
Thomas
No, a xfail will not help here.
Ok, fair, then I think the patch is fine:
PATCH 4/9 lib: s390x: uv: Fix share return value and print
In reply to Janosch FrankLet's only return 0/1 for success/failure respectively. If needed we can later add rc/rrc pointers so we can check for the reasons of cc==1 cases like we do in the kernel.
As share might also be used in snippets it's best not to use prints to avoid linking problems so lets remove the report_info().
--- lib/s390x/asm/uv.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
lib/s390x/asm/uv.h +1 -8
@@ -219,15 +219,8 @@ static inline int share(unsigned long addr, u16 cmd) .header.len = sizeof(uvcb), .paddr = addr }; -int cc; - cc =uv_call (0 , (u64)&uvcb); -if (!cc && uvcb.header.rc ==UVC_RC_EXECUTED ) -return 0 ; - -report_info ("uv_call: cmd %04x cc %d response code: %04x" , cc, cmd, - uvcb.header.rc); -return -1 ; +return uv_call (0 , (u64)&uvcb); }/*
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 4/9] lib: s390x: uv: Fix share return value and print
Quoted 8 lines · On Wed, 22 Sep 2021 07:18:06 +0000 Janosch Frank <[email protected]> wrote:
Let's only return 0/1 for success/failure respectively. If needed we can later add rc/rrc pointers so we can check for the reasons of cc==1 cases like we do in the kernel.
As share might also be used in snippets it's best not to use prints to avoid linking problems so lets remove the
report_info().Signed-off-by Janosch Frank <[email protected]>
Quoted 25 lines
--- lib/s390x/asm/uv.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)lib/s390x/asm/uv.h +1
-8@@ -219,15 +219,8 @@ static inline int share(unsigned long addr, u16 cmd) .header.len = sizeof(uvcb), .paddr = addr }; -int cc; - cc =uv_call (0 , (u64)&uvcb); -if (!cc && uvcb.header.rc ==UVC_RC_EXECUTED ) -return 0 ; - -report_info ("uv_call: cmd %04x cc %d response code: %04x" , cc, cmd, - uvcb.header.rc); -return -1 ; +return uv_call (0 , (u64)&uvcb); }/*
Re: [kvm-unit-tests PATCH 4/9] lib: s390x: uv: Fix share return value and print
In reply to Janosch FrankQuoted 5 lines · Janosch Frank
Let's only return 0/1 for success/failure respectively. If needed we can later add rc/rrc pointers so we can check for the reasons of cc==1 cases like we do in the kernel.
As share might also be used in snippets it's best not to use prints to
Maybe: s/share/share()/
... so that it is clear that you're talking about the function here...
Quoted 16 lines
avoid linking problems so lets remove the
report_info().Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/uv.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)lib/s390x/asm/uv.h +0
-1@@ -219,15 +219,8 @@ static inline int share(unsigned long addr, u16 cmd) .header.len = sizeof(uvcb), .paddr = addr }; -int cc;
lib/s390x/asm/uv.h static inline int share(unsigned long addr, u16 cmd) · line 224
Quoted 10 lines
lib/s390x/asm/uv.h +1
-7- cc =uv_call (0 , (u64)&uvcb); -if (!cc && uvcb.header.rc ==UVC_RC_EXECUTED ) -return 0 ; - -report_info ("uv_call: cmd %04x cc %d response code: %04x" , cc, cmd, - uvcb.header.rc); -return -1 ; +return uv_call (0 , (u64)&uvcb); }
PATCH 5/9 lib: s390x: uv: Add UVC_ERR_DEBUG switch
In reply to Janosch FrankEvery time something goes wrong in a way we don't expect, we need to add debug prints to some UVC to get the unexpected return code.
Let's just put the printing behind a macro so we can enable it if needed via a simple switch.
--- lib/s390x/asm/uv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
lib/s390x/asm/uv.h +12 -0
@@ -12,6 +12,9 @@#ifndef _ASMS390X_UV_H_#define _ASMS390X_UV_H_ +/* Enables printing of command code and return codes for failed UVCs */ +#define UVC_ERR_DEBUG 0 +#define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002#define UVC_RC_INV_STATE 0x0003
@@ -194,6 +197,15 @@ static inline int uv_call_once(unsigned long r1, unsigned long r2) : [cc] "=d" (cc) : [r1] "a" (r1), [r2] "a" (r2) : "memory", "cc"); + +#if UVC_ERR_DEBUG +if (cc) +printf ("UV call error: call %x rc %x rrc %x\n" , + ((struct uv_cb_header *)r2)->cmd, + ((struct uv_cb_header *)r2)->rc, + ((struct uv_cb_header *)r2)->rrc); +#endif +return cc; }
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 5/9] lib: s390x: uv: Add UVC_ERR_DEBUG switch
Quoted 7 lines · On Wed, 22 Sep 2021 07:18:07 +0000 Janosch Frank <[email protected]> wrote:
Every time something goes wrong in a way we don't expect, we need to add debug prints to some UVC to get the unexpected return code.
Let's just put the printing behind a macro so we can enable it if needed via a simple switch.
Signed-off-by Janosch Frank <[email protected]>
but see a nit below
Quoted 19 lines
--- lib/s390x/asm/uv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)lib/s390x/asm/uv.h +2
-0@@ -12,6 +12,9 @@#ifndef _ASMS390X_UV_H_#define _ASMS390X_UV_H_ +/* Enables printing of command code and return codes for failed UVCs */ +#define UVC_ERR_DEBUG 0 +#define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002#define UVC_RC_INV_STATE 0x0003
lib/s390x/asm/uv.h static inline int uv_call_once(unsigned long r1, · line 202
Quoted 6 lines
lib/s390x/asm/uv.h +3
-0@@ -194,6 +197,15 @@ static inline int uv_call_once(unsigned long r1, unsigned long r2) : [cc] "=d" (cc) : [r1] "a" (r1), [r2] "a" (r2) : "memory", "cc"); + +#if UVC_ERR_DEBUG + if (cc)
it probably looks cleaner like this:
if (UVC_ERR_DEBUG && cc)
and without the #if; the compiler should be smart enough to remove the dead code. In practice it doesn't really matter in the end, so feel free to ignore this comment :)
Quoted 9 lines
lib/s390x/asm/uv.h +6
-0+printf ("UV call error: call %x rc %x rrc %x\n" , + ((struct uv_cb_header *)r2)->cmd, + ((struct uv_cb_header *)r2)->rc, + ((struct uv_cb_header *)r2)->rrc); +#endif +return cc; }
Re: [kvm-unit-tests PATCH 5/9] lib: s390x: uv: Add UVC_ERR_DEBUG switch
Quoted 43 lines · Claudio Imbrenda
Quoted 7 lines · On Wed, 22 Sep 2021 07:18:07 +0000 Janosch Frank <[email protected]> wrote:
Every time something goes wrong in a way we don't expect, we need to add debug prints to some UVC to get the unexpected return code.
Let's just put the printing behind a macro so we can enable it if needed via a simple switch.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>but see a nit below
Quoted 19 lines
--- lib/s390x/asm/uv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)lib/s390x/asm/uv.h +2
-0@@ -12,6 +12,9 @@#ifndef _ASMS390X_UV_H_#define _ASMS390X_UV_H_ +/* Enables printing of command code and return codes for failed UVCs */ +#define UVC_ERR_DEBUG 0 +#define UVC_RC_EXECUTED 0x0001#define UVC_RC_INV_CMD 0x0002#define UVC_RC_INV_STATE 0x0003lib/s390x/asm/uv.h static inline int uv_call_once(unsigned long r1, · line 202
Quoted 6 lines
lib/s390x/asm/uv.h +3
-0@@ -194,6 +197,15 @@ static inline int uv_call_once(unsigned long r1, unsigned long r2) : [cc] "=d" (cc) : [r1] "a" (r1), [r2] "a" (r2) : "memory", "cc"); + +#if UVC_ERR_DEBUG + if (cc)it probably looks cleaner like this:
Quoted 5 lines
if (UVC_ERR_DEBUG && cc)and without the #if; the compiler should be smart enough to remove the dead code. In practice it doesn't really matter in the end, so feel free to ignore this comment :)
Didn't consider that, I'll fix it up.
Thank you
Quoted 11 lines
Quoted 10 lines
lib/s390x/asm/uv.h +6
-0+printf ("UV call error: call %x rc %x rrc %x\n" , + ((struct uv_cb_header *)r2)->cmd, + ((struct uv_cb_header *)r2)->rc, + ((struct uv_cb_header *)r2)->rrc); +#endif +return cc; }
Re: [kvm-unit-tests PATCH 5/9] lib: s390x: uv: Add UVC_ERR_DEBUG switch
In reply to Janosch FrankQuoted 16 lines · Janosch Frank
Every time something goes wrong in a way we don't expect, we need to add debug prints to some UVC to get the unexpected return code.
Let's just put the printing behind a macro so we can enable it if needed via a simple switch.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/uv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)lib/s390x/asm/uv.h +0
-0
lib/s390x/asm/uv.h line 16
Quoted 5 lines
lib/s390x/asm/uv.h +2
-0@@ -12,6 +12,9 @@#ifndef _ASMS390X_UV_H_#define _ASMS390X_UV_H_ +/* Enables printing of command code and return codes for failed UVCs */ +#define UVC_ERR_DEBUG 0
Do we maybe want a "#ifndef UVC_ERR_DEBUG" in front of this, so that we could also set the macro to 1 from individual *.c files (or from the Makefile)?
Thomas
Re: [kvm-unit-tests PATCH 5/9] lib: s390x: uv: Add UVC_ERR_DEBUG switch
Quoted 20 lines · Thomas Huth
Quoted 19 lines · Janosch Frank
Every time something goes wrong in a way we don't expect, we need to add debug prints to some UVC to get the unexpected return code.
Let's just put the printing behind a macro so we can enable it if needed via a simple switch.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/uv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)lib/s390x/asm/uv.h +0
-0@@ -12,6 +12,9 @@#ifndef _ASMS390X_UV_H_#define _ASMS390X_UV_H_
Quoted 8 lines
lib/s390x/asm/uv.h line 16
Quoted 2 lines
lib/s390x/asm/uv.h +2
-0+/* Enables printing of command code and return codes for failed UVCs */ +#define UVC_ERR_DEBUG 0Do we maybe want a "#ifndef
UVC_ERR_DEBUG" in front of this, so that we could also set the macro to 1 from individual *.c files (or from theMakefile)?Thomas
When testing it's the least amount of work to set this to 1 so I implemented it this way. If you think it's useful then I'll add the ifndef.
PATCH 6/9 lib: s390x: Print PGM code as hex
In reply to Janosch FrankWe have them defined as hex constants in lib/s390x/asm/arch_def.h so why not print them as hex values?
--- lib/s390x/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/s390x/interrupt.c +1 -1
@@ -169,7 +169,7 @@ static void print_pgm_info(struct stack_frame_int *stack) lc->pgm_old_psw.addr <= (uintptr_t)sie_exit);printf ("\n" ); -printf ("Unexpected program interrupt %s: %d on cpu %d at %#lx, ilen %d\n" , +printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, lc->pgm_int_id);print_int_regs (stack);
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 6/9] lib: s390x: Print PGM code as hex
Quoted 4 lines · On Wed, 22 Sep 2021 07:18:08 +0000 Janosch Frank <[email protected]> wrote:
We have them defined as hex constants in
lib/s390x/asm/arch_def.hso why not print them as hex values?Signed-off-by Janosch Frank <[email protected]>
Quoted 17 lines
--- lib/s390x/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/s390x/interrupt.c +1
-1@@ -169,7 +169,7 @@ static void print_pgm_info(struct stack_frame_int *stack) lc->pgm_old_psw.addr <= (uintptr_t)sie_exit);printf ("\n" ); -printf ("Unexpected program interrupt %s: %d on cpu %d at %#lx, ilen %d\n" , +printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, lc->pgm_int_id);print_int_regs (stack);
Re: [kvm-unit-tests PATCH 6/9] lib: s390x: Print PGM code as hex
In reply to Janosch FrankQuoted 14 lines · Janosch Frank
We have them defined as hex constants in
lib/s390x/asm/arch_def.hso why not print them as hex values?Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/s390x/interrupt.c +0
-0
lib/s390x/interrupt.c static void print_pgm_info(struct stack_frame_int *stack) · line 175
Quoted 8 lines
lib/s390x/interrupt.c +1
-1@@ -169,7 +169,7 @@ static void print_pgm_info(struct stack_frame_int *stack) lc->pgm_old_psw.addr <= (uintptr_t)sie_exit);printf ("\n" ); -printf ("Unexpected program interrupt %s: %d on cpu %d at %#lx, ilen %d\n" , +printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, lc->pgm_int_id);print_int_regs (stack);
PATCH 7/9 s390x: Makefile: Remove snippet flatlib linking
In reply to Janosch FrankWe can't link the flatlib as we do not export everything that it needs and we don't (want to) call the init functions.
In the future we might implement a tiny lib that uses select lib object files and re-implements functions like assert() and test_facility() to be able to use some parts of the lib.
--- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/Makefile +1 -1
@@ -92,7 +92,7 @@ $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_asmlib) $(FLATLIBS) - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib) $(FLATLIBS) + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib) $(OBJCOPY) -O binary $@ $@ $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 7/9] s390x: Makefile: Remove snippet flatlib linking
Quoted 4 lines · Janosch Frank
We can't link the flatlib as we do not export everything that it needs and we don't (want to) call the init functions.
In the future we might implement a tiny lib that uses select lib
s/select/selected/ ?
Quoted 13 lines
object files and re-implements functions like
assert()andtest_facility()to be able to use some parts of the lib.Signed-off-by Janosch Frank <[email protected]>--- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/Makefile +0
-0
s390x/Makefile $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) · line 95
Quoted 5 lines
s390x/Makefile +1
-1@@ -92,7 +92,7 @@ $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_asmlib) $(FLATLIBS) - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib) $(FLATLIBS) + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib)
Don't we need memcpy() and friends in some cases? ... well, likely not, otherwise linking would fail... So:
Re: [kvm-unit-tests PATCH 7/9] s390x: Makefile: Remove snippet flatlib linking
Quoted 7 lines · Thomas Huth
Quoted 4 lines · Janosch Frank
We can't link the flatlib as we do not export everything that it needs and we don't (want to) call the init functions.
In the future we might implement a tiny lib that uses select lib
s/select/selected/ ?
Sure
Quoted 16 lines
Quoted 16 lines
object files and re-implements functions like
assert()andtest_facility()to be able to use some parts of the lib.Signed-off-by Janosch Frank <[email protected]>--- s390x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/Makefile +0
-0@@ -92,7 +92,7 @@ $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@
Quoted 9 lines
s390x/Makefile $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) · line 95
Quoted 3 lines
s390x/Makefile +1
-1$(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_asmlib) $(FLATLIBS) - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib) $(FLATLIBS) + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib)Don't we need
memcpy()and friends in some cases? ... well, likely not, otherwise linking would fail... So:Reviewed-by Thomas Huth <[email protected]>
Currently not but we can still import header files and use static things which is very helpful already. Fixing this will require a lot of thought since I don't really want to write a new lib just for the snippets but making them compatible to the flatlib will also require a lot of work.
PATCH 8/9 s390x: Add sthyi cc==0 r2+1 verification
In reply to Janosch FrankOn success r2 + 1 should be 0, let's also check for that.
--- s390x/sthyi.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
s390x/sthyi.c +11 -9
@@ -24,16 +24,16 @@ static inline int sthyi(uint64_t vaddr, uint64_t fcode, uint64_t *rc, { register uint64_t code asm("0") = fcode; register uint64_t addr asm("2") = vaddr; - register uint64_t rc3 asm("3") = 0; + register uint64_t rc3 asm("3") = 42;int cc =0 ; - asmvolatile (".insn rre,0xB2560000,%[r1],%[r2]\n" -"ipm %[cc]\n" -"srl %[cc],28\n" - : [cc]"=d" (cc) - : [code]"d" (code), [addr]"a" (addr), [r1]"i" (r1), - [r2]"i" (r2) - :"memory" ,"cc" ,"r3" ); + asmvolatile ( +".insn rre,0xB2560000,%[r1],%[r2]\n" +"ipm %[cc]\n" +"srl %[cc],28\n" + : [cc]"=d" (cc),"+d" (rc3) + : [code]"d" (code), [addr]"a" (addr), [r1]"i" (r1), [r2]"i" (r2) + :"memory" ,"cc" );if (rc) *rc = rc3;return cc;
@@ -139,16 +139,18 @@ static void test_fcode0(void)struct sthyi_hdr_sctn *hdr;struct sthyi_mach_sctn *mach;struct sthyi_par_sctn *par; +uint64_t rc =42 ;/* Zero destination memory. */ memset (pagebuf,0 ,PAGE_SIZE );report_prefix_push ("fcode 0" ); -sthyi ((uint64_t )pagebuf,0 ,NULL ,0 ,2 ); +sthyi ((uint64_t )pagebuf,0 , &rc,0 ,2 ); hdr = (void *)pagebuf; mach = (void *)pagebuf + hdr->INFMOFF; par = (void *)pagebuf + hdr->INFPOFF; +report (!rc,"r2 + 1 == 0" );test_fcode0_hdr (hdr);test_fcode0_mach (mach);test_fcode0_par (par);
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 8/9] s390x: Add sthyi cc==0 r2+1 verification
Quoted 3 lines · On Wed, 22 Sep 2021 07:18:10 +0000 Janosch Frank <[email protected]> wrote:
On success r2 + 1 should be 0, let's also check for that.
Signed-off-by Janosch Frank <[email protected]>
but see comment below
Quoted 9 lines
--- s390x/sthyi.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)s390x/sthyi.c +0
-0
s390x/sthyi.c static inline int sthyi(uint64_t vaddr, uint64_t fcode, uint64_t *rc, · line 27
Quoted 5 lines
s390x/sthyi.c +1
-1@@ -24,16 +24,16 @@ static inline int sthyi(uint64_t vaddr, uint64_t fcode, uint64_t *rc, { register uint64_t code asm("0") = fcode; register uint64_t addr asm("2") = vaddr; - register uint64_t rc3 asm("3") = 0; + register uint64_t rc3 asm("3") = 42;
I am not a big fan of the asm constraints, in the kernel we are trying to move away from them, but I guess as long as it works it's ok
Quoted 39 lines
s390x/sthyi.c +10
-8int cc =0 ; - asmvolatile (".insn rre,0xB2560000,%[r1],%[r2]\n" -"ipm %[cc]\n" -"srl %[cc],28\n" - : [cc]"=d" (cc) - : [code]"d" (code), [addr]"a" (addr), [r1]"i" (r1), - [r2]"i" (r2) - :"memory" ,"cc" ,"r3" ); + asmvolatile ( +".insn rre,0xB2560000,%[r1],%[r2]\n" +"ipm %[cc]\n" +"srl %[cc],28\n" + : [cc]"=d" (cc),"+d" (rc3) + : [code]"d" (code), [addr]"a" (addr), [r1]"i" (r1), [r2]"i" (r2) + :"memory" ,"cc" );if (rc) *rc = rc3;return cc;@@ -139,16 +139,18 @@ static void test_fcode0(void)struct sthyi_hdr_sctn *hdr;struct sthyi_mach_sctn *mach;struct sthyi_par_sctn *par; +uint64_t rc =42 ;/* Zero destination memory. */ memset (pagebuf,0 ,PAGE_SIZE );report_prefix_push ("fcode 0" ); -sthyi ((uint64_t )pagebuf,0 ,NULL ,0 ,2 ); +sthyi ((uint64_t )pagebuf,0 , &rc,0 ,2 ); hdr = (void *)pagebuf; mach = (void *)pagebuf + hdr->INFMOFF; par = (void *)pagebuf + hdr->INFPOFF; +report (!rc,"r2 + 1 == 0" );test_fcode0_hdr (hdr);test_fcode0_mach (mach);test_fcode0_par (par);
PATCH 9/9 s390x: skrf: Fix tprot assembly
In reply to Janosch FrankIt's a base + displacement address so we need to address it via 0(%[addr]).
--- s390x/skrf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/skrf.c +1 -1
@@ -103,7 +103,7 @@ static void test_tprot(void) {report_prefix_push ("tprot" );expect_pgm_int (); - asmvolatile ("tprot %[addr],0xf0(0)\n" + asmvolatile ("tprot 0(%[addr]),0xf0(0)\n" : : [addr]"a" (pagebuf) : );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop ();
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 9/9] s390x: skrf: Fix tprot assembly
Quoted 3 lines · On Wed, 22 Sep 2021 07:18:11 +0000 Janosch Frank <[email protected]> wrote:
It's a base + displacement address so we need to address it via 0(%[addr]).
Signed-off-by Janosch Frank <[email protected]>
but see comment below
Quoted 9 lines
--- s390x/skrf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/skrf.c +0
-0
s390x/skrf.c static void test_tprot(void) · line 106
Quoted 5 lines
s390x/skrf.c +1
-1@@ -103,7 +103,7 @@ static void test_tprot(void) {report_prefix_push ("tprot" );expect_pgm_int (); - asm volatile("tprot %[addr],0xf0(0)\n" + asm volatile("tprot 0(%[addr]),0xf0(0)\n"
I think the displacement defaults to 0 if not specified?
did you get a warning, or why are you changing this now?
Quoted 3 lines
s390x/skrf.c +0
-0: : [addr] "a" (pagebuf) : );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop ();
Re: [kvm-unit-tests PATCH 9/9] s390x: skrf: Fix tprot assembly
Quoted 28 lines · Claudio Imbrenda
Quoted 3 lines · On Wed, 22 Sep 2021 07:18:11 +0000 Janosch Frank <[email protected]> wrote:
It's a base + displacement address so we need to address it via 0(%[addr]).
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>but see comment below
Quoted 9 lines
--- s390x/skrf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/skrf.c +0
-0s390x/skrf.c static void test_tprot(void) · line 106
Quoted 5 lines
s390x/skrf.c +1
-1@@ -103,7 +103,7 @@ static void test_tprot(void) {report_prefix_push ("tprot" );expect_pgm_int (); - asm volatile("tprot %[addr],0xf0(0)\n" + asm volatile("tprot 0(%[addr]),0xf0(0)\n"I think the displacement defaults to 0 if not specified?
Quoted 1 line
did you get a warning, or why are you changing this now?
It fixes one of the ~18 clang warnings and making it explicit directly tells you it's a B+D instruction i.e. it looks cleaner to me.
Quoted 5 lines
Quoted 4 lines
s390x/skrf.c +0
-0: : [addr] "a" (pagebuf) : );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop ();
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [kvm-unit-tests PATCH 9/9] s390x: skrf: Fix tprot assembly
Quoted 18 lines · Janis Schoetterl-Glausch
Quoted 17 lines · Janosch Frank
It's a base + displacement address so we need to address it via 0(%[addr]).
Signed-off-by Janosch Frank <[email protected]>--- s390x/skrf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)s390x/skrf.c +1
-1@@ -103,7 +103,7 @@ static void test_tprot(void) {report_prefix_push ("tprot" );expect_pgm_int (); - asm volatile("tprot %[addr],0xf0(0)\n" + asm volatile("tprot 0(%[addr]),0xf0(0)\n"
Quoted 8 lines
Quoted 6 lines
s390x/skrf.c +0
-0: : [addr] "a" (pagebuf) : );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop ();Signature · 1 line
2.30.2Let's add an argument to tprot instead.
Sure, LGTM
Quoted 64 lines
-- >8 --
Subject: [kvm-unit-tests PATCH] lib: s390x: Add access key argument to tprotCurrently there is only one callee passing a non zero key, but having the argument will be useful in the future.
Signed-off-by Janis Schoetterl-Glausch <[email protected]>--- lib/s390x/asm/arch_def.h | 6 +++--- lib/s390x/sclp.c | 2 +- s390x/skrf.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-)lib/s390x/asm/arch_def.h +3
-3@@ -206,15 +206,15 @@ static inline unsigned short stap(void)return cpu_address; } -static inline int tprot (unsigned long addr) +static inline int tprot (unsigned long addr,char access_key) {int cc; asmvolatile ( -" tprot 0(%1),0\n" +" tprot 0(%1),0(%2)\n" " ipm %0\n" " srl %0,28\n" - :"=d" (cc) :"a" (addr) :"cc" ); + :"=d" (cc) :"a" (addr),"a" (access_key <<4 ) :"cc" );return cc; }lib/s390x/sclp.c +1
-1@@ -217,7 +217,7 @@ void sclp_memory_setup(void)/* probe for r/w memory up to max memory size */ while (ram_size < max_ram_size) {expect_pgm_int (); - cc =tprot (ram_size + storage_increment_size -1 ); + cc =tprot (ram_size + storage_increment_size -1 ,0 );/* stop once we receive an exception or have protected memory */ if (clear_pgm_int () || cc !=0 )break ;s390x/skrf.c +1
-2@@ -102,8 +102,7 @@ static void test_tprot(void) {report_prefix_push ("tprot" );expect_pgm_int (); - asmvolatile ("tprot %[addr],0xf0(0)\n" - : : [addr]"a" (pagebuf) : ); +tprot ((unsigned long )pagebuf,0xf );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop (); }