All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Yang Zhong <yang.zhong@intel.com>
Subject: [PULL 26/33] target/i386: Add the query-sgx-capabilities QMP command
Date: Tue, 28 Sep 2021 14:51:09 +0200	[thread overview]
Message-ID: <20210928125116.183620-27-pbonzini@redhat.com> (raw)
In-Reply-To: <20210928125116.183620-1-pbonzini@redhat.com>

From: Yang Zhong <yang.zhong@intel.com>

Libvirt can use query-sgx-capabilities to get the host
sgx capabilities to decide how to allocate SGX EPC size to VM.

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20210910102258.46648-3-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/sgx-stub.c         |  6 ++++
 hw/i386/sgx.c              | 66 ++++++++++++++++++++++++++++++++++++++
 include/hw/i386/sgx.h      |  1 +
 qapi/misc-target.json      | 18 +++++++++++
 target/i386/monitor.c      |  5 +++
 tests/qtest/qmp-cmd-test.c |  1 +
 6 files changed, 97 insertions(+)

diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c
index 485e16ecc1..3be9f5ca32 100644
--- a/hw/i386/sgx-stub.c
+++ b/hw/i386/sgx-stub.c
@@ -9,6 +9,12 @@ SGXInfo *sgx_get_info(Error **errp)
     return NULL;
 }
 
+SGXInfo *sgx_get_capabilities(Error **errp)
+{
+    error_setg(errp, "SGX support is not compiled in");
+    return NULL;
+}
+
 void pc_machine_init_sgx_epc(PCMachineState *pcms)
 {
     memset(&pcms->sgx_epc, 0, sizeof(SGXEPCState));
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index ea75398575..e481e9358f 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -18,6 +18,72 @@
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
 #include "hw/i386/sgx.h"
+#include "sysemu/hw_accel.h"
+
+#define SGX_MAX_EPC_SECTIONS            8
+#define SGX_CPUID_EPC_INVALID           0x0
+
+/* A valid EPC section. */
+#define SGX_CPUID_EPC_SECTION           0x1
+#define SGX_CPUID_EPC_MASK              0xF
+
+static uint64_t sgx_calc_section_metric(uint64_t low, uint64_t high)
+{
+    return (low & MAKE_64BIT_MASK(12, 20)) +
+           ((high & MAKE_64BIT_MASK(0, 20)) << 32);
+}
+
+static uint64_t sgx_calc_host_epc_section_size(void)
+{
+    uint32_t i, type;
+    uint32_t eax, ebx, ecx, edx;
+    uint64_t size = 0;
+
+    for (i = 0; i < SGX_MAX_EPC_SECTIONS; i++) {
+        host_cpuid(0x12, i + 2, &eax, &ebx, &ecx, &edx);
+
+        type = eax & SGX_CPUID_EPC_MASK;
+        if (type == SGX_CPUID_EPC_INVALID) {
+            break;
+        }
+
+        if (type != SGX_CPUID_EPC_SECTION) {
+            break;
+        }
+
+        size += sgx_calc_section_metric(ecx, edx);
+    }
+
+    return size;
+}
+
+SGXInfo *sgx_get_capabilities(Error **errp)
+{
+    SGXInfo *info = NULL;
+    uint32_t eax, ebx, ecx, edx;
+
+    int fd = qemu_open_old("/dev/sgx_vepc", O_RDWR);
+    if (fd < 0) {
+        error_setg(errp, "SGX is not enabled in KVM");
+        return NULL;
+    }
+
+    info = g_new0(SGXInfo, 1);
+    host_cpuid(0x7, 0, &eax, &ebx, &ecx, &edx);
+
+    info->sgx = ebx & (1U << 2) ? true : false;
+    info->flc = ecx & (1U << 30) ? true : false;
+
+    host_cpuid(0x12, 0, &eax, &ebx, &ecx, &edx);
+    info->sgx1 = eax & (1U << 0) ? true : false;
+    info->sgx2 = eax & (1U << 1) ? true : false;
+
+    info->section_size = sgx_calc_host_epc_section_size();
+
+    close(fd);
+
+    return info;
+}
 
 SGXInfo *sgx_get_info(Error **errp)
 {
diff --git a/include/hw/i386/sgx.h b/include/hw/i386/sgx.h
index 2bf90b3f4f..16fc25725c 100644
--- a/include/hw/i386/sgx.h
+++ b/include/hw/i386/sgx.h
@@ -7,5 +7,6 @@
 #include "qapi/qapi-types-misc-target.h"
 
 SGXInfo *sgx_get_info(Error **errp);
+SGXInfo *sgx_get_capabilities(Error **errp);
 
 #endif
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index e2a347cc23..594fbd1577 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -376,3 +376,21 @@
 #
 ##
 { 'command': 'query-sgx', 'returns': 'SGXInfo', 'if': 'TARGET_I386' }
+
+##
+# @query-sgx-capabilities:
+#
+# Returns information from host SGX capabilities
+#
+# Returns: @SGXInfo
+#
+# Since: 6.2
+#
+# Example:
+#
+# -> { "execute": "query-sgx-capabilities" }
+# <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true,
+#                  "flc": true, "section-size" : 0 } }
+#
+##
+{ 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo', 'if': 'TARGET_I386' }
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index d7384ba348..196c1c9e77 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -790,3 +790,8 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "size: %" PRIu64 "\n",
                    info->section_size);
 }
+
+SGXInfo *qmp_query_sgx_capabilities(Error **errp)
+{
+    return sgx_get_capabilities(errp);
+}
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index b75f3364f3..1af2f74c28 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -101,6 +101,7 @@ static bool query_is_ignored(const char *cmd)
         "query-sev",
         "query-sev-capabilities",
         "query-sgx",
+        "query-sgx-capabilities",
         NULL
     };
     int i;
-- 
2.31.1




  parent reply	other threads:[~2021-09-28 13:35 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28 12:50 [PULL 00/33] x86 and misc changes for 2021-09-28 Paolo Bonzini
2021-09-28 12:50 ` [PULL 01/33] memory: Add RAM_PROTECTED flag to skip IOMMU mappings Paolo Bonzini
2021-09-28 12:50 ` [PULL 02/33] Kconfig: Add CONFIG_SGX support Paolo Bonzini
2021-09-28 12:50 ` [PULL 03/33] hostmem: Add hostmem-epc as a backend for SGX EPC Paolo Bonzini
2021-09-28 12:50 ` [PULL 04/33] qom: Add memory-backend-epc ObjectOptions support Paolo Bonzini
2021-09-28 12:50 ` [PULL 05/33] i386: Add 'sgx-epc' device to expose EPC sections to guest Paolo Bonzini
2021-11-09 14:25   ` Thomas Huth
2021-11-09 17:48     ` Paolo Bonzini
2021-11-10  6:41       ` Yang Zhong
2021-11-10  7:00         ` Thomas Huth
2021-09-28 12:50 ` [PULL 06/33] vl: Add sgx compound properties to expose SGX " Paolo Bonzini
2021-09-28 12:50 ` [PULL 07/33] i386: Add primary SGX CPUID and MSR defines Paolo Bonzini
2021-09-28 12:50 ` [PULL 08/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX Paolo Bonzini
2021-09-28 12:50 ` [PULL 09/33] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX Paolo Bonzini
2021-09-28 12:50 ` [PULL 10/33] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX Paolo Bonzini
2021-09-28 12:50 ` [PULL 11/33] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs Paolo Bonzini
2021-09-28 12:50 ` [PULL 12/33] i386: Add feature control MSR dependency when SGX is enabled Paolo Bonzini
2021-09-28 12:50 ` [PULL 13/33] i386: Update SGX CPUID info according to hardware/KVM/user input Paolo Bonzini
2021-09-28 12:50 ` [PULL 14/33] i386: kvm: Add support for exposing PROVISIONKEY to guest Paolo Bonzini
2021-09-28 12:50 ` [PULL 15/33] i386: Propagate SGX CPUID sub-leafs to KVM Paolo Bonzini
2021-09-28 12:50 ` [PULL 16/33] Adjust min CPUID level to 0x12 when SGX is enabled Paolo Bonzini
2021-09-28 12:51 ` [PULL 17/33] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly Paolo Bonzini
2021-09-28 12:51 ` [PULL 18/33] hw/i386/pc: Account for SGX EPC sections when calculating device memory Paolo Bonzini
2021-09-28 12:51 ` [PULL 19/33] i386/pc: Add e820 entry for SGX EPC section(s) Paolo Bonzini
2021-09-28 12:51 ` [PULL 20/33] i386: acpi: Add SGX EPC entry to ACPI tables Paolo Bonzini
2021-09-28 12:51 ` [PULL 21/33] q35: Add support for SGX EPC Paolo Bonzini
2021-09-28 12:51 ` [PULL 22/33] i440fx: " Paolo Bonzini
2021-09-28 12:51 ` [PULL 23/33] sgx-epc: Add the fill_device_info() callback support Paolo Bonzini
2021-09-28 12:51 ` [PULL 24/33] docs/system: Add SGX documentation to the system manual Paolo Bonzini
2021-09-28 12:51 ` [PULL 25/33] target/i386: Add HMP and QMP interfaces for SGX Paolo Bonzini
2021-09-28 12:51 ` Paolo Bonzini [this message]
2021-09-28 12:51 ` [PULL 27/33] meson: unpack edk2 firmware even if --disable-blobs Paolo Bonzini
2021-09-28 12:51 ` [PULL 28/33] tests: qtest: bios-tables-test depends on the unpacked edk2 ROMs Paolo Bonzini
2021-09-28 12:51 ` [PULL 29/33] target/i386: Fix memory leak in sev_read_file_base64() Paolo Bonzini
2021-09-28 12:51 ` [PULL 30/33] memory: Name all the memory listeners Paolo Bonzini
2021-09-28 12:51 ` [PULL 31/33] memory: Add tracepoint for dirty sync Paolo Bonzini
2021-09-28 12:51 ` [PULL 32/33] build-sys: add HAVE_IPPROTO_MPTCP Paolo Bonzini
2021-09-28 12:51 ` [PULL 33/33] meson_options.txt: Switch the default value for the vnc option to 'auto' Paolo Bonzini
2021-09-29 20:19 ` [PULL 00/33] x86 and misc changes for 2021-09-28 Peter Maydell

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=20210928125116.183620-27-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yang.zhong@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.