From: Michael Roth <michael.roth@amd.com>
To: <qemu-devel@nongnu.org>
Cc: kvm@vger.kernel.org, "Tom Lendacky" <thomas.lendacky@amd.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Pankaj Gupta" <pankaj.gupta@amd.com>,
"Xiaoyao Li" <xiaoyao.li@intel.com>,
"Isaku Yamahata" <isaku.yamahata@linux.intel.com>
Subject: [PATCH v3 34/49] i386/sev: Add KVM_EXIT_VMGEXIT handling for Page State Changes
Date: Wed, 20 Mar 2024 03:39:30 -0500 [thread overview]
Message-ID: <20240320083945.991426-35-michael.roth@amd.com> (raw)
In-Reply-To: <20240320083945.991426-1-michael.roth@amd.com>
When running SEV-SNP guests, the kernel may forward some subset of
VMGEXIT-based guest hypercalls to userspace. One of these is for Page
State Change requests, as documented by the GHCB specification[1].
Userspace does not directly have control over the SNP RMP table to
actually satisfy these requests, but will instead make use of the
kvm_convert_memory() interface, which makes use of the
KVM_SET_MEMORY_ATTRIBUTES ioctl to instruct KVM to map these these
GPAs using private/shared memory and make the appropriate RMP changes
via the associated kernel hooks.
Add the basic infrastructure for handling KVM_EXIT_VMGEXIT events, and
then implement handling for Page State Change requests on top of that.
[1] https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56421.pdf
Signed-off-by: Michael Roth <michael.roth@amd.com>
---
target/i386/kvm/kvm.c | 3 +
target/i386/sev.c | 152 ++++++++++++++++++++++++++++++++++++++++++
target/i386/sev.h | 2 +
3 files changed, 157 insertions(+)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 59e9048e61..22eb21a2f3 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -5409,6 +5409,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)
ret = kvm_xen_handle_exit(cpu, &run->xen);
break;
#endif
+ case KVM_EXIT_VMGEXIT:
+ ret = kvm_handle_vmgexit(run);
+ break;
default:
fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason);
ret = -1;
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 0c8e4bdb4c..0c6a253138 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -1423,6 +1423,158 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp)
return ret;
}
+typedef struct __attribute__((__packed__)) PscHdr {
+ uint16_t cur_entry;
+ uint16_t end_entry;
+ uint32_t reserved;
+} PscHdr;
+
+typedef struct __attribute__((__packed__)) PscEntry {
+ uint64_t cur_page : 12,
+ gfn : 40,
+ operation : 4,
+ pagesize : 1,
+ reserved : 7;
+} PscEntry;
+
+#define VMGEXIT_PSC_MAX_ENTRY 253
+
+typedef struct __attribute__((__packed__)) SnpPscDesc {
+ PscHdr hdr;
+ PscEntry entries[VMGEXIT_PSC_MAX_ENTRY];
+} SnpPscDesc;
+
+static int next_contig_gpa_range(SnpPscDesc *desc, uint16_t *entries_processed,
+ hwaddr *gfn_base, int *gfn_count,
+ bool *range_to_private)
+{
+ int i;
+
+ *entries_processed = 0;
+ *gfn_base = 0;
+ *gfn_count = 0;
+ *range_to_private = false;
+
+ for (i = desc->hdr.cur_entry; i <= desc->hdr.end_entry; i++) {
+ PscEntry *entry = &desc->entries[i];
+ bool to_private = entry->operation == 1;
+ int page_count = entry->pagesize ? 512 : 1;
+
+ if (!*gfn_count) {
+ *range_to_private = to_private;
+ *gfn_base = entry->gfn;
+ }
+
+ /* When first non-adjacent entry is seen, report the previous range */
+ if (entry->gfn != *gfn_base + *gfn_count || (to_private != *range_to_private)) {
+ return 0;
+ }
+
+ *gfn_count += page_count;
+
+ /*
+ * Currently entry-specific PSC_ERROR_INVALID_ENTRY errors are not
+ * returned. Instead only the more general GENERIC/INVALID_HDR
+ * errors are returned. If support for PSC_ERROR_INVALID_ENTRY errors
+ * are added, this logic will need to be re-worked to either not
+ * increment entries_processed until the request is issued
+ * successfully, or to rewind it after failure. Guests don't
+ * currently do anything useful with entry-specific errors so vs.
+ * the other errors types so this is unlikely to be an issue in the
+ * meantime.
+ */
+ entry->cur_page = page_count;
+ *entries_processed += 1;
+ }
+
+ return *gfn_count ? 0 : -ENOENT;
+}
+
+#define GHCB_SHARED_BUF_SIZE 0x7f0
+#define PSC_ERROR_GENERIC (0x100UL << 32)
+#define PSC_ERROR_INVALID_HDR ((0x1UL << 32) | 1)
+#define PSC_ERROR_INVALID_ENTRY ((0x1UL << 32) | 2)
+#define PSC_ENTRY_COUNT_MAX 253
+
+static int kvm_handle_vmgexit_psc(__u64 shared_gpa, __u64 *psc_ret)
+{
+ hwaddr len = GHCB_SHARED_BUF_SIZE;
+ MemTxAttrs attrs = { 0 };
+ SnpPscDesc *desc;
+ void *ghcb_shared_buf;
+ uint8_t shared_buf[GHCB_SHARED_BUF_SIZE];
+ uint16_t entries_processed;
+ hwaddr gfn_base = 0;
+ int gfn_count = 0;
+ bool range_to_private;
+
+ *psc_ret = 0;
+ ghcb_shared_buf = address_space_map(&address_space_memory, shared_gpa,
+ &len, true, attrs);
+ if (len < GHCB_SHARED_BUF_SIZE) {
+ g_warning("unable to map entire shared GHCB buffer, mapped size %ld (expected %d)",
+ len, GHCB_SHARED_BUF_SIZE);
+ *psc_ret = PSC_ERROR_GENERIC;
+ goto out_unmap;
+ }
+ memcpy(shared_buf, ghcb_shared_buf, GHCB_SHARED_BUF_SIZE);
+ address_space_unmap(&address_space_memory, ghcb_shared_buf, len, true, len);
+
+ desc = (SnpPscDesc *)shared_buf;
+
+ if (desc->hdr.end_entry >= PSC_ENTRY_COUNT_MAX) {
+ *psc_ret = PSC_ERROR_INVALID_HDR;
+ goto out_unmap;
+ }
+
+ /* No more entries left to process. */
+ if (desc->hdr.cur_entry > desc->hdr.end_entry) {
+ goto out_unmap;
+ }
+
+ while (!next_contig_gpa_range(desc, &entries_processed,
+ &gfn_base, &gfn_count, &range_to_private)) {
+ int ret = kvm_convert_memory(gfn_base * 0x1000, gfn_count * 0x1000,
+ range_to_private);
+ if (ret) {
+ *psc_ret = 0x100ULL << 32; /* Indicate interrupted processing */
+ g_warning("error doing memory conversion: %d", ret);
+ break;
+ }
+
+ desc->hdr.cur_entry += entries_processed;
+ }
+
+ ghcb_shared_buf = address_space_map(&address_space_memory, shared_gpa,
+ &len, true, attrs);
+ if (len < GHCB_SHARED_BUF_SIZE) {
+ g_warning("unable to map entire shared GHCB buffer, mapped size %ld (expected %d)",
+ len, GHCB_SHARED_BUF_SIZE);
+ *psc_ret = PSC_ERROR_GENERIC;
+ goto out_unmap;
+ }
+ memcpy(ghcb_shared_buf, shared_buf, GHCB_SHARED_BUF_SIZE);
+out_unmap:
+ address_space_unmap(&address_space_memory, ghcb_shared_buf, len, true, len);
+
+ return 0;
+}
+
+int kvm_handle_vmgexit(struct kvm_run *run)
+{
+ int ret;
+
+ if (run->vmgexit.type == KVM_USER_VMGEXIT_PSC) {
+ ret = kvm_handle_vmgexit_psc(run->vmgexit.psc.shared_gpa,
+ &run->vmgexit.psc.ret);
+ } else {
+ warn_report("KVM: unknown vmgexit type: %d", run->vmgexit.type);
+ ret = -1;
+ }
+
+ return ret;
+}
+
static char *
sev_common_get_sev_device(Object *obj, Error **errp)
{
diff --git a/target/i386/sev.h b/target/i386/sev.h
index 5dc4767b1e..5cbfc3365b 100644
--- a/target/i386/sev.h
+++ b/target/i386/sev.h
@@ -66,4 +66,6 @@ int sev_inject_launch_secret(const char *hdr, const char *secret,
int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size);
void sev_es_set_reset_vector(CPUState *cpu);
+int kvm_handle_vmgexit(struct kvm_run *run);
+
#endif
--
2.25.1
next prev parent reply other threads:[~2024-03-20 8:50 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 8:38 [PATCH RFC v3 00/49] Add AMD Secure Nested Paging (SEV-SNP) support Michael Roth
2024-03-20 8:38 ` [PATCH v3 01/49] Revert "linux-headers hack" from sevinit2 base tree Michael Roth
2024-03-20 8:38 ` [PATCH v3 02/49] scripts/update-linux-headers: Add setup_data.h to import list Michael Roth
2024-03-20 9:19 ` Paolo Bonzini
2024-03-20 8:38 ` [PATCH v3 03/49] scripts/update-linux-headers: Add bits.h to file imports Michael Roth
2024-03-20 8:39 ` [PATCH v3 04/49] [HACK] linux-headers: Update headers for 6.8 + kvm-coco-queue + SNP Michael Roth
2024-03-20 8:39 ` [PATCH v3 05/49] [TEMP] hw/i386: Remove redeclaration of struct setup_data Michael Roth
2024-03-20 8:39 ` [PATCH v3 06/49] RAMBlock: Add support of KVM private guest memfd Michael Roth
2024-03-20 16:38 ` Paolo Bonzini
2024-03-20 8:39 ` [PATCH v3 07/49] HostMem: Add mechanism to opt in kvm guest memfd via MachineState Michael Roth
2025-01-21 17:39 ` Peter Xu
2025-01-21 18:24 ` David Hildenbrand
2025-01-21 20:21 ` Peter Xu
2025-01-21 20:41 ` David Hildenbrand
2025-01-21 20:59 ` Peter Xu
2025-01-21 21:00 ` David Hildenbrand
2024-03-20 8:39 ` [PATCH v3 08/49] trace/kvm: Split address space and slot id in trace_kvm_set_user_memory() Michael Roth
2024-03-20 8:39 ` [PATCH v3 09/49] kvm: Enable KVM_SET_USER_MEMORY_REGION2 for memslot Michael Roth
2024-03-20 15:56 ` Paolo Bonzini
2024-03-20 8:39 ` [PATCH v3 10/49] kvm: Introduce support for memory_attributes Michael Roth
2024-03-20 16:00 ` Paolo Bonzini
2024-03-20 8:39 ` [PATCH v3 11/49] physmem: Introduce ram_block_discard_guest_memfd_range() Michael Roth
2024-03-20 9:37 ` David Hildenbrand
2024-03-20 12:43 ` Xiaoyao Li
2024-03-20 12:58 ` David Hildenbrand
2024-03-20 17:38 ` Michael Roth
2024-03-20 20:04 ` David Hildenbrand
2024-03-21 20:24 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 12/49] kvm: handle KVM_EXIT_MEMORY_FAULT Michael Roth
2024-03-20 8:39 ` [PATCH v3 13/49] [FIXUP] "kvm: handle KVM_EXIT_MEMORY_FAULT": drop qemu_host_page_size Michael Roth
2024-03-20 12:46 ` Xiaoyao Li
2024-03-20 8:39 ` [PATCH v3 14/49] trace/kvm: Add trace for page convertion between shared and private Michael Roth
2024-03-20 8:39 ` [PATCH v3 15/49] kvm/memory: Make memory type private by default if it has guest memfd backend Michael Roth
2024-03-20 8:39 ` [PATCH v3 16/49] memory: Introduce memory_region_init_ram_guest_memfd() Michael Roth
2024-03-20 8:39 ` [PATCH v3 17/49] pci-host/q35: Move PAM initialization above SMRAM initialization Michael Roth
2024-03-20 8:39 ` [PATCH v3 18/49] q35: Introduce smm_ranges property for q35-pci-host Michael Roth
2024-03-20 8:39 ` [PATCH v3 19/49] kvm: Make kvm_convert_memory() obey ram_block_discard_is_enabled() Michael Roth
2024-03-20 16:26 ` Paolo Bonzini
2024-03-20 19:47 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 20/49] trace/kvm: Add trace for KVM_EXIT_MEMORY_FAULT Michael Roth
2024-03-20 8:39 ` [PATCH v3 21/49] i386/sev: Introduce "sev-common" type to encapsulate common SEV state Michael Roth
2024-03-20 11:44 ` Daniel P. Berrangé
2024-03-20 21:36 ` Michael Roth
2024-03-27 15:22 ` Markus Armbruster
2024-03-20 11:47 ` Daniel P. Berrangé
2024-03-20 21:45 ` Michael Roth
2024-04-22 13:06 ` Markus Armbruster
2024-03-20 8:39 ` [PATCH v3 22/49] i386/sev: Introduce 'sev-snp-guest' object Michael Roth
2024-03-20 11:58 ` Daniel P. Berrangé
2024-03-20 22:09 ` Michael Roth
2024-04-22 13:52 ` Markus Armbruster
2024-03-20 8:39 ` [PATCH v3 23/49] i386/sev: Add a sev_snp_enabled() helper Michael Roth
2024-03-20 12:35 ` Daniel P. Berrangé
2024-03-20 22:11 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 24/49] target/i386: Add handling for KVM_X86_SNP_VM VM type Michael Roth
2024-03-20 9:33 ` Paolo Bonzini
2024-03-20 8:39 ` [PATCH v3 25/49] i386/sev: Skip RAMBlock notifiers for SNP Michael Roth
2024-03-20 9:46 ` Paolo Bonzini
2024-03-20 22:14 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 26/49] i386/sev: Skip machine-init-done " Michael Roth
2024-03-20 8:39 ` [PATCH v3 27/49] i386/sev: Set ms->require_guest_memfd " Michael Roth
2024-03-20 9:48 ` Paolo Bonzini
2024-03-20 8:39 ` [PATCH v3 28/49] i386/sev: Disable SMM " Michael Roth
2024-03-20 12:32 ` Daniel P. Berrangé
2024-03-20 8:39 ` [PATCH v3 29/49] i386/sev: Don't disable block discarding " Michael Roth
2024-03-20 12:33 ` Daniel P. Berrangé
2024-03-20 8:39 ` [PATCH v3 30/49] i386/cpu: Set SEV-SNP CPUID bit when SNP enabled Michael Roth
2024-03-20 8:39 ` [PATCH v3 31/49] i386/sev: Update query-sev QAPI format to handle SEV-SNP Michael Roth
2024-03-20 12:10 ` Daniel P. Berrangé
2024-03-20 22:23 ` Michael Roth
2024-04-22 15:01 ` Markus Armbruster
2024-03-20 8:39 ` [PATCH v3 32/49] i386/sev: Don't return launch measurements for SEV-SNP guests Michael Roth
2024-03-20 12:15 ` Daniel P. Berrangé
2024-03-20 12:27 ` Daniel P. Berrangé
2024-03-20 8:39 ` [PATCH v3 33/49] kvm: Make kvm_convert_memory() non-static Michael Roth
2024-03-20 8:39 ` Michael Roth [this message]
2024-03-20 8:39 ` [PATCH v3 35/49] i386/sev: Add KVM_EXIT_VMGEXIT handling for Page State Changes (MSR-based) Michael Roth
2024-03-20 8:39 ` [PATCH v3 36/49] i386/sev: Add KVM_EXIT_VMGEXIT handling for Extended Guest Requests Michael Roth
2024-04-22 15:02 ` Markus Armbruster
2024-03-20 8:39 ` [PATCH v3 37/49] i386/sev: Add the SNP launch start context Michael Roth
2024-03-20 9:58 ` Paolo Bonzini
2024-03-20 22:32 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 38/49] i386/sev: Add handling to encrypt/finalize guest launch data Michael Roth
2024-03-20 8:39 ` [PATCH v3 39/49] i386/sev: Set CPU state to protected once SNP guest payload is finalized Michael Roth
2024-03-20 8:39 ` [PATCH v3 40/49] hw/i386/sev: Add function to get SEV metadata from OVMF header Michael Roth
2024-03-20 17:55 ` Isaku Yamahata
2024-03-20 22:35 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 41/49] i386/sev: Add support for populating OVMF metadata pages Michael Roth
2024-03-20 8:39 ` [PATCH v3 42/49] i386/sev: Add support for SNP CPUID validation Michael Roth
2024-03-20 12:18 ` Daniel P. Berrangé
2024-03-20 8:39 ` [PATCH v3 43/49] qapi, i386: Move kernel-hashes to SevCommonProperties Michael Roth
2024-03-20 12:20 ` Daniel P. Berrangé
2024-04-22 15:03 ` Markus Armbruster
2024-03-20 8:39 ` [PATCH v3 44/49] i386/sev: Extract build_kernel_loader_hashes Michael Roth
2024-03-20 8:39 ` [PATCH v3 45/49] i386/sev: Reorder struct declarations Michael Roth
2024-03-20 8:39 ` [PATCH v3 46/49] i386/sev: Allow measured direct kernel boot on SNP Michael Roth
2024-03-20 8:39 ` [PATCH v3 47/49] hw/i386/sev: Add support to encrypt BIOS when SEV-SNP is enabled Michael Roth
2024-03-20 12:22 ` Daniel P. Berrangé
2024-03-21 13:42 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 48/49] hw/i386/sev: Use guest_memfd for legacy ROMs Michael Roth
2024-03-20 18:12 ` Isaku Yamahata
2024-03-28 0:45 ` Xiaoyao Li
2024-04-24 0:08 ` Michael Roth
2024-03-20 8:39 ` [PATCH v3 49/49] hw/i386: Add support for loading BIOS using guest_memfd Michael Roth
2024-03-20 9:59 ` [PATCH RFC v3 00/49] Add AMD Secure Nested Paging (SEV-SNP) support Paolo Bonzini
2024-03-20 17:08 ` Paolo Bonzini
2024-03-20 20:54 ` Xiaoyao Li
2024-03-21 20:26 ` Michael Roth
2024-04-18 11:37 ` Ani Sinha
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=20240320083945.991426-35-michael.roth@amd.com \
--to=michael.roth@amd.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=isaku.yamahata@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=pankaj.gupta@amd.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thomas.lendacky@amd.com \
--cc=xiaoyao.li@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox