[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RESEND PATCH 18/32] hw/i386/pc: Account for SGX EPC sections when calcu
From: |
Yang Zhong |
Subject: |
[RESEND PATCH 18/32] hw/i386/pc: Account for SGX EPC sections when calculating device memory |
Date: |
Fri, 30 Apr 2021 14:24:41 +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 8a84b25a03..90585a2471 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -925,8 +925,15 @@ void pc_memory_init(PCMachineState *pcms,
exit(EXIT_FAILURE);
}
+ if (pcms->sgx_epc != NULL) {
+ 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 */
@@ -1011,6 +1018,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 != NULL) {
+ 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 8d80b34fb7..743d0a943c 100644
--- a/include/hw/i386/sgx-epc.h
+++ b/include/hw/i386/sgx-epc.h
@@ -59,4 +59,11 @@ extern int sgx_epc_enabled;
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
--
2.29.2.334.gfaefdd61ec
- [RESEND PATCH 11/32] i386: Add feature control MSR dependency when SGX is enabled, (continued)
- [RESEND PATCH 11/32] i386: Add feature control MSR dependency when SGX is enabled, Yang Zhong, 2021/04/30
- [RESEND PATCH 13/32] linux-headers: Add placeholder for KVM_CAP_SGX_ATTRIBUTE, Yang Zhong, 2021/04/30
- [RESEND PATCH 12/32] i386: Update SGX CPUID info according to hardware/KVM/user input, Yang Zhong, 2021/04/30
- [RESEND PATCH 07/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX, Yang Zhong, 2021/04/30
- [RESEND PATCH 09/32] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX, Yang Zhong, 2021/04/30
- [RESEND PATCH 10/32] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs, Yang Zhong, 2021/04/30
- [RESEND PATCH 14/32] i386: kvm: Add support for exposing PROVISIONKEY to guest, Yang Zhong, 2021/04/30
- [RESEND PATCH 15/32] i386: Propagate SGX CPUID sub-leafs to KVM, Yang Zhong, 2021/04/30
- [RESEND PATCH 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly, Yang Zhong, 2021/04/30
- [RESEND PATCH 16/32] Adjust min CPUID level to 0x12 when SGX is enabled, Yang Zhong, 2021/04/30
- [RESEND PATCH 18/32] hw/i386/pc: Account for SGX EPC sections when calculating device memory,
Yang Zhong <=
- [RESEND PATCH 19/32] i386/pc: Add e820 entry for SGX EPC section(s), Yang Zhong, 2021/04/30
- [RESEND PATCH 20/32] i386: acpi: Add SGX EPC entry to ACPI tables, Yang Zhong, 2021/04/30
- [RESEND PATCH 21/32] q35: Add support for SGX EPC, Yang Zhong, 2021/04/30
- [RESEND PATCH 22/32] i440fx: Add support for SGX EPC, Yang Zhong, 2021/04/30
- [RESEND PATCH 23/32] hostmem: Add the reset interface for EPC backend reset, Yang Zhong, 2021/04/30
- [RESEND PATCH 24/32] sgx-epc: Add the reset interface for sgx-epc virt device, Yang Zhong, 2021/04/30
- [RESEND PATCH 25/32] qmp: Add query-sgx command, Yang Zhong, 2021/04/30
- [RESEND PATCH 26/32] hmp: Add 'info sgx' command, Yang Zhong, 2021/04/30
- [RESEND PATCH 28/32] bitops: Support 32 and 64 bit mask macro, Yang Zhong, 2021/04/30
- [RESEND PATCH 29/32] qmp: Add the qmp_query_sgx_capabilities(), Yang Zhong, 2021/04/30