s390x: uv-host: Access check extensions and improvements
v3 cover s390x: uv-host: Access check extensions and improvements
Over the last few weeks I had a few ideas on how to extend the uv-host test to get more coverage. Most checks are access checks for secure pages or the UVCB and its satellites.
v3:
* Added len assert for access_check_3d
* using the latest version of patch #1
v2:
* Moved 3d access check in function
* Small fixes
* Added two more fix patches
Janosch Frank (8):
s390x: uv-host: Add access checks for donated memory
s390x: uv-host: Add uninitialized UV tests
s390x: uv-host: Test uv immediate parameter
s390x: uv-host: Add access exception test
s390x: uv-host: Add a set secure config parameters test function
s390x: uv-host: Remove duplicated +
s390x: uv-host: Fence against being run as a PV guest
s390x: uv-host: Fix init storage origin and length check
s390x/uv-host.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 254 insertions(+), 10 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/8 s390x: uv-host: Add access checks for donated memory
Let's check if the UV really protected all the memory we donated.
--- s390x/uv-host.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
s390x/uv-host.c +37 -0
@@ -43,6 +43,32 @@ static void cpu_loop(void)for (;;) {} } +/* +* Checks if a memory area is protected as secure memory. +* Will return true if all pages are protected, false otherwise. +*/ +static bool access_check_3d (uint8_t *access_ptr,uint64_t len) +{ +assert (!(len & ~PAGE_MASK )); +assert (!((uint64_t )access_ptr & ~PAGE_MASK )); + +while (len) { +expect_pgm_int (); +READ_ONCE (*access_ptr); +if (clear_pgm_int () !=PGM_INT_CODE_SECURE_STOR_ACCESS ) +return false; +expect_pgm_int (); +WRITE_ONCE (*access_ptr,42 ); +if (clear_pgm_int () !=PGM_INT_CODE_SECURE_STOR_ACCESS ) +return false; + + access_ptr +=PAGE_SIZE ; + len -=PAGE_SIZE ; + } + +return true; +} +static struct cmd_list cmds[] = { {"init" ,UVC_CMD_INIT_UV ,sizeof (struct uv_cb_init ),BIT_UVC_CMD_INIT_UV }, {"create conf" ,UVC_CMD_CREATE_SEC_CONF ,sizeof (struct uv_cb_cgc ),BIT_UVC_CMD_CREATE_SEC_CONF },
@@ -194,6 +220,10 @@ static void test_cpu_create(void)report (rc ==0 && uvcb_csc.header.rc ==UVC_RC_EXECUTED && uvcb_csc.cpu_handle,"success" ); + rc =access_check_3d ((uint8_t *)uvcb_csc.stor_origin, + uvcb_qui.cpu_stor_len); +report (rc,"Storage protection" ); + tmp = uvcb_csc.stor_origin; uvcb_csc.stor_origin = (unsigned long )memalign (PAGE_SIZE , uvcb_qui.cpu_stor_len); rc =uv_call (0 , (uint64_t )&uvcb_csc);
@@ -292,6 +322,13 @@ static void test_config_create(void) rc =uv_call (0 , (uint64_t )&uvcb_cgc);report (rc ==0 && uvcb_cgc.header.rc ==UVC_RC_EXECUTED ,"successful" ); + rc =access_check_3d ((uint8_t *)uvcb_cgc.conf_base_stor_origin, + uvcb_qui.conf_base_phys_stor_len); +report (rc,"Base storage protection" ); + + rc =access_check_3d ((uint8_t *)uvcb_cgc.conf_var_stor_origin, vsize); +report (rc,"Variable storage protection" ); + uvcb_cgc.header.rc =0 ; uvcb_cgc.header.rrc =0 ; tmp = uvcb_cgc.guest_handle;
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v3 1/8] s390x: uv-host: Add access checks for donated memory
Quoted 5 lines · Janosch Frank
Let's check if the UV really protected all the memory we donated.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Nico Boehr <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>
LGTM.
Reviewed-by; Steffen Eiden <[email protected]>
Quoted 66 lines
--- s390x/uv-host.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)s390x/uv-host.c +37
-0@@ -43,6 +43,32 @@ static void cpu_loop(void)for (;;) {} } +/* +* Checks if a memory area is protected as secure memory. +* Will return true if all pages are protected, false otherwise. +*/ +static bool access_check_3d (uint8_t *access_ptr,uint64_t len) +{ +assert (!(len & ~PAGE_MASK )); +assert (!((uint64_t )access_ptr & ~PAGE_MASK )); + +while (len) { +expect_pgm_int (); +READ_ONCE (*access_ptr); +if (clear_pgm_int () !=PGM_INT_CODE_SECURE_STOR_ACCESS ) +return false; +expect_pgm_int (); +WRITE_ONCE (*access_ptr,42 ); +if (clear_pgm_int () !=PGM_INT_CODE_SECURE_STOR_ACCESS ) +return false; + + access_ptr +=PAGE_SIZE ; + len -=PAGE_SIZE ; + } + +return true; +} +static struct cmd_list cmds[] = { {"init" ,UVC_CMD_INIT_UV ,sizeof (struct uv_cb_init ),BIT_UVC_CMD_INIT_UV }, {"create conf" ,UVC_CMD_CREATE_SEC_CONF ,sizeof (struct uv_cb_cgc ),BIT_UVC_CMD_CREATE_SEC_CONF },@@ -194,6 +220,10 @@ static void test_cpu_create(void)report (rc ==0 && uvcb_csc.header.rc ==UVC_RC_EXECUTED && uvcb_csc.cpu_handle,"success" ); + rc =access_check_3d ((uint8_t *)uvcb_csc.stor_origin, + uvcb_qui.cpu_stor_len); +report (rc,"Storage protection" ); + tmp = uvcb_csc.stor_origin; uvcb_csc.stor_origin = (unsigned long )memalign (PAGE_SIZE , uvcb_qui.cpu_stor_len); rc =uv_call (0 , (uint64_t )&uvcb_csc);@@ -292,6 +322,13 @@ static void test_config_create(void) rc =uv_call (0 , (uint64_t )&uvcb_cgc);report (rc ==0 && uvcb_cgc.header.rc ==UVC_RC_EXECUTED ,"successful" ); + rc =access_check_3d ((uint8_t *)uvcb_cgc.conf_base_stor_origin, + uvcb_qui.conf_base_phys_stor_len); +report (rc,"Base storage protection" ); + + rc =access_check_3d ((uint8_t *)uvcb_cgc.conf_var_stor_origin, vsize); +report (rc,"Variable storage protection" ); + uvcb_cgc.header.rc =0 ; uvcb_cgc.header.rrc =0 ; tmp = uvcb_cgc.guest_handle;
PATCH v3 2/8 s390x: uv-host: Add uninitialized UV tests
In reply to Janosch FrankLet's also test for rc 0x3
--- s390x/uv-host.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-)
s390x/uv-host.c +77 -2
@@ -109,6 +109,25 @@ static void test_priv(void)report_prefix_pop (); } +static void test_uv_uninitialized (void ) +{ +struct uv_cb_header uvcb = {}; +int i; + +report_prefix_push ("uninitialized" ); + +for (i =0 ; cmds[i].name; i++) { +if (cmds[i].cmd ==UVC_CMD_INIT_UV ) +continue ; +expect_pgm_int (); + uvcb.cmd = cmds[i].cmd; + uvcb.len = cmds[i].len; +uv_call_once (0 , (uint64_t )&uvcb); +report (uvcb.rc ==UVC_RC_INV_STATE ,"%s" , cmds[i].name); + } +report_prefix_pop (); +} +static void test_config_destroy (void ) {int rc;
@@ -476,13 +495,68 @@ static void test_invalid(void)report_prefix_pop (); } +static void setup_test_clear (void ) +{ +unsigned long vsize; +int rc; + + uvcb_cgc.header.cmd =UVC_CMD_CREATE_SEC_CONF ; + uvcb_cgc.header.len =sizeof (uvcb_cgc); + + uvcb_cgc.guest_stor_origin =0 ; + uvcb_cgc.guest_stor_len =42 * (1UL <<20 ); + vsize = uvcb_qui.conf_base_virt_stor_len + + ((uvcb_cgc.guest_stor_len / (1UL <<20 )) * uvcb_qui.conf_virt_var_stor_len); + + uvcb_cgc.conf_base_stor_origin = (uint64_t )memalign (PAGE_SIZE *4 , uvcb_qui.conf_base_phys_stor_len); + uvcb_cgc.conf_var_stor_origin = (uint64_t )memalign (PAGE_SIZE , vsize); + uvcb_cgc.guest_asce = (uint64_t )memalign (PAGE_SIZE ,4 *PAGE_SIZE ) |ASCE_DT_SEGMENT |REGION_TABLE_LENGTH |ASCE_P ; + uvcb_cgc.guest_sca = (uint64_t )memalign (PAGE_SIZE *4 ,PAGE_SIZE *4 ); + + rc =uv_call (0 , (uint64_t )&uvcb_cgc); +assert (rc ==0 ); + + uvcb_csc.header.len =sizeof (uvcb_csc); + uvcb_csc.header.cmd =UVC_CMD_CREATE_SEC_CPU ; + uvcb_csc.guest_handle = uvcb_cgc.guest_handle; + uvcb_csc.stor_origin = (unsigned long )memalign (PAGE_SIZE , uvcb_qui.cpu_stor_len); + uvcb_csc.state_origin = (unsigned long )memalign (PAGE_SIZE ,PAGE_SIZE ); + + rc =uv_call (0 , (uint64_t )&uvcb_csc); +assert (rc ==0 ); +} +static void test_clear (void ) { -uint64_t *tmp = (void *)uvcb_init.stor_origin; +uint64_t *tmp; + +report_prefix_push ("load normal reset" ); + +/* +* Setup a config and a cpu so we can check if a diag308 reset +* clears the donated memory and makes the pages unsecure. +*/ +setup_test_clear ();diag308_load_reset (1 );sclp_console_setup (); -report (!*tmp,"memory cleared after reset 1" ); + + tmp = (void *)uvcb_init.stor_origin; +report (!*tmp,"uv init donated memory cleared" ); + + tmp = (void *)uvcb_cgc.conf_base_stor_origin; +report (!*tmp,"config base donated memory cleared" ); + + tmp = (void *)uvcb_cgc.conf_base_stor_origin; +report (!*tmp,"config variable donated memory cleared" ); + + tmp = (void *)uvcb_csc.stor_origin; +report (!*tmp,"cpu donated memory cleared after reset 1" ); + +/* Check if uninitialized after reset */ +test_uv_uninitialized (); + +report_prefix_pop (); }static void setup_vmem (void )
@@ -513,6 +587,7 @@ int main(void)test_priv ();test_invalid (); +test_uv_uninitialized ();test_query ();test_init ();
Signature · 1 line
2.34.1
PATCH v3 3/8 s390x: uv-host: Test uv immediate parameter
In reply to Janosch FrankLet's check if we get a specification PGM exception if we set a non-zero i3 when doing a UV call.
--- s390x/uv-host.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
s390x/uv-host.c +23 -0
@@ -90,6 +90,28 @@ static struct cmd_list cmds[] = { { NULL, 0, 0 }, }; +static void test_i3 (void ) +{ +struct uv_cb_header uvcb = { + .cmd =UVC_CMD_INIT_UV , + .len =sizeof (struct uv_cb_init ), + }; +unsigned long r1 =0 ; +int cc; + +report_prefix_push ("i3" ); +expect_pgm_int (); + asmvolatile ( +"0: .insn rrf,0xB9A40000,%[r1],%[r2],4,2\n" +" ipm %[cc]\n" +" srl %[cc],28\n" + : [cc]"=d" (cc) + : [r1]"a" (r1), [r2]"a" (&uvcb) + :"memory" ,"cc" ); +check_pgm_int_code (PGM_INT_CODE_SPECIFICATION ); +report_prefix_pop (); +} +static void test_priv (void ) {struct uv_cb_header uvcb = {};
@@ -585,6 +607,7 @@ int main(void) goto done; } +test_i3 ();test_priv ();test_invalid ();test_uv_uninitialized ();
Signature · 1 line
2.34.1
PATCH v3 4/8 s390x: uv-host: Add access exception test
In reply to Janosch FrankLet's check that we get access exceptions if the UVCB is on an invalid page or starts at a valid page and crosses into an invalid one.
--- s390x/uv-host.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
s390x/uv-host.c +52 -0
@@ -15,12 +15,14 @@#include <sclp.h> #include <smp.h> #include <uv.h> +#include <mmu.h> #include <asm/page.h> #include <asm/sigp.h> #include <asm/pgtable.h> #include <asm/asm-offsets.h> #include <asm/interrupt.h> #include <asm/facility.h> +#include <asm/pgtable.h> #include <asm/uv.h> #include <asm-generic/barrier.h>
@@ -150,6 +152,54 @@ static void test_uv_uninitialized(void)report_prefix_pop (); } +static void test_access (void ) +{ +struct uv_cb_header *uvcb; +void *pages =alloc_pages (1 ); +uint16_t pgm; +int i; + +/* Put UVCB on second page which we will protect later */ + uvcb = pages +PAGE_SIZE ; + +report_prefix_push ("access" ); + +report_prefix_push ("non-crossing" ); +protect_page (uvcb,PAGE_ENTRY_I ); +for (i =0 ; cmds[i].name; i++) { +expect_pgm_int (); +mb (); +uv_call_once (0 , (uint64_t )uvcb); + pgm =clear_pgm_int (); +report (pgm ==PGM_INT_CODE_PAGE_TRANSLATION ,"%s" , cmds[i].name); + } +report_prefix_pop (); + +report_prefix_push ("crossing" ); +/* +* Put the header into the readable page 1, everything after +* the header will be on the second, invalid page. +*/ + uvcb -=1 ; +for (i =0 ; cmds[i].name; i++) { + uvcb->cmd = cmds[i].cmd; + uvcb->len = cmds[i].len; + +expect_pgm_int (); +mb (); +uv_call_once (0 , (uint64_t )uvcb); + pgm =clear_pgm_int (); +report (pgm ==PGM_INT_CODE_PAGE_TRANSLATION ,"%s" , cmds[i].name); + } +report_prefix_pop (); + + uvcb +=1 ; +unprotect_page (uvcb,PAGE_ENTRY_I ); + +free_pages (pages); +report_prefix_pop (); +} +static void test_config_destroy (void ) {int rc;
@@ -615,6 +665,8 @@ int main(void)test_init ();setup_vmem (); +test_access (); +test_config_create ();test_cpu_create ();test_cpu_destroy ();
Signature · 1 line
2.34.1
PATCH v3 5/8 s390x: uv-host: Add a set secure config parameters test function
In reply to Janosch FrankTime for more tests.
--- s390x/uv-host.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
s390x/uv-host.c +48 -0
@@ -256,6 +256,53 @@ static void test_cpu_destroy(void)report_prefix_pop (); } +static void test_set_se_header (void ) +{ +struct uv_cb_ssc uvcb = { + .header.cmd =UVC_CMD_SET_SEC_CONF_PARAMS , + .header.len =sizeof (uvcb), + .guest_handle = uvcb_cgc.guest_handle, + .sec_header_origin =0 , + .sec_header_len =0x1000 , + }; +void *pages =alloc_pages (1 ); +void *inv; +int rc; + +report_prefix_push ("sscp" ); + + uvcb.header.len -=8 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_LEN , +"hdr invalid length" ); + uvcb.header.len +=8 ; + + uvcb.guest_handle +=1 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==UVC_RC_INV_GHANDLE ,"invalid handle" ); + uvcb.guest_handle -=1 ; + + inv = pages +PAGE_SIZE ; + uvcb.sec_header_origin = (uint64_t )inv; +protect_page (inv,PAGE_ENTRY_I ); + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==0x103 , +"se hdr access exception" ); + +/* +* Shift the ptr so the first few DWORDs are accessible but +* the following are on an invalid page. +*/ + uvcb.sec_header_origin -=0x20 ; + rc =uv_call (0 , (uint64_t )&uvcb); +report (rc ==1 && uvcb.header.rc ==0x103 , +"se hdr access exception crossing" ); +unprotect_page (inv,PAGE_ENTRY_I ); + +free_pages (pages); +report_prefix_pop (); +} +static void test_cpu_create (void ) {int rc;
@@ -669,6 +716,7 @@ int main(void)test_config_create ();test_cpu_create (); +test_set_se_header ();test_cpu_destroy ();test_config_destroy ();test_clear ();
Signature · 1 line
2.34.1
PATCH v3 6/8 s390x: uv-host: Remove duplicated +
In reply to Janosch FrankOne + is definitely enough here.
--- s390x/uv-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/uv-host.c +1 -1
@@ -451,7 +451,7 @@ static void test_config_create(void) uvcb_cgc.guest_sca = tmp; tmp = uvcb_cgc.guest_sca; - uvcb_cgc.guest_sca =get_max_ram_size () + +PAGE_SIZE *4 ; + uvcb_cgc.guest_sca =get_max_ram_size () +PAGE_SIZE *4 ; rc =uv_call (0 , (uint64_t )&uvcb_cgc);report (uvcb_cgc.header.rc ==0x10d && rc ==1 ,"sca inaccessible" );
Signature · 1 line
2.34.1
PATCH v3 7/8 s390x: uv-host: Fence against being run as a PV guest
In reply to Janosch FrankThis test checks the UV host API so we should skip it if we're a PV guest.
--- s390x/uv-host.c | 4 ++++ 1 file changed, 4 insertions(+)
s390x/uv-host.c +4 -0
@@ -703,6 +703,10 @@ int main(void)report_skip ("Ultravisor call facility is not available" ); goto done; } +if (!uv_os_is_host ()) { +report_skip ("This test needs to be run in a UV host environment" ); + goto done; + }test_i3 ();test_priv ();
Signature · 1 line
2.34.1
PATCH v3 8/8 s390x: uv-host: Fix init storage origin and length check
In reply to Janosch FrankThe origin and length are masked with the HPAGE_MASK and PAGE_MASK respectively so adding a few bytes doesn't matter at all.
--- s390x/uv-host.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
s390x/uv-host.c +12 -7
@@ -524,17 +524,22 @@ static void test_init(void) "storage invalid length"); uvcb_init.stor_len +=8 ; - uvcb_init.stor_origin =get_max_ram_size () +8 ; +/* Storage origin is 1MB aligned, the length is 4KB aligned */ + uvcb_init.stor_origin =get_max_ram_size (); rc =uv_call (0 , (uint64_t )&uvcb_init); -report (rc ==1 && uvcb_init.header.rc ==0x104 , +report (rc ==1 && (uvcb_init.header.rc ==0x104 || uvcb_init.header.rc ==0x105 ),"storage origin invalid" ); uvcb_init.stor_origin = mem; - uvcb_init.stor_origin =get_max_ram_size () -8 ; - rc =uv_call (0 , (uint64_t )&uvcb_init); -report (rc ==1 && uvcb_init.header.rc ==0x105 , -"storage + length invalid" ); - uvcb_init.stor_origin = mem; +if (uvcb_init.stor_len >=HPAGE_SIZE ) { + uvcb_init.stor_origin =get_max_ram_size () -HPAGE_SIZE ; + rc =uv_call (0 , (uint64_t )&uvcb_init); +report (rc ==1 && uvcb_init.header.rc ==0x105 , +"storage + length invalid" ); + uvcb_init.stor_origin = mem; + }else { +report_skip ("storage + length invalid, stor_len < HPAGE_SIZE" ); + } uvcb_init.stor_origin =1UL <<30 ; rc =uv_call (0 , (uint64_t )&uvcb_init);
Signature · 1 line
2.34.1
Quoted 3 lines · On Mon, 17 Oct 2022 09:39:17 +0000 Janosch Frank <[email protected]> wrote:
Over the last few weeks I had a few ideas on how to extend the uv-host test to get more coverage. Most checks are access checks for secure pages or the UVCB and its satellites.
thanks, picked
Quoted 23 lines
v3:
* Added len assert foraccess_check_3d
* using the latest version of patch #1v2:
* Moved 3d access check in function
* Small fixes
* Added two more fix patchesJanosch Frank (8):
s390x: uv-host: Add access checks for donated memory
s390x: uv-host: Add uninitialized UV tests
s390x: uv-host: Test uv immediate parameter
s390x: uv-host: Add access exception test
s390x: uv-host: Add a set secure config parameters test function
s390x: uv-host: Remove duplicated +
s390x: uv-host: Fence against being run as a PV guest
s390x: uv-host: Fix init storage origin and length checks390x/uv-host.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 254 insertions(+), 10 deletions(-)