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.web11.1875.1652856410939084206 for ; Tue, 17 May 2022 23:46:51 -0700 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 ([101.224.116.119]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 18 May 2022 14:45:35 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 101.224.116.119 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Xu, Min M'" Cc: "'Andrew Fish'" , "'Leif Lindholm'" , "'Kinney, Michael D'" , "'Dann Frazier'" , "'Aktas, Erdem'" , "'James Bottomley'" , "'Tom Lendacky'" References: <21af12a38d5cf2acc4fe2c7ee39105feecf4e91d.1652844962.git.min.m.xu@intel.com> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIFYyIDEvMV0gW2VkazItc3RhYmxlMjAyMjA1XU92bWZQa2cvT3ZtZlBrZ1g2NDogVXNlIGRpZmZlcmVudCBDY1Byb2JlTGliIHdoZW4gU01NIGlzIG9uIG9yIG9mZg==?= Date: Wed, 18 May 2022 14:45:36 +0800 Message-ID: <02ae01d86a82$e1a50250$a4ef06f0$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQKbBcLb7qPLPMTpqIhE7KSockY0WwFBwij3APQov8qrjUrBAA== Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Jiewen: I agree to merge it for this stable tag.=20 Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io =B4=FA=B1= =ED Yao, Jiewen > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA5=D4=C218=C8=D5 11:43 > =CA=D5=BC=FE=C8=CB: Xu, Min M ; devel@edk2.groups.io > =B3=AD=CB=CD: Andrew Fish ; Leif Lindholm > ; Kinney, Michael D > ; Dann Frazier ; > Aktas, Erdem ; James Bottomley > ; Tom Lendacky ; Gao, > Liming > =D6=F7=CC=E2: Re: [edk2-devel] [PATCH V2 1/1] > [edk2-stable202205]OvmfPkg/OvmfPkgX64: Use different CcProbeLib when > SMM is on or off >=20 > Hi Steward Team > I request this be in stable202205. It is a regression issue since stable202202. >=20 > Reviewed-by: Jiewen Yao >=20 > Thank you > Yao Jiewen >=20 >=20 > > -----Original Message----- > > From: Xu, Min M > > Sent: Wednesday, May 18, 2022 11:37 AM > > To: devel@edk2.groups.io > > Cc: Xu, Min M ; Andrew Fish ; > Leif > > Lindholm ; Kinney, Michael D > > ; Dann Frazier > ; > > Aktas, Erdem ; James Bottomley > > ; Yao, Jiewen ; Tom Lendacky > > ; Gao, Liming ; > Yao, > > Jiewen > > Subject: [PATCH V2 1/1] [edk2-stable202205]OvmfPkg/OvmfPkgX64: Use > > different CcProbeLib when SMM is on or off > > > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3930 > > > > CcProbeLib is designed to check the vm guest type. The > OvmfPkg/CcProbeLib > > reads the OvmfWorkArea (0x80B000) to get the vm guest type which is > > written by each guest (SEV or TDX guest). But in SMM drivers the access > > to OvmfWorkArea is illegal. PiSmmCpuDxeSmm.inf is an example. It uses > > IoLib which in OvmfPkgX64 BaseIoLibIntrinsicSev.inf is included. The > > IoLib probes if the working guest is td guest by calling CcProbe(). > > > > So CcProbeLibNull will be included when SMM_REQUIRE is set. Currently > > only TDVF uses CcProbe to check the guest type, and TDVF doesn't > > support SMM, so this fix has no side-effect. > > > > Cc: Andrew Fish > > Cc: Leif Lindholm > > Cc: Michael D Kinney > > Cc: Dann Frazier > > Cc: Erdem Aktas > > Cc: James Bottomley > > Cc: Jiewen Yao > > Cc: Tom Lendacky > > Cc: Liming Gao > > Tested-by: dann frazier > > Acked-by: Jiewen Yao > > Signed-off-by: Min Xu > > --- > > OvmfPkg/OvmfPkgX64.dsc | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > > index 71526bba3183..db7f4def7a24 100644 > > --- a/OvmfPkg/OvmfPkgX64.dsc > > +++ b/OvmfPkg/OvmfPkgX64.dsc > > @@ -171,7 +171,6 @@ > > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > > > > > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciC > apP > > ciSegmentLib.inf > > > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > > - CcProbeLib|OvmfPkg/Library/CcProbeLib/CcProbeLib.inf > > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > > > > > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNul > l/ > > OemHookStatusCodeLibNull.inf > > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > > @@ -198,6 +197,9 @@ > > > > !if $(SMM_REQUIRE) =3D=3D FALSE > > LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf > > + CcProbeLib|OvmfPkg/Library/CcProbeLib/CcProbeLib.inf > > +!else > > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > > !endif > > > > > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custom > ize > > dDisplayLib.inf > > > > > FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBl > tLi > > b.inf > > -- > > 2.29.2.windows.2 >=20 >=20 >=20 >=20 >=20