| Message ID | 7b024367db5909ffc22e6762acd0569c3a82ccd3.1699368363.git.isaku.yamahata@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM TDX: TDP MMU: large page support | expand |
On 11/7/2023 11:00 PM, isaku.yamahata@intel.com wrote: > From: Xiaoyao Li <xiaoyao.li@intel.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@intel.com> > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.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 2d5c86e06c5f..a728175c4a6d 100644 > --- a/arch/x86/kvm/vmx/tdx.c > +++ b/arch/x86/kvm/vmx/tdx.c > @@ -1434,13 +1434,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) IMHO, it's better to pass kvm page level instead of size here to align with other APIs. > { > struct tdx_module_args out; > u64 err; > int i; > > - for (i = 0; i < PAGE_SIZE; i += TDX_EXTENDMR_CHUNKSIZE) { > + WARN_ON_ONCE(size % TDX_EXTENDMR_CHUNKSIZE); If passed level instead of size, then no need to check KVM_HPAGE_SIZE(level) against TDX_EXTENDMR_CHUNKSIZE But same qeustion, tdx_measure_page() is only for tdh_mem_page_add(), is this change necessary? > + > + 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); > @@ -1544,7 +1546,7 @@ static int tdx_sept_page_add(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; >
On Thu, Nov 16, 2023 at 04:57:26PM +0800, Binbin Wu <binbin.wu@linux.intel.com> wrote: > > > On 11/7/2023 11:00 PM, isaku.yamahata@intel.com wrote: > > From: Xiaoyao Li <xiaoyao.li@intel.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@intel.com> > > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.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 2d5c86e06c5f..a728175c4a6d 100644 > > --- a/arch/x86/kvm/vmx/tdx.c > > +++ b/arch/x86/kvm/vmx/tdx.c > > @@ -1434,13 +1434,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) > IMHO, it's better to pass kvm page level instead of size here to align with > other APIs. > > > { > > struct tdx_module_args out; > > u64 err; > > int i; > > - for (i = 0; i < PAGE_SIZE; i += TDX_EXTENDMR_CHUNKSIZE) { > > + WARN_ON_ONCE(size % TDX_EXTENDMR_CHUNKSIZE); > > If passed level instead of size, then no need to check KVM_HPAGE_SIZE(level) > against TDX_EXTENDMR_CHUNKSIZE > > But same qeustion, tdx_measure_page() is only for tdh_mem_page_add(), is > this > change necessary? You're right. As tdx_mem_page_add() is the only caller of tdx_measure_page(), open-code it into tdx_mem_page_add() and drop this patch.
diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 2d5c86e06c5f..a728175c4a6d 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1434,13 +1434,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_args 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); @@ -1544,7 +1546,7 @@ static int tdx_sept_page_add(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;