From nobody Thu Sep 18 07:00:25 2025 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 AD778C4332F for ; Thu, 8 Dec 2022 23:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230145AbiLHXg1 (ORCPT ); Thu, 8 Dec 2022 18:36:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230101AbiLHXf6 (ORCPT ); Thu, 8 Dec 2022 18:35:58 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBF1B6BCB3; Thu, 8 Dec 2022 15:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670542557; x=1702078557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=55CT66bcMdxZrRpBG4Gr5xUaPrsTcdj1LMl8jhgsMD8=; b=Aa0evoS9bfohRZQopQNhzqPoBHCqm2M6cLOWBNZVdOg8aCOoDRZ2dSMA Z2y/oOgL8/6rEbl7pN2AiHD1CDg102xovrC5yGWNZbieecWUSt1+Dq5QC lRIuNOQV7ky6cu5xUcglf+jNdFdrWhbI/RgcUvgNTm2VrzFMTVgccULOu MFBtNO3MuQO0+lok2FFXFn9jLWGwS+UsiJlU3Sn+hpEmzXJX7SMm1LWUN adWxGza4M3e/RIFj8CySEJ+XalrP4Y+dRO+NCwMoWSWGWmbmzpEEnZIDS Q1tqtfa/9AhS+mMvwMFLpq3AkFlsr2NeRKm6jpBxfysIuIP16emRVq/Sb w==; X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="403586521" X-IronPort-AV: E=Sophos;i="5.96,228,1665471600"; d="scan'208";a="403586521" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2022 15:35:57 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="677950961" X-IronPort-AV: E=Sophos;i="5.96,228,1665471600"; d="scan'208";a="677950961" 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; 08 Dec 2022 15:35:56 -0800 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 , Sean Christopherson , David Matlack Subject: [RFC PATCH v2 08/15] KVM: TDX: Pin pages via get_page() right before ADD/AUG'ed to TDs Date: Thu, 8 Dec 2022 15:35:43 -0800 Message-Id: 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 When kvm_faultin_pfn(), it doesn't have the info regarding which page level will the gfn be mapped at. Hence it doesn't know to pin a 4K page or a 2M page. Move the guest private pages pinning logic right before TDH_MEM_PAGE_ADD/AUG() since at that time it knows the page level info. Signed-off-by: Xiaoyao Li --- arch/x86/kvm/vmx/tdx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 51b9e250437e..fad7413f7eab 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -1297,7 +1297,8 @@ static void tdx_measure_page(struct kvm_tdx *kvm_tdx,= hpa_t gpa, int size) } } =20 -static void tdx_unpin(struct kvm *kvm, kvm_pfn_t pfn, int level) +static void tdx_unpin(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, + enum pg_level level) { int i; =20 @@ -1330,12 +1331,12 @@ static int tdx_sept_set_private_spte(struct kvm *kv= m, gfn_t gfn, if (likely(is_td_finalized(kvm_tdx))) { err =3D tdh_mem_page_aug(kvm_tdx->tdr.pa, gpa, tdx_level, hpa, &out); if (err =3D=3D TDX_ERROR_SEPT_BUSY) { - tdx_unpin(kvm, pfn, level); + tdx_unpin(kvm, gfn, pfn, level); return -EAGAIN; } if (KVM_BUG_ON(err, kvm)) { pr_tdx_error(TDH_MEM_PAGE_AUG, err, &out); - tdx_unpin(kvm, pfn, level); + tdx_unpin(kvm, gfn, pfn, level); return -EIO; } return 0; @@ -1358,7 +1359,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm,= gfn_t gfn, * always uses vcpu 0's page table and protected by vcpu->mutex). */ if (KVM_BUG_ON(kvm_tdx->source_pa =3D=3D INVALID_PAGE, kvm)) { - tdx_unpin(kvm, pfn, level); + tdx_unpin(kvm, gfn, pfn, level); return -EINVAL; } =20 @@ -1376,7 +1377,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm,= gfn_t gfn, } while (err =3D=3D TDX_ERROR_SEPT_BUSY); if (KVM_BUG_ON(err, kvm)) { pr_tdx_error(TDH_MEM_PAGE_ADD, err, &out); - tdx_unpin(kvm, pfn, level); + tdx_unpin(kvm, gfn, pfn, level); return -EIO; } else if (measure) tdx_measure_page(kvm_tdx, gpa, KVM_HPAGE_SIZE(level)); @@ -1405,7 +1406,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm= , gfn_t gfn, err =3D tdx_reclaim_page(hpa, level, false, 0); if (KVM_BUG_ON(err, kvm)) return -EIO; - tdx_unpin(kvm, pfn, level); + tdx_unpin(kvm, gfn, pfn, level); return 0; } =20 @@ -1437,7 +1438,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm= , gfn_t gfn, pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err, NULL); r =3D -EIO; } else - tdx_unpin(kvm, pfn + i, PG_LEVEL_4K); + tdx_unpin(kvm, gfn + i, pfn + i, PG_LEVEL_4K); hpa +=3D PAGE_SIZE; } return r; --=20 2.25.1