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.web08.2608.1614649381332338589 for ; Mon, 01 Mar 2021 17:43:03 -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, 02 Mar 2021 09:42:55 +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: , , , "'Kinney, Michael D'" , "'Liu, Zhiguang'" Cc: "'Yao, Jiewen'" , "'Ni, Ray'" References: <20210220031501.24284-1-w.sheng@intel.com> <20210220031501.24284-2-w.sheng@intel.com> <007c01d7074a$29c01ef0$7d405cd0$@byosoft.com.cn> <007501d7097f$5d4860c0$17d92240$@byosoft.com.cn> <005101d70b18$f672fa90$e358efb0$@byosoft.com.cn> <005701d70b7c$5bff57b0$13fe0710$@byosoft.com.cn> <16682970DB33FFC1.25260@groups.io> In-Reply-To: <16682970DB33FFC1.25260@groups.io> Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHY1IDEvMl0gTWRlUGtnL0luY2x1ZGU6IEFkZCBDRVQgaW5zdHJ1Y3Rpb25zIHRvIE5hc20uaW5j?= Date: Tue, 2 Mar 2021 09:42:57 +0800 Message-ID: <008501d70f05$5f2a4da0$1d7ee8e0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQF3eV2yPKetLskLRESm8cmS0/XCYwIKQpoOAwDp/gcCspIB6AI3tnnhAu1thoICAE06vAKFQHB0AXBbRFQCis2h+AEZHmPDAe89ecOqa7hCQA== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn I have created PR https://github.com/tianocore/edk2/pull/1469 for this patc= h set.=20 Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io = =E4=BB=A3=E8=A1=A8 gaoliming > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B43=E6=9C=881=E6=97=A5 = 16:07 > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; w.sheng@intel.com; 'K= inney, Michael D' > ; 'Liu, Zhiguang' > =E6=8A=84=E9=80=81: 'Yao, Jiewen' ; 'Ni, Ray' > =E4=B8=BB=E9=A2=98: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/2] MdeP= kg/Include: Add CET > instructions to Nasm.inc >=20 > Sheng Wei: > I have sent the mail (https://edk2.groups.io/g/devel/message/72225) to > collect the feedback. If no other comment, I will help merge this patch = set > tomorrow. >=20 > Thanks > Liming > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io =E4=BB=A3=E8=A1=A8 Sheng Wei > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B43=E6=9C=881=E6=97= =A5 13:20 > > =E6=94=B6=E4=BB=B6=E4=BA=BA: gaoliming ; dev= el@edk2.groups.io; > > Kinney, Michael D ; Liu, Zhiguang > > > > =E6=8A=84=E9=80=81: Yao, Jiewen ; Ni, Ray > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v5 1/2] MdePkg/Include: Ad= d CET > instructions > > to Nasm.inc > > > > Hi Liming, > > I have updated the patch to V6 at last Friday. > > All the patches have been given Review-by. > > Patch v6 1/3 is for MdePkg. > > Patch v6 2/3 and 3/3 are for UefiCpuPkg. > > Patch v6 2/3 depends on 1/3 > > Could you help to merge these patches ? > > Thank you. > > BR > > Sheng Wei > > > > > -----Original Message----- > > > From: gaoliming > > > Sent: 2021=E5=B9=B42=E6=9C=8825=E6=97=A5 21:45 > > > To: devel@edk2.groups.io; Sheng, W ; Kinney, > > Michael > > > D ; Liu, Zhiguang > > > Cc: Yao, Jiewen > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/2] MdePkg/Incl= ude: Add CET > > > instructions to Nasm.inc > > > > > > Wei: > > > This is the patch set. They will be merged together, because one p= atch > > > update may impact another one. We don't want to roll back previous > > commit. > > > > > > Besides, can you give the reason to merge this patch for this stab= le tag > > > 202102? What impact will be caused if this patch is deferred to next= stable > > tag? > > > > > > Thanks > > > Liming > > > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > > > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.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=8825=E6= = =97=A5 13:48 > > > > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io; gaoliming@byoso= ft.com.cn; Kinney, > > > Michael D > > > > ; Liu, Zhiguang > > > > =E6=8A=84=E9=80=81: Yao, Jiewen > > > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v5 1/2] MdePkg/Include= : Add CET > > > > instructions to Nasm.inc > > > > > > > > Hi Liming, > > > > I would like to merge this fix to catch stable tag 202102. > > > > This bug fix includes 2 patches. > > > > One [PATCH v5 1/2] is for MdePkg. It only used to add DB format CE= T > > > > instructions to nasm.inc. > > > > Another one [PATCH v5 2/2] is for UefiCpuPkg. It is the bug fix > > > > itself. The patch will use the DB define in nasm.inc Could you hel= p to > > > > merge the one first ? > > > > I attached the patch file. > > > > Thank you > > > > BR > > > > Sheng Wei > > > > > > > > > -----Original Message----- > > > > > From: devel@edk2.groups.io On Behalf Of > > > > > gaoliming > > > > > Sent: 2021=E5=B9=B42=E6=9C=8825=E6=97=A5 9:53 > > > > > To: Kinney, Michael D ; > > > > devel@edk2.groups.io; > > > > > Liu, Zhiguang ; Sheng, W > > > > > > > Cc: Yao, Jiewen > > > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/2] MdePkg/= Include: Add CET > > > > > instructions to Nasm.inc > > > > > > > > > > Mike: > > > > > We agree to increase nasm compiler version after the stable ta= g. > > > > > If this > > > > fix > > > > > wants to catch stable tag 202102, it has to use hard code DB in > > Nasm.inc. > > > > > > > > > > Sheng: > > > > > If this fix doesn't need to catch stable tag 202102, you can > > > > > directly send > > > > the > > > > > patch with nasm command in Nasm.inc. > > > > > > > > > > Thanks > > > > > Liming > > > > > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > > > > > =E5=8F=91=E4=BB=B6=E4=BA=BA: Kinney, Michael D > > > > > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B42=E6=9C=882= 3=E6=97=A5 10:22 > > > > > > =E6=94=B6=E4=BB=B6=E4=BA=BA: gaoliming ; > > > devel@edk2.groups.io; > > > > > Liu, > > > > > > Zhiguang ; Sheng, W > ; > > > > > > Kinney, Michael D > > > > > > =E6=8A=84=E9=80=81: Yao, Jiewen > > > > > > =E4=B8=BB=E9=A2=98: RE: [edk2-devel] [PATCH v5 1/2] MdePkg/Inc= lude: Add CET > > > > > > instructions to Nasm.inc > > > > > > > > > > > > Liming, > > > > > > > > > > > > I thought we decided against adding macros and instead want to= use > > > > > > newer NASM version that supports these instructions. > > > > > > > > > > > > Mike > > > > > > > > > > > > > -----Original Message----- > > > > > > > From: gaoliming > > > > > > > Sent: Monday, February 22, 2021 5:01 PM > > > > > > > To: devel@edk2.groups.io; Liu, Zhiguang > > > > > > > ; Sheng, > > > > > > W > > > > > > > Cc: Kinney, Michael D ; Yao, Jie= wen > > > > > > > > > > > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/2] Mde= Pkg/Include: Add > > CET > > > > > > instructions to Nasm.inc > > > > > > > > > > > > > > Wei: > > > > > > > This is a patch set. If all patches pass the review by the > > > > > > > package > > > > > > maintainer, I will help merge it. > > > > > > > > > > > > > > Seemly, this is a bug fix. So, it can still be merged in > > > > > > > 202102 stable tag > > > > > > soft feature freeze phase. > > > > > > > > > > > > > > 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+87= 61045@groups.io > > > > > > > > =E4=BB=A3= =E8=A1=A8 > > > > Zhiguang > > > > > > 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 > > > > > > > > > > > > > > > > Hi Sheng Wei, > > > > > > > > I don't have the access to push patch. > > > > > > > > > > > > > > > > Hi Liming, > > > > > > > > Can you help merge this patch? Thanks > > > > > > > > > > > > > > > > Thanks > > > > > > > > Zhiguang > > > > > > > > > > > > > > > > > -----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 ; Li= u, > > > > > > > > > > Zhiguang ; Yao, Jiewen > > > > > > > > > > > > > > > > > > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v5 1/= 2] MdePkg/Include: > > > > > > > > > > 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@groups.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] MdeP= kg/Include: Add > > 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 > > > > > > update > > > > > > > > > > > to NASM 2.15.01. > > > > > > > > > > > The BZ ticket is > > > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D3227 . > > > > > > > > > > > > > > > > > > > > > > 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 >=20 >=20