From nobody Mon Sep 16 19:11:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101107+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101107+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1678727863; cv=none; d=zohomail.com; s=zohoarc; b=J/RIDlykff/h27TaRVC0P0y310bFcah50yfKkdvqL+xJ0n7mZ3AsyW2eBJx0hiSy+CSbmdkohhhehr48JQqDDPkPkbpzbQEeFb3OAzp5nrtQJNJYyV4OvOwHXzQZ0IRVLWky2hQ84ut5Cuzrtu2tuwxltzPdG4QkgwZPDaPH/4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678727863; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=9ZEh/yODSHboWGeuic6LHFTOTYwWEGN2o/vWSGYTwWA=; b=L6Etz1bKZJdic3KgEOsk7YmAFuYDbIiUwPBdzHkiKfcEqZ9Q+YuwX8UYBkvfWtfyaYxitI7XfGft7hrvNPnEwk42WtyLAXr4HdSMDB4cfnZrZxZs36rb9A8/esk7OFkJRHW5T5pEHLdM6HaSxP2q1fZKuhXEWPkQFlRxFajMwL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101107+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678727863720760.7127741678406; Mon, 13 Mar 2023 10:17:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SflnYY1788612xwhIj92zyMJ; Mon, 13 Mar 2023 10:17:43 -0700 X-Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web10.25779.1678727862374666252 for ; Mon, 13 Mar 2023 10:17:42 -0700 X-Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 12C32B811B8; Mon, 13 Mar 2023 17:17:40 +0000 (UTC) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BED9C433A0; Mon, 13 Mar 2023 17:17:36 +0000 (UTC) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Michael Kinney , Liming Gao , Jiewen Yao , Michael Kubacki , Sean Brogan , Rebecca Cran , Leif Lindholm , Sami Mujawar , Taylor Beebe Subject: [edk2-devel] [PATCH v5 02/38] ArmPkg/ArmMmuLib ARM: Split off XN page descriptor bit from type field Date: Mon, 13 Mar 2023 18:16:38 +0100 Message-Id: <20230313171714.3866151-3-ardb@kernel.org> In-Reply-To: <20230313171714.3866151-1-ardb@kernel.org> References: <20230313171714.3866151-1-ardb@kernel.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ardb@kernel.org X-Gm-Message-State: ljUp4enMUJ52TD4wKyGxSdY0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678727863; bh=nibtCUBPZs9iRp9VTKeX9wFcSTppYkKh4z99/IQiLz8=; h=Cc:Date:From:Reply-To:Subject:To; b=JSqT/DFv+wrt57MCTJclkTKwOa3AoBwFi0WGMmxwhK+Fcmwzl3Rsdo0w48ehL6/8NNc x9QvNbndzT9vAyx2N1s9xkb0xF+U5cN4gveaQz+xTMfZL8Uc6l2E1054xhighhKIhY/yi Q5MpIJpzBoYhGuzH8wIliXTbCfSK2deVHGA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678727863952100004 Content-Type: text/plain; charset="utf-8" With large page support out of the picture, we can treat bits 1 and 0 of the page descriptor as individual valid and XN bits, instead of treating XN as a page type. Doing so aligns the handling of the attribute with the section descriptor layout, as well as the XN handling on AArch64, and this is beneficial for maintainability. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPkg/Include/Chipset/ArmV7Mmu.h | 8 +++----- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/ArmPkg/Include/Chipset/Arm= V7Mmu.h index 7501ebfdf97f..6a2584ceb303 100644 --- a/ArmPkg/Include/Chipset/ArmV7Mmu.h +++ b/ArmPkg/Include/Chipset/ArmV7Mmu.h @@ -54,11 +54,9 @@ #define TT_DESCRIPTOR_SECTION_TYPE_IS_PAGE_TABLE(Desc) (((Desc) & 3UL) = =3D=3D TT_DESCRIPTOR_SECTION_TYPE_PAGE_TABLE) =20 // Translation table descriptor types -#define TT_DESCRIPTOR_PAGE_TYPE_MASK (3UL << 0) -#define TT_DESCRIPTOR_PAGE_TYPE_FAULT (0UL << 0) -#define TT_DESCRIPTOR_PAGE_TYPE_PAGE (2UL << 0) -#define TT_DESCRIPTOR_PAGE_TYPE_PAGE_XN (3UL << 0) -#define TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE (1UL << 0) +#define TT_DESCRIPTOR_PAGE_TYPE_MASK (1UL << 1) +#define TT_DESCRIPTOR_PAGE_TYPE_FAULT (0UL << 1) +#define TT_DESCRIPTOR_PAGE_TYPE_PAGE (1UL << 1) =20 // Section descriptor definitions #define TT_DESCRIPTOR_SECTION_SIZE (0x00100000) diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c b/ArmPkg/Librar= y/ArmMmuLib/Arm/ArmMmuLibUpdate.c index 9ca00c976d5f..12d0f4c30f8e 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c @@ -104,12 +104,8 @@ UpdatePageEntries ( =20 // EntryMask: bitmask of values to change (1 =3D change this value, 0 = =3D leave alone) // EntryValue: values at bit positions specified by EntryMask - EntryMask =3D TT_DESCRIPTOR_PAGE_TYPE_MASK | TT_DESCRIPTOR_PAGE_AP_MASK; - if ((Attributes & EFI_MEMORY_XP) !=3D 0) { - EntryValue =3D TT_DESCRIPTOR_PAGE_TYPE_PAGE_XN; - } else { - EntryValue =3D TT_DESCRIPTOR_PAGE_TYPE_PAGE; - } + EntryMask =3D TT_DESCRIPTOR_PAGE_TYPE_MASK | TT_DESCRIPTOR_PAGE_AP_MASK = | TT_DESCRIPTOR_PAGE_XN_MASK; + EntryValue =3D TT_DESCRIPTOR_PAGE_TYPE_PAGE; =20 // Although the PI spec is unclear on this, the GCD guarantees that only // one Attribute bit is set at a time, so the order of the conditionals = below @@ -148,6 +144,10 @@ UpdatePageEntries ( EntryValue |=3D TT_DESCRIPTOR_PAGE_AP_RW_RW; } =20 + if ((Attributes & EFI_MEMORY_XP) !=3D 0) { + EntryValue |=3D TT_DESCRIPTOR_PAGE_XN_MASK; + } + // Obtain page table base FirstLevelTable =3D (ARM_FIRST_LEVEL_DESCRIPTOR *)ArmGetTTBR0BaseAddress= (); =20 --=20 2.39.2 -=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 (#101107): https://edk2.groups.io/g/devel/message/101107 Mute This Topic: https://groups.io/mt/97585984/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-