qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yang Zhong <yang.zhong@intel.com>
To: qemu-devel@nongnu.org
Cc: yang.zhong@intel.com, seanjc@google.com, kai.huang@intel.com,
	jarkko@kernel.org, pbonzini@redhat.com, eblake@redhat.com
Subject: [PATCH v3 24/33] sgx-epc: Avoid bios reset during sgx epc initialization
Date: Fri,  9 Jul 2021 19:09:46 +0800	[thread overview]
Message-ID: <20210709110955.73256-25-yang.zhong@intel.com> (raw)
In-Reply-To: <20210709110955.73256-1-yang.zhong@intel.com>

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



  parent reply	other threads:[~2021-07-09 11:35 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-09 11:09 [PATCH v3 00/33] Qemu SGX virtualization Yang Zhong
2021-07-09 11:09 ` [PATCH v3 01/33] memory: Add RAM_PROTECTED flag to skip IOMMU mappings Yang Zhong
2021-07-09 11:09 ` [PATCH v3 02/33] hostmem: Add hostmem-epc as a backend for SGX EPC Yang Zhong
2021-07-09 11:09 ` [PATCH v3 03/33] qom: Add memory-backend-epc ObjectOptions support Yang Zhong
2021-07-09 11:09 ` [PATCH v3 04/33] i386: Add 'sgx-epc' device to expose EPC sections to guest Yang Zhong
2021-07-09 11:09 ` [PATCH v3 05/33] vl: Add sgx compound properties to expose SGX " Yang Zhong
2021-07-09 16:07   ` Paolo Bonzini
2021-07-12  9:23     ` Yang Zhong
2021-07-09 11:09 ` [PATCH v3 06/33] i386: Add primary SGX CPUID and MSR defines Yang Zhong
2021-07-09 11:09 ` [PATCH v3 07/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX Yang Zhong
2021-07-09 11:09 ` [PATCH v3 08/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX Yang Zhong
2021-07-09 11:09 ` [PATCH v3 09/33] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX Yang Zhong
2021-07-09 11:09 ` [PATCH v3 10/33] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs Yang Zhong
2021-07-09 11:09 ` [PATCH v3 11/33] i386: Add feature control MSR dependency when SGX is enabled Yang Zhong
2021-07-09 11:09 ` [PATCH v3 12/33] i386: Update SGX CPUID info according to hardware/KVM/user input Yang Zhong
2021-07-09 11:09 ` [PATCH v3 13/33] i386: kvm: Add support for exposing PROVISIONKEY to guest Yang Zhong
2021-07-09 11:09 ` [PATCH v3 14/33] i386: Propagate SGX CPUID sub-leafs to KVM Yang Zhong
2021-07-09 11:09 ` [PATCH v3 15/33] Adjust min CPUID level to 0x12 when SGX is enabled Yang Zhong
2021-07-09 11:09 ` [PATCH v3 16/33] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly Yang Zhong
2021-07-09 11:09 ` [PATCH v3 17/33] hw/i386/pc: Account for SGX EPC sections when calculating device memory Yang Zhong
2021-07-09 11:09 ` [PATCH v3 18/33] i386/pc: Add e820 entry for SGX EPC section(s) Yang Zhong
2021-07-09 11:09 ` [PATCH v3 19/33] i386: acpi: Add SGX EPC entry to ACPI tables Yang Zhong
2021-07-09 11:09 ` [PATCH v3 20/33] q35: Add support for SGX EPC Yang Zhong
2021-07-09 11:09 ` [PATCH v3 21/33] i440fx: " Yang Zhong
2021-07-09 11:09 ` [PATCH v3 22/33] hostmem-epc: Add the reset interface for EPC backend reset Yang Zhong
2021-07-09 11:09 ` [PATCH v3 23/33] sgx-epc: Add the reset interface for sgx-epc virt device Yang Zhong
2021-07-09 11:09 ` Yang Zhong [this message]
2021-07-09 11:09 ` [PATCH v3 25/33] hostmem-epc: Make prealloc consistent with qemu cmdline during reset Yang Zhong
2021-07-09 11:09 ` [PATCH v3 26/33] qmp: Add query-sgx command Yang Zhong
2021-07-09 11:09 ` [PATCH v3 27/33] hmp: Add 'info sgx' command Yang Zhong
2021-07-09 11:09 ` [PATCH v3 28/33] i386: Add sgx_get_info() interface Yang Zhong
2021-07-09 11:09 ` [PATCH v3 29/33] bitops: Support 32 and 64 bit mask macro Yang Zhong
2021-07-09 11:09 ` [PATCH v3 30/33] qmp: Add the qmp_query_sgx_capabilities() Yang Zhong
2021-07-09 11:09 ` [PATCH v3 31/33] Kconfig: Add CONFIG_SGX support Yang Zhong
2021-07-09 11:09 ` [PATCH v3 32/33] sgx-epc: Add the fill_device_info() callback support Yang Zhong
2021-07-09 11:09 ` [PATCH v3 33/33] doc: Add the SGX doc Yang Zhong
2021-07-09 17:48 ` [PATCH v3 00/33] Qemu SGX virtualization Jarkko Sakkinen
2021-07-12  6:57   ` Yang Zhong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210709110955.73256-25-yang.zhong@intel.com \
    --to=yang.zhong@intel.com \
    --cc=eblake@redhat.com \
    --cc=jarkko@kernel.org \
    --cc=kai.huang@intel.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=seanjc@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).