Handle VMs misbehaving.
If a VM accesses memory it is not allowed to or otherwise triggers and
unhandled exception it will be aborted such that none of the vCPUs can
be run again.
The VM remains unchanged from the point of view of other VMs other than
it will not make any further progress.
Change-Id: I352e1c714f1e4b1b43185269f92e7fa41e09a4db
diff --git a/test/hftest/inc/hftest_impl.h b/test/hftest/inc/hftest_impl.h
index fa9e4c7..39e50a9 100644
--- a/test/hftest/inc/hftest_impl.h
+++ b/test/hftest/inc/hftest_impl.h
@@ -18,6 +18,8 @@
#include <stdnoreturn.h>
+#include "hf/std.h"
+
/*
* Log with the HFTEST_LOG_PREFIX and a new line. The zero is added so there is
* always at least one variadic argument.
diff --git a/test/vmapi/primary_with_secondaries/BUILD.gn b/test/vmapi/primary_with_secondaries/BUILD.gn
index df38e18..8126d67 100644
--- a/test/vmapi/primary_with_secondaries/BUILD.gn
+++ b/test/vmapi/primary_with_secondaries/BUILD.gn
@@ -24,6 +24,7 @@
public_configs = [ ":config" ]
sources = [
+ "abort.c",
"memory_sharing.c",
"no_services.c",
"run_race.c",
diff --git a/test/vmapi/primary_with_secondaries/abort.c b/test/vmapi/primary_with_secondaries/abort.c
new file mode 100644
index 0000000..60c0b5d
--- /dev/null
+++ b/test/vmapi/primary_with_secondaries/abort.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "vmapi/hf/call.h"
+
+#include "hftest.h"
+#include "primary_with_secondary.h"
+
+/**
+ * Accessing unmapped memory aborts the VM.
+ */
+TEST(abort, data_abort)
+{
+ struct hf_vcpu_run_return run_res;
+ struct mailbox_buffers mb = set_up_mailbox();
+
+ SERVICE_SELECT(SERVICE_VM0, "data_abort", mb.send);
+
+ run_res = hf_vcpu_run(SERVICE_VM0, 0);
+ EXPECT_EQ(run_res.code, HF_VCPU_RUN_ABORTED);
+}
+
+/**
+ * Executing unmapped memory aborts the VM.
+ */
+TEST(abort, instruction_abort)
+{
+ struct hf_vcpu_run_return run_res;
+ struct mailbox_buffers mb = set_up_mailbox();
+
+ SERVICE_SELECT(SERVICE_VM0, "instruction_abort", mb.send);
+
+ run_res = hf_vcpu_run(SERVICE_VM0, 0);
+ EXPECT_EQ(run_res.code, HF_VCPU_RUN_ABORTED);
+}
diff --git a/test/vmapi/primary_with_secondaries/services/BUILD.gn b/test/vmapi/primary_with_secondaries/services/BUILD.gn
index 2389751..66f602e 100644
--- a/test/vmapi/primary_with_secondaries/services/BUILD.gn
+++ b/test/vmapi/primary_with_secondaries/services/BUILD.gn
@@ -62,6 +62,16 @@
]
}
+# Services related to aborting VMs.
+source_set("abort") {
+ testonly = true
+ public_configs = [ "//test/hftest:hftest_config" ]
+
+ sources = [
+ "abort.c",
+ ]
+}
+
# Service that can be interrupted.
source_set("interruptible") {
testonly = true
@@ -95,6 +105,7 @@
testonly = true
deps = [
+ ":abort",
":check_state",
":echo",
":echo_with_notification",
diff --git a/test/vmapi/primary_with_secondaries/services/abort.c b/test/vmapi/primary_with_secondaries/services/abort.c
new file mode 100644
index 0000000..1571a69
--- /dev/null
+++ b/test/vmapi/primary_with_secondaries/services/abort.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "hf/mm.h"
+#include "hf/std.h"
+
+#include "vmapi/hf/call.h"
+
+#include "hftest.h"
+
+TEST_SERVICE(data_abort)
+{
+ /* Not using NULL so static analysis doesn't complain. */
+ int *p = (int *)1;
+ *p = 12;
+}
+
+TEST_SERVICE(instruction_abort)
+{
+ /* Not using NULL so static analysis doesn't complain. */
+ int (*f)(void) = (int (*)(void))4;
+ f();
+}