Skip to contentSkip to conversation

KVM: SEV: Disable KVM_CAP_VM_COPY_ENC_CONTEXT_FROM for SEV-ES

PATCH In review Peter Gonda 3 participants 3 messages Sep 14, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 KVM: SEV: Disable KVM_CAP_VM_COPY_ENC_CONTEXT_FROM for SEV-ES

Copying an ASID into new vCPUs will not work for SEV-ES since the vCPUs VMSAs need to be setup and measured before SEV_LAUNCH_FINISH. Return an error if a users tries to KVM_CAP_VM_COPY_ENC_CONTEXT_FROM from an SEV-ES guest. The destination VM is already checked for SEV and SEV-ES with sev_guest(), so this ioctl already fails if the destination is SEV enabled.

Enabling mirroring a VM or copying its encryption context with an SEV-ES VM is more involved and should happen in its own feature patch if that's needed. This is because the vCPUs of SEV-ES VMs need to be updated with LAUNCH_UPDATE_VMSA before LAUNCH_FINISH. This needs KVM changes because the mirror VM has all its SEV ioctls blocked and the original VM doesn't know about the mirrors vCPUs.

Fixes 54526d1fd593 ("KVM: x86: Support KVM VMs sharing SEV context")

V2:
* Updated changelog with more information and added stable CC.

Cc Marc Orr <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
Cc Nathan Tempelman <[email protected]>
Cc Brijesh Singh <[email protected]>
---
 arch/x86/kvm/svm/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -1
index 75e0b21ad07c..8a279027425f 100644
@@ -1728,7 +1728,7 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
 	source_kvm = source_kvm_file->private_data;
 	mutex_lock(&source_kvm->lock);
 
-	if (!sev_guest(source_kvm)) {
+	if (!sev_guest(source_kvm) || sev_es_guest(source_kvm)) {
 		ret = -EINVAL;
 		goto e_source_unlock;
 	}
Signature · 1 line
2.33.0.309.g3052b89438-goog
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Peter Gonda

Copying an ASID into new vCPUs will not work for SEV-ES since the vCPUs VMSAs need to be setup and measured before SEV_LAUNCH_FINISH. Return an error if a users tries to KVM_CAP_VM_COPY_ENC_CONTEXT_FROM from an SEV-ES guest. The destination VM is already checked for SEV and SEV-ES with sev_guest(), so this ioctl already fails if the destination is SEV enabled.

Quoted 6 lines

Enabling mirroring a VM or copying its encryption context with an SEV-ES VM is more involved and should happen in its own feature patch if that's needed. This is because the vCPUs of SEV-ES VMs need to be updated with LAUNCH_UPDATE_VMSA before LAUNCH_FINISH. This needs KVM changes because the mirror VM has all its SEV ioctls blocked and the original VM doesn't know about the mirrors vCPUs.

mirror's, or I guess mirrors'? :-)

Quoted 4 lines
Fixes 54526d1fd593 ("KVM: x86: Support KVM VMs sharing SEV context")

V2:
* Updated changelog with more information and added stable CC.

Nit, but this in the section ignored by git (below the ---) so that omitted from the committed changelog.

Quoted 9 lines
Cc Marc Orr <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
Cc Nathan Tempelman <[email protected]>
Cc Brijesh Singh <[email protected]>
Quoted 1 line

---

Git ignores stuff in this section.

Quoted 19 lines
 arch/x86/kvm/svm/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -1
index 75e0b21ad07c..8a279027425f 100644
@@ -1728,7 +1728,7 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
 	source_kvm = source_kvm_file->private_data;
 	mutex_lock(&source_kvm->lock);
 
-	if (!sev_guest(source_kvm)) {
+	if (!sev_guest(source_kvm) || sev_es_guest(source_kvm)) {
 		ret = -EINVAL;
 		goto e_source_unlock;
 	}
Signature · 1 line
2.33.0.309.g3052b89438-goog
Reviewed-by on v2 1/1
#2 lore raw
In reply to Peter Gonda
Quoted 47 lines · Peter Gonda

Copying an ASID into new vCPUs will not work for SEV-ES since the vCPUs VMSAs need to be setup and measured before SEV_LAUNCH_FINISH. Return an error if a users tries to KVM_CAP_VM_COPY_ENC_CONTEXT_FROM from an SEV-ES guest. The destination VM is already checked for SEV and SEV-ES with sev_guest(), so this ioctl already fails if the destination is SEV enabled.

Enabling mirroring a VM or copying its encryption context with an SEV-ES VM is more involved and should happen in its own feature patch if that's needed. This is because the vCPUs of SEV-ES VMs need to be updated with LAUNCH_UPDATE_VMSA before LAUNCH_FINISH. This needs KVM changes because the mirror VM has all its SEV ioctls blocked and the original VM doesn't know about the mirrors vCPUs.

Fixes 54526d1fd593 ("KVM: x86: Support KVM VMs sharing SEV context")

V2:
* Updated changelog with more information and added stable CC.

Cc Marc Orr <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
Cc Nathan Tempelman <[email protected]>
Cc Brijesh Singh <[email protected]>
---
 arch/x86/kvm/svm/sev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -2
index 75e0b21ad07c..8a279027425f 100644
@@ -1728,7 +1728,7 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
        source_kvm = source_kvm_file->private_data;
        mutex_lock(&source_kvm->lock);
 
-       if (!sev_guest(source_kvm)) {
+       if (!sev_guest(source_kvm) || sev_es_guest(source_kvm)) {
                ret = -EINVAL;
                goto e_source_unlock;
        }
--
Quoted 2 lines

2.33.0.309.g3052b89438-goog