From nobody Sun Feb 8 12:58:26 2026 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+107074+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+107074+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1689811565; cv=none; d=zohomail.com; s=zohoarc; b=ANecm+zQVXAUMw2XM+K+bwHAZyFiI0rEek4Hkhj6xGZ6YCBp1HESYR9qJo86edmeJ1SAPEvlgxbFzdpCiMZraa3U4G8ijC/dOdUVaX8v3JS93JDNhVEmfJ7H0gbuhpY6mrV0ozt+WF+UqAroC8M9t0mPXEfNMmvwFLmhjRw5ZUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689811565; 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=uhpB9kPVXCSL48lYSQvbO5aytVTnfgHpIuA9LTndVb8=; b=EyhC2PCn1JfhApD+5a79tUc8D9ipC7iyDR5tR9Wgt7aC8Yrn39GCMijxycAzmuE/f/RPCkzo5stMK2qga5dIj3Y85y9FD5PeoeyK03nyIXq5uwyEVmaW01m0C9Mec6GpSc5VSs6yIgqNgMsldNy3J/wmPYHRyaodBXuTmXHhaGc= 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+107074+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1689811565222553.7429825407297; Wed, 19 Jul 2023 17:06:05 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=1pfAtpFEdm+weG+qsv8rj7xxLoxwLddg6F5eUWcGDtg=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-Received:X-Gm-Message-State:X-Google-Smtp-Source:X-Received:X-Received:From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Unsubscribe:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:Content-Transfer-Encoding; s=20140610; t=1689811564; v=1; b=AqHD5/mMGfScRVKOhFDTWEPXRL8rXFBe2B8K5mQTr+WUEv9j7i0sUarWCsf6O6ugY/jP4a/i r0DvFM3dkByF6O2jZBs7kmhpwozaQAeh1o0JtjrZsbTdxRrrACmDpL3O6+eLArnaEO+EuKKnlnf 45R4UlgBQMjiaNcbnu3m3KDw= X-Received: by 127.0.0.2 with SMTP id lY58YY1788612x0BBUar6lJx; Wed, 19 Jul 2023 17:06:04 -0700 X-Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web10.2240.1689811564403910967 for ; Wed, 19 Jul 2023 17:06:04 -0700 X-Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1bb1baf55f5so1713355ad.0 for ; Wed, 19 Jul 2023 17:06:04 -0700 (PDT) X-Gm-Message-State: 2pn9eAbDuXZFcmiPSmjBuQD0x1787277AA= X-Google-Smtp-Source: APBJJlHr8n8z6vkRD/jQTuGZXpMOS1Il1srG9dq5AaO51/HfAoAdzJ9gUPMACtoV7YoY5kzksb2gKg== X-Received: by 2002:a17:903:2310:b0:1b8:91ad:79e2 with SMTP id d16-20020a170903231000b001b891ad79e2mr22300929plh.3.1689811563760; Wed, 19 Jul 2023 17:06:03 -0700 (PDT) X-Received: from localhost.localdomain ([50.46.230.135]) by smtp.gmail.com with ESMTPSA id jf10-20020a170903268a00b001b83e624eecsm4617286plb.81.2023.07.19.17.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 17:06:03 -0700 (PDT) From: "Taylor Beebe" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 8/9] UefiCpuPkg: Use Attribute From SMM MemoryAttributesTable if Nonzero Date: Wed, 19 Jul 2023 17:05:43 -0700 Message-ID: <20230720000544.146-9-t@taylorbeebe.com> In-Reply-To: <20230720000544.146-1-t@taylorbeebe.com> References: <20230720000544.146-1-t@taylorbeebe.com> 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,t@taylorbeebe.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1689811567428100035 Content-Type: text/plain; charset="utf-8" The function EnforceMemoryMapAttribute() in the SMM MAT logic will ensure that the CODE and DATA memory types have the desired attributes. The consumer of the SMM MAT should only override the Attributes field in the MAT if it is nonzero. This also allows the UEFI and SMM MAT logic to use ImagePropertiesRecordLib instead of carrying two copies of the image properties record manipulation. Signed-off-by: Taylor Beebe Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPk= g/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c index 6f498666157e..d302a9b0cbcf 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c @@ -1062,14 +1062,17 @@ SetMemMapAttributes ( MemoryMap =3D MemoryMapStart; for (Index =3D 0; Index < MemoryMapEntryCount; Index++) { DEBUG ((DEBUG_VERBOSE, "SetAttribute: Memory Entry - 0x%lx, 0x%x\n", M= emoryMap->PhysicalStart, MemoryMap->NumberOfPages)); - if (MemoryMap->Type =3D=3D EfiRuntimeServicesCode) { - MemoryAttribute =3D EFI_MEMORY_RO; - } else { - ASSERT ((MemoryMap->Type =3D=3D EfiRuntimeServicesData) || (MemoryMa= p->Type =3D=3D EfiConventionalMemory)); - // - // Set other type memory as NX. - // - MemoryAttribute =3D EFI_MEMORY_XP; + MemoryAttribute =3D MemoryMap->Attribute & EFI_MEMORY_ACCESS_MASK; + if (MemoryAttribute =3D=3D 0) { + if (MemoryMap->Type =3D=3D EfiRuntimeServicesCode) { + MemoryAttribute =3D EFI_MEMORY_RO; + } else { + ASSERT ((MemoryMap->Type =3D=3D EfiRuntimeServicesData) || (Memory= Map->Type =3D=3D EfiConventionalMemory)); + // + // Set other type memory as NX. + // + MemoryAttribute =3D EFI_MEMORY_XP; + } } =20 // --=20 2.41.0.windows.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 (#107074): https://edk2.groups.io/g/devel/message/107074 Mute This Topic: https://groups.io/mt/100246943/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-