From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 57E30D80471 for ; Wed, 28 Feb 2024 04:34:25 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=TAz/5qqvWKNSh/BTnGvFVOAVxp7eTuIkGoroTzMMruA=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1709094863; v=1; b=fZMtydkvdqBjrezB4O+q32cwKeI6Lgbz/UjZGCVx1uHcpXXkOm+Dmt2FmoY7PegYjaNgID0g Ycx7fmwEYrL5KwRIW1dklrvGyX3qUGqQsD4xFeVaGo2duxwRbOVy0qEWFBgOcXBXAiQ68NP0T82 +PLWVSt8jpg9yn7lqxAIuq2Q= X-Received: by 127.0.0.2 with SMTP id MwKpYY7687511xojp7SEzai6; Tue, 27 Feb 2024 20:34:23 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.6266.1709094863089536252 for ; Tue, 27 Feb 2024 20:34:23 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-iPcqBmr8Nti26267lGX_nA-1; Tue, 27 Feb 2024 23:34:18 -0500 X-MC-Unique: iPcqBmr8Nti26267lGX_nA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D7D8832C06; Wed, 28 Feb 2024 04:34:17 +0000 (UTC) X-Received: from [10.39.192.46] (unknown [10.39.192.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A2B4492BC6; Wed, 28 Feb 2024 04:34:15 +0000 (UTC) Message-ID: <91e43d3b-df61-46c5-9607-78681155aa8f@redhat.com> Date: Wed, 28 Feb 2024 05:34:14 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 04/10] OvmfPkg/ResetVector: split TDX BSP workflow To: devel@edk2.groups.io, kraxel@redhat.com Cc: Tom Lendacky , Jiewen Yao , Oliver Steffen , Erdem Aktas , Michael Roth , Ard Biesheuvel , Min Xu References: <20240222115435.85794-1-kraxel@redhat.com> <20240222115435.85794-5-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240222115435.85794-5-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: efTBPnWuzvDcQv8pDSTrJsGsx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=fZMtydkv; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) On 2/22/24 12:54, Gerd Hoffmann wrote: > Create a separate control flow for TDX BSP. >=20 > TdxPostBuildPageTables will now only be called when running in TDX > mode, so the TDX check in that function is not needed any more. >=20 > No functional change. >=20 > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/ResetVector/Ia32/IntelTdx.asm | 4 ---- > OvmfPkg/ResetVector/Ia32/PageTables64.asm | 15 ++++++++++----- > 2 files changed, 10 insertions(+), 9 deletions(-) >=20 > diff --git a/OvmfPkg/ResetVector/Ia32/IntelTdx.asm b/OvmfPkg/ResetVector/= Ia32/IntelTdx.asm > index 06794baef81d..c6b86019dfb9 100644 > --- a/OvmfPkg/ResetVector/Ia32/IntelTdx.asm > +++ b/OvmfPkg/ResetVector/Ia32/IntelTdx.asm > @@ -197,11 +197,7 @@ NotTdx: > ; Set byte[TDX_WORK_AREA_PGTBL_READY] to 1 > ; > TdxPostBuildPageTables: > - cmp byte[WORK_AREA_GUEST_TYPE], VM_GUEST_TDX > - jne ExitTdxPostBuildPageTables > mov byte[TDX_WORK_AREA_PGTBL_READY], 1 > - > -ExitTdxPostBuildPageTables: > OneTimeCallRet TdxPostBuildPageTables > =20 > ; > diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVec= tor/Ia32/PageTables64.asm > index 14cc2c33aa3d..166e80293c89 100644 > --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm > +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm > @@ -112,7 +112,7 @@ SetCr3ForPageTables64: > ; is set. > OneTimeCall CheckTdxFeaturesBeforeBuildPagetables > cmp eax, TDX_BSP > - je ClearOvmfPageTables > + je TdxBspInit > cmp eax, TDX_AP > je SetCr3 > =20 > @@ -124,16 +124,21 @@ SetCr3ForPageTables64: > ; the page table build below. > OneTimeCall GetSevCBitMaskAbove31 > =20 > -ClearOvmfPageTables: > ClearOvmfPageTables > CreatePageTables4Level edx > =20 > ; Clear the C-bit from the GHCB page if the SEV-ES is enabled. > OneTimeCall SevClearPageEncMaskForGhcbPage > + jmp SetCr3 > =20 > - ; TDX will do some PostBuildPages task, such as setting > - ; byte[TDX_WORK_AREA_PGTBL_READY]. > - OneTimeCall TdxPostBuildPageTables > +TdxBspInit: > + ; > + ; TDX BSP workflow > + ; > + ClearOvmfPageTables > + CreatePageTables4Level 0 > + OneTimeCall TdxPostBuildPageTables > + jmp SetCr3 > =20 > SetCr3: > ; Reviewed-by: Laszlo Ersek -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116082): https://edk2.groups.io/g/devel/message/116082 Mute This Topic: https://groups.io/mt/104506797/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-