From: Laszlo Ersek <lersek@redhat.com>
To: Gary Lin <glin@suse.com>, edk2-devel@ml01.01.org
Cc: Justen Jordan L <jordan.l.justen@intel.com>,
Wu Jiaxin <jiaxin.wu@intel.com>, Long Qin <qin.long@intel.com>
Subject: Re: [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack
Date: Tue, 17 Jan 2017 10:22:19 +0100 [thread overview]
Message-ID: <ae34e72d-f15e-8b68-5641-8eee43f88d1d@redhat.com> (raw)
In-Reply-To: <20170117045232.4765-3-glin@suse.com>
On 01/17/17 05:52, Gary Lin wrote:
> Always use IScsiDxe from NetworkPkg when IPv6 is enabled since it provides
> 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 <lersek@redhat.com>
> Cc: Justen Jordan L <jordan.l.justen@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Cc: Long Qin <qin.long@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> 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/DxeTpmMeasurementLib.inf
> AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
> !else
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> +!endif
> +
> !if $(HTTP_BOOT_ENABLE) == 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) == 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) == 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/DxeTpmMeasurementLib.inf
> AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
> !else
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> +!endif
> +
> !if $(HTTP_BOOT_ENABLE) == 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) == 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) == 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/DxeTpmMeasurementLib.inf
> AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!endif
> !else
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> !endif
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>
> +!if $(NETWORK_IP6_ENABLE) == TRUE
> + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> +!endif
> +
> !if $(HTTP_BOOT_ENABLE) == 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) == 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) == 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
>
For this patch, I think one of the following updates is necessary:
(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
OvmfPkg: correct the IScsiDxe module included for the IPv6 stack
(b) or else, squash the IpSecDxe addition into this patch (with the same
subject).
Perhaps I was not clear enough about this in the previous discussion.
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:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
next prev parent reply other threads:[~2017-01-17 9:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 4:52 [PATCH 0/3] Enable HTTPS Boot in OVMF Gary Lin
2017-01-17 4:52 ` [PATCH 1/3] OvmfPkg: always resolve OpenSslLib, IntrinsicLib and BaseCryptLib Gary Lin
2017-01-17 8:03 ` Wu, Jiaxin
2017-01-17 9:13 ` Laszlo Ersek
2017-01-17 4:52 ` [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack Gary Lin
2017-01-17 8:04 ` Wu, Jiaxin
2017-01-17 9:22 ` Laszlo Ersek [this message]
2017-01-18 0:47 ` Wu, Jiaxin
2017-01-18 8:17 ` Laszlo Ersek
2017-01-18 9:21 ` Gary Lin
2017-01-19 3:09 ` Wu, Jiaxin
2017-01-19 8:36 ` Laszlo Ersek
2017-01-17 4:52 ` [PATCH 3/3] OvmfPkg: pull in TLS modules with -D TLS_ENABLE (also enabling HTTPS) Gary Lin
2017-01-17 8:04 ` Wu, Jiaxin
2017-01-17 9:24 ` Laszlo Ersek
2017-01-17 8:13 ` [PATCH 0/3] Enable HTTPS Boot in OVMF Long, Qin
2017-01-17 8:25 ` Jordan Justen
2017-01-17 20:13 ` Laszlo Ersek
2017-01-18 1:59 ` Gary Lin
2017-01-17 9:49 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae34e72d-f15e-8b68-5641-8eee43f88d1d@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox