From nobody Fri May 17 06:43:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+88372+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+88372+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1648864109; cv=none; d=zohomail.com; s=zohoarc; b=UZ0tRawSFqTa458eV3HcTP1ImiZELXdgn49yZULq5tbY6O1xDTDX7hCzHd3aK7MMTuh1A8fMh3+ZhgPSkfJbIFLKiA4TUsADPvPNxU2C4iwRH3oCKFMiQRZSC9/uoGp8xk33JmLKrrHhTRpQJKqmYaP82v3vN4bX4nxkekB5wJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648864109; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=GpPGrvIx4sxs42In0/zV4C/mCcg6at07aYdPg9KCel8=; b=YDP96b0J1NpqP0l1rbJnT3XC0D8WiiDliKoiWXulHvwSqlKPz9RrsyN6ZWV72Xe1D+b6dNgHPJ8ptSk9apSYF2Vn8AcVrvTnyeB+b4v/Pi/UOvmwvJBs7LZk9iFHcjaylXGI1oS2Glk/wdKrXNg7ZAkz5+sqAZCIitMjzES+T9s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+88372+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1648864109866113.10155630194208; Fri, 1 Apr 2022 18:48:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vfxrYY1788612xtu6A7Beejn; Fri, 01 Apr 2022 18:48:29 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.7428.1648864108200104104 for ; Fri, 01 Apr 2022 18:48:28 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10304"; a="242408541" X-IronPort-AV: E=Sophos;i="5.90,229,1643702400"; d="scan'208";a="242408541" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2022 18:48:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,229,1643702400"; d="scan'208";a="567995849" X-Received: from unknown (HELO hengluo-dev.ccr.corp.intel.com) ([10.239.153.141]) by orsmga008.jf.intel.com with ESMTP; 01 Apr 2022 18:48:25 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Maciej Rabeda , Fu Siyuan , Wu Jiaxin Subject: [edk2-devel] [Patch V3] NetworkPkg: Add PCDs for HTTP DNS RetryCount and RetryInterval Date: Sat, 2 Apr 2022 09:47:06 +0800 Message-Id: <20220402014706.1131-1-heng.luo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,heng.luo@intel.com X-Gm-Message-State: oh9ycdJDuVmmI0O86z6FGUCGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1648864109; bh=KsrcLcOKKNG0eJ6gktsVGLGE3ra8aQlb/rYCsXN/XQk=; h=Cc:Date:From:Reply-To:Subject:To; b=Xd2bM1L1lwKedjecYhEjlq2hoRI2MIMm3rCSZInMQ4ZYUdW5Tt3cnwy9zVj+uWLRT82 UsEjA6Es956exLOFjBhfwoB1UGFZqNs9YWDJ6ZIVSNJGHer9WtHMZoqk5VmoTk87L10JG 5IoCCc54LgXiN0NE52QOU1EUMDO+ey9N92U= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1648864111924100003 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3889 Currently the HTTP DNS Retry Interval is 2 second and no retry attempt. If DNS response can't arrive in 2 second, the DNS request is failed, and then HTTP boot is failed. In order to resolve this issue, Add PCDs to support RetryCount and RetryInterval configured in Platform. Cc: Maciej Rabeda Cc: Fu Siyuan Cc: Wu Jiaxin Signed-off-by: Heng Luo --- NetworkPkg/HttpDxe/HttpDns.c | 4 ++++ NetworkPkg/HttpDxe/HttpDxe.inf | 2 ++ NetworkPkg/NetworkPkg.dec | 9 +++++++++ NetworkPkg/NetworkPkg.uni | 11 +++++++++++ 4 files changed, 26 insertions(+) diff --git a/NetworkPkg/HttpDxe/HttpDns.c b/NetworkPkg/HttpDxe/HttpDns.c index 59a2784e6a..e609aba519 100644 --- a/NetworkPkg/HttpDxe/HttpDns.c +++ b/NetworkPkg/HttpDxe/HttpDns.c @@ -108,6 +108,8 @@ HttpDns4 ( Dns4CfgData.DnsServerListCount =3D DnsServerListCount; Dns4CfgData.DnsServerList =3D DnsServerList; Dns4CfgData.UseDefaultSetting =3D HttpInstance->IPv4Node.UseDefaultAddr= ess; + Dns4CfgData.RetryInterval =3D PcdGet32 (PcdHttpDnsRetryInterval); + Dns4CfgData.RetryCount =3D PcdGet32 (PcdHttpDnsRetryCount); if (!Dns4CfgData.UseDefaultSetting) { IP4_COPY_ADDRESS (&Dns4CfgData.StationIp, &HttpInstance->IPv4Node.Loca= lAddress); IP4_COPY_ADDRESS (&Dns4CfgData.SubnetMask, &HttpInstance->IPv4Node.Loc= alSubnet); @@ -316,6 +318,8 @@ HttpDns6 ( Dns6ConfigData.EnableDnsCache =3D TRUE; Dns6ConfigData.Protocol =3D EFI_IP_PROTO_UDP; IP6_COPY_ADDRESS (&Dns6ConfigData.StationIp, &HttpInstance->Ipv6Node.Loc= alAddress); + Dns6ConfigData.RetryInterval =3D PcdGet32 (PcdHttpDnsRetryInterval); + Dns6ConfigData.RetryCount =3D PcdGet32 (PcdHttpDnsRetryCount); Status =3D Dns6->Configure ( Dns6, &Dns6ConfigData diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf b/NetworkPkg/HttpDxe/HttpDxe.inf index af681c0184..c9502d0bb6 100644 --- a/NetworkPkg/HttpDxe/HttpDxe.inf +++ b/NetworkPkg/HttpDxe/HttpDxe.inf @@ -75,6 +75,8 @@ [Pcd] gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections ## CONSUMES gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout ## CONSUMES + gEfiNetworkPkgTokenSpaceGuid.PcdHttpDnsRetryInterval ## CONSUMES + gEfiNetworkPkgTokenSpaceGuid.PcdHttpDnsRetryCount ## CONSUMES =20 [UserExtensions.TianoCore."ExtraFiles"] HttpDxeExtra.uni diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec index 928e84fec4..5e43ebf8c5 100644 --- a/NetworkPkg/NetworkPkg.dec +++ b/NetworkPkg/NetworkPkg.dec @@ -163,5 +163,14 @@ # @Prompt The Timeout value of HTTP Io. Default value is 5000. gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout|5000|UINT32|0x0000000F =20 + ## The Retry Interval of HTTP DNS in seconds. If the Retry Interval is l= ess than + # DNS_DEFAULT_TIMEOUT, then use the DNS_DEFAULT_TIMEOUT. + # @Prompt The value of Retry Interval. Default value is 0 + gEfiNetworkPkgTokenSpaceGuid.PcdHttpDnsRetryInterval|0|UINT32|0x00000010 + + ## The Retry Count of HTTP DNS if no DNS response received after Retry I= nterval. + # @Prompt The value of Retry Count, Default value is 0. + gEfiNetworkPkgTokenSpaceGuid.PcdHttpDnsRetryCount|0|UINT32|0x00000011 + [UserExtensions.TianoCore."ExtraFiles"] NetworkPkgExtra.uni diff --git a/NetworkPkg/NetworkPkg.uni b/NetworkPkg/NetworkPkg.uni index 6d0fa67c6f..c0bbbd3ee1 100644 --- a/NetworkPkg/NetworkPkg.uni +++ b/NetworkPkg/NetworkPkg.uni @@ -111,3 +111,14 @@ #string STR_gEfiNetworkPkgTokenSpaceGuid_PcdHttpIoTimeout_HELP #language = en-US "This value is used to configure the request and response timeout whe= n getting " = "the recovery image from the remote source during an HTTP recovery boo= t." = "The default value set is 5 seconds." + +#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdHttpDnsRetryInterval_PROMPT #= language en-US "Retry Interval of HTTP DNS" + +#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdHttpDnsRetryInterval_HELP #la= nguage en-US "This value is used to configure the retry Interval of HTTP DN= S." + = "The default value set is 0 second. If the value is less than" + = "DNS_DEFAULT_TIMEOUT, then use the DNS_DEFAULT_TIMEOUT." + +#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdHttpDnsRetryCount_PROMPT #lan= guage en-US "Retry Count of HTTP DNS" + +#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdHttpDnsRetryCount_HELP #langu= age en-US "This value is used to configure the Retry Count of HTTP DNS if " + = "no DNS response received after Retry Interval. The default value set= is 0." --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#88372): https://edk2.groups.io/g/devel/message/88372 Mute This Topic: https://groups.io/mt/90193782/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-