tests/tcg: target/s390x: Test MVC
PATCH 1/1 tests/tcg: target/s390x: Test MVC
Let's add a test that especially verifies that no data will be touched in case we cross page boundaries and one page access triggers a fault.
Before the fault-safe handling fixes, the test failes with:
TEST mvc on s390x
data modified during a fault
make[2]: *** [../Makefile.target:116: run-mvc] Error 1--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/mvc.c | 109 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tests/tcg/s390x/mvc.c
tests/tcg/s390x/Makefile.target +1 -0
@@ -7,3 +7,4 @@ TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack TESTS+=mvo +TESTS+=mvc
tests/tcg/s390x/mvc.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.21.0
Quoted 62 lines · David Hildenbrand
Let's add a test that especially verifies that no data will be touched in case we cross page boundaries and one page access triggers a fault.
Before the fault-safe handling fixes, the test failes with:
TEST mvc on s390x data modified during a fault make[2]: *** [../Makefile.target:116: run-mvc] Error 1Cc Alex Bennée <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/mvc.c | 109 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tests/tcg/s390x/mvc.ctests/tcg/s390x/Makefile.target +1
-0@@ -7,3 +7,4 @@ TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack TESTS+=mvo +TESTS+=mvctests/tcg/s390x/mvc.c new file +31
-0@@ -0,0 +1,109 @@ +#include <stdint.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/mman.h> +#include <signal.h> +#include <setjmp.h> + +jmp_buf jmp_env; + +static void handle_sigsegv (int sig) +{ +siglongjmp (jmp_env,1 ); +} + +#define ALLOC_SIZE (2 * 4096) + +static inline void mvc_256 (const char *dst,const char *src) +{ + asmvolatile ( +" mvc 0(256,%[dst]),0(%[src])\n" + : + : [dst]"d" (dst), + [src]"d" (src) + :"memory" ); +} + +int main (void ) +{ +char *src, *dst; +int i;
tests/tcg/s390x/mvc.c line 41
Quoted 10 lines
tests/tcg/s390x/mvc.c new file +10
-0+ +/* register the SIGSEGV handler */ +if (signal (SIGSEGV , handle_sigsegv) ==SIG_ERR ) { +fprintf (stderr,"SIGSEGV not registered\n" ); +return 1 ; + } + +/* prepare the buffers - two consecutive pages */ + src =valloc (ALLOC_SIZE ); + dst =valloc (ALLOC_SIZE );
If anybody cares, I can convert the obsolete valloc into a posix_memalign(&src, 4096, ALLOC_SIZE) etc.
Quoted 3 lines
tests/tcg/s390x/mvc.c new file +3
-0+memset (src,0xff ,ALLOC_SIZE ); +memset (dst,0x0 ,ALLOC_SIZE ); +
Signature · 3 lines
Thanks, David / dhildenb
Richard Henderson
Reviewed-byQuoted 6 lines · David Hildenbrand
tests/tcg/s390x/mvc.c line 41
Quoted 3 lines
tests/tcg/s390x/mvc.c new file +3
-0+/* prepare the buffers - two consecutive pages */ + src =valloc (ALLOC_SIZE ); + dst =valloc (ALLOC_SIZE );If anybody cares, I can convert the obsolete valloc into a
posix_memalign(&src, 4096, ALLOC_SIZE)etc.
I don't care. It may be obsolete, but it still works.
If you were to change it to anything I would think mmap instead of using mprotect on the heap at all...
r~
Quoted 5 lines · Richard Henderson
Quoted 4 lines · David Hildenbrand
Quoted 3 lines
tests/tcg/s390x/mvc.c new file +3
-0+/* prepare the buffers - two consecutive pages */ + src =valloc (ALLOC_SIZE ); + dst =valloc (ALLOC_SIZE );
Quoted 7 lines
Quoted 2 lines
If anybody cares, I can convert the obsolete valloc into a
posix_memalign(&src, 4096, ALLOC_SIZE)etc.I don't care. It may be obsolete, but it still works.
If you were to change it to anything I would think mmap instead of using mprotect on the heap at all...
Yeah, that was my other thought, but after all I own "full" pages.
I'll leave it like this than unless somebody objects :)
Quoted 2 lines
Reviewed-by Richard Henderson <[email protected]>
Thanks!
Quoted 4 lines
r~
Signature · 3 lines
Thanks, David / dhildenb
Quoted 131 lines · David Hildenbrand
Let's add a test that especially verifies that no data will be touched in case we cross page boundaries and one page access triggers a fault.
Before the fault-safe handling fixes, the test failes with:
TEST mvc on s390x data modified during a fault make[2]: *** [../Makefile.target:116: run-mvc] Error 1Cc Alex Bennée <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/mvc.c | 109 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tests/tcg/s390x/mvc.ctests/tcg/s390x/Makefile.target +1
-0@@ -7,3 +7,4 @@ TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack TESTS+=mvo +TESTS+=mvctests/tcg/s390x/mvc.c new file +99
-0@@ -0,0 +1,109 @@ +#include <stdint.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/mman.h> +#include <signal.h> +#include <setjmp.h> + +jmp_buf jmp_env; + +static void handle_sigsegv (int sig) +{ +siglongjmp (jmp_env,1 ); +} + +#define ALLOC_SIZE (2 * 4096) + +static inline void mvc_256 (const char *dst,const char *src) +{ + asmvolatile ( +" mvc 0(256,%[dst]),0(%[src])\n" + : + : [dst]"d" (dst), + [src]"d" (src) + :"memory" ); +} + +int main (void ) +{ +char *src, *dst; +int i; + +/* register the SIGSEGV handler */ +if (signal (SIGSEGV , handle_sigsegv) ==SIG_ERR ) { +fprintf (stderr,"SIGSEGV not registered\n" ); +return 1 ; + } + +/* prepare the buffers - two consecutive pages */ + src =valloc (ALLOC_SIZE ); + dst =valloc (ALLOC_SIZE ); +memset (src,0xff ,ALLOC_SIZE ); +memset (dst,0x0 ,ALLOC_SIZE ); + +/* protect the second pages */ +if (mprotect (src +4096 ,4096 ,PROT_NONE ) || +mprotect (dst +4096 ,4096 ,PROT_NONE )) { +fprintf (stderr,"mprotect failed\n" ); +return 1 ; + } + +/* fault on second destination page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst +4096 -128 , src); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* fault on second source page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst, src +4096 -128 ); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* fault on second source and second destination page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst +4096 -128 , src +4096 -128 ); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* restore permissions */ +if (mprotect (src +4096 ,4096 ,PROT_READ |PROT_WRITE ) || +mprotect (dst +4096 ,4096 ,PROT_READ |PROT_WRITE )) { +fprintf (stderr,"mprotect failed\n" ); +return 1 ; + } + +/* no data must be touched during the faults */ +for (i =0 ; i <ALLOC_SIZE ; i++) { +if (src[i] !=0xff || dst[i]) { +fprintf (stderr,"data modified during a fault\n" ); +return 1 ; + } + } + +/* test if MVC works now correctly accross page boundaries */ +mvc_256 (dst +4096 -128 , src +4096 -128 ); +for (i =0 ; i <ALLOC_SIZE ; i++) { +if (src[i] !=0xff ) { +fprintf (stderr,"src modified\n" ); +return 1 ; + } +if (i <4096 -128 || i >=4096 +128 ) { +if (dst[i]) { +fprintf (stderr,"wrong dst modified\n" ); +return 1 ; + }
tests/tcg/s390x/mvc.c line 109
Quoted 10 lines
tests/tcg/s390x/mvc.c new file +10
-0+ }else { +if (dst[i] !=0xff ) { +fprintf (stderr,"wrong data moved\n" ); +return 1 ; + } + } + } + +return 0 ; +}
I'll send this along with the updated pull request of
"[PULL SUBSYSTEM s390x 00/29] s390x/tcg: mem_helper: Fault-safe handling"
Signature · 3 lines
Thanks, David / dhildenb
Alex Bennée
Acked-byQuoted 145 lines · David Hildenbrand
Quoted 131 lines · David Hildenbrand
Let's add a test that especially verifies that no data will be touched in case we cross page boundaries and one page access triggers a fault.
Before the fault-safe handling fixes, the test failes with:
TEST mvc on s390x data modified during a fault make[2]: *** [../Makefile.target:116: run-mvc] Error 1Cc Alex Bennée <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/mvc.c | 109 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tests/tcg/s390x/mvc.ctests/tcg/s390x/Makefile.target +1
-0@@ -7,3 +7,4 @@ TESTS+=exrl-trt TESTS+=exrl-trtr TESTS+=pack TESTS+=mvo +TESTS+=mvctests/tcg/s390x/mvc.c new file +99
-0@@ -0,0 +1,109 @@ +#include <stdint.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/mman.h> +#include <signal.h> +#include <setjmp.h> + +jmp_buf jmp_env; + +static void handle_sigsegv (int sig) +{ +siglongjmp (jmp_env,1 ); +} + +#define ALLOC_SIZE (2 * 4096) + +static inline void mvc_256 (const char *dst,const char *src) +{ + asmvolatile ( +" mvc 0(256,%[dst]),0(%[src])\n" + : + : [dst]"d" (dst), + [src]"d" (src) + :"memory" ); +} + +int main (void ) +{ +char *src, *dst; +int i; + +/* register the SIGSEGV handler */ +if (signal (SIGSEGV , handle_sigsegv) ==SIG_ERR ) { +fprintf (stderr,"SIGSEGV not registered\n" ); +return 1 ; + } + +/* prepare the buffers - two consecutive pages */ + src =valloc (ALLOC_SIZE ); + dst =valloc (ALLOC_SIZE ); +memset (src,0xff ,ALLOC_SIZE ); +memset (dst,0x0 ,ALLOC_SIZE ); + +/* protect the second pages */ +if (mprotect (src +4096 ,4096 ,PROT_NONE ) || +mprotect (dst +4096 ,4096 ,PROT_NONE )) { +fprintf (stderr,"mprotect failed\n" ); +return 1 ; + } + +/* fault on second destination page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst +4096 -128 , src); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* fault on second source page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst, src +4096 -128 ); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* fault on second source and second destination page */ +if (sigsetjmp (jmp_env,1 ) ==0 ) { +mvc_256 (dst +4096 -128 , src +4096 -128 ); +fprintf (stderr,"fault not triggered\n" ); +return 1 ; + } + +/* restore permissions */ +if (mprotect (src +4096 ,4096 ,PROT_READ |PROT_WRITE ) || +mprotect (dst +4096 ,4096 ,PROT_READ |PROT_WRITE )) { +fprintf (stderr,"mprotect failed\n" ); +return 1 ; + } + +/* no data must be touched during the faults */ +for (i =0 ; i <ALLOC_SIZE ; i++) { +if (src[i] !=0xff || dst[i]) { +fprintf (stderr,"data modified during a fault\n" ); +return 1 ; + } + } + +/* test if MVC works now correctly accross page boundaries */ +mvc_256 (dst +4096 -128 , src +4096 -128 ); +for (i =0 ; i <ALLOC_SIZE ; i++) { +if (src[i] !=0xff ) { +fprintf (stderr,"src modified\n" ); +return 1 ; + } +if (i <4096 -128 || i >=4096 +128 ) { +if (dst[i]) { +fprintf (stderr,"wrong dst modified\n" ); +return 1 ; + }tests/tcg/s390x/mvc.c line 109
Quoted 10 lines
tests/tcg/s390x/mvc.c new file +10
-0+ }else { +if (dst[i] !=0xff ) { +fprintf (stderr,"wrong data moved\n" ); +return 1 ; + } + } + } + +return 0 ; +}I'll send this along with the updated pull request of
Quoted 2 lines
"[PULL SUBSYSTEM s390x 00/29] s390x/tcg:
mem_helper: Fault-safe handling"
--
Alex Bennée