s390x: Cleanup and maintenance 3
cover s390x: Cleanup and maintenance 3
Two small cleanup patches improving snippet usage.
Janosch Frank (2):
lib: s390x: Fix PSW constant
lib: s390x: snippet.h: Add a few constants that will make our life
easier
lib/s390x/asm/arch_def.h | 2 +- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 lib/s390x/snippet.h
Signature · 1 line
2.30.2
PATCH 1/2 lib: s390x: Fix PSW constant
Somehow the ";" got into that patch and now complicates compilation. Let's remove it and put the constant in braces.
--- lib/s390x/asm/arch_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/s390x/asm/arch_def.h +1 -1
@@ -53,7 +53,7 @@ struct psw {#define PSW_MASK_PSTATE 0x0001000000000000UL#define PSW_MASK_EA 0x0000000100000000UL#define PSW_MASK_BA 0x0000000080000000UL -#define PSW_MASK_64 PSW_MASK_BA | PSW_MASK_EA; +#define PSW_MASK_64 (PSW_MASK_BA | PSW_MASK_EA)#define CTL0_LOW_ADDR_PROT (63 - 35)#define CTL0_EDAT (63 - 40)
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 1/2] lib: s390x: Fix PSW constant
Quoted 2 lines · On Wed, 13 Oct 2021 10:27:21 +0000 Janosch Frank <[email protected]> wrote:
Somehow the ";" got into that patch and now complicates compilation. Let's remove it and put the constant in braces.
ouch
Quoted 19 lines
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/s390x/asm/arch_def.h +1
-1@@ -53,7 +53,7 @@ struct psw {#define PSW_MASK_PSTATE 0x0001000000000000UL#define PSW_MASK_EA 0x0000000100000000UL#define PSW_MASK_BA 0x0000000080000000UL -#define PSW_MASK_64 PSW_MASK_BA | PSW_MASK_EA; +#define PSW_MASK_64 (PSW_MASK_BA | PSW_MASK_EA)#define CTL0_LOW_ADDR_PROT (63 - 35)#define CTL0_EDAT (63 - 40)
Re: [kvm-unit-tests PATCH 1/2] lib: s390x: Fix PSW constant
In reply to Janosch FrankQuoted 13 lines · Janosch Frank
Somehow the ";" got into that patch and now complicates compilation. Let's remove it and put the constant in braces.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/asm/arch_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/s390x/asm/arch_def.h +0
-0
lib/s390x/asm/arch_def.h struct psw { · line 56
Quoted 5 lines
lib/s390x/asm/arch_def.h +1
-1@@ -53,7 +53,7 @@ struct psw {#define PSW_MASK_PSTATE 0x0001000000000000UL#define PSW_MASK_EA 0x0000000100000000UL#define PSW_MASK_BA 0x0000000080000000UL -#define PSW_MASK_64 PSW_MASK_BA | PSW_MASK_EA; +#define PSW_MASK_64 (PSW_MASK_BA | PSW_MASK_EA)
PATCH 2/2 lib: s390x: snippet.h: Add a few constants that will make our life easier
In reply to Janosch FrankThe variable names for the snippet objects are of gigantic length so let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
--- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 lib/s390x/snippet.h
lib/s390x/snippet.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Snippet definitions +* +* Copyright IBM, Corp. 2021 +* Author: Janosch Frank <[email protected]> +*/ + +#ifndef _S390X_SNIPPET_H_ +#define _S390X_SNIPPET_H_ + +/* This macro cuts down the length of the pointers to snippets */ +#define SNIPPET_NAME_START (type, file) \ + _binary_s390x_snippets_##type##_##file##_gbin_start +#define SNIPPET_NAME_END (type, file) \ + _binary_s390x_snippets_##type##_##file##_gbin_end + +/* Returns the length of the snippet */ +#define SNIPPET_LEN (type, file) \ + (uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file) + +/* +* C snippet instructions start at 0x4000 due to the prefix and the +* stack being before that. +*/ +#define SNIPPET_C_ENTRY_ADDR 0x4000 +/* ASM snippets only have the prefix and hence start at 0x2000 */ +#define SNIPPET_ASM_ENTRY_ADDR 0x2000 + +/* Standard entry PSWs for snippets which can simply be copied into the guest PSW */ +static const struct psw snippet_c_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_C_ENTRY_ADDR , +}; + +static const struct psw snippet_asm_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_ASM_ENTRY_ADDR , +}; +#endif
s390x/mvpg-sie.c +6 -7
@@ -19,6 +19,7 @@#include <vm.h> #include <sclp.h> #include <sie.h> +#include <snippet.h> static u8 *guest;static struct vm vm;
@@ -27,8 +28,8 @@ static uint8_t *src;static uint8_t *dst;static uint8_t *cmp; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[]; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[]; +extern const char SNIPPET_NAME_START (c ,mvpg_snippet )[]; +extern const char SNIPPET_NAME_END (c ,mvpg_snippet )[];int binary_size;static void test_mvpg_pei (void )
@@ -77,10 +78,9 @@ static void test_mvpg_pei(void)static void test_mvpg (void ) { -int binary_size = ((uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_end - - (uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_start); +int binary_size =SNIPPET_LEN (c, mvpg_snippet); -memcpy (guest, _binary_s390x_snippets_c_mvpg_snippet_gbin_start, binary_size); +memcpy (guest,SNIPPET_NAME_START (c, mvpg_snippet), binary_size);memset (src,0x42 ,PAGE_SIZE );memset (dst,0x43 ,PAGE_SIZE );sie (&vm);
@@ -96,8 +96,7 @@ static void setup_guest(void)sie_guest_create (&vm, (uint64_t )guest,HPAGE_SIZE ); - vm.sblk->gpsw.addr =PAGE_SIZE *4 ; - vm.sblk->gpsw.mask =PSW_MASK_64 ; + vm.sblk->gpsw = snippet_c_psw; vm.sblk->ictl =ICTL_OPEREXC |ICTL_PINT ;/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;
Signature · 1 line
2.30.2
Re: [kvm-unit-tests PATCH 2/2] lib: s390x: snippet.h: Add a few constants that will make our life easier
Quoted 28 lines · On Wed, 13 Oct 2021 10:27:22 +0000 Janosch Frank <[email protected]> wrote:
The variable names for the snippet objects are of gigantic length so let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 lib/s390x/snippet.hlib/s390x/snippet.h new file +10
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Snippet definitions +* +* Copyright IBM, Corp. 2021 +* Author: Janosch Frank <[email protected]> +*/ + +#ifndef _S390X_SNIPPET_H_ +#define _S390X_SNIPPET_H_
lib/s390x/snippet.h line 20
Quoted 10 lines
lib/s390x/snippet.h new file +10
-0+ +/* This macro cuts down the length of the pointers to snippets */ +#define SNIPPET_NAME_START (type, file) \ + _binary_s390x_snippets_##type##_##file##_gbin_start +#define SNIPPET_NAME_END (type, file) \ + _binary_s390x_snippets_##type##_##file##_gbin_end + +/* Returns the length of the snippet */ +#define SNIPPET_LEN (type, file) \ + (uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file)
parentheses around the expansion:
((uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file))
lib/s390x/snippet.h line 27
Quoted 7 lines
lib/s390x/snippet.h new file +7
-0+ +/* +* C snippet instructions start at 0x4000 due to the prefix and the +* stack being before that. +*/ +#define SNIPPET_C_ENTRY_ADDR 0x4000 +/* ASM snippets only have the prefix and hence start at 0x2000 */
wouldn't it be possible to make both start at the same address? would make everything easier.
ASM snippets would have a couple of unused pages, but who cares?
Quoted 59 lines
lib/s390x/snippet.h new file +13
-0+#define SNIPPET_ASM_ENTRY_ADDR 0x2000 + +/* Standard entry PSWs for snippets which can simply be copied into the guest PSW */ +static const struct psw snippet_c_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_C_ENTRY_ADDR , +}; + +static const struct psw snippet_asm_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_ASM_ENTRY_ADDR , +}; +#endif s390x/mvpg-sie.c +6
-7@@ -19,6 +19,7 @@#include <vm.h> #include <sclp.h> #include <sie.h> +#include <snippet.h> static u8 *guest;static struct vm vm;@@ -27,8 +28,8 @@ static uint8_t *src;static uint8_t *dst;static uint8_t *cmp; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[]; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[]; +extern const char SNIPPET_NAME_START (c ,mvpg_snippet )[]; +extern const char SNIPPET_NAME_END (c ,mvpg_snippet )[];int binary_size;static void test_mvpg_pei (void )@@ -77,10 +78,9 @@ static void test_mvpg_pei(void)static void test_mvpg (void ) { -int binary_size = ((uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_end - - (uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_start); +int binary_size =SNIPPET_LEN (c, mvpg_snippet); -memcpy (guest, _binary_s390x_snippets_c_mvpg_snippet_gbin_start, binary_size); +memcpy (guest,SNIPPET_NAME_START (c, mvpg_snippet), binary_size);memset (src,0x42 ,PAGE_SIZE );memset (dst,0x43 ,PAGE_SIZE );sie (&vm);@@ -96,8 +96,7 @@ static void setup_guest(void)sie_guest_create (&vm, (uint64_t )guest,HPAGE_SIZE ); - vm.sblk->gpsw.addr =PAGE_SIZE *4 ; - vm.sblk->gpsw.mask =PSW_MASK_64 ; + vm.sblk->gpsw = snippet_c_psw; vm.sblk->ictl =ICTL_OPEREXC |ICTL_PINT ;/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;
Re: [kvm-unit-tests PATCH 2/2] lib: s390x: snippet.h: Add a few constants that will make our life easier
Quoted 36 lines · Claudio Imbrenda
Quoted 33 lines · On Wed, 13 Oct 2021 10:27:22 +0000 Janosch Frank <[email protected]> wrote:
The variable names for the snippet objects are of gigantic length so let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 2 files changed, 46 insertions(+), 7 deletions(-)create mode 100644
lib/s390x/snippet.hlib/s390x/snippet.h new file +15
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Snippet definitions +* +* Copyright IBM, Corp. 2021 +* Author: Janosch Frank <[email protected]> +*/ + +#ifndef _S390X_SNIPPET_H_ +#define _S390X_SNIPPET_H_ + +/* This macro cuts down the length of the pointers to snippets */ +#define SNIPPET_NAME_START (type, file) \ + _binary_s390x_snippets_##type##_##file##_gbin_start +#define SNIPPET_NAME_END (type, file) \
Quoted 9 lines
lib/s390x/snippet.h line 20
Quoted 5 lines
lib/s390x/snippet.h new file +5
-0+ _binary_s390x_snippets_##type##_##file##_gbin_end + +/* Returns the length of the snippet */ +#define SNIPPET_LEN (type, file) \ + (uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file)parentheses around the expansion:
((uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file))
Will do
Quoted 10 lines
lib/s390x/snippet.h line 27
Quoted 7 lines
lib/s390x/snippet.h new file +7
-0+ +/* +* C snippet instructions start at 0x4000 due to the prefix and the +* stack being before that. +*/ +#define SNIPPET_C_ENTRY_ADDR 0x4000 +/* ASM snippets only have the prefix and hence start at 0x2000 */ wouldn't it be possible to make both start at the same address? would make everything easier.
Sure, for the ASM snippets the entry address only depends on where you copy them if I'm not mistaken.
Quoted 63 lines
ASM snippets would have a couple of unused pages, but who cares?
Quoted 59 lines
lib/s390x/snippet.h new file +13
-0+#define SNIPPET_ASM_ENTRY_ADDR 0x2000 + +/* Standard entry PSWs for snippets which can simply be copied into the guest PSW */ +static const struct psw snippet_c_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_C_ENTRY_ADDR , +}; + +static const struct psw snippet_asm_psw = { + .mask =PSW_MASK_64 , + .addr =SNIPPET_ASM_ENTRY_ADDR , +}; +#endif s390x/mvpg-sie.c +6
-7@@ -19,6 +19,7 @@#include <vm.h> #include <sclp.h> #include <sie.h> +#include <snippet.h> static u8 *guest;static struct vm vm;@@ -27,8 +28,8 @@ static uint8_t *src;static uint8_t *dst;static uint8_t *cmp; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[]; -extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[]; +extern const char SNIPPET_NAME_START (c ,mvpg_snippet )[]; +extern const char SNIPPET_NAME_END (c ,mvpg_snippet )[];int binary_size;static void test_mvpg_pei (void )@@ -77,10 +78,9 @@ static void test_mvpg_pei(void)static void test_mvpg (void ) { -int binary_size = ((uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_end - - (uintptr_t )_binary_s390x_snippets_c_mvpg_snippet_gbin_start); +int binary_size =SNIPPET_LEN (c, mvpg_snippet); -memcpy (guest, _binary_s390x_snippets_c_mvpg_snippet_gbin_start, binary_size); +memcpy (guest,SNIPPET_NAME_START (c, mvpg_snippet), binary_size);memset (src,0x42 ,PAGE_SIZE );memset (dst,0x43 ,PAGE_SIZE );sie (&vm);@@ -96,8 +96,7 @@ static void setup_guest(void)sie_guest_create (&vm, (uint64_t )guest,HPAGE_SIZE ); - vm.sblk->gpsw.addr =PAGE_SIZE *4 ; - vm.sblk->gpsw.mask =PSW_MASK_64 ; + vm.sblk->gpsw = snippet_c_psw; vm.sblk->ictl =ICTL_OPEREXC |ICTL_PINT ;/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;
Re: [kvm-unit-tests PATCH 2/2] lib: s390x: snippet.h: Add a few constants that will make our life easier
In reply to Janosch FrankQuoted 18 lines · Janosch Frank
The variable names for the snippet objects are of gigantic length so let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 lib/s390x/snippet.hlib/s390x/snippet.h new file +0
-0
lib/s390x/snippet.h line 5
Quoted 5 lines
lib/s390x/snippet.h new file +5
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Snippet definitions +* +* Copyright IBM, Corp. 2021
^
That comma should not be there.
Quoted 3 lines
lib/s390x/snippet.h new file +3
-0+* Author: Janosch Frank <[email protected]> +*/ +
[...]
Re: [kvm-unit-tests PATCH 2/2] lib: s390x: snippet.h: Add a few constants that will make our life easier
Quoted 25 lines · Janis Schoetterl-Glausch
Quoted 18 lines · Janosch Frank
The variable names for the snippet objects are of gigantic length so let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/snippet.h | 40 ++++++++++++++++++++++++++++++++++++++++ s390x/mvpg-sie.c | 13 ++++++------- 2 files changed, 46 insertions(+), 7 deletions(-)create mode 100644
lib/s390x/snippet.hlib/s390x/snippet.h new file +0
-0lib/s390x/snippet.h line 5
Quoted 5 lines
lib/s390x/snippet.h new file +5
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Snippet definitions +* +* Copyright IBM, Corp. 2021 ^
Quoted 1 line
That comma should not be there.
Right, copied that over from css.h.
Fixed that and wrote a reminder to fix sclp.h and css.h in v2
Quoted 5 lines
Quoted 3 lines
lib/s390x/snippet.h new file +3
-0+* Author: Janosch Frank <[email protected]> +*/ +[...]