VHE: Update VM loading code to load and map EL0 partitions
Updated load_secondary function to account for EL0 partitions. The main
change is that all the EL0 partitions mappings need to be marked as user
only and non-global. Also the hypervisor is mapped into the partitions
page tables but unprivileged access is disabled to those mappings. This
is required when crossing the boundary from EL0 to the hypervisor.
Note that the amount of hypervisor memory mapped into the EL0 partitions
page tables can be minimized to only contain the exception vectors but
that is left as a future exercise.
Change-Id: Ie4960c1e78855fd6e4e44565137238092dc173e8
Signed-off-by: Raghu Krishnamurthy <raghu.ncstate@gmail.com>
diff --git a/inc/hf/mm.h b/inc/hf/mm.h
index 901a799..54d9f94 100644
--- a/inc/hf/mm.h
+++ b/inc/hf/mm.h
@@ -132,6 +132,7 @@
bool mm_vm_get_mode(struct mm_ptable *t, ipaddr_t begin, ipaddr_t end,
uint32_t *mode);
+struct mm_stage1_locked mm_lock_ptable_unsafe(struct mm_ptable *ptable);
struct mm_stage1_locked mm_lock_stage1(void);
void mm_unlock_stage1(struct mm_stage1_locked *lock);
void *mm_identity_map(struct mm_stage1_locked stage1_locked, paddr_t begin,
diff --git a/src/load.c b/src/load.c
index 0e4f9dd..a69880d 100644
--- a/src/load.c
+++ b/src/load.c
@@ -387,6 +387,7 @@
bool has_fdt;
size_t kernel_size = 0;
const size_t mem_size = pa_difference(mem_begin, mem_end);
+ uint32_t map_mode;
/*
* Load the kernel if a filename is specified in the VM manifest.
@@ -441,9 +442,17 @@
vm_locked = vm_lock(vm);
- /* Grant the VM access to the memory. */
- if (!vm_identity_map(vm_locked, mem_begin, mem_end,
- MM_MODE_R | MM_MODE_W | MM_MODE_X, ppool,
+ /*
+ * Grant the VM access to the memory. TODO: For S-EL0 partitions,
+ * mapping all of its memory as RWX is bad from a security standpoint.
+ * Should just skip this and expect this to be present in the memory
+ * regions?
+ */
+ map_mode = MM_MODE_R | MM_MODE_W | MM_MODE_X;
+ if (vm->el0_partition) {
+ map_mode |= MM_MODE_USER | MM_MODE_NG;
+ }
+ if (!vm_identity_map(vm_locked, mem_begin, mem_end, map_mode, ppool,
&secondary_entry)) {
dlog_error("Unable to initialise memory.\n");
ret = false;
@@ -487,11 +496,15 @@
region_begin = pa_subtract(alloc_base, size);
alloc_base = region_begin;
- if (!vm_identity_map(
- vm_locked, region_begin, region_end,
- manifest_vm->sp.mem_regions[j]
- .attributes,
- ppool, NULL)) {
+ map_mode = manifest_vm->sp.mem_regions[j]
+ .attributes;
+ if (vm->el0_partition) {
+ map_mode |= MM_MODE_USER | MM_MODE_NG;
+ }
+
+ if (!vm_identity_map(vm_locked, region_begin,
+ region_end, map_mode,
+ ppool, NULL)) {
dlog_error(
"Unable to map secondary VM "
"memory-region.\n");
@@ -512,11 +525,15 @@
.base_address);
region_end = pa_add(region_begin, size);
- if (!vm_identity_map(
- vm_locked, region_begin, region_end,
- manifest_vm->sp.mem_regions[j]
- .attributes,
- ppool, NULL)) {
+ map_mode = manifest_vm->sp.mem_regions[j]
+ .attributes;
+ if (vm->el0_partition) {
+ map_mode |= MM_MODE_USER | MM_MODE_NG;
+ }
+
+ if (!vm_identity_map(vm_locked, region_begin,
+ region_end, map_mode,
+ ppool, NULL)) {
dlog_error(
"Unable to map secondary VM "
"memory-region.\n");
@@ -547,10 +564,14 @@
PAGE_SIZE;
region_end = pa_add(region_begin, size);
- if (!vm_identity_map(
- vm_locked, region_begin, region_end,
- manifest_vm->sp.dev_regions[j].attributes,
- ppool, NULL)) {
+ map_mode = manifest_vm->sp.dev_regions[j].attributes;
+ if (vm->el0_partition) {
+ map_mode |= MM_MODE_USER | MM_MODE_NG;
+ }
+
+ if (!vm_identity_map(vm_locked, region_begin,
+ region_end, map_mode, ppool,
+ NULL)) {
dlog_error(
"Unable to map secondary VM "
"device-region.\n");
@@ -573,6 +594,29 @@
ipa_add(secondary_entry, manifest_vm->sp.ep_offset);
}
+ /*
+ * Map hypervisor into the VM's page table. The hypervisor pages will
+ * not be accessible from EL0 since it will not be marked for user
+ * access.
+ * TODO: Map only the exception vectors and data that exception vectors
+ * require and not the entire hypervisor. This helps with speculative
+ * side-channel attacks.
+ */
+ if (vm->el0_partition) {
+ CHECK(vm_identity_map(vm_locked, layout_text_begin(),
+ layout_text_end(), MM_MODE_X, ppool,
+ NULL));
+
+ CHECK(vm_identity_map(vm_locked, layout_rodata_begin(),
+ layout_rodata_end(), MM_MODE_R, ppool,
+ NULL));
+
+ CHECK(vm_identity_map(vm_locked, layout_data_begin(),
+ layout_data_end(), MM_MODE_R | MM_MODE_W,
+ ppool, NULL));
+ plat_console_mm_init(mm_lock_ptable_unsafe(&vm->ptable), ppool);
+ }
+
if (!load_common(stage1_locked, vm_locked, manifest_vm, ppool)) {
ret = false;
goto out;
diff --git a/src/mm.c b/src/mm.c
index 113263c..00b1d14 100644
--- a/src/mm.c
+++ b/src/mm.c
@@ -1005,6 +1005,11 @@
return (struct mm_stage1_locked){.ptable = &ptable};
}
+struct mm_stage1_locked mm_lock_ptable_unsafe(struct mm_ptable *ptable)
+{
+ return (struct mm_stage1_locked){.ptable = ptable};
+}
+
struct mm_stage1_locked mm_lock_stage1(void)
{
sl_lock(&ptable_lock);