From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web09.3626.1614042067795088741 for ; Mon, 22 Feb 2021 17:01:08 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Tue, 23 Feb 2021 09:01:03 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Sheng, W'" Cc: "'Kinney, Michael D'" , "'Yao, Jiewen'" References: <20210220031501.24284-1-w.sheng@intel.com> <20210220031501.24284-2-w.sheng@intel.com> <007c01d7074a$29c01ef0$7d405cd0$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHY1IDEvMl0gTWRlUGtnL0luY2x1ZGU6IEFkZCBDRVQgaW5zdHJ1Y3Rpb25zIHRvIE5hc20uaW5j?= Date: Tue, 23 Feb 2021 09:01:05 +0800 Message-ID: <007501d7097f$5d4860c0$17d92240$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQF3eV2yPKetLskLRESm8cmS0/XCYwIKQpoOAwDp/gcCspIB6AI3tnnhqtRfXfA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Wei: This is a patch set. If all patches pass the review by the package maint= ainer, I will help merge it.=20 Seemly, this is a bug fix. So, it can still be merged in 202102 stable t= ag soft feature freeze phase.=20 Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: bounce+27952+71908+4905953+8761045@groups.i= o > =E4=BB=A3=E8=A1=A8 Zhigua= ng Liu > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B42=E6=9C=8822=E6=97=A5= 10:23 > =E6=94=B6=E4=BB=B6=E4=BA=BA: Sheng, W ; gaoliming > ; devel@edk2.groups.io > =E6=8A=84=E9=80=81: Kinney, Michael D ; Yao,= Jiewen > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v5 1/2] MdePkg/Include: Add = CET instructions > to Nasm.inc >=20 > Hi Sheng Wei, > I don't have the access to push patch. >=20 > Hi Liming, > Can you help merge this patch? Thanks >=20 > Thanks > Zhiguang >=20 > > -----Original Message----- > > From: Sheng, W > > Sent: Monday, February 22, 2021 10:12 AM > > To: gaoliming ; devel@edk2.groups.io; Liu, > > Zhiguang > > Cc: Kinney, Michael D ; Yao, Jiewen > > > > Subject: RE: [edk2-devel] [PATCH v5 1/2] MdePkg/Include: Add CET > > instructions to Nasm.inc > > > > Hi Zhiguang, > > Could you help to merge the patch to the master branch ? > > > > @gaoliming > > Thank you for giving the review-by. > > BR > > Sheng Wei > > > > > -----Original Message----- > > > From: gaoliming > > > Sent: 2021=E5=B9=B42=E6=9C=8820=E6=97=A5 13:35 > > > To: devel@edk2.groups.io; Sheng, W > > > Cc: Kinney, Michael D ; Liu, Zhiguang > > > ; Yao, Jiewen > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/2] MdePkg/Incl= ude: Add CET > > > instructions to Nasm.inc > > > > > > Reviewed-by: Liming Gao > > > > > > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > > > =E5=8F=91=E4=BB=B6=E4=BA=BA: bounce+27952+71865+4905953+8761045@gr= oups.io > > > > =E4=BB=A3=E8=A1=A8 = Sheng > Wei > > > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B42=E6=9C=8820=E6= = =97=A5 11:15 > > > > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io > > > > =E6=8A=84=E9=80=81: Michael D Kinney ;= Liming Gao > > > > ; Zhiguang Liu ; > > > > Jiewen Yao > > > > =E4=B8=BB=E9=A2=98: [edk2-devel] [PATCH v5 1/2] MdePkg/Include: Ad= d CET > instructions > > > > to Nasm.inc > > > > > > > > This is to add instruction SAVEPREVSSP, CLRSSBSY and RSTORSSP_RAX = in > > > > Nasm. > > > > The open CI is using NASM 2.14.02. > > > > CET instructions are supported since NASM 2.15.01. > > > > > > > > DB-encoded CET instructions need to be removed after open CI updat= e > > > > to NASM 2.15.01. > > > > The BZ ticket is https://bugzilla.tianocore.org/show_bug.cgi?id=3D= 3227 . > > > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3192 > > > > > > > > Signed-off-by: Sheng Wei > > > > Cc: Michael D Kinney > > > > Cc: Liming Gao > > > > Cc: Zhiguang Liu > > > > Cc: Jiewen Yao > > > > --- > > > > MdePkg/Include/Ia32/Nasm.inc | 12 ++++++++++++ > > > > MdePkg/Include/X64/Nasm.inc | 12 ++++++++++++ > > > > 2 files changed, 24 insertions(+) > > > > > > > > diff --git a/MdePkg/Include/Ia32/Nasm.inc > > > > b/MdePkg/Include/Ia32/Nasm.inc index 31ce861f1e..fa42f9d3e9 > 100644 > > > > --- a/MdePkg/Include/Ia32/Nasm.inc > > > > +++ b/MdePkg/Include/Ia32/Nasm.inc > > > > @@ -9,6 +9,18 @@ > > > > ; > > > > > > > ;-------------------------------------------------------------------= -- > > > ------ > > > --- > > > > > > > > +%macro SAVEPREVSSP 0 > > > > + DB 0xF3, 0x0F, 0x01, 0xEA > > > > +%endmacro > > > > + > > > > +%macro CLRSSBSY_EAX 0 > > > > + DB 0x67, 0xF3, 0x0F, 0xAE, 0x30 %endmacro > > > > + > > > > +%macro RSTORSSP_EAX 0 > > > > + DB 0x67, 0xF3, 0x0F, 0x01, 0x28 %endmacro > > > > + > > > > %macro SETSSBSY 0 > > > > DB 0xF3, 0x0F, 0x01, 0xE8 > > > > %endmacro > > > > diff --git a/MdePkg/Include/X64/Nasm.inc > > > b/MdePkg/Include/X64/Nasm.inc > > > > index 42412735ea..e57a803c81 100644 > > > > --- a/MdePkg/Include/X64/Nasm.inc > > > > +++ b/MdePkg/Include/X64/Nasm.inc > > > > @@ -9,6 +9,18 @@ > > > > ; > > > > > > > ;-------------------------------------------------------------------= -- > > > ------ > > > --- > > > > > > > > +%macro SAVEPREVSSP 0 > > > > + DB 0xF3, 0x0F, 0x01, 0xEA > > > > +%endmacro > > > > + > > > > +%macro CLRSSBSY_RAX 0 > > > > + DB 0xF3, 0x0F, 0xAE, 0x30 > > > > +%endmacro > > > > + > > > > +%macro RSTORSSP_RAX 0 > > > > + DB 0xF3, 0x0F, 0x01, 0x28 > > > > +%endmacro > > > > + > > > > %macro SETSSBSY 0 > > > > DB 0xF3, 0x0F, 0x01, 0xE8 > > > > %endmacro > > > > -- > > > > 2.16.2.windows.1 > > > > > > > > > > > > > > > > > > > > > > > > > > >=20 >=20 >=20 >=20 >=20