From nobody Tue Dec 2 02:04:19 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2CA4298991; Fri, 21 Nov 2025 00:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763686310; cv=none; b=TPoJ+yhd7EU9KxcAsVQSFdaTVrY+8SyM1XOkwopOruHTgcXzT6/W5kIwc27yZNjtlbMSY1YOjpQb8g9BQakN3oTyLmOuxrz9mG8XrBEz+kiZsGSZ50OpyW3BHt+lW5b0bdjRPwP2NVlwv82GlEV50m6qc48syMhFI8uH+QBYYNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763686310; c=relaxed/simple; bh=kPB6qJw0RQ0uKhgIzE4Nb0jjFz7PQ7mO7NFAXf93bm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DEelO2UkCSaKHoCzgiFVzVpzo1h5qWAB6/o6NbKYVl77IBLlEcp7lY5l2OiBnMc4myMlNHv3XX9Mr9ZCkb4Urvspz78TL8UYfetyIl9lSCBILKOpdfeOU1VZBuT1oHtnPWNPjGcrKdN0mTjdsZeIQ4sAE3v8CnXAAL0FCtThpnk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FjPaTKKw; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FjPaTKKw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763686309; x=1795222309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kPB6qJw0RQ0uKhgIzE4Nb0jjFz7PQ7mO7NFAXf93bm8=; b=FjPaTKKw/3K7bWOyWtZDNEEaml2b3eUtt3HybfF+SB7of1wspRSq2uOH uOsYAjH/VPgz/Zt+So+NQRHH20b0ToDn2YZyFMPbZ+o4rsgFIoQUTRo6I JacP0PsZH3LnxSHQXnOnAXQWGzcXbMPPd551F8KoerlBAiC5gbDkDN3mj jTaMNdXNt3UyDpRAd5RvQr5JCY9/RvFPr0CwX6Ec48JMrcN45eUZdABX9 OmJxfFg1Suog/dxLbzIAE1iuPwaNVgjJYWzDwN5YyHS6JuAckvSx7WpvX tG3Wi/+w9ysZPqYX4r6WB2fyqebgsQAH1ggBIYO2BH9lwhZJjiMEOnPwH Q==; X-CSE-ConnectionGUID: xG9nWgAIRGS3X5QpOAc+OA== X-CSE-MsgGUID: Jqc7YjSIQ9ODQBIUxmUvBw== X-IronPort-AV: E=McAfee;i="6800,10657,11619"; a="64780789" X-IronPort-AV: E=Sophos;i="6.20,214,1758610800"; d="scan'208";a="64780789" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 16:51:45 -0800 X-CSE-ConnectionGUID: RBJ4stqKQIWQkphX5+tk/g== X-CSE-MsgGUID: n2+ap+otReO526p+/ES6vQ== X-ExtLoop1: 1 Received: from rpedgeco-desk.jf.intel.com ([10.88.27.139]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2025 16:51:45 -0800 From: Rick Edgecombe To: bp@alien8.de, chao.gao@intel.com, dave.hansen@intel.com, isaku.yamahata@intel.com, kai.huang@intel.com, kas@kernel.org, kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, mingo@redhat.com, pbonzini@redhat.com, seanjc@google.com, tglx@linutronix.de, vannapurve@google.com, x86@kernel.org, yan.y.zhao@intel.com, xiaoyao.li@intel.com, binbin.wu@intel.com Cc: rick.p.edgecombe@intel.com, "Kirill A. Shutemov" Subject: [PATCH v4 10/16] KVM: TDX: Allocate PAMT memory for vCPU control structures Date: Thu, 20 Nov 2025 16:51:19 -0800 Message-ID: <20251121005125.417831-11-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251121005125.417831-1-rick.p.edgecombe@intel.com> References: <20251121005125.417831-1-rick.p.edgecombe@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Kirill A. Shutemov" TDX vCPU control structures are provided to the TDX module at 4KB page size and require PAMT backing. This means for Dynamic PAMT they need to also have 4KB backings installed. Previous changes introduced tdx_alloc_page()/tdx_free_page() that can allocate a page and automatically handle the DPAMT maintenance. Use them for vCPU control structures instead of alloc_page()/__free_page(). Signed-off-by: Kirill A. Shutemov [update log] Signed-off-by: Rick Edgecombe Reviewed-by: Binbin Wu --- v3: - Write log. Reame from =E2=80=9CAllocate PAMT memory for TDH.VP.CREATE and TDH.VP.ADDCX=E2=80=9D. - Remove new line damage --- arch/x86/kvm/vmx/tdx.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 8c4c1221e311..b6d7f4b5f40f 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -2882,7 +2882,7 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, u6= 4 vcpu_rcx) int ret, i; u64 err; =20 - page =3D alloc_page(GFP_KERNEL); + page =3D tdx_alloc_page(); if (!page) return -ENOMEM; tdx->vp.tdvpr_page =3D page; @@ -2902,7 +2902,7 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, u6= 4 vcpu_rcx) } =20 for (i =3D 0; i < kvm_tdx->td.tdcx_nr_pages; i++) { - page =3D alloc_page(GFP_KERNEL); + page =3D tdx_alloc_page(); if (!page) { ret =3D -ENOMEM; goto free_tdcx; @@ -2924,7 +2924,7 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, u6= 4 vcpu_rcx) * method, but the rest are freed here. */ for (; i < kvm_tdx->td.tdcx_nr_pages; i++) { - __free_page(tdx->vp.tdcx_pages[i]); + tdx_free_page(tdx->vp.tdcx_pages[i]); tdx->vp.tdcx_pages[i] =3D NULL; } return -EIO; @@ -2952,16 +2952,14 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, = u64 vcpu_rcx) =20 free_tdcx: for (i =3D 0; i < kvm_tdx->td.tdcx_nr_pages; i++) { - if (tdx->vp.tdcx_pages[i]) - __free_page(tdx->vp.tdcx_pages[i]); + tdx_free_page(tdx->vp.tdcx_pages[i]); tdx->vp.tdcx_pages[i] =3D NULL; } kfree(tdx->vp.tdcx_pages); tdx->vp.tdcx_pages =3D NULL; =20 free_tdvpr: - if (tdx->vp.tdvpr_page) - __free_page(tdx->vp.tdvpr_page); + tdx_free_page(tdx->vp.tdvpr_page); tdx->vp.tdvpr_page =3D NULL; tdx->vp.tdvpr_pa =3D 0; =20 --=20 2.51.2