From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web11.34960.1679923808611714177 for ; Mon, 27 Mar 2023 06:30:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=CptU3TyK; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: quicinc.com, ip: 205.220.168.131, mailfrom: quic_llindhol@quicinc.com) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32RDNFUd029808; Mon, 27 Mar 2023 13:29:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=qcppdkim1; bh=hq0GHzGIkI74CNJNMZfYNMfXmfR9rZwqX3Na+WlbQcU=; b=CptU3TyKXyhknnuVirsEE5N4XNXqBPoMHxG2LzsoozVTm7xAFva6eGIlGv5ez/CusVKH yO/Udlju/8QqyuJvlPHEBtHcbQqWI9TdOikU4gkd8ZQJ1d3FaGMuPnbj9/UiYX3B7c1a DU6YYI9xHPXNhJ2Ydk+ms6kgqVe2ewZKrbzmBG34EzHJJ9+9qrtjiuxsEZTO+a8/rylw 121tePvsMt2VQXh6rtyQW/iH7/oS1AfasSLwXHTISsWu7PnDMFhHMjNVdOmGe7i2QMnU Ys21S0pCx75bBn6+E3Nf5KkojPJVsPNH9dNqWwK6hb6qJEk4t0nQa4Z8khHg4vc1gNNm AQ== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pkbyw80ey-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Mar 2023 13:29:57 +0000 Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32RDTvJ9026859 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Mar 2023 13:29:57 GMT Received: from qc-i7.hemma.eciton.net (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 27 Mar 2023 06:29:54 -0700 Date: Mon, 27 Mar 2023 14:29:50 +0100 From: "Leif Lindholm" To: Ard Biesheuvel CC: , Michael Kinney , Liming Gao , Jiewen Yao , Michael Kubacki , Sean Brogan , Rebecca Cran , Sami Mujawar , Taylor Beebe , Marvin =?iso-8859-1?Q?H=E4user?= , Bob Feng Subject: Re: [PATCH v2 15/17] MdePkg: Update MemoryAttributesTable to v2.10 Message-ID: References: <20230327110112.262503-1-ardb@kernel.org> <20230327110112.262503-16-ardb@kernel.org> MIME-Version: 1.0 In-Reply-To: <20230327110112.262503-16-ardb@kernel.org> X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: -am7S6M4ttU2djPl-Hsty_S7VwJq3ftu X-Proofpoint-ORIG-GUID: -am7S6M4ttU2djPl-Hsty_S7VwJq3ftu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-27_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 adultscore=0 priorityscore=1501 mlxlogscore=884 spamscore=0 malwarescore=0 impostorscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303270106 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline 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? / Leif > // EFI_MEMORY_DESCRIPTOR Entry[1]; > } EFI_MEMORY_ATTRIBUTES_TABLE; > > -#define EFI_MEMORY_ATTRIBUTES_TABLE_VERSION 0x00000001 > +#define EFI_MEMORY_ATTRIBUTES_TABLE_VERSION 0x00000002 > + > +#define EFI_MEMORY_ATTRIBUTES_FLAGS_RT_FORWARD_CONTROL_FLOW_GUARD 0x1 > +// BIT0 implies that Runtime code includes the forward control flow guard > +// instruction, such as X86 CET-IBT or ARM BTI. > > extern EFI_GUID gEfiMemoryAttributesTableGuid; > > -- > 2.39.2 >