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 C5C7A7803CC for ; Fri, 1 Mar 2024 12:48:43 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=fhf28dStfwdJjkgSj4TuMlF//4DV+5/B/y1tHCvTM4Y=; 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=1709297322; v=1; b=ey6JxkcxcZh010BHaDJj0mY6XucJZ73m2o4dnfALJDRawpjYBz/QATnKzA5XtoQWlBimyN3c 5mdFBPlLtfDvv8PNAq3Ff9OJI03umfvOGif/s2t5ygJ6POi5SKaKOg3J4dBr+0EEP7x4vc5pTnL QbLWF5oGjfIeHwl1olnFQIGY= X-Received: by 127.0.0.2 with SMTP id mFLQYY7687511xiaYRjlAEgL; Fri, 01 Mar 2024 04:48:42 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.21711.1709297321529871355 for ; Fri, 01 Mar 2024 04:48:41 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-193-kry29pBXNPK-Uou7Q4FGFg-1; Fri, 01 Mar 2024 07:48:37 -0500 X-MC-Unique: kry29pBXNPK-Uou7Q4FGFg-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 2F8B33C13A94; Fri, 1 Mar 2024 12:48:37 +0000 (UTC) X-Received: from [10.39.194.215] (unknown [10.39.194.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 77DF11BDB1; Fri, 1 Mar 2024 12:48:35 +0000 (UTC) Message-ID: <06ecb08b-9e39-b1d3-4a49-7bfb7719a00a@redhat.com> Date: Fri, 1 Mar 2024 13:48:34 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v2 06/10] OvmfPkg/ResetVector: add 5-level paging support To: devel@edk2.groups.io, kraxel@redhat.com Cc: Jiewen Yao , Oliver Steffen , Michael Roth , Erdem Aktas , Min Xu , Ard Biesheuvel , Tom Lendacky References: <20240301074402.98625-1-kraxel@redhat.com> <20240301074402.98625-7-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240301074402.98625-7-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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: r1wwQ3GLwzzdyhZNUZFc0mOox7686176AA= 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=ey6Jxkcx; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 3/1/24 08:43, Gerd Hoffmann wrote: > Add macros to check for 5-level paging and gigabyte page support. > Enable 5-level paging for the non-confidential-computing case. >=20 > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/ResetVector/ResetVector.inf | 1 + > OvmfPkg/ResetVector/Ia32/PageTables64.asm | 100 ++++++++++++++++++++++ > OvmfPkg/ResetVector/ResetVector.nasmb | 1 + > 3 files changed, 102 insertions(+) >=20 > diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/ResetVector/Re= setVector.inf > index a4154ca90c28..65f71b05a02e 100644 > --- a/OvmfPkg/ResetVector/ResetVector.inf > +++ b/OvmfPkg/ResetVector/ResetVector.inf > @@ -64,3 +64,4 @@ [FixedPcd] > gUefiOvmfPkgTokenSpaceGuid.PcdQemuHashTableSize > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase > gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize > + gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable > diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVec= tor/Ia32/PageTables64.asm > index 84a7b4efc019..2d7fd523e4b1 100644 > --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm > +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm > @@ -101,6 +101,97 @@ BITS 32 > loop .pageTableEntriesLoop4Level > %endmacro > =20 > +; > +; Check whenever 5-level paging can be used > +; > +; Argument: jump label for 4-level paging > +; > +%macro Check5LevelPaging 1 > + ; check for cpuid leaf 0x07 > + mov eax, 0x00 > + cpuid > + cmp eax, 0x07 > + jb %1 > + > + ; check for la57 (aka 5-level paging) > + mov eax, 0x07 > + mov ecx, 0x00 > + cpuid > + bt ecx, 16 > + jnc %1 > + > + ; check for cpuid leaf 0x80000001 > + mov eax, 0x80000000 > + cpuid > + cmp eax, 0x80000001 > + jb %1 > + > + ; check for 1g pages > + mov eax, 0x80000001 > + cpuid > + bt edx, 26 > + jnc %1 > +%endmacro > + > +; > +; Create page tables for 5-level paging with gigabyte pages > +; > +; Argument: upper 32 bits of the page table entries > +; > +; We have 6 pages available for the early page tables, > +; we use four of them: > +; PT_ADDR(0) - level 5 directory > +; PT_ADDR(0x1000) - level 4 directory > +; PT_ADDR(0x2000) - level 2 directory (0 -> 1GB) > +; PT_ADDR(0x3000) - level 3 directory > +; > +; The level 2 directory for the first gigabyte has the same > +; physical address in both 4-level and 5-level paging mode, > +; SevClearPageEncMaskForGhcbPage depends on this. > +; > +; The 1 GB -> 4 GB range is mapped using 1G pages in the > +; level 3 directory. > +; > +%macro CreatePageTables5Level 1 > + ; level 5 > + mov dword[PT_ADDR (0)], PT_ADDR (0x1000) + PAGE_PDE_DIRECTORY_AT= TR > + mov dword[PT_ADDR (4)], %1 > + > + ; level 4 > + mov dword[PT_ADDR (0x1000)], PT_ADDR (0x3000) + PAGE_PDE_DIRECTO= RY_ATTR > + mov dword[PT_ADDR (0x1004)], %1 > + > + ; level 3 (1x -> level 2, 3x 1GB) > + mov dword[PT_ADDR (0x3000)], PT_ADDR (0x2000) + PAGE_PDE_DIRECTO= RY_ATTR > + mov dword[PT_ADDR (0x3004)], %1 > + mov dword[PT_ADDR (0x3008)], (1 << 30) + PAGE_PDE_LARGEPAGE_ATTR > + mov dword[PT_ADDR (0x300c)], %1 > + mov dword[PT_ADDR (0x3010)], (2 << 30) + PAGE_PDE_LARGEPAGE_ATTR > + mov dword[PT_ADDR (0x3014)], %1 > + mov dword[PT_ADDR (0x3018)], (3 << 30) + PAGE_PDE_LARGEPAGE_ATTR > + mov dword[PT_ADDR (0x301c)], %1 > + > + ; > + ; level 2 (512 * 2MB entries =3D> 1GB) > + ; > + mov ecx, 0x200 > +.pageTableEntriesLoop5Level: > + mov eax, ecx > + dec eax > + shl eax, 21 > + add eax, PAGE_PDE_LARGEPAGE_ATTR > + mov dword[ecx * 8 + PT_ADDR (0x2000 - 8)], eax > + mov dword[(ecx * 8 + PT_ADDR (0x2000 - 8)) + 4], %1 > + loop .pageTableEntriesLoop5Level > +%endmacro > + > +%macro Enable5LevelPaging 0 > + ; set la57 bit in cr4 > + mov eax, cr4 > + bts eax, 12 > + mov cr4, eax > +%endmacro > + > ; > ; Modified: EAX, EBX, ECX, EDX > ; > @@ -125,6 +216,13 @@ SetCr3ForPageTables64: > ; normal (non-CoCo) workflow > ; > ClearOvmfPageTables > +%if PG_5_LEVEL > + Check5LevelPaging Paging4Level > + CreatePageTables5Level 0 > + Enable5LevelPaging > + jmp SetCr3 > +Paging4Level: > +%endif > CreatePageTables4Level 0 > jmp SetCr3 > =20 > @@ -152,6 +250,8 @@ TdxBspInit: > jmp SetCr3 > =20 > SetCr3: > + ; > + ; common workflow > ; > ; Set CR3 now that the paging structures are available > ; Nice touch, moving the "common workflow" comment here! Reviewed-by: Laszlo Ersek > diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/ResetVector/= ResetVector.nasmb > index 366a70fb9992..2bd80149e58b 100644 > --- a/OvmfPkg/ResetVector/ResetVector.nasmb > +++ b/OvmfPkg/ResetVector/ResetVector.nasmb > @@ -53,6 +53,7 @@ > =20 > %define WORK_AREA_GUEST_TYPE (FixedPcdGet32 (PcdOvmfWorkAreaBas= e)) > %define PT_ADDR(Offset) (FixedPcdGet32 (PcdOvmfSecPageTabl= esBase) + (Offset)) > +%define PG_5_LEVEL (FixedPcdGetBool (PcdUse5LevelPage= Table)) > =20 > %define GHCB_PT_ADDR (FixedPcdGet32 (PcdOvmfSecGhcbPage= TableBase)) > %define GHCB_BASE (FixedPcdGet32 (PcdOvmfSecGhcbBase= )) -=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 (#116245): https://edk2.groups.io/g/devel/message/116245 Mute This Topic: https://groups.io/mt/104660114/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-