From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5A87A78003C for ; Tue, 14 Nov 2023 04:11:24 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=n6iKIndkqXibeuIu8Ip9Sx1CoZyAcl/olrmM41JBqfM=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:msip_labels:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699935082; v=1; b=EsigKjPgOvO0GnwSj0gDiRL09NNHT8iGXnQIn6wLASvKjnVGGjSMebKvCkvJ8fWbpSJDZGPi DitFe3Rl5b72QT6Igsenh110tFP7s0fnFD+W4vQiU+ufb+7IXPFTCrJjppwOjVbql4NOliq6s7e 809yGFgUum0a+HVw4mzYWGCU= X-Received: by 127.0.0.2 with SMTP id HHHaYY7687511xTDSrkcEWya; Mon, 13 Nov 2023 20:11:22 -0800 X-Received: from NAM04-BN8-obe.outbound.protection.outlook.com (NAM04-BN8-obe.outbound.protection.outlook.com [40.107.100.57]) by mx.groups.io with SMTP id smtpd.web11.6187.1699935081898753276 for ; Mon, 13 Nov 2023 20:11:22 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GkMqh/072E+ncE9Sj+R6vkH0WhKBESAqi7EEJgg4onYvo5t0b+ELQEAWnEajHjV3TCeq91VVx2+V3s90D6virqfMdGeJOXQagbUBRDDahLK7IjQ2OB4rNt/X6gEX61KkNH5ZJicFQSuxRg4GnNGaCzS9UrppYJeaJg0+kkmwvDyWFY9Ifc8j2rKy5brcyW/CiL+BgOnUse/A520N1dFFngEl1lo+aBvj31wErJ7cpFQ3zKN8jD79PsICwrsiAfTflFclWSAKiFZqC03U8A1BdezbabNsuQpyd/1pzyWfLoE50yRVTf3IRNlA1DbctyhN63Zi3zJaI0jBI14pXwtz/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FAEi17oRtJFam/Dzii1zcBDB1JoAsms0PnvGFrBt8vg=; b=BW9G8L/8uOqrsypSQOyXVGxNpGcUWv1rISmGyDMA3S+WHUWJxmcOv0HOgcJldXRF5gI9wew1XXsH4W0a54hfHixDpbnrbeeBAJMFWr7wASModsFSSnOOazuDchsUqul81aMmlHxNBAFu6ghaOv+46n+j7seAJOEPjsrbKLfmcgnfVOJINFOyV/8TEF0k14wW6m1GqrE3t77zTCd/PR+mVhiJ6q5f0IEn9hv3sp9sPzWzjla8c1Oc2WZWl5UP4twyecIGcdTemH/YM/eLbbu91A2ROzmXmFiSUe4a1/0a3SVA7HZ+wjWBj9Kxz/OP3HsQXljR2rUahxbuCFWhJqx8UA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from MN2PR12MB3966.namprd12.prod.outlook.com (2603:10b6:208:165::18) by SN7PR12MB8772.namprd12.prod.outlook.com (2603:10b6:806:341::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.28; Tue, 14 Nov 2023 04:11:18 +0000 X-Received: from MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::91d9:e679:32a3:dd05]) by MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::91d9:e679:32a3:dd05%4]) with mapi id 15.20.6977.029; Tue, 14 Nov 2023 04:11:17 +0000 From: "Chang, Abner via groups.io" To: Igor Kulchytskyy , "devel@edk2.groups.io" CC: Nickle Wang Subject: Re: [edk2-devel] [PATCH 2/2] RedfishPkg: RedfishDiscoverDxe: Optimize the Redfish Discover flow Thread-Topic: [PATCH 2/2] RedfishPkg: RedfishDiscoverDxe: Optimize the Redfish Discover flow Thread-Index: AQHaFlY+IlOuOGHW5kGqdjHFJMIBELB5MylQ Date: Tue, 14 Nov 2023 04:11:17 +0000 Message-ID: References: <20231113172421.1912-1-igork@ami.com> In-Reply-To: <20231113172421.1912-1-igork@ami.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ActionId=cd89a6c5-82ff-4c0b-8d57-c829c569000b;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ContentBits=0;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Enabled=true;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Method=Standard;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Name=General;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SetDate=2023-11-14T04:06:17Z;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN2PR12MB3966:EE_|SN7PR12MB8772:EE_ x-ms-office365-filtering-correlation-id: b4e37b68-3bdb-47f0-a8af-08dbe4c7c01f x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: dLYZ89dc3mv1OyshqqOUwME0cel0dR2FTsLi0zTJnL+VU8mD3/xFoC1plRY7gxMBt1qK1rOy7AcIp3j5NTV/7Ghhtr+HGjskeXvZKIffA0xoXj36/Idx25NWQeEORVaFoDwyZFSUqs62ktwqDWeLf9cBuLjbJCUgUOppADqHwMYnAbbiKXu6QMKQs9ixZR1DzDAi2kemcLWhvzY0ZZmSI1nZAFA6s2gP5CAxgnsFtq/aYi09rLDLtds5j+D0i7gycOMkpFNY2x+/k6HO1MXGYOS7vUzvmSOYwwwWNI6nX1s9dUx3mw5FPEESqbqOPM6oE9+vILAsAyqgz1saHUVNHUmGh+2dwA0EIbVsRYDDBWkdVcG6Bn86LQ557nVc04k20g+B93qU7l+2jB3rJuohAFF4bWGAjMMNzbaFI8sKEtws5DgI5/oYx2emEY+CagfHV8+piRg2aeG7I9N5FuMXqeNVqfr2xVFVFN3lAgHj0KCHuHBlZf3SrE5U9G2kWFYuMeiySoCV+5wLQ+AhWnJNeWCkShAf7WXd8rGlP5Q49dS7BVyyHYp07w/uSSgGe0Ft3d5kfMnuBfV1t2S+JZiuliZ66AjTLYmFcYdBwabOSI5Nhf+eHS3dEzf0qTD3e4KXpTXP8Fz0DZ4F1BtXc8lXIIRZOxc2f0kroEsZmAjafYQ= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?YiDREGa1kyxn+IS6z1CWei17sNvmKSSxmnyK1hi+ZrMq5NjbbZJBInxUWQgO?= =?us-ascii?Q?aeL7damgTVQ/FNE0LGJ1akJr7ORAZoyhanrc3lK25jjcE2ZBweAo25+NsZCZ?= =?us-ascii?Q?h1wXZ/R3a+TCP2VTv6LzMXiJnXv2StdYf/mCz3yEwnqJOV0V0yhGkB7qeZhv?= =?us-ascii?Q?FIfQfxlpr/78s4w5an5/fkkFKlSvFxPzoOpF7jAenXwdsmLIxJtKbej23ls5?= =?us-ascii?Q?mtsl4bt5P1LuXGNL2aainybqUyodyFpXTo4kPfpGxiPYt3MmIHvcnvOQQ8Ja?= =?us-ascii?Q?wa7/Hy18697ZxLV657B09XIkjr0clok9RLi67eLD99YhFSnJzu+UgMKO5TiB?= =?us-ascii?Q?YHGgn/QrjHuUeRpsR+8moV8aRYI9IbYBHesQTWpjIB3ijHDMBxb9iF+ftJtq?= =?us-ascii?Q?Piw3zfiqORlRga/peUlXLTHDyp6US6aC/BjeYAhuNkYTdsh3KhGTTL8F6zGw?= =?us-ascii?Q?JvYl6VY9XOF6TaPCUbOYxcmRuz6XndLOlsTsgkE+WPmx/YHhyf04tz76UKSw?= =?us-ascii?Q?1fq7oncldBixzGbrpbMvlJsSIS63sQfx39HEANPojiOw8T9uagiCY8fxrnwv?= =?us-ascii?Q?cPuHvSktMKI1nCZvh9UxvSoSJyHE5wmRNKW+gpBfR/LRQHFG3RMEsktgKzJ0?= =?us-ascii?Q?tDTWaTgzhEVE6ypa7waM20awMRX9EQs6r3LHfs8REzn2LhPaAPHiWYqDtVTP?= =?us-ascii?Q?6xSaE77UseiNRNvfZqx2OtfSQ/94QbmLJCf41nZWgdDq9lVLOx5p/kyB+3Od?= =?us-ascii?Q?1Tb+gh22K9NOrLQhhtdJwyPhYvpr8RIy+f9F0oT9th6/MdFT5u/ry2C9D1iK?= =?us-ascii?Q?16ISK4PrhbDOr3COLwMgp0pRWVb0g4PU8RyrMVdFm8c/iRM6Lo22skbpT8WR?= =?us-ascii?Q?7otURyVKsx2qN3Gxs6eUGBH87nmG5DnJdE9XWINK4ZK8URgjwxlgL3Kyfnub?= =?us-ascii?Q?QwdrXeT+Js2a5L3XPRvnzriFoPeCZT57zTlS22LWoKYoiWqvRCskOCE0T+9S?= =?us-ascii?Q?Og1/9Rz/rPz33lYqfKSISickMhjcgd+jRz4XMc/6/a6iEacgyZu1QLLBqIos?= =?us-ascii?Q?AIIzrD04l5+u3I+vu7/KJyaO9VD+M9hCqF634KJGYuJFlww8crTtxTAbVvdh?= =?us-ascii?Q?el5Ly0282TZb+SNjCMBrGcJ4KwP7L/GG2HqcvyqwK0A3+a+cF8mJF9USKn35?= =?us-ascii?Q?//TrUzlpsGCnWUWW9Ch4OevOPTO8ds+UH6GZkD911y9jRgo/ucikZG0R5SBB?= =?us-ascii?Q?JfmBcnxSbAyifAm+INv3pvXFnAvkWr9zAA6h6jbVMrrVz/u5L7irYvjrKUDT?= =?us-ascii?Q?vfwny7joELq2SLGPG/ZSArHIbaaEICtuMREvDRnqIuIRYhDnjQJHTj4EzPYu?= =?us-ascii?Q?K7lOm7miQnR7b0iA3OewFhXw3DTrTEUDrhkwHCT30CDZzOLss+8xK4owsdjl?= =?us-ascii?Q?3jQ+J2hjYUwJ5HcehhW34et1Dff6n4dpQ6zRYpg2LJiqNHURArX34nEJd+eZ?= =?us-ascii?Q?Xdm7E87m9KC9Z6pkeZ94TEVPfKBKsrhhfdZTjJV5uVp+Eefp04UyCC8oIscr?= =?us-ascii?Q?vb2i7c1WvwTuaKtOjADyPAfweNmF0mz8t0puDp4S?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3966.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4e37b68-3bdb-47f0-a8af-08dbe4c7c01f X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Nov 2023 04:11:17.5466 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xzK5TCE15ELXBxXOSPlf0IbzoHrqxl+nL2s/fpN+HdXWv/ruA9pFFEm6hnmT4tfwQ5T90z3y9+sNZpYKpueutA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8772 Precedence: Bulk 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,abner.chang@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7bPlbjXOWuV5Ne7cvTweShqPx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=EsigKjPg; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io [AMD Official Use Only - General] Hi Igor, Only one comment below, > -----Original Message----- > From: Igor Kulchytskyy > Sent: Tuesday, November 14, 2023 1:24 AM > To: devel@edk2.groups.io > Cc: Chang, Abner ; Nickle Wang > > Subject: [PATCH 2/2] RedfishPkg: RedfishDiscoverDxe: Optimize the Redfish > Discover flow > > Caution: This message originated from an External Source. Use proper caut= ion > when opening attachments, clicking links, or responding. > > > Filter out the network interfaces which are not supported by > Redfish Host Interface. > > Cc: Abner Chang > Cc: Nickle Wang > Signed-off-by: Igor Kulchytskyy > --- > .../RedfishDiscoverDxe/RedfishDiscoverDxe.c | 169 +++++++++++++----- > 1 file changed, 120 insertions(+), 49 deletions(-) > > diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c > b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c > index 0f622e05a9..3d514d7e4c 100644 > --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c > +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c > @@ -13,6 +13,12 @@ > > #include "RedfishDiscoverInternal.h" > > +#define MAC_COMPARE(ThisNetworkInterface, TargetNetworkInterface) > (CompareMem ((VOID *)&ThisNetworkInterface->MacAddress, > &TargetNetworkInterface->MacAddress, ThisNetworkInterface- > >HwAddressSize)) > +#define VALID_TCP6(TargetNetworkInterface, ThisNetworkInterface) > (TargetNetworkInterface->IsIpv6 && (ThisNetworkInterface- > >NetworkProtocolType =3D=3D ProtocolTypeTcp6)) > +#define VALID_TCP4(TargetNetworkInterface, ThisNetworkInterface) > (!TargetNetworkInterface->IsIpv6 && (ThisNetworkInterface- > >NetworkProtocolType =3D=3D ProtocolTypeTcp4)) > +#define IS_TCP4_MATCH(IpType) > ((gRequiredProtocol[Index].ProtocolType =3D=3D ProtocolTypeTcp4) && (IpTy= pe !=3D > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP4)) > +#define IS_TCP6_MATCH(IpType) > ((gRequiredProtocol[Index].ProtocolType =3D=3D ProtocolTypeTcp6) && (IpTy= pe !=3D > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP6)) Let's move these macro to RedfishDicoverInternal.h Abner > + > LIST_ENTRY mRedfishDiscoverList; > LIST_ENTRY mRedfishInstanceList; > EFI_SMBIOS_PROTOCOL *mSmbios =3D NULL; > @@ -322,9 +328,16 @@ GetTargetNetworkInterfaceInternal ( > { > EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL > *ThisNetworkInterface; > > + if (IsListEmpty (&mEfiRedfishDiscoverNetworkInterface)) { > + return NULL; > + } > + > ThisNetworkInterface =3D > (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetFirstNode > (&mEfiRedfishDiscoverNetworkInterface); > while (TRUE) { > - if (CompareMem ((VOID *)&ThisNetworkInterface->MacAddress, > &TargetNetworkInterface->MacAddress, ThisNetworkInterface- > >HwAddressSize) =3D=3D 0) { > + if ((MAC_COMPARE (ThisNetworkInterface, TargetNetworkInterface) =3D= =3D 0) > && > + (VALID_TCP6 (TargetNetworkInterface, ThisNetworkInterface) || > + VALID_TCP4 (TargetNetworkInterface, ThisNetworkInterface))) > + { > return ThisNetworkInterface; > } > > @@ -354,6 +367,10 @@ GetTargetNetworkInterfaceInternalByController ( > { > EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL > *ThisNetworkInterface; > > + if (IsListEmpty (&mEfiRedfishDiscoverNetworkInterface)) { > + return NULL; > + } > + > ThisNetworkInterface =3D > (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetFirstNode > (&mEfiRedfishDiscoverNetworkInterface); > while (TRUE) { > if (ThisNetworkInterface->OpenDriverControllerHandle =3D=3D > ControllerHandle) { > @@ -476,6 +493,42 @@ CheckIsIpVersion6 ( > return FALSE; > } > > +/** > + This function returns the IP type supported by the Host Interface. > + > + @retval 00h is Unknown > + 01h is Ipv4 > + 02h is Ipv6 > + > +**/ > +UINT8 > +GetHiIpProtocolType ( > + VOID > + ) > +{ > + EFI_STATUS Status; > + REDFISH_OVER_IP_PROTOCOL_DATA *Data; > + REDFISH_INTERFACE_DATA *DeviceDescriptor; > + > + Data =3D NULL; > + DeviceDescriptor =3D NULL; > + if (mSmbios =3D=3D NULL) { > + Status =3D gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID > **)&mSmbios); > + if (EFI_ERROR (Status)) { > + return > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_UNKNOWN; > + } > + } > + > + Status =3D RedfishGetHostInterfaceProtocolData (mSmbios, > &DeviceDescriptor, &Data); // Search for SMBIOS type 42h > + if (!EFI_ERROR (Status) && (Data !=3D NULL) && > + (Data->HostIpAssignmentType =3D=3D RedfishHostIpAssignmentStatic)) > + { > + return Data->HostIpAddressFormat; > + } > + > + return > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_UNKNOWN; > +} > + > /** > This function discover Redfish service through SMBIOS host interface. > > @@ -512,6 +565,18 @@ DiscoverRedfishHostInterface ( > > Status =3D RedfishGetHostInterfaceProtocolData (mSmbios, > &DeviceDescriptor, &Data); // Search for SMBIOS type 42h > if (!EFI_ERROR (Status) && (Data !=3D NULL) && (DeviceDescriptor !=3D = NULL)) { > + if ((Instance->NetworkInterface->NetworkProtocolType =3D=3D > ProtocolTypeTcp4) && > + (Data->HostIpAddressFormat !=3D > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP4)) // IPv4 case > + { > + DEBUG ((DEBUG_ERROR, "%a: Network Interface is IPv4, but Host > Interface requires Ipv6\n", __func__)); > + return EFI_UNSUPPORTED; > + } else if ((Instance->NetworkInterface->NetworkProtocolType =3D=3D > ProtocolTypeTcp6) && > + (Data->HostIpAddressFormat !=3D > REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP6)) // IPv6 case > + { > + DEBUG ((DEBUG_ERROR, "%a: Network Interface is IPv6, but Host > Interface requires IPv4\n", __func__)); > + return EFI_UNSUPPORTED; > + } > + > // > // Check if we can reach out Redfish service using this network inte= rface. > // Check with MAC address using Device Descriptor Data Device Type 0= 4 > and Type 05. > @@ -1102,6 +1167,7 @@ RedfishServiceGetNetworkInterface ( > OUT EFI_REDFISH_DISCOVER_NETWORK_INTERFACE > **NetworkIntfInstances > ) > { > + EFI_STATUS Status; > EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL > *ThisNetworkInterfaceIntn; > EFI_REDFISH_DISCOVER_NETWORK_INTERFACE > *ThisNetworkInterface; > EFI_REDFISH_DISCOVER_REST_EX_INSTANCE_INTERNAL *RestExInstance; > @@ -1141,13 +1207,23 @@ RedfishServiceGetNetworkInterface ( > > ThisNetworkInterfaceIntn =3D > (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetFirstNode > (&mEfiRedfishDiscoverNetworkInterface); > while (TRUE) { > + // If Get Subnet Info failed then skip this interface > + Status =3D NetworkInterfaceGetSubnetInfo (ThisNetworkInterfaceIntn, > ImageHandle); // Get subnet info > + if (EFI_ERROR (Status)) { > + if (IsNodeAtEnd (&mEfiRedfishDiscoverNetworkInterface, > &ThisNetworkInterfaceIntn->Entry)) { > + break; > + } > + > + ThisNetworkInterfaceIntn =3D > (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetNextNode > (&mEfiRedfishDiscoverNetworkInterface, &ThisNetworkInterfaceIntn->Entry); > + continue; > + } > + > ThisNetworkInterface->IsIpv6 =3D FALSE; > if (CheckIsIpVersion6 (ThisNetworkInterfaceIntn)) { > ThisNetworkInterface->IsIpv6 =3D TRUE; > } > > CopyMem ((VOID *)&ThisNetworkInterface->MacAddress, > &ThisNetworkInterfaceIntn->MacAddress, ThisNetworkInterfaceIntn- > >HwAddressSize); > - NetworkInterfaceGetSubnetInfo (ThisNetworkInterfaceIntn, ImageHandle= ); > // Get subnet info. > if (!ThisNetworkInterface->IsIpv6) { > IP4_COPY_ADDRESS (&ThisNetworkInterface->SubnetId.v4, > &ThisNetworkInterfaceIntn->SubnetAddr.v4); // IPv4 subnet information. > } else { > @@ -1230,7 +1306,12 @@ RedfishServiceAcquireService ( > > if (TargetNetworkInterface !=3D NULL) { > TargetNetworkInterfaceInternal =3D GetTargetNetworkInterfaceInternal > (TargetNetworkInterface); > - NumNetworkInterfaces =3D 1; > + if (TargetNetworkInterfaceInternal =3D=3D NULL) { > + DEBUG ((DEBUG_ERROR, "%a:No network interface on platform.\n", > __func__)); > + return EFI_UNSUPPORTED; > + } > + > + NumNetworkInterfaces =3D 1; > } else { > TargetNetworkInterfaceInternal =3D > (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *)GetFirstNode > (&mEfiRedfishDiscoverNetworkInterface); > NumNetworkInterfaces =3D NumberOfNetworkInterface (); > @@ -1260,7 +1341,13 @@ RedfishServiceAcquireService ( > // Get subnet information in case subnet information is not set be= cause > // RedfishServiceGetNetworkInterfaces hasn't been called yet. > // > - NetworkInterfaceGetSubnetInfo (TargetNetworkInterfaceInternal, > ImageHandle); > + Status1 =3D NetworkInterfaceGetSubnetInfo > (TargetNetworkInterfaceInternal, ImageHandle); > + if (EFI_ERROR (Status1)) { > + DEBUG ((DEBUG_ERROR, "%a: Get subnet information fail.\n", > __func__)); > + FreePool (Instance); > + continue; > + } > + > NewInstance =3D TRUE; > } > > @@ -1547,26 +1634,25 @@ TestForRequiredProtocols ( > ControllerHandle, > EFI_OPEN_PROTOCOL_TEST_PROTOCOL > ); > - if (EFI_ERROR (Status)) { > - return EFI_UNSUPPORTED; > - } > - > - Status =3D gBS->OpenProtocol ( > - ControllerHandle, > - gRequiredProtocol[Index].DiscoveredProtocolGuid, > - (VOID **)&Id, > - This->DriverBindingHandle, > - ControllerHandle, > - EFI_OPEN_PROTOCOL_GET_PROTOCOL > - ); > if (!EFI_ERROR (Status)) { > - // Already installed > - return EFI_UNSUPPORTED; > + Status =3D gBS->OpenProtocol ( > + ControllerHandle, > + gRequiredProtocol[Index].DiscoveredProtocolGuid, > + (VOID **)&Id, > + This->DriverBindingHandle, > + ControllerHandle, > + EFI_OPEN_PROTOCOL_GET_PROTOCOL > + ); > + if (EFI_ERROR (Status)) { > + if (Index =3D=3D ListCount - 1) { > + DEBUG ((DEBUG_INFO, "%a: all required protocols are found on t= his > controller handle: %p.\n", __func__, ControllerHandle)); > + return EFI_SUCCESS; > + } > + } > } > } > > - DEBUG ((DEBUG_MANAGEABILITY, "%a: all required protocols are found on > this controller handle: %p.\n", __func__, ControllerHandle)); > - return EFI_SUCCESS; > + return EFI_UNSUPPORTED; > } > > /** > @@ -1601,10 +1687,22 @@ BuildupNetworkInterface ( > EFI_REDFISH_DISCOVER_REST_EX_INSTANCE_INTERNAL *RestExInstance; > EFI_TPL OldTpl; > BOOLEAN NewNetworkInterfaceIn= stalled; > + UINT8 IpType; > + UINTN ListCount; > > + ListCount =3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL)); > NewNetworkInterfaceInstalled =3D FALSE; > Index =3D 0; > - do { > + > + // Get IP Type to filter out unnecessary network protocol if possible > + IpType =3D GetHiIpProtocolType (); > + > + for (Index =3D 0; Index < ListCount; Index++) { > + // Check IP Type and skip an unnecessary network protocol if does no= t > match > + if (IS_TCP4_MATCH (IpType) || IS_TCP6_MATCH (IpType)) { > + continue; > + } > + > Status =3D gBS->OpenProtocol ( > // Already in list? > ControllerHandle, > @@ -1615,11 +1713,6 @@ BuildupNetworkInterface ( > EFI_OPEN_PROTOCOL_GET_PROTOCOL > ); > if (!EFI_ERROR (Status)) { > - Index++; > - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { > - break; > - } > - > continue; > } > > @@ -1632,11 +1725,6 @@ BuildupNetworkInterface ( > EFI_OPEN_PROTOCOL_GET_PROTOCOL > ); > if (EFI_ERROR (Status)) { > - Index++; > - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { > - break; > - } > - > continue; > } > > @@ -1695,11 +1783,6 @@ BuildupNetworkInterface ( > ProtocolDiscoverIdPtr > ); > if (EFI_ERROR (Status)) { > - Index++; > - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { > - break; > - } > - > continue; > } > > @@ -1756,25 +1839,13 @@ BuildupNetworkInterface ( > } > } else { > DEBUG ((DEBUG_MANAGEABILITY, "%a: Not REST EX, continue with > next\n", __func__)); > - Index++; > - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { > - break; > - } > - > continue; > } > } > > return Status; > - } else { > - Index++; > - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))) { > - break; > - } > - > - continue; > } > - } while (Index < (sizeof (gRequiredProtocol) / sizeof > (REDFISH_DISCOVER_REQUIRED_PROTOCOL))); > + } > > return EFI_DEVICE_ERROR; > } > -- > 2.37.1.windows.1 > -The information contained in this message may be confidential and > proprietary to American Megatrends (AMI). This communication is intended > to be read only by the individual or entity to whom it is addressed or by= their > designee. If the reader of this message is not the intended recipient, yo= u are > on notice that any distribution of this message, in any form, is strictly > prohibited. Please promptly notify the sender by reply e-mail or by telep= hone > at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#111192): https://edk2.groups.io/g/devel/message/111192 Mute This Topic: https://groups.io/mt/102566326/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-