Skip to content

Commit

Permalink
hw/i386/pc: Account for SGX EPC sections when calculating device memory
Browse files Browse the repository at this point in the history
Add helpers to detect if SGX EPC exists above 4g, and if so, where SGX
EPC above 4g ends.  Use the helpers to adjust the device memory range
if SGX EPC exists above 4g.

For multiple virtual EPC sections, we just put them together physically
contiguous for the simplicity because we don't support EPC NUMA affinity
now. Once the SGX EPC NUMA support in the kernel SGX driver, we will
support this in the future.

Note that SGX EPC is currently hardcoded to reside above 4g.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20210719112136.57018-18-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Sean Christopherson authored and bonzini committed Sep 7, 2021
1 parent 6901d7a commit 6cd7669
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
11 changes: 10 additions & 1 deletion hw/i386/pc.c
Expand Up @@ -913,8 +913,15 @@ void pc_memory_init(PCMachineState *pcms,
exit(EXIT_FAILURE);
}

if (pcms->sgx_epc.size != 0) {
machine->device_memory->base = sgx_epc_above_4g_end(&pcms->sgx_epc);
} else {
machine->device_memory->base =
0x100000000ULL + x86ms->above_4g_mem_size;
}

machine->device_memory->base =
ROUND_UP(0x100000000ULL + x86ms->above_4g_mem_size, 1 * GiB);
ROUND_UP(machine->device_memory->base, 1 * GiB);

if (pcmc->enforce_aligned_dimm) {
/* size device region assuming 1G page max alignment per slot */
Expand Down Expand Up @@ -999,6 +1006,8 @@ uint64_t pc_pci_hole64_start(void)
if (!pcmc->broken_reserved_end) {
hole64_start += memory_region_size(&ms->device_memory->mr);
}
} else if (pcms->sgx_epc.size != 0) {
hole64_start = sgx_epc_above_4g_end(&pcms->sgx_epc);
} else {
hole64_start = 0x100000000ULL + x86ms->above_4g_mem_size;
}
Expand Down
7 changes: 7 additions & 0 deletions include/hw/i386/sgx-epc.h
Expand Up @@ -57,4 +57,11 @@ typedef struct SGXEPCState {

int sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size);

static inline uint64_t sgx_epc_above_4g_end(SGXEPCState *sgx_epc)
{
assert(sgx_epc != NULL && sgx_epc->base >= 0x100000000ULL);

return sgx_epc->base + sgx_epc->size;
}

#endif

0 comments on commit 6cd7669

Please sign in to comment.