From nobody Wed Dec 17 09:46:52 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 25F9CCDB482 for ; Mon, 16 Oct 2023 16:38:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234179AbjJPQiM (ORCPT ); Mon, 16 Oct 2023 12:38:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234456AbjJPQhg (ORCPT ); Mon, 16 Oct 2023 12:37:36 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3D1A83C0; Mon, 16 Oct 2023 09:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697473398; x=1729009398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B72YDEO70rKyCktJVODQJPRxRRKceKPZ5dkJZRqrFkA=; b=ChweWF400kKXogUbCsz/6iO2/3nfrcalzm3xrKzrfkdj9R4aM8sNJ7HC 0nOiTdoou5aFqcO4MIKVF+C6Msy/ooumSWx2q5ly4elB1xmH/3iSI5Fjz mMVo2qlgrsYeBqHxMzj8jyd5QvY1tg+klifW0JgR5bu5AvIlo2tb4w2Xw dQ7nzqiBYYlaShDXg/XxnO+9AQ1trhkSkEwcgmazxzFUPHmXAN1qfFeYz Qxm1TbyKg/q02BfYvDAHo0nQybqJjTv/mvnMyBwwVBhrXhVXoFx/L/uas 3vp6a8RjJ8yVOapqvBTAaJui1gqOm5hPM2mAxueiKMZPo9qLj7jXSOw0X g==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="471793226" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="471793226" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:21:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="899569280" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="899569280" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:19:18 -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 v5 16/16] KVM: TDX: Allow 2MB large page for TD GUEST Date: Mon, 16 Oct 2023 09:21:07 -0700 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 Now that everything is there to support 2MB page for TD guest. Because TDX module TDH.MEM.PAGE.AUG supports 4KB page and 2MB page, set struct kvm_arch.tdp_max_page_level to 2MB page level. Signed-off-by: Xiaoyao Li Signed-off-by: Isaku Yamahata --- arch/x86/kvm/mmu/tdp_mmu.c | 9 ++------- arch/x86/kvm/vmx/tdx.c | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index cac48881c5f1..4158ca4612fa 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1687,14 +1687,9 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kv= m_page_fault *fault) =20 sp->nx_huge_page_disallowed =3D fault->huge_page_disallowed; =20 - if (is_shadow_present_pte(iter.old_spte)) { - /* - * TODO: large page support. - * Doesn't support large page for TDX now - */ - KVM_BUG_ON(is_private_sptep(iter.sptep), vcpu->kvm); + if (is_shadow_present_pte(iter.old_spte)) r =3D tdp_mmu_split_huge_page(kvm, &iter, sp, true); - } else + else r =3D tdp_mmu_link_sp(kvm, &iter, sp, true); =20 /* diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 2627dcf240cc..648bd2636ff3 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -565,8 +565,8 @@ int tdx_vm_init(struct kvm *kvm) */ kvm_mmu_set_mmio_spte_value(kvm, 0); =20 - /* TODO: Enable 2mb and 1gb large page support. */ - kvm->arch.tdp_max_page_level =3D PG_LEVEL_4K; + /* TDH.MEM.PAGE.AUG supports up to 2MB page. */ + kvm->arch.tdp_max_page_level =3D PG_LEVEL_2M; =20 /* * This function initializes only KVM software construct. It doesn't --=20 2.25.1