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 986B7AC0D88 for ; Thu, 22 Feb 2024 11:54:47 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=LtOaSCdvP/nWOLqgr4fATSjm4F+XikRzCWi9Cp6vu1A=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1708602886; v=1; b=DSFAOdUkqGoU/r26/lrtlA0W1oJdkfEkhe+TzHJRVe3LYLP33ftElsQ2GDLVMEet8ougqBm2 gFquFgo4fOEwAibRC0w0ciGg9xUrt49QdfuCGOKEnRzW/zYfRmRiNXnM9xttJBolr+WpVM+T/nU Moah7o+sfCXsmTvwOd0ZdP04= X-Received: by 127.0.0.2 with SMTP id s85nYY7687511xOuhV94Iq0F; Thu, 22 Feb 2024 03:54:46 -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.11056.1708602885626710657 for ; Thu, 22 Feb 2024 03:54:45 -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-510-EsEnyIciObq7TNoOwqk21g-1; Thu, 22 Feb 2024 06:54:43 -0500 X-MC-Unique: EsEnyIciObq7TNoOwqk21g-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 CA76D38130AE; Thu, 22 Feb 2024 11:54:42 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.237]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C33D1C14B0B; Thu, 22 Feb 2024 11:54:42 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1E1BB1801A85; Thu, 22 Feb 2024 12:54:36 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Tom Lendacky , Jiewen Yao , Oliver Steffen , Laszlo Ersek , Erdem Aktas , Michael Roth , Ard Biesheuvel , Gerd Hoffmann , Min Xu Subject: [edk2-devel] [PATCH 06/10] OvmfPkg/ResetVector: add 5-level paging support Date: Thu, 22 Feb 2024 12:54:31 +0100 Message-ID: <20240222115435.85794-7-kraxel@redhat.com> In-Reply-To: <20240222115435.85794-1-kraxel@redhat.com> References: <20240222115435.85794-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ckyBbhAyGLf07vkxddhSDoWix7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=DSFAOdUk; 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 Add macros to check for 5-level paging and gigabyte page support. Enable 5-level paging for the non-confidential-computing case. Signed-off-by: Gerd Hoffmann --- OvmfPkg/ResetVector/ResetVector.inf | 1 + OvmfPkg/ResetVector/Ia32/PageTables64.asm | 105 ++++++++++++++++++++++ OvmfPkg/ResetVector/ResetVector.nasmb | 1 + 3 files changed, 107 insertions(+) diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/ResetVector/ResetVector.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/ResetVector/Ia32/PageTables64.asm index 84a7b4efc019..825589f31193 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -101,6 +101,97 @@ BITS 32 loop .pageTableEntriesLoop4Level %endmacro +; +; Check whenever 5-level paging can ca 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_ATTR + mov dword[PT_ADDR (4)], %1 + + ; level 4 + mov dword[PT_ADDR (0x1000)], PT_ADDR (0x3000) + PAGE_PDE_DIRECTORY_ATTR + mov dword[PT_ADDR (0x1004)], %1 + + ; level 3 (1x -> level 2, 3x 1GB) + mov dword[PT_ADDR (0x3000)], PT_ADDR (0x2000) + PAGE_PDE_DIRECTORY_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 => 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,12 @@ SetCr3ForPageTables64: ; normal (non-CoCo) workflow ; ClearOvmfPageTables +%if PG_5_LEVEL + Check5LevelPaging Paging4Level + CreatePageTables5Level 0 + jmp SetCr3La57 +Paging4Level: +%endif CreatePageTables4Level 0 jmp SetCr3 @@ -151,6 +248,14 @@ TdxBspInit: OneTimeCall TdxPostBuildPageTables jmp SetCr3 + ; + ; common workflow + ; +%if PG_5_LEVEL +SetCr3La57: + Enable5LevelPaging +%endif + SetCr3: ; ; Set CR3 now that the paging structures are available 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 @@ %define WORK_AREA_GUEST_TYPE (FixedPcdGet32 (PcdOvmfWorkAreaBase)) %define PT_ADDR(Offset) (FixedPcdGet32 (PcdOvmfSecPageTablesBase) + (Offset)) +%define PG_5_LEVEL (FixedPcdGetBool (PcdUse5LevelPageTable)) %define GHCB_PT_ADDR (FixedPcdGet32 (PcdOvmfSecGhcbPageTableBase)) %define GHCB_BASE (FixedPcdGet32 (PcdOvmfSecGhcbBase)) -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115806): https://edk2.groups.io/g/devel/message/115806 Mute This Topic: https://groups.io/mt/104506793/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-