From nobody Sat Apr 11 21:18:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE3BDC25B08 for ; Sun, 7 Aug 2022 22:32:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242384AbiHGWcR (ORCPT ); Sun, 7 Aug 2022 18:32:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242188AbiHGWbi (ORCPT ); Sun, 7 Aug 2022 18:31:38 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E398818360; Sun, 7 Aug 2022 15:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659910730; x=1691446730; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n1VhPYbloRyaQpOluo7vN8itgxhqrMUvvsfBcoYG0Y8=; b=THSepzMTwTBrSkHRqbLQIou3jEpn9IPUNdHiM1mLCC6WMnBaY9T/7b/L swcxQdzV85oX5ZA3J/7MUmfunYefWy97Z6pVybD4XXE+PFYQE9mG391gm zxTmtGc4GPhVr8yOGroDu2g2lAGsqRNyiFeWckrqX6DQK0qvNX6jrH/3z +J6lAMuhaAGA3ac5tJ/5l4o8kJj9qUfSR7JpIU1o6GOZDE/Q0zgkw2atl w151bQnIb+FdEd4fkzXlW4ugNB+CUklsSK/op92gKeWOdNG7kSOxr2tlg 8+N/ckW2sBO6OPT58tadTUUMSzkEqfOAshBTNTp3v+yt4h8eBeFqinZqd Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10432"; a="270852833" X-IronPort-AV: E=Sophos;i="5.93,221,1654585200"; d="scan'208";a="270852833" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2022 15:18:49 -0700 X-IronPort-AV: E=Sophos;i="5.93,221,1654585200"; d="scan'208";a="632642313" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2022 15:18:49 -0700 From: isaku.yamahata@intel.com To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Paolo Bonzini , erdemaktas@google.com, Sean Christopherson , Sagi Shahar Subject: [RFC PATCH 05/13] KVM: TDX: Pass size to tdx_measure_page() Date: Sun, 7 Aug 2022 15:18:38 -0700 Message-Id: <824f3a80ea74d1065ec5e2f8c123aa64e527f7f0.1659854957.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 b717d50ee4d3..b7a75c0adbfa 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1417,13 +1417,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); } =20 -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; =20 - for (i =3D 0; i < PAGE_SIZE; i +=3D TDX_EXTENDMR_CHUNKSIZE) { + WARN_ON_ONCE(size % TDX_EXTENDMR_CHUNKSIZE); + + for (i =3D 0; i < size; i +=3D TDX_EXTENDMR_CHUNKSIZE) { err =3D 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); @@ -1497,7 +1499,7 @@ static void __tdx_sept_set_private_spte(struct kvm *k= vm, gfn_t gfn, pr_tdx_error(TDH_MEM_PAGE_ADD, err, &out); tdx_unpin_pfn(kvm, pfn); } else if ((kvm_tdx->source_pa & KVM_TDX_MEASURE_MEMORY_REGION)) - tdx_measure_page(kvm_tdx, gpa); /* TODO: handle page size > 4KB */ + tdx_measure_page(kvm_tdx, gpa, KVM_HPAGE_SIZE(level)); =20 kvm_tdx->source_pa =3D INVALID_PAGE; } --=20 2.25.1