From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web11.1622.1680108484992639992 for ; Wed, 29 Mar 2023 09:48:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fhKldzFy; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 6CB2761DA9 for ; Wed, 29 Mar 2023 16:48:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D43BCC4339B for ; Wed, 29 Mar 2023 16:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680108483; bh=SNVrMvhbCm77Yts1jU4enB4CyKR29vD2eRtEcigZqqA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=fhKldzFyOcDQ+Z+ySvSEBABCOi5+menz6jgyOFCLrHLdj5xi2L2TjeHUcp+O5QAIg OfgMLjmHMVjRLQPCtXZTHiKc1Ab7LGaMHm6fs+QFA/L50wRiZGVZKhml5hrF23QFSh +TdJzLGj/ShVz6QSE/yp9Qf/qtEU9Px+yDjvsRt7YUmm+JHqQDK16u3cogo+NnElyY 9DQdATgsCns+YN3uTOEzJ39gFSDMmQIPuXX7H4NJjb/QWUu5ULnKvT8Ear5Wb9L70h 9BestDNbJSCv1tiXB0Hk9c7xScOJNB+I8w6CiEM3JkEVkajWTzb1FM78LBpacgau9+ 1KsqplFsZ0Y1A== Received: by mail-lj1-f177.google.com with SMTP id by8so16798920ljb.12 for ; Wed, 29 Mar 2023 09:48:03 -0700 (PDT) X-Gm-Message-State: AAQBX9fNCeL+6TU8MwLPDSUxAWtjezcHqBGQMFp+CzNmQAtpXT6/U0c0 /8jcEp+Q3SbFp0eNW3D5GlPrmeSR09mN309uoO0= X-Google-Smtp-Source: AKy350ZH+7zUygUfUfTJZnEXPpQgoklUzfi8Q7MYJ2lceEQyllInY6a5TdZ+Tes6SEhkoE79ZV2ZDhhragI6VVFcmhk= X-Received: by 2002:a2e:be1c:0:b0:2a2:35dd:4b30 with SMTP id z28-20020a2ebe1c000000b002a235dd4b30mr1617743ljq.3.1680108481854; Wed, 29 Mar 2023 09:48:01 -0700 (PDT) MIME-Version: 1.0 References: <20230327110112.262503-1-ardb@kernel.org> <20230327110112.262503-16-ardb@kernel.org> In-Reply-To: From: "Ard Biesheuvel" Date: Wed, 29 Mar 2023 18:47:50 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [PATCH v2 15/17] MdePkg: Update MemoryAttributesTable to v2.10 To: devel@edk2.groups.io, quic_llindhol@quicinc.com Cc: Michael Kinney , Liming Gao , Jiewen Yao , Michael Kubacki , Sean Brogan , Rebecca Cran , Sami Mujawar , Taylor Beebe , =?UTF-8?Q?Marvin_H=C3=A4user?= , Bob Feng Content-Type: text/plain; charset="UTF-8" On Mon, 27 Mar 2023 at 15:30, Leif Lindholm wrote: > > On Mon, Mar 27, 2023 at 13:01:10 +0200, Ard Biesheuvel wrote: > > UEFI v2.10 introduces a new flag to the memory attributes table to > > inform the OS whether or not runtime services code regions were emitted > > by the compiler with guard instructions for forward edge control flow > > integrity enforcement. > > > > So update our definition accordingly. > > > > Link: https://uefi.org/specs/UEFI/2.10/04_EFI_System_Table.html#efi-memory-attributes-table > > Signed-off-by: Ard Biesheuvel > > Reviewed-by: Michael D Kinney > > Acked-by: Michael Kubacki > > --- > > MdePkg/Include/Guid/MemoryAttributesTable.h | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/MdePkg/Include/Guid/MemoryAttributesTable.h b/MdePkg/Include/Guid/MemoryAttributesTable.h > > index 82f83a67b96d38c5..238c14ff92dfed31 100644 > > --- a/MdePkg/Include/Guid/MemoryAttributesTable.h > > +++ b/MdePkg/Include/Guid/MemoryAttributesTable.h > > @@ -17,11 +17,15 @@ typedef struct { > > UINT32 Version; > > UINT32 NumberOfEntries; > > UINT32 DescriptorSize; > > - UINT32 Reserved; > > + UINT32 Flags; > > Does this not cause a bisect breakage vs patch 17? > Yeah, rebase error - this change should update the reference to Reserved as well in MdeModulePkg/Core/Dxe/Misc/MemoryAttributesTable.c, and patch 17/17 should only change the value that gets assigned to it.