Remove straddling_instruction_unmapped test to fix FVP test failure.
This test was trying to test that an instruction straddling the boundary
between a mapped page and an unmapped page causes a fault due to the
unmapped page. It does on QEMU because QEMU doesn't enforce PC alignment
as the architecture specifies, but on FVP it fails with a PC alignment
fault instead, which is not very interesting to test for.
Change-Id: I90695887fc9913dc842bd535a90d8ef5b30f56c1
diff --git a/test/vmapi/primary_with_secondaries/services/unmapped.c b/test/vmapi/primary_with_secondaries/services/unmapped.c
index d4b323c..9197233 100644
--- a/test/vmapi/primary_with_secondaries/services/unmapped.c
+++ b/test/vmapi/primary_with_secondaries/services/unmapped.c
@@ -64,32 +64,3 @@
f();
FAIL("Exception not generated by invalid access.");
}
-
-TEST_SERVICE(straddling_instruction_unmapped)
-{
- void *send_buf = SERVICE_SEND_BUFFER();
-
- /*
- * Get a function pointer which, when branched to, will attempt to
- * execute a 4-byte instruction straddling two pages.
- */
- int (*f)(void) = (int (*)(void))(&pages[PAGE_SIZE - 2]);
-
- /* Give second page to the primary VM so that it's unmapped. */
- struct spci_memory_region_constituent constituents[] = {
- {.address = (uint64_t)(&pages[PAGE_SIZE]), .page_count = 1},
- };
- uint32_t msg_size = spci_memory_region_init(
- send_buf, hf_vm_get_id(), HF_PRIMARY_VM_ID, constituents,
- ARRAY_SIZE(constituents), 0, 0, SPCI_MEMORY_RW_X,
- SPCI_MEMORY_NORMAL_MEM, SPCI_MEMORY_CACHE_WRITE_BACK,
- SPCI_MEMORY_OUTER_SHAREABLE);
-
- exception_setup(NULL, exception_handler_yield_instruction_abort);
-
- EXPECT_EQ(spci_mem_donate(msg_size, msg_size, 0).func, SPCI_SUCCESS_32);
-
- /* Branch to instruction whose 2 bytes are now in an unmapped page. */
- f();
- FAIL("Exception not generated by invalid access.");
-}
diff --git a/test/vmapi/primary_with_secondaries/unmapped.c b/test/vmapi/primary_with_secondaries/unmapped.c
index 45164c1..43619f5 100644
--- a/test/vmapi/primary_with_secondaries/unmapped.c
+++ b/test/vmapi/primary_with_secondaries/unmapped.c
@@ -73,26 +73,3 @@
EXPECT_EQ(exception_handler_receive_exception_count(&run_res, mb.recv),
1);
}
-
-/**
- * Executing partially unmapped memory traps the VM.
- */
-TEST(unmapped, straddling_instruction_unmapped)
-{
- struct spci_value run_res;
- struct mailbox_buffers mb = set_up_mailbox();
-
- SERVICE_SELECT(SERVICE_VM1, "straddling_instruction_unmapped", mb.send);
-
- /*
- * First we get a message about the memory being donated to us, then we
- * get the trap.
- */
- run_res = spci_run(SERVICE_VM1, 0);
- EXPECT_EQ(run_res.func, SPCI_MEM_DONATE_32);
- EXPECT_EQ(spci_rx_release().func, SPCI_SUCCESS_32);
-
- run_res = spci_run(SERVICE_VM1, 0);
- EXPECT_EQ(exception_handler_receive_exception_count(&run_res, mb.recv),
- 1);
-}
