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, pbonzini@redhat.com, eblake@redhat.com,
	seanjc@google.com
Subject: [PATCH 3/7] i386: Add sgx_get_info() interface
Date: Wed,  8 Sep 2021 16:19:33 +0800	[thread overview]
Message-ID: <20210908081937.77254-4-yang.zhong@intel.com> (raw)
In-Reply-To: <20210908081937.77254-1-yang.zhong@intel.com>

Add the sgx_get_info() interface for hmp and QMP usage, which
will get the SGX info from this API.

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
 hw/i386/sgx.c         | 21 +++++++++++++++++++++
 include/hw/i386/sgx.h | 11 +++++++++++
 target/i386/monitor.c | 32 ++++++++++++++++++++++++++++----
 3 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 include/hw/i386/sgx.h

diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index 5f988c6368..a3cd671a70 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -17,6 +17,27 @@
 #include "monitor/qdev.h"
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
+#include "hw/i386/sgx.h"
+
+SGXInfo *sgx_get_info(void)
+{
+    SGXInfo *info = NULL;
+    MachineState *ms = MACHINE(qdev_get_machine());
+    X86MachineState *x86ms = X86_MACHINE(qdev_get_machine());
+
+    if (x86ms->sgx_epc_list) {
+        PCMachineState *pcms = PC_MACHINE(ms);
+        SGXEPCState *sgx_epc = &pcms->sgx_epc;
+        info = g_new0(SGXInfo, 1);
+
+        info->sgx = true;
+        info->sgx1 = true;
+        info->sgx2 = true;
+        info->flc = true;
+        info->section_size = sgx_epc->size;
+    }
+    return info;
+}
 
 int sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size)
 {
diff --git a/include/hw/i386/sgx.h b/include/hw/i386/sgx.h
new file mode 100644
index 0000000000..ea8672f8eb
--- /dev/null
+++ b/include/hw/i386/sgx.h
@@ -0,0 +1,11 @@
+#ifndef QEMU_SGX_H
+#define QEMU_SGX_H
+
+#include "qom/object.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qapi/qapi-types-misc-target.h"
+
+SGXInfo *sgx_get_info(void);
+
+#endif
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index f1861fe6c2..0f1b48b4f8 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -35,6 +35,7 @@
 #include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qapi-commands-misc.h"
 #include "hw/i386/pc.h"
+#include "hw/i386/sgx.h"
 
 /* Perform linear address sign extension */
 static hwaddr addr_canonical(CPUArchState *env, hwaddr addr)
@@ -766,12 +767,35 @@ qmp_query_sev_attestation_report(const char *mnonce, Error **errp)
 
 SGXInfo *qmp_query_sgx(Error **errp)
 {
-    error_setg(errp, QERR_FEATURE_DISABLED, "query-sgx");
-    return NULL;
+    SGXInfo *info;
+
+    info = sgx_get_info();
+    if (!info) {
+        error_setg(errp, "SGX features are not available");
+        return NULL;
+    }
+
+    return info;
 }
 
 void hmp_info_sgx(Monitor *mon, const QDict *qdict)
 {
-    error_setg(errp, QERR_FEATURE_DISABLED, "query-sgx");
-    return NULL;
+    SGXInfo *info = qmp_query_sgx(NULL);
+
+    if (info && info->sgx) {
+        monitor_printf(mon, "SGX support: %s\n",
+                       info->sgx ? "enabled" : "disabled");
+        monitor_printf(mon, "SGX1 support: %s\n",
+                       info->sgx1 ? "enabled" : "disabled");
+        monitor_printf(mon, "SGX2 support: %s\n",
+                       info->sgx2 ? "enabled" : "disabled");
+        monitor_printf(mon, "FLC support: %s\n",
+                       info->flc ? "enabled" : "disabled");
+        monitor_printf(mon, "size: %" PRIu64 "\n",
+                       info->section_size);
+    } else {
+        monitor_printf(mon, "SGX is not enabled\n");
+    }
+
+    qapi_free_SGXInfo(info);
 }


  parent reply	other threads:[~2021-09-08  8:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08  8:19 [PATCH 0/7] The HMP/QMP interfaces in Qemu SGX Yang Zhong
2021-09-08  8:19 ` [PATCH 1/7] qmp: Add query-sgx command Yang Zhong
2021-09-08  8:19 ` [PATCH 2/7] hmp: Add 'info sgx' command Yang Zhong
2021-09-08  8:19 ` Yang Zhong [this message]
2021-09-08  8:32   ` [PATCH 3/7] i386: Add sgx_get_info() interface Philippe Mathieu-Daudé
2021-09-09  2:20     ` Yang Zhong
2021-09-08  8:55   ` Paolo Bonzini
2021-09-09  7:05     ` Yang Zhong
2021-09-08  8:19 ` [PATCH 4/7] bitops: Support 32 and 64 bit mask macro Yang Zhong
2021-09-08  8:34   ` Philippe Mathieu-Daudé
2021-09-09  2:04     ` Yang Zhong
2021-09-08  8:19 ` [PATCH 5/7] qmp: Add the qmp_query_sgx_capabilities() Yang Zhong
2021-09-08  8:38   ` Philippe Mathieu-Daudé
2021-09-09  2:51     ` Yang Zhong
2021-09-09  9:36       ` Philippe Mathieu-Daudé
2021-09-09 12:06         ` Yang Zhong
2021-09-09 13:25           ` Philippe Mathieu-Daudé
2021-09-08  8:19 ` [PATCH 6/7] monitor: Fix coredump issue in non-x86 platform Yang Zhong
2021-09-08  8:53   ` Philippe Mathieu-Daudé
2021-09-08  8:54   ` Paolo Bonzini
2021-09-09  6:48     ` Yang Zhong
2021-09-08  8:19 ` [PATCH 7/7] pc: Cleanup the SGX definitions 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=20210908081937.77254-4-yang.zhong@intel.com \
    --to=yang.zhong@intel.com \
    --cc=eblake@redhat.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).