Skip to contentSkip to conversation

Add AMD SEV and SEV-ES intra host migration support

PATCH Superseded Peter Gonda 3 participants 8 messages Aug 30, 2021 – Sep 1, 2021

Subsystems (5)
Documentation x86 KVM Kselftest +1 more subsystems

v6 of 11 Superseded Latest is v11 →

lore
Share & tools
lore
#0 lore raw

v6 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).

For the intra host operation the SEV required metadata, the source VM FD is sent to the target VMM. The target VMM calls the new cap ioctl with the source VM FD, KVM then moves all the SEV state to the target VM from the source VM.

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]/

Peter Gonda (2):
KVM, SEV: Add support for SEV intra host migration KVM, SEV: Add support for SEV-ES intra host migration

 Documentation/virt/kvm/api.rst  |  15 +++
 arch/x86/include/asm/kvm_host.h |   1 +
 arch/x86/kvm/svm/sev.c          | 157 ++++++++++++++++++++++++++++++++
 arch/x86/kvm/svm/svm.c          |   1 +
 arch/x86/kvm/svm/svm.h          |   2 +
 arch/x86/kvm/x86.c              |   5 +
 include/uapi/linux/kvm.h        |   1 +
 7 files changed, 182 insertions(+)

base-commit: a3e0b8bd99ab

Peter Gonda (3):
KVM, SEV: Add support for SEV intra host migration KVM, SEV: Add support for SEV-ES intra host migration selftesting

 Documentation/virt/kvm/api.rst                |  15 ++
 arch/x86/include/asm/kvm_host.h               |   1 +
 arch/x86/kvm/svm/sev.c                        | 157 ++++++++++++++++++
 arch/x86/kvm/svm/svm.c                        |   1 +
 arch/x86/kvm/svm/svm.h                        |   2 +
 arch/x86/kvm/x86.c                            |   5 +
 include/uapi/linux/kvm.h                      |   1 +
 tools/testing/selftests/kvm/Makefile          |   1 +
 .../selftests/kvm/x86_64/sev_vm_tests.c       | 152 +++++++++++++++++
 9 files changed, 335 insertions(+)
 create mode 100644 tools/testing/selftests/kvm/x86_64/sev_vm_tests.c
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 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]>
Signature · 1 line
2.33.0.259.gc128427fd7-goog
#1 lore raw

PATCH v6 1/3 KVM, SEV: Add support for SEV intra host migration

For 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.

The target is expected to be initialized (sev_guest_init), but not launched state (sev_launch_start) when performing receive. Once the target has received, it will be in a launched state and will not need to perform the typical SEV launch commands.

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 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]>
---
 Documentation/virt/kvm/api.rst  | 15 +++++
 arch/x86/include/asm/kvm_host.h |  1 +
 arch/x86/kvm/svm/sev.c          | 99 +++++++++++++++++++++++++++++++++
 arch/x86/kvm/svm/svm.c          |  1 +
 arch/x86/kvm/svm/svm.h          |  2 +
 arch/x86/kvm/x86.c              |  5 ++
 include/uapi/linux/kvm.h        |  1 +
 7 files changed, 124 insertions(+)
Documentation/virt/kvm/api.rst +15 -0
index 86d7ad3a126c..9dc56778b421 100644
@@ -6701,6 +6701,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_ENC_CONTEXT_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
index 20daaf67a5bf..fd3a118c9e40 100644
@@ -1448,6 +1448,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_enc_context_from)(struct kvm *kvm, unsigned int source_fd);
 
 	int (*get_msr_feature)(struct kvm_msr_entry *entry);
 
arch/x86/kvm/svm/sev.c +99 -0

105 lines not on this page · raw message

arch/x86/kvm/svm/svm.c +1 -0
index 7b58e445a967..8b5bcab48937 100644
@@ -4627,6 +4627,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_enc_context_from = svm_vm_migrate_from,
 
 	.can_emulate_instruction = svm_can_emulate_instruction,
 
arch/x86/kvm/svm/svm.h +2 -0
index 524d943f3efc..67bfb43301e1 100644
@@ -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 {
@@ -552,6 +553,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 +5 -0
index fdc0c18339fb..ea3100134e35 100644
@@ -5655,6 +5655,11 @@ 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_ENC_CONTEXT_FROM:
+		r = -EINVAL;
+		if (kvm_x86_ops.vm_migrate_enc_context_from)
+			r = kvm_x86_ops.vm_migrate_enc_context_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
index a067410ebea5..49660204cdb9 100644
@@ -1112,6 +1112,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_ENC_CONTEXT_FROM 206
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
Signature · 1 line
2.33.0.259.gc128427fd7-goog
Reviewed-by on v6 1/3
#2 lore raw

Re: [PATCH 1/3 V6] KVM, SEV: Add support for SEV intra host migration

Quoted 147 lines · Peter Gonda

For 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.

The target is expected to be initialized (sev_guest_init), but not launched state (sev_launch_start) when performing receive. Once the target has received, it will be in a launched state and will not need to perform the typical SEV launch commands.

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 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]>
---
 Documentation/virt/kvm/api.rst  | 15 +++++
 arch/x86/include/asm/kvm_host.h |  1 +
 arch/x86/kvm/svm/sev.c          | 99 +++++++++++++++++++++++++++++++++
 arch/x86/kvm/svm/svm.c          |  1 +
 arch/x86/kvm/svm/svm.h          |  2 +
 arch/x86/kvm/x86.c              |  5 ++
 include/uapi/linux/kvm.h        |  1 +
 7 files changed, 124 insertions(+)
Documentation/virt/kvm/api.rst +15 -0
index 86d7ad3a126c..9dc56778b421 100644
@@ -6701,6 +6701,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_ENC_CONTEXT_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
index 20daaf67a5bf..fd3a118c9e40 100644
@@ -1448,6 +1448,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_enc_context_from)(struct kvm *kvm, unsigned int source_fd);
 
        int (*get_msr_feature)(struct kvm_msr_entry *entry);
 
arch/x86/kvm/svm/sev.c +61 -0
index 46eb1ba62d3d..063cf26528bc 100644
@@ -1501,6 +1501,105 @@ static int sev_receive_finish(struct kvm *kvm, struct kvm_sev_cmd *argp)
        return sev_issue_cmd(kvm, SEV_CMD_RECEIVE_FINISH, &data, &argp->error);
 }
 
+static int svm_sev_lock_for_migration(struct kvm *kvm)
+{
+       struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
+
+       /*
+        * Bail if this VM is already involved in a migration to avoid deadlock
+        * between two VMs trying to migrate to/from each other.
+        */
+       if (atomic_cmpxchg_acquire(&sev->migration_in_progress, 0, 1))
+               return -EBUSY;
+
+       mutex_lock(&kvm->lock);
+
+       return 0;
+}
+
+static void svm_unlock_after_migration(struct kvm *kvm)
+{
+       struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
+
+       mutex_unlock(&kvm->lock);
+       atomic_set_release(&sev->migration_in_progress, 0);
+}
+
+static void migrate_info_from(struct kvm_sev_info *dst,
+                             struct kvm_sev_info *src)
+{
+       sev_asid_free(dst);
+
+       dst->asid = src->asid;
+       dst->misc_cg = src->misc_cg;
+       dst->handle = src->handle;
+       dst->pages_locked = src->pages_locked;
+
+       src->asid = 0;
+       src->active = false;
+       src->handle = 0;
+       src->pages_locked = 0;
+       src->misc_cg = NULL;
+
+       INIT_LIST_HEAD(&dst->regions_list);
+       list_replace_init(&src->regions_list, &dst->regions_list);
+}
+
+int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)
+{
+       struct kvm_sev_info *dst_sev = &to_kvm_svm(kvm)->sev_info;
+       struct file *source_kvm_file;
+       struct kvm *source_kvm;
+       int ret;
+
+       ret = svm_sev_lock_for_migration(kvm);
+       if (ret)
+               return ret;
+
+       if (!sev_guest(kvm) || sev_es_guest(kvm)) {
+               ret = -EINVAL;
+               pr_warn_ratelimited("VM must be SEV enabled to migrate to.\n");
+               goto out_unlock;
+       }
+

arch/x86/kvm/svm/sev.c static int sev_receive_finish(struct kvm *kvm, struct kvm_sev_cmd *argp) · line 1574

Quoted 10 lines
arch/x86/kvm/svm/sev.c +10 -0
+       if (!list_empty(&dst_sev->regions_list)) {
+               ret = -EINVAL;
+               pr_warn_ratelimited(
+                       "VM must not have encrypted regions to migrate to.\n");
+               goto out_unlock;
+       }
+
+       source_kvm_file = fget(source_fd);
+       if (!file_is_kvm(source_kvm_file)) {
+               ret = -EBADF;

nit/optional: Should we add a pr_warn_ratelimited here as well? I could see an argument against adding it, since this is the only place we return EBADF.

Quoted 92 lines
arch/x86/kvm/svm/sev.c +28 -0
+               goto out_fput;
+       }
+
+       source_kvm = source_kvm_file->private_data;
+       ret = svm_sev_lock_for_migration(source_kvm);
+       if (ret)
+               goto out_fput;
+
+       if (!sev_guest(source_kvm) || sev_es_guest(source_kvm)) {
+               ret = -EINVAL;
+               pr_warn_ratelimited(
+                       "Source VM must be SEV enabled to migrate from.\n");
+               goto out_source;
+       }
+
+       migrate_info_from(dst_sev, &to_kvm_svm(source_kvm)->sev_info);
+       ret = 0;
+
+out_source:
+       svm_unlock_after_migration(source_kvm);
+out_fput:
+       if (source_kvm_file)
+               fput(source_kvm_file);
+out_unlock:
+       svm_unlock_after_migration(kvm);
+       return ret;
+}
+
 int svm_mem_enc_op(struct kvm *kvm, void __user *argp)
 {
        struct kvm_sev_cmd sev_cmd;
arch/x86/kvm/svm/svm.c +1 -0
index 7b58e445a967..8b5bcab48937 100644
@@ -4627,6 +4627,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_enc_context_from = svm_vm_migrate_from,
 
        .can_emulate_instruction = svm_can_emulate_instruction,
 
arch/x86/kvm/svm/svm.h +2 -0
index 524d943f3efc..67bfb43301e1 100644
@@ -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 {
@@ -552,6 +553,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 +5 -0
index fdc0c18339fb..ea3100134e35 100644
@@ -5655,6 +5655,11 @@ 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_ENC_CONTEXT_FROM:
+               r = -EINVAL;
+               if (kvm_x86_ops.vm_migrate_enc_context_from)
+                       r = kvm_x86_ops.vm_migrate_enc_context_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 -1
index a067410ebea5..49660204cdb9 100644
@@ -1112,6 +1112,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_ENC_CONTEXT_FROM 206
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
--
Quoted 2 lines

2.33.0.259.gc128427fd7-goog

#3 lore raw

PATCH v6 2/3 KVM, SEV: Add support for SEV-ES intra host migration

In reply to 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.

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 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 | 62 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +60 -2
index 063cf26528bc..3324eed1a39e 100644
@@ -1545,6 +1545,59 @@ static void migrate_info_from(struct kvm_sev_info *dst,
 	list_replace_init(&src->regions_list, &dst->regions_list);
 }
 
+static int migrate_vmsa_from(struct kvm *dst, struct kvm *src)
+{
+	int i, num_vcpus;
+	struct kvm_vcpu *dst_vcpu, *src_vcpu;
+	struct vcpu_svm *dst_svm, *src_svm;
+
+	num_vcpus = atomic_read(&dst->online_vcpus);
+	if (num_vcpus != atomic_read(&src->online_vcpus)) {
+		pr_warn_ratelimited(
+			"Source and target VMs must have same number of vCPUs.\n");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < num_vcpus; ++i) {
+		src_vcpu = src->vcpus[i];
+		if (!src_vcpu->arch.guest_state_protected) {
+			pr_warn_ratelimited(
+				"Source ES VM vCPUs must have protected state.\n");
+			return -EINVAL;
+		}
+	}
+
+	for (i = 0; i < num_vcpus; ++i) {
+		src_vcpu = src->vcpus[i];
+		src_svm = to_svm(src_vcpu);
+		dst_vcpu = dst->vcpus[i];
+		dst_svm = to_svm(dst_vcpu);
+
+		/*
+		 * Copy VMSA and GHCB fields from the source to the destination.
+		 * Clear them on the source to prevent the VM running and
+		 * changing the state of the VMSA/GHCB unexpectedly.
+		 */
+		dst_vcpu->vcpu_id = src_vcpu->vcpu_id;
+		dst_svm->vmsa = src_svm->vmsa;
+		src_svm->vmsa = NULL;
+		dst_svm->ghcb = src_svm->ghcb;
+		src_svm->ghcb = NULL;
+		dst_svm->vmcb->control.ghcb_gpa =
+				src_svm->vmcb->control.ghcb_gpa;
+		src_svm->vmcb->control.ghcb_gpa = 0;
+		dst_svm->ghcb_sa = src_svm->ghcb_sa;
+		src_svm->ghcb_sa = NULL;
+		dst_svm->ghcb_sa_len = src_svm->ghcb_sa_len;
+		src_svm->ghcb_sa_len = 0;
+		dst_svm->ghcb_sa_sync = src_svm->ghcb_sa_sync;
+		src_svm->ghcb_sa_sync = false;
+		dst_svm->ghcb_sa_free = src_svm->ghcb_sa_free;
+		src_svm->ghcb_sa_free = 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;
@@ -1556,7 +1609,7 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)
 	if (ret)
 		return ret;
 
-	if (!sev_guest(kvm) || sev_es_guest(kvm)) {
+	if (!sev_guest(kvm)) {
 		ret = -EINVAL;
 		pr_warn_ratelimited("VM must be SEV enabled to migrate to.\n");
 		goto out_unlock;
@@ -1580,13 +1633,18 @@ 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;
 		pr_warn_ratelimited(
 			"Source VM must be SEV enabled to migrate from.\n");
 		goto out_source;
 	}
 
+	if (sev_es_guest(kvm)) {
+		ret = migrate_vmsa_from(kvm, source_kvm);
+		if (ret)
+			goto out_source;
+	}
 	migrate_info_from(dst_sev, &to_kvm_svm(source_kvm)->sev_info);
 	ret = 0;
 
Signature · 1 line
2.33.0.259.gc128427fd7-goog
Reviewed-by on v6 2/3
#4 lore raw

Re: [PATCH 2/3 V6] KVM, SEV: Add support for SEV-ES intra host migration

Quoted 120 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.

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 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 | 62 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/sev.c +60 -3
index 063cf26528bc..3324eed1a39e 100644
@@ -1545,6 +1545,59 @@ static void migrate_info_from(struct kvm_sev_info *dst,
        list_replace_init(&src->regions_list, &dst->regions_list);
 }
 
+static int migrate_vmsa_from(struct kvm *dst, struct kvm *src)
+{
+       int i, num_vcpus;
+       struct kvm_vcpu *dst_vcpu, *src_vcpu;
+       struct vcpu_svm *dst_svm, *src_svm;
+
+       num_vcpus = atomic_read(&dst->online_vcpus);
+       if (num_vcpus != atomic_read(&src->online_vcpus)) {
+               pr_warn_ratelimited(
+                       "Source and target VMs must have same number of vCPUs.\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num_vcpus; ++i) {
+               src_vcpu = src->vcpus[i];
+               if (!src_vcpu->arch.guest_state_protected) {
+                       pr_warn_ratelimited(
+                               "Source ES VM vCPUs must have protected state.\n");
+                       return -EINVAL;
+               }
+       }
+
+       for (i = 0; i < num_vcpus; ++i) {
+               src_vcpu = src->vcpus[i];
+               src_svm = to_svm(src_vcpu);
+               dst_vcpu = dst->vcpus[i];
+               dst_svm = to_svm(dst_vcpu);
+
+               /*
+                * Copy VMSA and GHCB fields from the source to the destination.
+                * Clear them on the source to prevent the VM running and
+                * changing the state of the VMSA/GHCB unexpectedly.
+                */
+               dst_vcpu->vcpu_id = src_vcpu->vcpu_id;
+               dst_svm->vmsa = src_svm->vmsa;
+               src_svm->vmsa = NULL;
+               dst_svm->ghcb = src_svm->ghcb;
+               src_svm->ghcb = NULL;
+               dst_svm->vmcb->control.ghcb_gpa =
+                               src_svm->vmcb->control.ghcb_gpa;
+               src_svm->vmcb->control.ghcb_gpa = 0;
+               dst_svm->ghcb_sa = src_svm->ghcb_sa;
+               src_svm->ghcb_sa = NULL;
+               dst_svm->ghcb_sa_len = src_svm->ghcb_sa_len;
+               src_svm->ghcb_sa_len = 0;
+               dst_svm->ghcb_sa_sync = src_svm->ghcb_sa_sync;
+               src_svm->ghcb_sa_sync = false;
+               dst_svm->ghcb_sa_free = src_svm->ghcb_sa_free;
+               src_svm->ghcb_sa_free = 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;
@@ -1556,7 +1609,7 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)
        if (ret)
                return ret;
 
-       if (!sev_guest(kvm) || sev_es_guest(kvm)) {
+       if (!sev_guest(kvm)) {
                ret = -EINVAL;
                pr_warn_ratelimited("VM must be SEV enabled to migrate to.\n");
                goto out_unlock;
@@ -1580,13 +1633,18 @@ 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;
                pr_warn_ratelimited(
                        "Source VM must be SEV enabled to migrate from.\n");
                goto out_source;
        }
 
+       if (sev_es_guest(kvm)) {
+               ret = migrate_vmsa_from(kvm, source_kvm);
+               if (ret)
+                       goto out_source;
+       }
        migrate_info_from(dst_sev, &to_kvm_svm(source_kvm)->sev_info);
        ret = 0;
 
--
Quoted 2 lines

2.33.0.259.gc128427fd7-goog

#5 lore raw

PATCH v6 3/3 selftest: KVM: Add intra host migration

In reply to Peter Gonda

Adds testcases for intra host migration for SEV and SEV-ES. Also adds locking test to confirm no deadlock exists.

---
 tools/testing/selftests/kvm/Makefile          |   1 +
 .../selftests/kvm/x86_64/sev_vm_tests.c       | 152 ++++++++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 tools/testing/selftests/kvm/x86_64/sev_vm_tests.c
tools/testing/selftests/kvm/Makefile +1 -0
index 5832f510a16c..de6e64d5c9c4 100644
@@ -71,6 +71,7 @@ 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 += x86_64/sev_vm_tests
 TEST_GEN_PROGS_x86_64 += access_tracking_perf_test
 TEST_GEN_PROGS_x86_64 += demand_paging_test
 TEST_GEN_PROGS_x86_64 += dirty_log_test
tools/testing/selftests/kvm/x86_64/sev_vm_tests.c new file +150 -0

150 lines not on this page · raw message

Signature · 1 line
2.33.0.259.gc128427fd7-goog
#6 lore raw

Re: [PATCH 3/3 V6] selftest: KVM: Add intra host migration

Thank you for the patch! Perhaps something to improve:

Hi Peter,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on vhost/linux-next]
[also build test WARNING on v5.14 next-20210901]
[cannot apply to kvm/queue]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Peter-Gonda/KVM-SEV-Add-support-for-SEV-intra-host-migration/20210831-055739
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0

If you fix the issue, kindly add following tag as appropriate

includecheck warnings: (new ones prefixed by >>)

>> tools/testing/selftests/kvm/x86_64/sev_vm_tests.c: kvm_util.h is included more than once.

Please review and possibly fold the followup patch.

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#7 lore raw

[RFC PATCH] selftest: KVM: fix duplicated inclusion

In reply to Peter Gonda
Generated by: scripts/checkincludes.pl

Generated by: scripts/checkincludes.pl

---
 sev_vm_tests.c |    1 -
 1 file changed, 1 deletion(-)
tools/testing/selftests/kvm/x86_64/sev_vm_tests.c +0 -1
index 1c0c6bb95ec45..78c2b87b498d8 100644
@@ -8,7 +8,6 @@
 #include <pthread.h>
 
 #include "test_util.h"
-#include "kvm_util.h"
 #include "processor.h"
 #include "svm_util.h"
 #include "kvm_util.h"