RISC-V: KVM: Reflect CoVE TAP address to TSM

Retrieve the TVM attestation payload (TAP) address passed by the VMM
and reflect it to TEE security monitor (TSM) during the creation of
the TEE virtual machine (TVM) via the promote call.

Signed-off-by: Wojciech Ozga <woz@zurich.ibm.com>

Author: wojciechozga

arch/riscv/include/asm/kvm_cove.h

@@ -92,6 +92,9 @@ struct kvm_cove_tvm_context {
 	/* TODO: This is not really a VMID as TSM returns the page owner ID instead of VMID */
 	unsigned long tvm_guest_id;
 
+	/* Address of TVM Attestation Payload (TAP) */
+	unsigned long cove_tap_addr;
+
 	/* Pages where TVM page table is stored */
 	struct kvm_riscv_cove_page pgtable;
 

arch/riscv/kvm/cove.c

@@ -605,7 +605,8 @@ void noinstr kvm_riscv_cove_vcpu_switchto(struct kvm_vcpu *vcpu, struct kvm_cpu_
 		if (is_cove_vm_multi_step_initializing(vcpu->kvm)) {
 			rc = sbi_covh_tsm_finalize_tvm(tvmc->tvm_guest_id, cntx->sepc, cntx->a1);
 		} else if (is_cove_vm_single_step_initializing(vcpu->kvm)) {
-			rc = sbi_covh_tsm_promote_to_tvm(cntx->a1, 0, cntx->sepc, &tvmc->tvm_guest_id);
+			rc = sbi_covh_tsm_promote_to_tvm(cntx->a1, tvmc->cove_tap_addr, cntx->sepc,
+							 &tvmc->tvm_guest_id);
 		} else {
 			rc = -EOPNOTSUPP;
 		}
@@ -746,6 +747,10 @@ int kvm_riscv_cove_vm_measure_pages(struct kvm *kvm, struct kvm_riscv_cove_measu
 		return -EINVAL;
 	}
 
+	if (mr->type == KVM_RISCV_COVE_REGION_COVE_TAP) {
+		tvmc->cove_tap_addr = mr->gpa;
+	}
+
 	if (!is_cove_vm_multi_step_initializing(kvm))
 		return 0;
 

arch/riscv/kvm/vm.c

@@ -237,8 +237,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
 
 	switch (ioctl) {
 	case KVM_RISCV_COVE_MEASURE_REGION:
-		if (!is_cove_vm_multi_step_initializing(kvm))
-			return -EINVAL;
 		if (copy_from_user(&mr, argp, sizeof(mr)))
 			return -EFAULT;