NetworkPkg: Record user configured TargetIP/Port in iBFT

Current ISCSI driver records redirected iSCSI targetIP/Port in iBFT
once redirection occurs, which removes the possibility of the OS
to reconnect to the configured IP for load balancing. The behavior
is not explicitly described in IBFT spec, though the MSFT expert
confirm we should record original user setting rather than
publish the redirected IP.

Thanks Sriram for reviewing and validating this patch in his test-bed.

Cc: Subramanian Sriram <sriram-s@hpe.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Zhang Lubo <lubo.zhang@intel.com>

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Subramanian Sriram <sriram-s@hpe.com>

1 files changed, 19 insertions, 0 deletions

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index c3ab2c9288..279f1c0496 100644
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -358,6 +358,7 @@ IScsiStart (
   VOID                            *Interface;

   EFI_GUID                        *ProtocolGuid;

   UINT8                           NetworkBootPolicy;

+  ISCSI_SESSION_CONFIG_NVDATA     *NvData;

 

   //

   // Test to see if iSCSI driver supports the given controller.

@@ -701,6 +702,24 @@ IScsiStart (
       Status = IScsiSessionReLogin (Session);

     }

 

+    //

+    // Restore the origial user setting which specifies the proxy/virtual iSCSI target to NV region.

+    //

+    NvData = &AttemptConfigData->SessionConfigData;

+    if (NvData->RedirectFlag) {

+      NvData->TargetPort = NvData->OriginalTargetPort;

+      CopyMem (&NvData->TargetIp, &NvData->OriginalTargetIp, sizeof (EFI_IP_ADDRESS));

+      NvData->RedirectFlag = FALSE;

+

+      gRT->SetVariable (

+             mPrivate->PortString,

+             &gEfiIScsiInitiatorNameProtocolGuid,

+             ISCSI_CONFIG_VAR_ATTR,

+             sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),

+             AttemptConfigData

+             );

+    }

+

     if (EFI_ERROR (Status)) {

       //

       // In Single path mode, only the successful attempt will be recorded in iBFT;