[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <f305a49c4397af85c673f026f2b5b0e7aa0c8cc0.1670541736.git.isaku.yamahata@intel.com>
Date: Thu, 8 Dec 2022 15:35:39 -0800
From: isaku.yamahata@...el.com
To: kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: isaku.yamahata@...el.com, isaku.yamahata@...il.com,
Paolo Bonzini <pbonzini@...hat.com>,
Sean Christopherson <seanjc@...gle.com>,
David Matlack <dmatlack@...gle.com>
Subject: [RFC PATCH v2 04/15] KVM: TDX: Pass size to tdx_measure_page()
From: Xiaoyao Li <xiaoyao.li@...el.com>
Extend tdx_measure_page() to pass size info so that it can measure
large page as well.
Signed-off-by: Xiaoyao Li <xiaoyao.li@...el.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@...el.com>
---
arch/x86/kvm/vmx/tdx.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index 4f8479c20553..5b392d9baa25 100644
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -1273,13 +1273,15 @@ void tdx_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa, int pgd_level)
td_vmcs_write64(to_tdx(vcpu), SHARED_EPT_POINTER, root_hpa & PAGE_MASK);
}
-static void tdx_measure_page(struct kvm_tdx *kvm_tdx, hpa_t gpa)
+static void tdx_measure_page(struct kvm_tdx *kvm_tdx, hpa_t gpa, int size)
{
struct tdx_module_output out;
u64 err;
int i;
- for (i = 0; i < PAGE_SIZE; i += TDX_EXTENDMR_CHUNKSIZE) {
+ WARN_ON_ONCE(size % TDX_EXTENDMR_CHUNKSIZE);
+
+ for (i = 0; i < size; i += TDX_EXTENDMR_CHUNKSIZE) {
err = tdh_mr_extend(kvm_tdx->tdr.pa, gpa + i, &out);
if (KVM_BUG_ON(err, &kvm_tdx->kvm)) {
pr_tdx_error(TDH_MR_EXTEND, err, &out);
@@ -1371,7 +1373,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
tdx_unpin(kvm, pfn);
return -EIO;
} else if (measure)
- tdx_measure_page(kvm_tdx, gpa);
+ tdx_measure_page(kvm_tdx, gpa, KVM_HPAGE_SIZE(level));
return 0;
}
--
2.25.1
Powered by blists - more mailing lists