Add AMD SEV and SEV-ES intra host migration support
Subsystems (5)
v10 cover Add AMD SEV and SEV-ES intra host migration support
Intra host migration provides a low-cost mechanism for userspace VMM upgrades. It is an alternative to traditional (i.e., remote) live migration. Whereas remote migration handles moving a guest to a new host, intra host migration only handles moving a guest to a new userspace VMM within a host. This can be used to update, rollback, change flags of the VMM, etc. The lower cost compared to live migration comes from the fact that the guest's memory does not need to be copied between processes. A handle to the guest memory simply gets passed to the new VMM, this could be done via /dev/shm with share=on or similar feature.
The guest state can be transferred from an old VMM to a new VMM as follows:
1. Export guest state from KVM to the old user-space VMM via a getter user-space/kernel API 2. Transfer guest state from old VMM to new VMM via IPC communication 3. Import guest state into KVM from the new user-space VMM via a setter user-space/kernel API VMMs by exporting from KVM using getters, sending that data to the new VMM, then setting it again in KVM.
In the common case for intra host migration, we can rely on the normal ioctls for passing data from one VMM to the next. SEV, SEV-ES, and other confidential compute environments make most of this information opaque, and render KVM ioctls such as "KVM_GET_REGS" irrelevant. As a result, we need the ability to pass this opaque metadata from one VMM to the next. The easiest way to do this is to leave this data in the kernel, and transfer ownership of the metadata from one KVM VM (or vCPU) to the next. For example, we need to move the SEV enabled ASID, VMSAs, and GHCB metadata from one VMM to the next. In general, we need to be able to hand off any data that would be unsafe/impossible for the kernel to hand directly to userspace (and cannot be reproduced using data that can be handed safely to userspace).
V10
* Add new starting patch to refactor all SEV-ES related vCPU data into for easier copying.
V9
* Fix sev_lock_vcpus_for_migration from unlocking the vCPU mutex it failed to unlock.
V8
* Update to require that @dst is not SEV or SEV-ES enabled.
* Address selftest feedback.
V7
* Address selftest feedback.
V6
* Add selftest.
V5:
* Fix up locking scheme
* Address marcorr@ comments.
V4:
* Move to seanjc@'s suggestion of source VM FD based single ioctl design.
v3:
* Fix memory leak found by dan.carpenter@
v2:
* Added marcorr@ reviewed by tag
* Renamed function introduced in 1/3
* Edited with seanjc@'s review comments
** Cleaned up WARN usage
** Userspace makes random token now
* Edited with brijesh.singh@'s review comments ** Checks for different LAUNCH_* states in send function
v1: https://lore.kernel.org/kvm/[email protected]/
base-commit: 2acbc5c9a0ec
Peter Gonda (5):
Refactor out sev_es_state struct
KVM: SEV: Add support for SEV intra host migration
KVM: SEV: Add support for SEV-ES intra host migration
selftest: KVM: Add open sev dev helper
selftest: KVM: Add intra host migration tests
Documentation/virt/kvm/api.rst | 15 + arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/sev.c | 264 +++++++++++++++--- arch/x86/kvm/svm/svm.c | 9 +- arch/x86/kvm/svm/svm.h | 28 +- arch/x86/kvm/x86.c | 6 + include/uapi/linux/kvm.h | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../testing/selftests/kvm/include/kvm_util.h | 1 + .../selftests/kvm/include/x86_64/svm_util.h | 2 + tools/testing/selftests/kvm/lib/kvm_util.c | 24 +- tools/testing/selftests/kvm/lib/x86_64/svm.c | 13 + .../selftests/kvm/x86_64/sev_vm_tests.c | 203 ++++++++++++++ 13 files changed, 504 insertions(+), 66 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86_64/sev_vm_tests.c
Signature · 1 line
2.33.0.882.g93a45727a2-goog
PATCH v10 1/5 KVM: SEV: Refactor out sev_es_state struct
Move SEV-ES vCPU metadata into new sev_es_state struct from vcpu_svm.
--- arch/x86/kvm/svm/sev.c | 81 +++++++++++++++++++++--------------------- arch/x86/kvm/svm/svm.c | 8 ++--- arch/x86/kvm/svm/svm.h | 26 ++++++++------ 3 files changed, 60 insertions(+), 55 deletions(-)
arch/x86/kvm/svm/sev.c +41 -40
@@ -590,7 +590,7 @@ static int sev_es_sync_vmsa(struct vcpu_svm *svm)* traditional VMSA as it has been built so far (in prep * for LAUNCH_UPDATE_VMSA) to be the initial SEV-ES state. */ -memcpy (svm->vmsa, save,sizeof (*save)); +memcpy (svm->sev_es.vmsa, save,sizeof (*save));return 0 ; }
@@ -612,11 +612,11 @@ static int __sev_launch_update_vmsa(struct kvm *kvm, struct kvm_vcpu *vcpu,* the VMSA memory content (i.e it will write the same memory region * with the guest's key), so invalidate it first. */ -clflush_cache_range (svm->vmsa,PAGE_SIZE ); +clflush_cache_range (svm->sev_es.vmsa,PAGE_SIZE ); vmsa.reserved =0 ; vmsa.handle =to_kvm_svm (kvm)->sev_info.handle; - vmsa.address =__sme_pa (svm->vmsa); + vmsa.address =__sme_pa (svm->sev_es.vmsa); vmsa.len =PAGE_SIZE ;return sev_issue_cmd (kvm,SEV_CMD_LAUNCH_UPDATE_VMSA , &vmsa, error); }
@@ -2026,16 +2026,16 @@ void sev_free_vcpu(struct kvm_vcpu *vcpu) svm =to_svm (vcpu);if (vcpu->arch.guest_state_protected) -sev_flush_guest_memory (svm, svm->vmsa,PAGE_SIZE ); -__free_page (virt_to_page (svm->vmsa)); +sev_flush_guest_memory (svm, svm->sev_es.vmsa,PAGE_SIZE ); +__free_page (virt_to_page (svm->sev_es.vmsa)); -if (svm->ghcb_sa_free) -kfree (svm->ghcb_sa); +if (svm->sev_es.ghcb_sa_free) +kfree (svm->sev_es.ghcb_sa); }static void dump_ghcb (struct vcpu_svm *svm) { -struct ghcb *ghcb = svm->ghcb; +struct ghcb *ghcb = svm->sev_es.ghcb;unsigned int nbits;/* Re-use the dump_invalid_vmcb module parameter */
@@ -2061,7 +2061,7 @@ static void dump_ghcb(struct vcpu_svm *svm)static void sev_es_sync_to_ghcb (struct vcpu_svm *svm) {struct kvm_vcpu *vcpu = &svm->vcpu; -struct ghcb *ghcb = svm->ghcb; +struct ghcb *ghcb = svm->sev_es.ghcb;/* * The GHCB protocol so far allows for the following data
@@ -2081,7 +2081,7 @@ static void sev_es_sync_from_ghcb(struct vcpu_svm *svm) {struct vmcb_control_area *control = &svm->vmcb->control;struct kvm_vcpu *vcpu = &svm->vcpu; -struct ghcb *ghcb = svm->ghcb; +struct ghcb *ghcb = svm->sev_es.ghcb;u64 exit_code;/*
@@ -2128,7 +2128,7 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm)struct ghcb *ghcb;u64 exit_code =0 ; - ghcb = svm->ghcb; + ghcb = svm->sev_es.ghcb;/* Only GHCB Usage code 0 is supported */ if (ghcb->ghcb_usage)
@@ -2246,33 +2246,34 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm)void sev_es_unmap_ghcb (struct vcpu_svm *svm) { -if (!svm->ghcb) +if (!svm->sev_es.ghcb)return ; -if (svm->ghcb_sa_free) { +if (svm->sev_es.ghcb_sa_free) {/* * The scratch area lives outside the GHCB, so there is a * buffer that, depending on the operation performed, may * need to be synced, then freed. */ -if (svm->ghcb_sa_sync) { +if (svm->sev_es.ghcb_sa_sync) {kvm_write_guest (svm->vcpu.kvm, -ghcb_get_sw_scratch (svm->ghcb), - svm->ghcb_sa, svm->ghcb_sa_len); - svm->ghcb_sa_sync = false; +ghcb_get_sw_scratch (svm->sev_es.ghcb), + svm->sev_es.ghcb_sa, + svm->sev_es.ghcb_sa_len); + svm->sev_es.ghcb_sa_sync = false; } -kfree (svm->ghcb_sa); - svm->ghcb_sa =NULL ; - svm->ghcb_sa_free = false; +kfree (svm->sev_es.ghcb_sa); + svm->sev_es.ghcb_sa =NULL ; + svm->sev_es.ghcb_sa_free = false; } -trace_kvm_vmgexit_exit (svm->vcpu.vcpu_id, svm->ghcb); +trace_kvm_vmgexit_exit (svm->vcpu.vcpu_id, svm->sev_es.ghcb);sev_es_sync_to_ghcb (svm); -kvm_vcpu_unmap (&svm->vcpu, &svm->ghcb_map, true); - svm->ghcb =NULL ; +kvm_vcpu_unmap (&svm->vcpu, &svm->sev_es.ghcb_map, true); + svm->sev_es.ghcb =NULL ; }void pre_sev_run (struct vcpu_svm *svm,int cpu)
@@ -2302,7 +2303,7 @@ void pre_sev_run(struct vcpu_svm *svm, int cpu)static bool setup_vmgexit_scratch (struct vcpu_svm *svm,bool sync,u64 len) {struct vmcb_control_area *control = &svm->vmcb->control; -struct ghcb *ghcb = svm->ghcb; +struct ghcb *ghcb = svm->sev_es.ghcb;u64 ghcb_scratch_beg, ghcb_scratch_end;u64 scratch_gpa_beg, scratch_gpa_end;void *scratch_va;
@@ -2338,7 +2339,7 @@ static bool setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)return false; } - scratch_va = (void *)svm->ghcb; + scratch_va = (void *)svm->sev_es.ghcb; scratch_va += (scratch_gpa_beg - control->ghcb_gpa); }else {/*
@@ -2368,12 +2369,12 @@ static bool setup_vmgexit_scratch(struct vcpu_svm *svm, bool sync, u64 len)* the vCPU next time (i.e. a read was requested so the data * must be written back to the guest memory). */ - svm->ghcb_sa_sync = sync; - svm->ghcb_sa_free = true; + svm->sev_es.ghcb_sa_sync = sync; + svm->sev_es.ghcb_sa_free = true; } - svm->ghcb_sa = scratch_va; - svm->ghcb_sa_len = len; + svm->sev_es.ghcb_sa = scratch_va; + svm->sev_es.ghcb_sa_len = len;return true; }
@@ -2492,15 +2493,15 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu)return -EINVAL ; } -if (kvm_vcpu_map (vcpu, ghcb_gpa >>PAGE_SHIFT , &svm->ghcb_map)) { +if (kvm_vcpu_map (vcpu, ghcb_gpa >>PAGE_SHIFT , &svm->sev_es.ghcb_map)) {/* Unable to map GHCB from guest */ vcpu_unimpl (vcpu,"vmgexit: error mapping GHCB [%#llx] from guest\n" , ghcb_gpa);return -EINVAL ; } - svm->ghcb = svm->ghcb_map.hva; - ghcb = svm->ghcb_map.hva; + svm->sev_es.ghcb = svm->sev_es.ghcb_map.hva; + ghcb = svm->sev_es.ghcb_map.hva;trace_kvm_vmgexit_enter (vcpu->vcpu_id, ghcb);
@@ -2523,7 +2524,7 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) ret =kvm_sev_es_mmio_read (vcpu, control->exit_info_1, control->exit_info_2, - svm->ghcb_sa); + svm->sev_es.ghcb_sa);break ;case SVM_VMGEXIT_MMIO_WRITE :if (!setup_vmgexit_scratch (svm, false, control->exit_info_2))
@@ -2532,7 +2533,7 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) ret =kvm_sev_es_mmio_write (vcpu, control->exit_info_1, control->exit_info_2, - svm->ghcb_sa); + svm->sev_es.ghcb_sa);break ;case SVM_VMGEXIT_NMI_COMPLETE : ret =svm_invoke_exit_handler (vcpu,SVM_EXIT_IRET );
@@ -2583,7 +2584,7 @@ int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in)return -EINVAL ;return kvm_sev_es_string_io (&svm->vcpu, size, port, - svm->ghcb_sa, svm->ghcb_sa_len, in); + svm->sev_es.ghcb_sa, svm->sev_es.ghcb_sa_len, in); }void sev_es_init_vmcb (struct vcpu_svm *svm)
@@ -2598,7 +2599,7 @@ void sev_es_init_vmcb(struct vcpu_svm *svm)* VMCB page. Do not include the encryption mask on the VMSA physical * address since hardware will access it using the guest key. */ - svm->vmcb->control.vmsa_pa =__pa (svm->vmsa); + svm->vmcb->control.vmsa_pa =__pa (svm->sev_es.vmsa);/* Can't intercept CR register access, HV can't modify CR registers */ svm_clr_intercept (svm,INTERCEPT_CR0_READ );
@@ -2670,8 +2671,8 @@ void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)struct vcpu_svm *svm =to_svm (vcpu);/* First SIPI: Use the values as initially set by the VMM */ -if (!svm->received_first_sipi) { - svm->received_first_sipi = true; +if (!svm->sev_es.received_first_sipi) { + svm->sev_es.received_first_sipi = true;return ; }
@@ -2680,8 +2681,8 @@ void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)* the guest will set the CS and RIP. Set SW_EXIT_INFO_2 to a * non-zero value. */ -if (!svm->ghcb) +if (!svm->sev_es.ghcb)return ; -ghcb_set_sw_exit_info_2 (svm->ghcb,1 ); +ghcb_set_sw_exit_info_2 (svm->sev_es.ghcb,1 ); }
arch/x86/kvm/svm/svm.c +4 -4
@@ -1450,7 +1450,7 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)svm_switch_vmcb (svm, &svm->vmcb01);if (vmsa_page) - svm->vmsa =page_address (vmsa_page); + svm->sev_es.vmsa =page_address (vmsa_page); svm->guest_state_loaded = false;
@@ -2833,11 +2833,11 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)static int svm_complete_emulated_msr (struct kvm_vcpu *vcpu,int err) {struct vcpu_svm *svm =to_svm (vcpu); -if (!err || !sev_es_guest (vcpu->kvm) ||WARN_ON_ONCE (!svm->ghcb)) +if (!err || !sev_es_guest (vcpu->kvm) ||WARN_ON_ONCE (!svm->sev_es.ghcb))return kvm_complete_insn_gp (vcpu, err); -ghcb_set_sw_exit_info_1 (svm->ghcb,1 ); -ghcb_set_sw_exit_info_2 (svm->ghcb, +ghcb_set_sw_exit_info_1 (svm->sev_es.ghcb,1 ); +ghcb_set_sw_exit_info_2 (svm->sev_es.ghcb,X86_TRAP_GP |SVM_EVTINJ_TYPE_EXEPT |SVM_EVTINJ_VALID );
arch/x86/kvm/svm/svm.h +15 -11
@@ -123,6 +123,20 @@ struct svm_nested_state {bool initialized; }; +struct vcpu_sev_es_state { +/* SEV-ES support */ +struct vmcb_save_area *vmsa; +struct ghcb *ghcb; +struct kvm_host_map ghcb_map; +bool received_first_sipi; + +/* SEV-ES scratch area support */ +void *ghcb_sa; +u64 ghcb_sa_len; +bool ghcb_sa_sync; +bool ghcb_sa_free; +}; +struct vcpu_svm {struct kvm_vcpu vcpu;/* vmcb always points at current_vmcb->ptr, it's purely a shorthand. */
@@ -186,17 +200,7 @@ struct vcpu_svm {DECLARE_BITMAP (write,MAX_DIRECT_ACCESS_MSRS ); } shadow_msr_intercept; -/* SEV-ES support */ -struct vmcb_save_area *vmsa; -struct ghcb *ghcb; -struct kvm_host_map ghcb_map; -bool received_first_sipi; - -/* SEV-ES scratch area support */ -void *ghcb_sa; -u64 ghcb_sa_len; -bool ghcb_sa_sync; -bool ghcb_sa_free; +struct vcpu_sev_es_state sev_es;bool guest_state_loaded; };
Signature · 1 line
2.33.0.882.g93a45727a2-goog
Re: [PATCH 1/5 V10] KVM: SEV: Refactor out sev_es_state struct
Quoted 13 lines · Peter Gonda
Move SEV-ES vCPU metadata into new
sev_es_statestruct fromvcpu_svm.Signed-off-by Peter Gonda <[email protected]>Suggested-by Tom Lendacky <[email protected]>Cc Marc Orr <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Cc David Rientjes <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Brijesh Singh <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Wanpeng Li <[email protected]>
Quoted 8 lines
Cc Jim Mattson <[email protected]>Cc Joerg Roedel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>
Quoted 1 line
Paolo Bonzini
maintainerRe: [PATCH 1/5 V10] KVM: SEV: Refactor out sev_es_state struct
Quoted 23 lines · Tom Lendacky
Quoted 13 lines · Peter Gonda
Move SEV-ES vCPU metadata into new
sev_es_statestruct fromvcpu_svm.Signed-off-by Peter Gonda <[email protected]>Suggested-by Tom Lendacky <[email protected]>Cc Marc Orr <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Cc David Rientjes <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Brijesh Singh <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Wanpeng Li <[email protected]>Quoted 8 lines
Cc Jim Mattson <[email protected]>Cc Joerg Roedel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>
Quoted 1 line
Acked-by Tom Lendacky <[email protected]>
FWIW this series won't apply due to the string I/O fixes in 5.15, so I've delayed it---but it's not lost.
Paolo
PATCH v10 2/5 KVM: SEV: Add support for SEV intra host migration
In reply to Peter GondaFor SEV to work with intra host migration, contents of the SEV info struct such as the ASID (used to index the encryption key in the AMD SP) and the list of memory regions need to be transferred to the target VM. This change adds a commands for a target VMM to get a source SEV VM's sev info.
--- Documentation/virt/kvm/api.rst | 15 ++++ arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/sev.c | 137 ++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/svm/svm.h | 2 + arch/x86/kvm/x86.c | 6 ++ include/uapi/linux/kvm.h | 1 + 7 files changed, 163 insertions(+)
Documentation/virt/kvm/api.rst +15 -0
@@ -6911,6 +6911,21 @@ MAP_SHARED mmap will result in an -EINVAL return. When enabled the VMM may make use of the ``KVM_ARM_MTE_COPY_TAGS`` ioctl to perform a bulk copy of tags to/from the guest. +7.29 KVM_CAP_VM_MIGRATE_PROTECTED_VM_FROM +------------------------------------- + +Architectures: x86 SEV enabled +Type: vm +Parameters: args[0] is the fd of the source vm +Returns: 0 on success + +This capability enables userspace to migrate the encryption context from the VM +indicated by the fd to the VM this is called on. + +This is intended to support intra-host migration of VMs between userspace VMMs. +in-guest workloads scheduled by the host. This allows for upgrading the VMM +process without interrupting the guest. + 8. Other capabilities. ======================
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1481,6 +1481,7 @@ struct kvm_x86_ops {int (*mem_enc_reg_region)(struct kvm *kvm,struct kvm_enc_region *argp);int (*mem_enc_unreg_region)(struct kvm *kvm,struct kvm_enc_region *argp);int (*vm_copy_enc_context_from)(struct kvm *kvm,unsigned int source_fd); +int (*vm_migrate_protected_vm_from)(struct kvm *kvm,unsigned int source_fd);int (*get_msr_feature)(struct kvm_msr_entry *entry);
arch/x86/kvm/svm/sev.c +137 -0
143 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +1 -0
@@ -4697,6 +4697,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .mem_enc_unreg_region = svm_unregister_enc_region, .vm_copy_enc_context_from = svm_vm_copy_asid_from, + .vm_migrate_protected_vm_from = svm_vm_migrate_from, .can_emulate_instruction = svm_can_emulate_instruction,
arch/x86/kvm/svm/svm.h +2 -0
@@ -80,6 +80,7 @@ struct kvm_sev_info {u64 ap_jump_table;/* SEV-ES AP Jump Table address */ struct kvm *enc_context_owner;/* Owner of copied encryption context */ struct misc_cg *misc_cg;/* For misc cgroup accounting */ +atomic_t migration_in_progress; };struct kvm_svm {
@@ -562,6 +563,7 @@ int svm_register_enc_region(struct kvm *kvm,int svm_unregister_enc_region (struct kvm *kvm,struct kvm_enc_region *range);int svm_vm_copy_asid_from (struct kvm *kvm,unsigned int source_fd); +int svm_vm_migrate_from (struct kvm *kvm,unsigned int source_fd);void pre_sev_run (struct vcpu_svm *svm,int cpu);void __init sev_set_cpu_caps (void );void __init sev_hardware_setup (void );
arch/x86/kvm/x86.c +6 -0
@@ -5806,6 +5806,12 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,if (kvm_x86_ops.vm_copy_enc_context_from) r = kvm_x86_ops.vm_copy_enc_context_from (kvm, cap->args[0 ]);return r; +case KVM_CAP_VM_MIGRATE_PROTECTED_VM_FROM : + r = -EINVAL ; +if (kvm_x86_ops.vm_migrate_protected_vm_from) + r = kvm_x86_ops.vm_migrate_protected_vm_from ( + kvm, cap->args[0 ]); +return r;case KVM_CAP_EXIT_HYPERCALL :if (cap->args[0 ] & ~KVM_EXIT_HYPERCALL_VALID_MASK ) { r = -EINVAL ;
include/uapi/linux/kvm.h +1 -0
@@ -1120,6 +1120,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_BINARY_STATS_FD 203#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204#define KVM_CAP_ARM_MTE 205 +#define KVM_CAP_VM_MIGRATE_PROTECTED_VM_FROM 206#ifdef KVM_CAP_IRQ_ROUTING
Signature · 1 line
2.33.0.882.g93a45727a2-goog
PATCH v10 3/5 KVM: SEV: Add support for SEV-ES intra host migration
In reply to Peter GondaFor SEV-ES to work with intra host migration the VMSAs, GHCB metadata, and other SEV-ES info needs to be preserved along with the guest's memory.
--- arch/x86/kvm/svm/sev.c | 48 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +47 -1
@@ -1600,6 +1600,46 @@ static void sev_migrate_from(struct kvm_sev_info *dst,list_replace_init (&src->regions_list, &dst->regions_list); } +static int sev_es_migrate_from (struct kvm *dst,struct kvm *src) +{ +int i; +struct kvm_vcpu *dst_vcpu, *src_vcpu; +struct vcpu_svm *dst_svm, *src_svm; + +if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) +return -EINVAL ; + +kvm_for_each_vcpu (i, src_vcpu, src) { +if (!src_vcpu->arch.guest_state_protected) +return -EINVAL ; + } + +kvm_for_each_vcpu (i, src_vcpu, src) { + src_svm =to_svm (src_vcpu); + dst_vcpu =kvm_get_vcpu (dst, i); + dst_svm =to_svm (dst_vcpu); + +/* +* Transfer VMSA and GHCB state to the destination. Nullify and +* clear source fields as appropriate, the state now belongs to +* the destination. +*/ + dst_vcpu->vcpu_id = src_vcpu->vcpu_id; +memcpy (&dst_svm->sev_es, &src_svm->sev_es, +sizeof (dst_svm->sev_es)); + dst_svm->vmcb->control.ghcb_gpa = + src_svm->vmcb->control.ghcb_gpa; + dst_svm->vmcb->control.vmsa_pa =__pa (dst_svm->sev_es.vmsa); + dst_vcpu->arch.guest_state_protected = true; + src_svm->vmcb->control.ghcb_gpa =0 ; + src_svm->vmcb->control.vmsa_pa =0 ; + src_vcpu->arch.guest_state_protected = false; + } +to_kvm_svm (src)->sev_info.es_active = false; + +return 0 ; +} +int svm_vm_migrate_from (struct kvm *kvm,unsigned int source_fd) {struct kvm_sev_info *dst_sev = &to_kvm_svm (kvm)->sev_info;
@@ -1628,7 +1668,7 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)if (ret) goto out_fput; -if (!sev_guest (source_kvm) ||sev_es_guest (source_kvm)) { +if (!sev_guest (source_kvm)) { ret = -EINVAL ; goto out_source; }
@@ -1639,6 +1679,12 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)if (ret) goto out_source_vcpu; +if (sev_es_guest (source_kvm)) { + ret =sev_es_migrate_from (kvm, source_kvm); +if (ret) + goto out_source_vcpu; + } +sev_migrate_from (dst_sev, &to_kvm_svm (source_kvm)->sev_info); kvm_for_each_vcpu (i, vcpu, source_kvm) {kvm_vcpu_reset (vcpu,/* init_event= */ false);
Signature · 1 line
2.33.0.882.g93a45727a2-goog
Re: [PATCH 3/5 V10] KVM: SEV: Add support for SEV-ES intra host migration
Quoted 56 lines · Peter Gonda
For SEV-ES to work with intra host migration the VMSAs, GHCB metadata, and other SEV-ES info needs to be preserved along with the guest's memory.
Signed-off-by Peter Gonda <[email protected]>Reviewed-by Marc Orr <[email protected]>Cc Marc Orr <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Cc David Rientjes <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Brijesh Singh <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Wanpeng Li <[email protected]>Cc Jim Mattson <[email protected]>Cc Joerg Roedel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/kvm/svm/sev.c | 48 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)arch/x86/kvm/svm/sev.c +21
-0@@ -1600,6 +1600,46 @@ static void sev_migrate_from(struct kvm_sev_info *dst,list_replace_init (&src->regions_list, &dst->regions_list); } +static int sev_es_migrate_from (struct kvm *dst,struct kvm *src) +{ +int i; +struct kvm_vcpu *dst_vcpu, *src_vcpu; +struct vcpu_svm *dst_svm, *src_svm; + +if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) +return -EINVAL ; + +kvm_for_each_vcpu (i, src_vcpu, src) { +if (!src_vcpu->arch.guest_state_protected) +return -EINVAL ; + } + +kvm_for_each_vcpu (i, src_vcpu, src) { + src_svm =to_svm (src_vcpu); + dst_vcpu =kvm_get_vcpu (dst, i); + dst_svm =to_svm (dst_vcpu); + +/* +* Transfer VMSA and GHCB state to the destination. Nullify and
arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm_sev_info *dst, · line 1633
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+* clear source fields as appropriate, the state now belongs to +* the destination. +*/ + dst_vcpu->vcpu_id = src_vcpu->vcpu_id; +memcpy (&dst_svm->sev_es, &src_svm->sev_es, +sizeof (dst_svm->sev_es)); + dst_svm->vmcb->control.ghcb_gpa = + src_svm->vmcb->control.ghcb_gpa; + dst_svm->vmcb->control.vmsa_pa =__pa (dst_svm->sev_es.vmsa); + dst_vcpu->arch.guest_state_protected = true;
Maybe just add a blank line here to separate the setting and clearing (only if you have to do another version).
arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm_sev_info *dst, · line 1636
Quoted 3 lines
arch/x86/kvm/svm/sev.c +3
-0+ src_svm->vmcb->control.ghcb_gpa =0 ; + src_svm->vmcb->control.vmsa_pa =0 ; + src_vcpu->arch.guest_state_protected = false;
In the previous patch you were clearing some of the fields that are now in the vcpu_sev_es_state. Did you want to memset that to zero now?
Thanks,
Tom
Quoted 6 lines
arch/x86/kvm/svm/sev.c +6
-0+ } +to_kvm_svm (src)->sev_info.es_active = false; + +return 0 ; +} +
Re: [PATCH 3/5 V10] KVM: SEV: Add support for SEV-ES intra host migration
Quoted 72 lines · Tom Lendacky
Quoted 56 lines · Peter Gonda
For SEV-ES to work with intra host migration the VMSAs, GHCB metadata, and other SEV-ES info needs to be preserved along with the guest's memory.
Signed-off-by Peter Gonda <[email protected]>Reviewed-by Marc Orr <[email protected]>Cc Marc Orr <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Cc David Rientjes <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Brijesh Singh <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Wanpeng Li <[email protected]>Cc Jim Mattson <[email protected]>Cc Joerg Roedel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/kvm/svm/sev.c | 48 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)arch/x86/kvm/svm/sev.c +21
-0@@ -1600,6 +1600,46 @@ static void sev_migrate_from(struct kvm_sev_info *dst,list_replace_init (&src->regions_list, &dst->regions_list); } +static int sev_es_migrate_from (struct kvm *dst,struct kvm *src) +{ +int i; +struct kvm_vcpu *dst_vcpu, *src_vcpu; +struct vcpu_svm *dst_svm, *src_svm; + +if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) +return -EINVAL ; + +kvm_for_each_vcpu (i, src_vcpu, src) { +if (!src_vcpu->arch.guest_state_protected) +return -EINVAL ; + } + +kvm_for_each_vcpu (i, src_vcpu, src) { + src_svm =to_svm (src_vcpu); + dst_vcpu =kvm_get_vcpu (dst, i); + dst_svm =to_svm (dst_vcpu); + +/* +* Transfer VMSA and GHCB state to the destination. Nullify and arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm_sev_info *dst, · line 1633
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+* clear source fields as appropriate, the state now belongs to +* the destination. +*/ + dst_vcpu->vcpu_id = src_vcpu->vcpu_id; +memcpy (&dst_svm->sev_es, &src_svm->sev_es, +sizeof (dst_svm->sev_es)); + dst_svm->vmcb->control.ghcb_gpa = + src_svm->vmcb->control.ghcb_gpa; + dst_svm->vmcb->control.vmsa_pa =__pa (dst_svm->sev_es.vmsa); + dst_vcpu->arch.guest_state_protected = true;Maybe just add a blank line here to separate the setting and clearing (only if you have to do another version).
Quoted 6 lines
arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm_sev_info *dst, · line 1636
Quoted 3 lines
arch/x86/kvm/svm/sev.c +3
-0+ src_svm->vmcb->control.ghcb_gpa =0 ; + src_svm->vmcb->control.vmsa_pa =0 ; + src_vcpu->arch.guest_state_protected = false;In the previous patch you were clearing some of the fields that are now in the
vcpu_sev_es_state. Did you want to memset that to zero now?
Oops, making that an easy memset was one of the pros of the |sev_es| refactor. Will fix and add newline in V11.
Quoted 10 lines
Thanks,
TomQuoted 6 lines
arch/x86/kvm/svm/sev.c +6
-0+ } +to_kvm_svm (src)->sev_info.es_active = false; + +return 0 ; +} +
Re: [PATCH 3/5 V10] KVM: SEV: Add support for SEV-ES intra host migration
Quoted 77 lines · Peter Gonda
Quoted 76 lines · Tom Lendacky
Quoted 56 lines · Peter Gonda
For SEV-ES to work with intra host migration the VMSAs, GHCB metadata, and other SEV-ES info needs to be preserved along with the guest's memory.
Signed-off-by Peter Gonda <[email protected]>Reviewed-by Marc Orr <[email protected]>Cc Marc Orr <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Sean Christopherson <[email protected]>Cc David Rientjes <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Brijesh Singh <[email protected]>Cc Tom Lendacky <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Wanpeng Li <[email protected]>Cc Jim Mattson <[email protected]>Cc Joerg Roedel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/kvm/svm/sev.c | 48 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)arch/x86/kvm/svm/sev.c +21
-0@@ -1600,6 +1600,46 @@ static void sev_migrate_from(struct kvm_sev_info *dst,list_replace_init (&src->regions_list, &dst->regions_list); } +static int sev_es_migrate_from (struct kvm *dst,struct kvm *src) +{ +int i; +struct kvm_vcpu *dst_vcpu, *src_vcpu; +struct vcpu_svm *dst_svm, *src_svm; + +if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) +return -EINVAL ; + +kvm_for_each_vcpu (i, src_vcpu, src) { +if (!src_vcpu->arch.guest_state_protected) +return -EINVAL ; + } + +kvm_for_each_vcpu (i, src_vcpu, src) { + src_svm =to_svm (src_vcpu); + dst_vcpu =kvm_get_vcpu (dst, i); + dst_svm =to_svm (dst_vcpu); + +/* +* Transfer VMSA and GHCB state to the destination. Nullify and arch/x86/kvm/svm/sev.c static void sev_migrate_from(struct kvm_sev_info *dst, · line 1633
Quoted 10 lines
arch/x86/kvm/svm/sev.c +10
-0+* clear source fields as appropriate, the state now belongs to +* the destination. +*/ + dst_vcpu->vcpu_id = src_vcpu->vcpu_id; +memcpy (&dst_svm->sev_es, &src_svm->sev_es, +sizeof (dst_svm->sev_es)); + dst_svm->vmcb->control.ghcb_gpa = + src_svm->vmcb->control.ghcb_gpa; + dst_svm->vmcb->control.vmsa_pa =__pa (dst_svm->sev_es.vmsa); + dst_vcpu->arch.guest_state_protected = true;Maybe just add a blank line here to separate the setting and clearing (only if you have to do another version).
Quoted 3 lines
arch/x86/kvm/svm/sev.c +3
-0+ src_svm->vmcb->control.ghcb_gpa =0 ; + src_svm->vmcb->control.vmsa_pa =0 ; + src_vcpu->arch.guest_state_protected = false;
Quoted 5 lines
Quoted 2 lines
In the previous patch you were clearing some of the fields that are now in the
vcpu_sev_es_state. Did you want to memset that to zero now?Oops, making that an easy memset was one of the pros of the |sev_es| refactor. Will fix and add newline in V11.
And totally up to you, but I think you can replace the memcpy() above with a direct assignment, if you want:
dst_svm->sev_es = src_svm->sev_es;
Thanks,
Tom
Quoted 11 lines
Quoted 11 lines
Thanks,
TomQuoted 6 lines
arch/x86/kvm/svm/sev.c +6
-0+ } +to_kvm_svm (src)->sev_info.es_active = false; + +return 0 ; +} +
PATCH v10 4/5 selftest: KVM: Add open sev dev helper
In reply to Peter GondaRefactors out open path support from open_kvm_dev_path_or_exit() and adds new helper for SEV device path.
--- .../testing/selftests/kvm/include/kvm_util.h | 1 + .../selftests/kvm/include/x86_64/svm_util.h | 2 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 24 +++++++++++-------- tools/testing/selftests/kvm/lib/x86_64/svm.c | 13 ++++++++++ 4 files changed, 30 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +1 -0
@@ -82,6 +82,7 @@ struct vm_guest_mode_params { };extern const struct vm_guest_mode_params vm_guest_mode_params[]; +int open_path_or_exit (const char *path,int flags);int open_kvm_dev_path_or_exit (void );int kvm_check_cap (long cap);int vm_enable_cap (struct kvm_vm *vm,struct kvm_enable_cap *cap);
tools/testing/selftests/kvm/include/x86_64/svm_util.h +2 -0
@@ -46,4 +46,6 @@ static inline bool cpu_has_svm(void) return ecx & CPUID_SVM; } +int open_sev_dev_path_or_exit (void ); +#endif /* SELFTEST_KVM_SVM_UTILS_H */
tools/testing/selftests/kvm/lib/kvm_util.c +14 -10
@@ -31,6 +31,19 @@ static void *align(void *x, size_t size)return (void *) (((size_t ) x + mask) & ~mask); } +int open_path_or_exit (const char *path,int flags) +{ +int fd; + + fd =open (path, flags); +if (fd <0 ) { +print_skip ("%s not available (errno: %d)" , path, errno); +exit (KSFT_SKIP ); + } + +return fd; +} +/* * Open KVM_DEV_PATH if available, otherwise exit the entire program. *
@@ -42,16 +55,7 @@ static void *align(void *x, size_t size)*/ static int _open_kvm_dev_path_or_exit (int flags) { -int fd; - - fd =open (KVM_DEV_PATH , flags); -if (fd <0 ) { -print_skip ("%s not available, is KVM loaded? (errno: %d)" , -KVM_DEV_PATH , errno); -exit (KSFT_SKIP ); - } - -return fd; +return open_path_or_exit (KVM_DEV_PATH , flags); }int open_kvm_dev_path_or_exit (void )
tools/testing/selftests/kvm/lib/x86_64/svm.c +13 -0
@@ -13,6 +13,8 @@#include "processor.h" #include "svm_util.h" +#define SEV_DEV_PATH "/dev/sev" +struct gpr64_regs guest_regs;u64 rflags;
@@ -160,3 +162,14 @@ void nested_svm_check_supported(void)exit (KSFT_SKIP ); } } + +/* +* Open SEV_DEV_PATH if available, otherwise exit the entire program. +* +* Return: +* The opened file descriptor of /dev/sev. +*/ +int open_sev_dev_path_or_exit (void ) +{ +return open_path_or_exit (SEV_DEV_PATH ,0 ); +}
Signature · 1 line
2.33.0.882.g93a45727a2-goog
PATCH v10 5/5 selftest: KVM: Add intra host migration tests
In reply to Peter GondaAdds testcases for intra host migration for SEV and SEV-ES. Also adds locking test to confirm no deadlock exists.
--- tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/x86_64/sev_vm_tests.c | 203 ++++++++++++++++++ 2 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/x86_64/sev_vm_tests.c
tools/testing/selftests/kvm/Makefile +2 -1
@@ -73,7 +73,8 @@ TEST_GEN_PROGS_x86_64 += x86_64/tsc_msrs_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_pmu_msrs_test TEST_GEN_PROGS_x86_64 += x86_64/xen_shinfo_test TEST_GEN_PROGS_x86_64 += x86_64/xen_vmcall_test -TEST_GEN_PROGS_x86_64 += access_tracking_perf_test +TEST_GEN_PROGS_x86_64 += x86_64/vmx_pi_mmio_test +TEST_GEN_PROGS_x86_64 += x86_64/sev_vm_tests TEST_GEN_PROGS_x86_64 += demand_paging_test TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += dirty_log_perf_test
tools/testing/selftests/kvm/x86_64/sev_vm_tests.c new file +203 -0
203 lines not on this page · raw message
Signature · 1 line
2.33.0.882.g93a45727a2-goog