[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/33] hw/i386/pc: Account for SGX EPC sections when calculati
From: |
Yang Zhong |
Subject: |
[PATCH v4 17/33] hw/i386/pc: Account for SGX EPC sections when calculating device memory |
Date: |
Mon, 19 Jul 2021 19:21:20 +0800 |
From: Sean Christopherson <sean.j.christopherson@intel.com>
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>
---
hw/i386/pc.c | 11 ++++++++++-
include/hw/i386/sgx-epc.h | 7 +++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c2b9d62a35..109e835890 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -920,8 +920,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 */
@@ -1006,6 +1013,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;
}
diff --git a/include/hw/i386/sgx-epc.h b/include/hw/i386/sgx-epc.h
index f85fd2a4ca..155e8fad3e 100644
--- a/include/hw/i386/sgx-epc.h
+++ b/include/hw/i386/sgx-epc.h
@@ -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
- [PATCH v4 07/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX, (continued)
- [PATCH v4 07/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX, Yang Zhong, 2021/07/19
- [PATCH v4 08/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX, Yang Zhong, 2021/07/19
- [PATCH v4 09/33] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX, Yang Zhong, 2021/07/19
- [PATCH v4 10/33] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs, Yang Zhong, 2021/07/19
- [PATCH v4 11/33] i386: Add feature control MSR dependency when SGX is enabled, Yang Zhong, 2021/07/19
- [PATCH v4 12/33] i386: Update SGX CPUID info according to hardware/KVM/user input, Yang Zhong, 2021/07/19
- [PATCH v4 13/33] i386: kvm: Add support for exposing PROVISIONKEY to guest, Yang Zhong, 2021/07/19
- [PATCH v4 14/33] i386: Propagate SGX CPUID sub-leafs to KVM, Yang Zhong, 2021/07/19
- [PATCH v4 15/33] Adjust min CPUID level to 0x12 when SGX is enabled, Yang Zhong, 2021/07/19
- [PATCH v4 16/33] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly, Yang Zhong, 2021/07/19
- [PATCH v4 17/33] hw/i386/pc: Account for SGX EPC sections when calculating device memory,
Yang Zhong <=
- [PATCH v4 18/33] i386/pc: Add e820 entry for SGX EPC section(s), Yang Zhong, 2021/07/19
- [PATCH v4 19/33] i386: acpi: Add SGX EPC entry to ACPI tables, Yang Zhong, 2021/07/19
- [PATCH v4 20/33] q35: Add support for SGX EPC, Yang Zhong, 2021/07/19
- [PATCH v4 21/33] i440fx: Add support for SGX EPC, Yang Zhong, 2021/07/19
- [PATCH v4 22/33] hostmem-epc: Add the reset interface for EPC backend reset, Yang Zhong, 2021/07/19
- [PATCH v4 23/33] sgx-epc: Add the reset interface for sgx-epc virt device, Yang Zhong, 2021/07/19
- [PATCH v4 24/33] sgx-epc: Avoid bios reset during sgx epc initialization, Yang Zhong, 2021/07/19
- [PATCH v4 25/33] hostmem-epc: Make prealloc consistent with qemu cmdline during reset, Yang Zhong, 2021/07/19
- [PATCH v4 26/33] qmp: Add query-sgx command, Yang Zhong, 2021/07/19
- [PATCH v4 27/33] hmp: Add 'info sgx' command, Yang Zhong, 2021/07/19