Skip to content

Commit 012426d

Browse files
yamahatabonzini
authored andcommitted
KVM: TDX: Finalize VM initialization
Add a new VM-scoped KVM_MEMORY_ENCRYPT_OP IOCTL subcommand, KVM_TDX_FINALIZE_VM, to perform TD Measurement Finalization. Documentation for the API is added in another patch: "Documentation/virt/kvm: Document on Trust Domain Extensions(TDX)" For the purpose of attestation, a measurement must be made of the TDX VM initial state. This is referred to as TD Measurement Finalization, and uses SEAMCALL TDH.MR.FINALIZE, after which: 1. The VMM adding TD private pages with arbitrary content is no longer allowed 2. The TDX VM is runnable Co-developed-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Message-ID: <20240904030751.117579-21-rick.p.edgecombe@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent c846b45 commit 012426d

File tree

3 files changed

+74
-8
lines changed

3 files changed

+74
-8
lines changed

arch/x86/include/uapi/asm/kvm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,7 @@ enum kvm_tdx_cmd_id {
933933
KVM_TDX_INIT_VM,
934934
KVM_TDX_INIT_VCPU,
935935
KVM_TDX_INIT_MEM_REGION,
936+
KVM_TDX_FINALIZE_VM,
936937
KVM_TDX_GET_CPUID,
937938

938939
KVM_TDX_CMD_NR_MAX,

arch/x86/kvm/vmx/tdx.c

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,29 @@ static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn,
562562
return 0;
563563
}
564564

565+
/*
566+
* KVM_TDX_INIT_MEM_REGION calls kvm_gmem_populate() to map guest pages; the
567+
* callback tdx_gmem_post_populate() then maps pages into private memory.
568+
* through the a seamcall TDH.MEM.PAGE.ADD(). The SEAMCALL also requires the
569+
* private EPT structures for the page to have been built before, which is
570+
* done via kvm_tdp_map_page(). nr_premapped counts the number of pages that
571+
* were added to the EPT structures but not added with TDH.MEM.PAGE.ADD().
572+
* The counter has to be zero on KVM_TDX_FINALIZE_VM, to ensure that there
573+
* are no half-initialized shared EPT pages.
574+
*/
575+
static int tdx_mem_page_record_premap_cnt(struct kvm *kvm, gfn_t gfn,
576+
enum pg_level level, kvm_pfn_t pfn)
577+
{
578+
struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
579+
580+
if (KVM_BUG_ON(kvm->arch.pre_fault_allowed, kvm))
581+
return -EINVAL;
582+
583+
/* nr_premapped will be decreased when tdh_mem_page_add() is called. */
584+
atomic64_inc(&kvm_tdx->nr_premapped);
585+
return 0;
586+
}
587+
565588
int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
566589
enum pg_level level, kvm_pfn_t pfn)
567590
{
@@ -582,14 +605,15 @@ int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
582605
*/
583606
get_page(page);
584607

608+
/*
609+
* Read 'pre_fault_allowed' before 'kvm_tdx->state'; see matching
610+
* barrier in tdx_td_finalize().
611+
*/
612+
smp_rmb();
585613
if (likely(kvm_tdx->state == TD_STATE_RUNNABLE))
586614
return tdx_mem_page_aug(kvm, gfn, level, page);
587615

588-
/*
589-
* TODO: KVM_TDX_INIT_MEM_REGION support to populate before finalize
590-
* comes here for the initial memory.
591-
*/
592-
return -EOPNOTSUPP;
616+
return tdx_mem_page_record_premap_cnt(kvm, gfn, level, pfn);
593617
}
594618

595619
static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,
@@ -620,10 +644,12 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,
620644
if (unlikely(kvm_tdx->state != TD_STATE_RUNNABLE &&
621645
err == (TDX_EPT_WALK_FAILED | TDX_OPERAND_ID_RCX))) {
622646
/*
623-
* This page was mapped with KVM_MAP_MEMORY, but
624-
* KVM_TDX_INIT_MEM_REGION is not issued yet.
647+
* Page is mapped by KVM_TDX_INIT_MEM_REGION, but hasn't called
648+
* tdh_mem_page_add().
625649
*/
626-
if (!is_last_spte(entry, level) || !(entry & VMX_EPT_RWX_MASK)) {
650+
if ((!is_last_spte(entry, level) || !(entry & VMX_EPT_RWX_MASK)) &&
651+
!KVM_BUG_ON(!atomic64_read(&kvm_tdx->nr_premapped), kvm)) {
652+
atomic64_dec(&kvm_tdx->nr_premapped);
627653
tdx_unpin(kvm, page);
628654
return 0;
629655
}
@@ -1371,6 +1397,36 @@ void tdx_flush_tlb_all(struct kvm_vcpu *vcpu)
13711397
ept_sync_global();
13721398
}
13731399

1400+
static int tdx_td_finalize(struct kvm *kvm, struct kvm_tdx_cmd *cmd)
1401+
{
1402+
struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
1403+
1404+
guard(mutex)(&kvm->slots_lock);
1405+
1406+
if (!is_hkid_assigned(kvm_tdx) || kvm_tdx->state == TD_STATE_RUNNABLE)
1407+
return -EINVAL;
1408+
/*
1409+
* Pages are pending for KVM_TDX_INIT_MEM_REGION to issue
1410+
* TDH.MEM.PAGE.ADD().
1411+
*/
1412+
if (atomic64_read(&kvm_tdx->nr_premapped))
1413+
return -EINVAL;
1414+
1415+
cmd->hw_error = tdh_mr_finalize(&kvm_tdx->td);
1416+
if (tdx_operand_busy(cmd->hw_error))
1417+
return -EBUSY;
1418+
if (KVM_BUG_ON(cmd->hw_error, kvm)) {
1419+
pr_tdx_error(TDH_MR_FINALIZE, cmd->hw_error);
1420+
return -EIO;
1421+
}
1422+
1423+
kvm_tdx->state = TD_STATE_RUNNABLE;
1424+
/* TD_STATE_RUNNABLE must be set before 'pre_fault_allowed' */
1425+
smp_wmb();
1426+
kvm->arch.pre_fault_allowed = true;
1427+
return 0;
1428+
}
1429+
13741430
int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
13751431
{
13761432
struct kvm_tdx_cmd tdx_cmd;
@@ -1395,6 +1451,9 @@ int tdx_vm_ioctl(struct kvm *kvm, void __user *argp)
13951451
case KVM_TDX_INIT_VM:
13961452
r = tdx_td_init(kvm, &tdx_cmd);
13971453
break;
1454+
case KVM_TDX_FINALIZE_VM:
1455+
r = tdx_td_finalize(kvm, &tdx_cmd);
1456+
break;
13981457
default:
13991458
r = -EINVAL;
14001459
goto out;
@@ -1662,6 +1721,9 @@ static int tdx_gmem_post_populate(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn,
16621721
goto out;
16631722
}
16641723

1724+
if (!KVM_BUG_ON(!atomic64_read(&kvm_tdx->nr_premapped), kvm))
1725+
atomic64_dec(&kvm_tdx->nr_premapped);
1726+
16651727
if (arg->flags & KVM_TDX_MEASURE_MEMORY_REGION) {
16661728
for (i = 0; i < PAGE_SIZE; i += TDX_EXTENDMR_CHUNKSIZE) {
16671729
err = tdh_mr_extend(&kvm_tdx->td, gpa + i, &entry,

arch/x86/kvm/vmx/tdx.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ struct kvm_tdx {
3232
u64 tsc_multiplier;
3333

3434
struct tdx_td td;
35+
36+
/* For KVM_TDX_INIT_MEM_REGION. */
37+
atomic64_t nr_premapped;
3538
};
3639

3740
/* TDX module vCPU states */

0 commit comments

Comments
 (0)