From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HNe5gzl8" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CD4EA1; Thu, 16 Nov 2023 00:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700125054; x=1731661054; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=6hF/KOy4geEzMKDye/KnnEK2zzobLNIQdCZGvFvFx7o=; b=HNe5gzl8rRw3i7yMvw7P0d7YAv8/iO5RuqzW1q3r70wBr8No8yvrZJL8 WuGUilodLGmHGC7m5z9Ifpg0hiyxATSsjfsobYNNONri/1SHVeSrdR/Ar q9DUJMc7gd/8MSe8bJwObtLVstBWQxTqQMGbcUnOY9nibmMFAdowKCit7 tVJ3KJwWZKRfCrEYLj03TsUI97/HFuPZhhUfKXvfD6Y/TDTb4zRXaaaez TMLXQ58DBMbEEyLAflsSrPVM/vUy9uxbdVxkNYd1BUn4x8LnLI3dGhu2+ Ejsy/4Sl14DiRixdEryNMdrZuHUvgpk5hp2pWnaM/xRRunojDyUATEpry Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="9687822" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="9687822" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:57:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10895"; a="794437255" X-IronPort-AV: E=Sophos;i="6.03,307,1694761200"; d="scan'208";a="794437255" Received: from binbinwu-mobl.ccr.corp.intel.com (HELO [10.238.10.126]) ([10.238.10.126]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 00:57:28 -0800 Message-ID: <00b167fa-6635-47a4-a219-1f4117fe6c97@linux.intel.com> Date: Thu, 16 Nov 2023 16:57:26 +0800 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 04/16] KVM: TDX: Pass size to tdx_measure_page() To: isaku.yamahata@intel.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, isaku.yamahata@gmail.com, Paolo Bonzini , erdemaktas@google.com, Sean Christopherson , Sagi Shahar , David Matlack , Kai Huang , Zhi Wang , chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com, Xiaoyao Li References: <7b024367db5909ffc22e6762acd0569c3a82ccd3.1699368363.git.isaku.yamahata@intel.com> From: Binbin Wu In-Reply-To: <7b024367db5909ffc22e6762acd0569c3a82ccd3.1699368363.git.isaku.yamahata@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/7/2023 11:00 PM, isaku.yamahata@intel.com wrote: > From: Xiaoyao Li > > Extend tdx_measure_page() to pass size info so that it can measure > large page as well. > > Signed-off-by: Xiaoyao Li > Signed-off-by: Isaku Yamahata > --- > 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; >