From nobody Mon Feb 9 09:16:05 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 7E068C001DE for ; Tue, 25 Jul 2023 22:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbjGYWgT (ORCPT ); Tue, 25 Jul 2023 18:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232418AbjGYWfx (ORCPT ); Tue, 25 Jul 2023 18:35:53 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 641684C03; Tue, 25 Jul 2023 15:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690324159; x=1721860159; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vRTwnVkAPRceYB8hWCuKqbqhiGxKBfRejTzNTUTVWEo=; b=lG9IOhBbP4bARo0MKUSEK+nQuqAP9bfTPCK8m8fPOdaTfLVibX8Jn8/O GGjspN9Mx4i83ymFo0i69lfKgGpr7NgOTcPgu1jByNTLuGIi/oNSKzbuH grjs+w8MuLALmj2fQ8t4CKusNjlTSp3Be2aDN7t1Ab599wpbmVLxvWxAF LciqPMT7Az67UOLu/6hqPZ0PAKGUT2+4CC52tWuVrWoOxAZm1sep1GTAA ni4I66esbHr6xsi21OrOalGocTyf7oR1W+0HEW8iW2/LGWdJ/5g1pqbr9 Auo5vFiDYpiqMj6y6C06lwo3yxyZ5OUdallnDSabdoQOoKAx+LhtMstWu g==; X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="371467117" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="371467117" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:24:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="972855799" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="972855799" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:24:09 -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 , David Matlack , Kai Huang , Zhi Wang , chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com, Xiaoyao Li Subject: [RFC PATCH v4 05/16] KVM: TDX: Pass size to reclaim_page() Date: Tue, 25 Jul 2023 15:23:51 -0700 Message-Id: <48b900ccfa2257ddbfeea475b9b43ee36fb52080.1690323516.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 A 2MB large page can be tdh_mem_page_aug()'ed to TD directly. In this case, it needs to reclaim and clear the page as 2MB size. Signed-off-by: Xiaoyao Li Signed-off-by: Isaku Yamahata --- arch/x86/kvm/vmx/tdx.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 3522ee232eda..86cfbf435671 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -198,12 +198,13 @@ static void tdx_disassociate_vp_on_cpu(struct kvm_vcp= u *vcpu) smp_call_function_single(cpu, tdx_disassociate_vp_arg, vcpu, 1); } =20 -static void tdx_clear_page(unsigned long page_pa) +static void tdx_clear_page(unsigned long page_pa, int size) { const void *zero_page =3D (const void *) __va(page_to_phys(ZERO_PAGE(0))); void *page =3D __va(page_pa); unsigned long i; =20 + WARN_ON_ONCE(size % PAGE_SIZE); /* * When re-assign one page from old keyid to a new keyid, MOVDIR64B is * required to clear/write the page with new keyid to prevent integrity @@ -212,7 +213,7 @@ static void tdx_clear_page(unsigned long page_pa) * clflush doesn't flush cache with HKID set. The cache line could be * poisoned (even without MKTME-i), clear the poison bit. */ - for (i =3D 0; i < PAGE_SIZE; i +=3D 64) + for (i =3D 0; i < size; i +=3D 64) movdir64b(page + i, zero_page); /* * MOVDIR64B store uses WC buffer. Prevent following memory reads @@ -221,7 +222,8 @@ static void tdx_clear_page(unsigned long page_pa) __mb(); } =20 -static int tdx_reclaim_page(hpa_t pa, bool do_wb, u16 hkid) +static int tdx_reclaim_page(hpa_t pa, enum pg_level level, + bool do_wb, u16 hkid) { struct tdx_module_output out; u64 err; @@ -239,8 +241,10 @@ static int tdx_reclaim_page(hpa_t pa, bool do_wb, u16 = hkid) pr_tdx_error(TDH_PHYMEM_PAGE_RECLAIM, err, &out); return -EIO; } + /* out.r8 =3D=3D tdx sept page level */ + WARN_ON_ONCE(out.r8 !=3D pg_level_to_tdx_sept_level(level)); =20 - if (do_wb) { + if (do_wb && level =3D=3D PG_LEVEL_4K) { /* * Only TDR page gets into this path. No contention is expected * because of the last page of TD. @@ -252,7 +256,7 @@ static int tdx_reclaim_page(hpa_t pa, bool do_wb, u16 h= kid) } } =20 - tdx_clear_page(pa); + tdx_clear_page(pa, KVM_HPAGE_SIZE(level)); return 0; } =20 @@ -266,7 +270,7 @@ static void tdx_reclaim_td_page(unsigned long td_page_p= a) * was already flushed by TDH.PHYMEM.CACHE.WB before here, So * cache doesn't need to be flushed again. */ - if (tdx_reclaim_page(td_page_pa, false, 0)) + if (tdx_reclaim_page(td_page_pa, PG_LEVEL_4K, false, 0)) /* * Leak the page on failure: * tdx_reclaim_page() returns an error if and only if there's an @@ -474,7 +478,7 @@ void tdx_vm_free(struct kvm *kvm) * while operating on TD (Especially reclaiming TDCS). Cache flush with * TDX global HKID is needed. */ - if (tdx_reclaim_page(kvm_tdx->tdr_pa, true, tdx_global_keyid)) + if (tdx_reclaim_page(kvm_tdx->tdr_pa, PG_LEVEL_4K, true, tdx_global_keyid= )) return; =20 free_page((unsigned long)__va(kvm_tdx->tdr_pa)); @@ -1468,7 +1472,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm= , gfn_t gfn, * The HKID assigned to this TD was already freed and cache * was already flushed. We don't have to flush again. */ - err =3D tdx_reclaim_page(hpa, false, 0); + err =3D tdx_reclaim_page(hpa, level, false, 0); if (KVM_BUG_ON(err, kvm)) return -EIO; tdx_unpin(kvm, pfn); @@ -1501,7 +1505,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm= , gfn_t gfn, pr_tdx_error(TDH_PHYMEM_PAGE_WBINVD, err, NULL); return -EIO; } - tdx_clear_page(hpa); + tdx_clear_page(hpa, PAGE_SIZE); tdx_unpin(kvm, pfn); return 0; } @@ -1612,7 +1616,7 @@ static int tdx_sept_free_private_spt(struct kvm *kvm,= gfn_t gfn, * already flushed. We don't have to flush again. */ if (!is_hkid_assigned(kvm_tdx)) - return tdx_reclaim_page(__pa(private_spt), false, 0); + return tdx_reclaim_page(__pa(private_spt), PG_LEVEL_4K, false, 0); =20 /* * free_private_spt() is (obviously) called when a shadow page is being --=20 2.25.1