From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E7E8681E0E for ; Tue, 17 Jan 2017 16:47:41 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP; 17 Jan 2017 16:47:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,247,1477983600"; d="scan'208";a="1095457526" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 17 Jan 2017 16:47:41 -0800 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 16:47:39 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 16:47:39 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by shsmsx102.ccr.corp.intel.com ([169.254.2.88]) with mapi id 14.03.0248.002; Wed, 18 Jan 2017 08:47:36 +0800 From: "Wu, Jiaxin" To: Laszlo Ersek , Gary Lin , "edk2-devel@ml01.01.org" CC: "Justen, Jordan L" , "Long, Qin" Thread-Topic: [edk2] [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack Thread-Index: AQHScH2XV043vXIcYkatzDUAWoZQN6E730+AgAGBoWA= Date: Wed, 18 Jan 2017 00:47:35 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B72741629483A@SHSMSX103.ccr.corp.intel.com> References: <20170117045232.4765-1-glin@suse.com> <20170117045232.4765-3-glin@suse.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmM5NmE0ZWMtZTQzZC00ZDQ1LTlhOTMtNjYzYjE4MWU3ZTliIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX1BVQkxJQyJ9XX1dfSwiU3ViamVjdExhYmVscyI6W10sIlRNQ1ZlcnNpb24iOiIxNS45LjYuNiIsIlRydXN0ZWRMYWJlbEhhc2giOiJoaXNrZHRuTTlFbkJMWXZPY0FnRXNiY2k1MmlQaHRhRmgyQm9YUWYrNmlFPSJ9 x-ctpclassification: CTP_PUBLIC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2017 00:47:42 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > Subject: Re: [edk2] [PATCH 2/3] OvmfPkg: correct the set of modules inclu= ded > for the IPv6 stack >=20 > On 01/17/17 05:52, Gary Lin wrote: > > Always use IScsiDxe from NetworkPkg when IPv6 is enabled since it provi= des > > the complete ISCSI support. > > > > NOTE: This makes OpenSSL a hard requirement when NETWORK_IP6_ENABLE > is > > true. > > > > (Based on Jiaxin's suggestion) > > > > Cc: Laszlo Ersek > > Cc: Justen Jordan L > > Cc: Wu Jiaxin > > Cc: Long Qin > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Gary Lin > > --- > > OvmfPkg/OvmfPkgIa32.dsc | 11 ++++------- > > OvmfPkg/OvmfPkgIa32.fdf | 4 ---- > > OvmfPkg/OvmfPkgIa32X64.dsc | 11 ++++------- > > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ---- > > OvmfPkg/OvmfPkgX64.dsc | 11 ++++------- > > OvmfPkg/OvmfPkgX64.fdf | 4 ---- > > 6 files changed, 12 insertions(+), 33 deletions(-) > > > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > > index 9aa66eb951..77287920e2 100644 > > --- a/OvmfPkg/OvmfPkgIa32.dsc > > +++ b/OvmfPkg/OvmfPkgIa32.dsc > > @@ -148,15 +148,16 @@ [LibraryClasses] > > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!endif > > !else > > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > > !endif > > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > > > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > +!endif > > + > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > !endif > > @@ -697,12 +698,8 @@ [Components] > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > > index 34d57a6079..069e21b7d0 100644 > > --- a/OvmfPkg/OvmfPkgIa32.fdf > > +++ b/OvmfPkg/OvmfPkgIa32.fdf > > @@ -314,12 +314,8 @@ [FV.DXEFV] > > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > > index 9537e92077..64a7c16d2f 100644 > > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > > @@ -153,15 +153,16 @@ [LibraryClasses] > > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!endif > > !else > > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > > !endif > > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > > > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > +!endif > > + > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > !endif > > @@ -706,12 +707,8 @@ [Components.X64] > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > > index df55c2b210..f29feb27b4 100644 > > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > > @@ -314,12 +314,8 @@ [FV.DXEFV] > > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > > index d15294eb72..ac4bf4f63e 100644 > > --- a/OvmfPkg/OvmfPkgX64.dsc > > +++ b/OvmfPkg/OvmfPkgX64.dsc > > @@ -153,15 +153,16 @@ [LibraryClasses] > > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.= inf > > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!endif > > !else > > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > > !endif > > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > > > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > +!endif > > + > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > !endif > > @@ -704,12 +705,8 @@ [Components] > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > > index 5e2e1dfaf5..8d66da099f 100644 > > --- a/OvmfPkg/OvmfPkgX64.fdf > > +++ b/OvmfPkg/OvmfPkgX64.fdf > > @@ -314,12 +314,8 @@ [FV.DXEFV] > > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > !else > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > -!endif > > -!else > > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > >=20 > For this patch, I think one of the following updates is necessary: >=20 > (a) either restrict the subject line to identify IScsiDxe (because the > current patch does not fix the full set of packages related to IPv6), > such as >=20 > OvmfPkg: correct the IScsiDxe module included for the IPv6 stack >=20 > (b) or else, squash the IpSecDxe addition into this patch (with the same > subject). >=20 > Perhaps I was not clear enough about this in the previous discussion. >=20 > Either way, I think (b) might need more experimentation / additional > work, and a later patch, so for now, I think we should do (a). I will > update the subject line myself, if that's okay with you. With that: >=20 Laszlo,=20 I also agree with (a). For IpSec, we can do the below update later: 1), Include it under NETWORK_IP6_ENABLE directly but with the limit usage f= or IPv4. Or 2), Define new flag "IPSEC_ENABLE" for both of them. I prefer 2).=20 Thanks, Jiaxin > Reviewed-by: Laszlo Ersek >=20 > Thanks! > Laszlo