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, kai.huang@intel.com,
	seanjc@google.com
Subject: [PATCH 15/32] i386: Propagate SGX CPUID sub-leafs to KVM
Date: Mon, 19 Apr 2021 18:01:39 +0800	[thread overview]
Message-ID: <20210419100156.53504-16-yang.zhong@intel.com> (raw)
In-Reply-To: <20210419100156.53504-1-yang.zhong@intel.com>

From: Sean Christopherson <sean.j.christopherson@intel.com>

The SGX sub-leafs are enumerated at CPUID 0x12.  Indices 0 and 1 are
always present when SGX is supported, and enumerate SGX features and
capabilities.  Indices >=2 are directly correlated with the platform's
EPC sections.  Because the number of EPC sections is dynamic and user
defined, the number of SGX sub-leafs is "NULL" terminated.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
 target/i386/kvm/kvm.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 648cccd7c2..67770b01cb 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1615,6 +1615,25 @@ int kvm_arch_init_vcpu(CPUState *cs)
             }
             break;
         case 0x7:
+        case 0x12:
+            for (j = 0; ; j++) {
+                c->function = i;
+                c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
+                c->index = j;
+                cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx);
+
+                if (j > 1 && (c->eax & 0xf) != 1) {
+                    break;
+                }
+
+                if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
+                    fprintf(stderr, "cpuid_data is full, no space for "
+                                "cpuid(eax:0x12,ecx:0x%x)\n", j);
+                    abort();
+                }
+                c = &cpuid_data.entries[cpuid_i++];
+            }
+            break;
         case 0x14: {
             uint32_t times;
 
-- 
2.29.2.334.gfaefdd61ec



  parent reply	other threads:[~2021-04-19 10:31 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-19 10:01 [PATCH 00/32] Qemu SGX virtualization Yang Zhong
2021-04-19 10:01 ` [PATCH 01/32] memory: Add RAM_PROTECTED flag to skip IOMMU mappings Yang Zhong
2021-04-19 10:01 ` [PATCH 02/32] hostmem: Add hostmem-epc as a backend for SGX EPC Yang Zhong
2021-04-19 10:01 ` [PATCH 03/32] qom: Add memory-backend-epc ObjectOptions support Yang Zhong
2021-04-19 10:01 ` [PATCH 04/32] i386: Add 'sgx-epc' device to expose EPC sections to guest Yang Zhong
2021-04-19 10:01 ` [PATCH 05/32] vl: Add "sgx-epc" option to expose SGX " Yang Zhong
2021-04-19 10:01 ` [PATCH 06/32] i386: Add primary SGX CPUID and MSR defines Yang Zhong
2021-04-19 10:01 ` [PATCH 07/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX Yang Zhong
2021-04-19 10:01 ` [PATCH 08/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX Yang Zhong
2021-04-19 10:01 ` [PATCH 09/32] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX Yang Zhong
2021-04-19 10:01 ` [PATCH 10/32] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs Yang Zhong
2021-04-19 10:01 ` [PATCH 11/32] i386: Add feature control MSR dependency when SGX is enabled Yang Zhong
2021-04-19 10:01 ` [PATCH 12/32] i386: Update SGX CPUID info according to hardware/KVM/user input Yang Zhong
2021-04-19 10:01 ` [PATCH 13/32] linux-headers: Add placeholder for KVM_CAP_SGX_ATTRIBUTE Yang Zhong
2021-04-20  2:08   ` Kai Huang
2021-04-20  2:58     ` Yang Zhong
2021-04-19 10:01 ` [PATCH 14/32] i386: kvm: Add support for exposing PROVISIONKEY to guest Yang Zhong
2021-04-19 10:01 ` Yang Zhong [this message]
2021-04-19 10:01 ` [PATCH 16/32] Adjust min CPUID level to 0x12 when SGX is enabled Yang Zhong
2021-04-19 10:01 ` [PATCH 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly Yang Zhong
2021-04-19 10:01 ` [PATCH 18/32] hw/i386/pc: Account for SGX EPC sections when calculating device memory Yang Zhong
2021-04-19 10:01 ` [PATCH 19/32] i386/pc: Add e820 entry for SGX EPC section(s) Yang Zhong
2021-04-19 10:01 ` [PATCH 20/32] i386: acpi: Add SGX EPC entry to ACPI tables Yang Zhong
2021-04-19 10:01 ` [PATCH 21/32] q35: Add support for SGX EPC Yang Zhong
2021-04-19 10:01 ` [PATCH 22/32] i440fx: " Yang Zhong
2021-04-19 10:01 ` [PATCH 23/32] hostmem: Add the reset interface for EPC backend reset Yang Zhong
2021-04-19 10:01 ` [PATCH 24/32] sgx-epc: Add the reset interface for sgx-epc virt device Yang Zhong
2021-04-19 10:01 ` [PATCH 25/32] qmp: Add query-sgx command Yang Zhong
2021-04-19 10:01 ` [PATCH 26/32] hmp: Add 'info sgx' command Yang Zhong
2021-04-19 10:01 ` [PATCH 27/32] i386: Add sgx_get_info() interface Yang Zhong
2021-04-19 10:01 ` [PATCH 28/32] bitops: Support 32 and 64 bit mask macro Yang Zhong
2021-04-19 10:01 ` [PATCH 29/32] qmp: Add the qmp_query_sgx_capabilities() Yang Zhong
2021-04-19 10:01 ` [PATCH 30/32] Kconfig: Add CONFIG_SGX support Yang Zhong
2021-04-19 10:01 ` [PATCH 31/32] sgx-epc: Add the fill_device_info() callback support Yang Zhong
2021-04-19 10:01 ` [PATCH 32/32] doc: Add the SGX doc 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=20210419100156.53504-16-yang.zhong@intel.com \
    --to=yang.zhong@intel.com \
    --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).