[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 23/33] sgx-epc: Add the reset interface for sgx-epc virt devic
From: |
Yang Zhong |
Subject: |
[PATCH v3 23/33] sgx-epc: Add the reset interface for sgx-epc virt device |
Date: |
Fri, 9 Jul 2021 19:09:45 +0800 |
If the VM is reset, we need make sure sgx virt epc in clean status.
Once the VM is reset, and sgx epc virt device will be reseted by
reset callback registered by qemu_register_reset(). Since this epc
virt device depend on backend, this reset will call backend reset
interface to re-mmap epc to guest.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
hw/i386/sgx-epc.c | 94 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 81 insertions(+), 13 deletions(-)
diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
index 904531107a..99a7fb8ba1 100644
--- a/hw/i386/sgx-epc.c
+++ b/hw/i386/sgx-epc.c
@@ -18,6 +18,9 @@
#include "qapi/visitor.h"
#include "target/i386/cpu.h"
#include "exec/address-spaces.h"
+#include "sysemu/reset.h"
+
+uint32_t epc_num;
static Property sgx_epc_properties[] = {
DEFINE_PROP_UINT64(SGX_EPC_ADDR_PROP, SGXEPCDevice, addr, 0),
@@ -47,12 +50,84 @@ static void sgx_epc_init(Object *obj)
NULL, NULL, NULL);
}
+static void sgx_epc_del_subregion(DeviceState *dev)
+{
+ PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
+ SGXEPCState *sgx_epc = pcms->sgx_epc;
+ SGXEPCDevice *epc = SGX_EPC(dev);
+
+ /* del subregion and related operations */
+ memory_region_del_subregion(&sgx_epc->mr,
+ host_memory_backend_get_memory(epc->hostmem));
+ host_memory_backend_set_mapped(epc->hostmem, false);
+ g_free(sgx_epc->sections);
+ sgx_epc->sections = NULL;
+
+ /* multiple epc devices, only zero the first time */
+ if (epc_num == sgx_epc->nr_sections) {
+ sgx_epc->size = 0;
+ sgx_epc->nr_sections = 0;
+ }
+}
+
+static void sgx_epc_initialization(DeviceState *dev)
+{
+ PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
+ SGXEPCState *sgx_epc = pcms->sgx_epc;
+ MemoryDeviceState *md = MEMORY_DEVICE(dev);
+ SGXEPCDevice *epc = SGX_EPC(dev);
+ Error *errp = NULL;
+
+ if (!epc->hostmem) {
+ error_setg(&errp, "'" SGX_EPC_MEMDEV_PROP "' property is not set");
+ return;
+ }
+
+ epc->addr = sgx_epc->base + sgx_epc->size;
+
+ memory_region_add_subregion(&sgx_epc->mr, epc->addr - sgx_epc->base,
+ host_memory_backend_get_memory(epc->hostmem));
+
+ host_memory_backend_set_mapped(epc->hostmem, true);
+
+ sgx_epc->sections = g_renew(SGXEPCDevice *, sgx_epc->sections,
+ sgx_epc->nr_sections + 1);
+ sgx_epc->sections[sgx_epc->nr_sections++] = epc;
+
+ sgx_epc->size += memory_device_get_region_size(md, &errp);
+}
+
+static void sgx_epc_reset(void *opaque)
+{
+ DeviceState *dev = opaque;
+ SGXEPCDevice *epc = SGX_EPC(dev);
+ Error *errp = NULL;
+ int fd;
+
+ if (!epc->hostmem) {
+ error_setg(&errp, "'" SGX_EPC_MEMDEV_PROP "' property is not set");
+ return;
+ }
+
+ /* delete subregion and related operations */
+ sgx_epc_del_subregion(dev);
+
+ /* reset sgx backend */
+ fd = memory_region_get_fd(host_memory_backend_get_memory(epc->hostmem));
+ sgx_memory_backend_reset(epc->hostmem, fd, &errp);
+ if (errp) {
+ error_setg(&errp, "failed to call sgx_memory_backend_reset");
+ return;
+ }
+
+ /* re-add subregion and related operations */
+ sgx_epc_initialization(dev);
+}
+
static void sgx_epc_realize(DeviceState *dev, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
X86MachineState *x86ms = X86_MACHINE(pcms);
- MemoryDeviceState *md = MEMORY_DEVICE(dev);
- SGXEPCState *sgx_epc = pcms->sgx_epc;
SGXEPCDevice *epc = SGX_EPC(dev);
const char *path;
@@ -71,18 +146,11 @@ static void sgx_epc_realize(DeviceState *dev, Error **errp)
return;
}
- epc->addr = sgx_epc->base + sgx_epc->size;
-
- memory_region_add_subregion(&sgx_epc->mr, epc->addr - sgx_epc->base,
- host_memory_backend_get_memory(epc->hostmem));
-
- host_memory_backend_set_mapped(epc->hostmem, true);
-
- sgx_epc->sections = g_renew(SGXEPCDevice *, sgx_epc->sections,
- sgx_epc->nr_sections + 1);
- sgx_epc->sections[sgx_epc->nr_sections++] = epc;
+ sgx_epc_initialization(dev);
+ epc_num++;
- sgx_epc->size += memory_device_get_region_size(md, errp);
+ /* register the reset callback for sgx reset */
+ qemu_register_reset(sgx_epc_reset, dev);
}
static void sgx_epc_unrealize(DeviceState *dev)
--
2.29.2.334.gfaefdd61ec
- [PATCH v3 14/33] i386: Propagate SGX CPUID sub-leafs to KVM, (continued)
- [PATCH v3 14/33] i386: Propagate SGX CPUID sub-leafs to KVM, Yang Zhong, 2021/07/09
- [PATCH v3 13/33] i386: kvm: Add support for exposing PROVISIONKEY to guest, Yang Zhong, 2021/07/09
- [PATCH v3 15/33] Adjust min CPUID level to 0x12 when SGX is enabled, Yang Zhong, 2021/07/09
- [PATCH v3 16/33] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly, Yang Zhong, 2021/07/09
- [PATCH v3 17/33] hw/i386/pc: Account for SGX EPC sections when calculating device memory, Yang Zhong, 2021/07/09
- [PATCH v3 18/33] i386/pc: Add e820 entry for SGX EPC section(s), Yang Zhong, 2021/07/09
- [PATCH v3 19/33] i386: acpi: Add SGX EPC entry to ACPI tables, Yang Zhong, 2021/07/09
- [PATCH v3 21/33] i440fx: Add support for SGX EPC, Yang Zhong, 2021/07/09
- [PATCH v3 20/33] q35: Add support for SGX EPC, Yang Zhong, 2021/07/09
- [PATCH v3 22/33] hostmem-epc: Add the reset interface for EPC backend reset, Yang Zhong, 2021/07/09
- [PATCH v3 23/33] sgx-epc: Add the reset interface for sgx-epc virt device,
Yang Zhong <=
- [PATCH v3 24/33] sgx-epc: Avoid bios reset during sgx epc initialization, Yang Zhong, 2021/07/09
- [PATCH v3 25/33] hostmem-epc: Make prealloc consistent with qemu cmdline during reset, Yang Zhong, 2021/07/09
- [PATCH v3 26/33] qmp: Add query-sgx command, Yang Zhong, 2021/07/09
- [PATCH v3 28/33] i386: Add sgx_get_info() interface, Yang Zhong, 2021/07/09
- [PATCH v3 27/33] hmp: Add 'info sgx' command, Yang Zhong, 2021/07/09
- [PATCH v3 29/33] bitops: Support 32 and 64 bit mask macro, Yang Zhong, 2021/07/09
- [PATCH v3 30/33] qmp: Add the qmp_query_sgx_capabilities(), Yang Zhong, 2021/07/09
- [PATCH v3 31/33] Kconfig: Add CONFIG_SGX support, Yang Zhong, 2021/07/09
- [PATCH v3 32/33] sgx-epc: Add the fill_device_info() callback support, Yang Zhong, 2021/07/09
- [PATCH v3 33/33] doc: Add the SGX doc, Yang Zhong, 2021/07/09