Only a couple KVM_SEV_* ioctls need to be handled differently for
SEV-ES. Do so when the specified policy indicates SEV-ES support.
Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
tools/testing/selftests/kvm/lib/x86_64/sev.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/lib/x86_64/sev.c b/tools/testing/selftests/kvm/lib/x86_64/sev.c
index adda3b396566..d01b0f637ced 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/sev.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/sev.c
@@ -238,13 +238,17 @@ struct sev_vm *sev_vm_create(uint32_t policy, uint64_t npages)
return NULL;
sev->sev_policy = policy;
- kvm_sev_ioctl(sev, KVM_SEV_INIT, NULL);
+ if (sev->sev_policy & SEV_POLICY_ES)
+ kvm_sev_ioctl(sev, KVM_SEV_ES_INIT, NULL);
+ else
+ kvm_sev_ioctl(sev, KVM_SEV_INIT, NULL);
vm_set_memory_encryption(vm, true, true, sev->enc_bit);
vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, 0, 0, npages, 0);
sev_register_user_range(sev, addr_gpa2hva(vm, 0), npages * vm_get_page_size(vm));
- pr_info("SEV guest created, policy: 0x%x, size: %lu KB\n",
+ pr_info("%s guest created, policy: 0x%x, size: %lu KB\n",
+ (sev->sev_policy & SEV_POLICY_ES) ? "SEV-ES" : "SEV",
sev->sev_policy, npages * vm_get_page_size(vm) / 1024);
return sev;
@@ -269,6 +273,9 @@ void sev_vm_launch(struct sev_vm *sev)
"Unexpected guest state: %d", ksev_status.state);
sev_encrypt(sev);
+
+ if (sev->sev_policy & SEV_POLICY_ES)
+ kvm_sev_ioctl(sev, KVM_SEV_LAUNCH_UPDATE_VMSA, NULL);
}
void sev_vm_measure(struct sev_vm *sev, uint8_t *measurement)
--
2.25.1
