[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 24/33] sgx-epc: Avoid bios reset during sgx epc initialization
From: |
Yang Zhong |
Subject: |
[PATCH v3 24/33] sgx-epc: Avoid bios reset during sgx epc initialization |
Date: |
Fri, 9 Jul 2021 19:09:46 +0800 |
Since bios do the reset when qemu boot up, and sgx epc will be
reset by the registered reset callback function. Like this, the
sgx epc will do two times initialization. This patch will check
protected mode from cr0 register, and will bypass reset operation
from bios. The reset callback will only accept reset operation
from guest.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
hw/i386/sgx-epc.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
index 99a7fb8ba1..a1784d4c8f 100644
--- a/hw/i386/sgx-epc.c
+++ b/hw/i386/sgx-epc.c
@@ -19,6 +19,7 @@
#include "target/i386/cpu.h"
#include "exec/address-spaces.h"
#include "sysemu/reset.h"
+#include "sysemu/hw_accel.h"
uint32_t epc_num;
@@ -97,6 +98,21 @@ static void sgx_epc_initialization(DeviceState *dev)
sgx_epc->size += memory_device_get_region_size(md, &errp);
}
+static bool check_reset_from_guest(void)
+{
+ CPUState *cs = first_cpu;
+ X86CPU *cpu = X86_CPU(cs);
+ CPUX86State *env = &cpu->env;
+
+ cpu_synchronize_state(cs);
+
+ if (env->cr[0] & CR0_PE_MASK) {
+ return true;
+ }
+
+ return false;
+}
+
static void sgx_epc_reset(void *opaque)
{
DeviceState *dev = opaque;
@@ -104,6 +120,9 @@ static void sgx_epc_reset(void *opaque)
Error *errp = NULL;
int fd;
+ if (!check_reset_from_guest())
+ return;
+
if (!epc->hostmem) {
error_setg(&errp, "'" SGX_EPC_MEMDEV_PROP "' property is not set");
return;
--
2.29.2.334.gfaefdd61ec
- [PATCH v3 13/33] i386: kvm: Add support for exposing PROVISIONKEY to guest, (continued)
- [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, 2021/07/09
- [PATCH v3 24/33] sgx-epc: Avoid bios reset during sgx epc initialization,
Yang Zhong <=
- [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
- Re: [PATCH v3 00/33] Qemu SGX virtualization, Jarkko Sakkinen, 2021/07/09