From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.46024.1638755557137360862 for ; Sun, 05 Dec 2021 17:52:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=fSZ/HBab; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ray.ni@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10189"; a="300615052" X-IronPort-AV: E=Sophos;i="5.87,290,1631602800"; d="scan'208";a="300615052" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2021 17:52:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,290,1631602800"; d="scan'208";a="747863569" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 05 Dec 2021 17:52:36 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 5 Dec 2021 17:52:35 -0800 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 5 Dec 2021 17:52:35 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 5 Dec 2021 17:52:35 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.103) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 5 Dec 2021 17:52:35 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WIYFW2ORTrtLSPafEWpmD6tWTdK9+gT0SWB+HfKmJUALQ2pTEjLSTN1DLiGTxzjm8BZaHqDPT+AoXPmwWTxYfZUrpLNbgtouPQsgs8cj41KC2ixMi+ucNHD7cFSQQmOoKCr0UK4MMPRA4bY2LMwQYdA5Lv/XKDVDmy3lTven9S5v2KjQVL8hqSIbG14oaO7dqMr7rqkC4JF4C8OV7OS6ncUakk8wxPbzRGEBAWgtDnHFgPtfx4n5GHdFfzlmQX/3+tjbJTfeJxUCHspkkRr1UzzbhoPUHTV5QK7pJ+oKzyLKbRO7ddUF5stDPjpBgutWePT001ys04wEig0GFoZqAw== 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=I6wKVquUXwDpToGSkOxgMqm7Zq9wJVl0Fn+JO7v9sSM=; b=i8HtK6L3IA5pEU2KNdRNoWmCTiQW6qYy1/KyunIoIoq8iYnjyEc0pWe6zQkyAjTEmDaR/56EFN92HX0KKutXJdaIVSLGotMsujulghc6Hd1/nAgW8+nouWwVBy8owSB0ngiTrMPXZBjFMrZEUXfc5ee6+ZPWrW2BvodMuNYy7nHaBUSJKVliSJF7CIzprqDNv4TRCE+8xDLlOo2gO0ZiK3HlInd8XF+DRugpRNb5c6i1pT3Uuqj5HGTa6Q5e/NMs99xw5Ox6POUqQrAtZRcpVA+NrsvkE2EXqGy6rUjbVetMjUIT6YKMv98mUtLnOIvd69zgV4t/rvXbYudzkLiLNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I6wKVquUXwDpToGSkOxgMqm7Zq9wJVl0Fn+JO7v9sSM=; b=fSZ/HBabUYqrxsQRE9+84iPuSeE8cXw8rXZhEj3IKTnpm8HNxaqsl2RZZm3d60wfBi7p6WXzczK9cVPVpv5Yy6o+dAXCv09I2hWvQ1YhcwUG+J2dWYKuwgNnZ3JhKwUTTut3l6rGyEkmXOEUyNpuLfdzjogXao+KjUhBMalkTkE= Received: from BN0PR11MB5696.namprd11.prod.outlook.com (2603:10b6:408:14b::11) by BN6PR1101MB2067.namprd11.prod.outlook.com (2603:10b6:405:58::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Mon, 6 Dec 2021 01:52:34 +0000 Received: from BN0PR11MB5696.namprd11.prod.outlook.com ([fe80::49dc:7490:201e:9fc9]) by BN0PR11MB5696.namprd11.prod.outlook.com ([fe80::49dc:7490:201e:9fc9%7]) with mapi id 15.20.4690.029; Mon, 6 Dec 2021 01:52:34 +0000 From: "Ni, Ray" To: "Jiang, Guomin" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ma, Maurice" , "You, Benjamin" Subject: Re: [PATCH v2 1/1] UefiPayloadPkg: Skip ModuleInfo HOB in Payload Thread-Topic: [PATCH v2 1/1] UefiPayloadPkg: Skip ModuleInfo HOB in Payload Thread-Index: AQHX6AUXwl392a4GO0GsFWk9eq/Ndawkt3Kg Date: Mon, 6 Dec 2021 01:52:33 +0000 Message-ID: References: <20211203051726.1105-1-guomin.jiang@intel.com> In-Reply-To: <20211203051726.1105-1-guomin.jiang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e93e3ec1-f510-4e99-10cf-08d9b85b126f x-ms-traffictypediagnostic: BN6PR1101MB2067: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3826; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Wu4ggYye7pHEZR7xgHSD/3E/pb35Tyttng6Bx1CfUk3HWp9HeVjvcT7FlzGyWyG0bE1Y06lxfPlVljUWnX9FRAFZH5+M7WP5uU5DFbRwwFLACodn3xX73fiMqe9o94xkjKgSUA6Kx4MGCl9T0ujXc57CHsU2ue1R50rLnKbJQ4AGF98YvGjNqC6Hwe+upehBrbP6wPi3Y5dJTWrU5NZfBv+YFSUtFc07ypKy68URYEDeveJxvLRoYVH/81cVaFYGEWD90F6GCylLEXfaoqfkwBhsN/Flx7KzWS2/vhsnFph+nWaGRR66gAz2vnv4Zv5dJGof33lh44q9/kCK0zXmicXtIr87cGrk4R0x3lHdHB08kMhEzl4HhBzKDPUPoDaLAbceMf7QiFFBizOYAgp9Isf3adOQPZPyGLu3pPHf3jCfMRinPzFOWCVred+0O8DNEfG/Nu6sES+fZLdh1cqvcu3wRm54ErMoufJlpB5PdluHlzkHZ4bXF0vkI391FzYvIVCk1SLnF6cqZp3xjoGapvXpHLkNoqgPgaewXgj6g1857YPerXS6aGbWQp92dVW9YfjPB5mozTKTyzC6DeJRu3bokGY93/zN+F2IqGzWHsbaPaInujNE3NlZGXI4YIemnWYnqLlhM1RpYIJGJEtxynvYZ+vb3TQT97id9SJcbggO1L6VTj71U0TSxyRHkCOXMNvg9dJihl7c0SoMyJ4QNpUlSF9P+brf5jUKP3v0YYmmhteMELJiQWfE7kBWfqoNXfk15kpsLAfO6PiT0/4P2hAwlsUuRG8/91udUyU4N4g= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN0PR11MB5696.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(53546011)(107886003)(186003)(86362001)(19627235002)(5660300002)(52536014)(6506007)(66946007)(316002)(66476007)(122000001)(83380400001)(54906003)(38070700005)(110136005)(66446008)(76116006)(66556008)(26005)(64756008)(2906002)(38100700002)(508600001)(7696005)(8936002)(71200400001)(966005)(82960400001)(9686003)(55016003)(4326008)(8676002)(33656002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WHDqgHtARZvCAzW+eSgGpUsoewsuML77oHq8/DOjnog9yVT7UiE14q1MsrOM?= =?us-ascii?Q?fASb9mMp7am+loPh7UwMGjWQ0Unzz4HAxKsGf+CGPiV5E4d+9JJWO/eMFuJv?= =?us-ascii?Q?9RPlDe9pM8Zuepg+bv7MuJLrFf/bPfGMo7y+Gp9bv8E7K5ttIlo3NY6FSDt9?= =?us-ascii?Q?8ya7ao70Rw0I3/D9ToAvOUJUseUrUSLupJ+vkwGKY3Iz7YXcwP2Oo+erGQZD?= =?us-ascii?Q?6eSyo6jy8YtKulnaTh9kVhAyzOdOo2lQFzo+A2DzUnMl0eiozjqghGqkMmyo?= =?us-ascii?Q?wNdC9TyEeZmg812gwrGxKR3hcAnj0ae7tWJCXDftUdUJ9E83t5/qZCwjt8HV?= =?us-ascii?Q?+9FdvpiYszlIOqjL16C/Yh1w+nZrciHwRbOSLNEMcfDjughtQT7AtjOI+arQ?= =?us-ascii?Q?tmtFX5QeA8esSZGS+YYVG9EOiA6npQbgF07uIk2AzWRfucEq44NtZR91dDbf?= =?us-ascii?Q?ZZRUotPu3hsmiGP7DI6Awn+F/FJZhoy03Tst4GfskBc/a6SwJcVqBndaKgY9?= =?us-ascii?Q?WzrMFr3BKEla+P9+cH4QStGjsPsgYrzmAKgoFoXo9YqYDgjKj+zEluFjZGsA?= =?us-ascii?Q?wCYk9FedybwYpTzfTg/tPszNP8wBNbj2ypnxVSXPs0WDILaURbsqI3S34cy3?= =?us-ascii?Q?HfQ7FCbiBIyvI/II20TEnxvWvqQMxFgdoWFjgshcEvkaYoJUf7tag7LdKHZO?= =?us-ascii?Q?vLD1eMoltTMXym1lbJgExMHKnW18f7qAYmAguMbRqz/8pzik5a6ie2eYviBr?= =?us-ascii?Q?5psi/AL3y0NuiV5tPiWlR6POGlRkVs0YprVqilWWgm93xhIm3Avovz5tuocz?= =?us-ascii?Q?P+gxCfWlZP7McwwQ8qmCx3jhNaxeYPWWdo4eRYXfvKzQExDrWg4gwcj8M+12?= =?us-ascii?Q?0WoCQdzRYPJ2/Co+XxHPGf0Ox5uO4wkdbrkJZlDi3kU+486OS0jIhOcuhtJp?= =?us-ascii?Q?+p9h1cK9VHNUmZSq7v1RiMfh7qVCdzo3NbPM+GcwYjdhnCGhKDgDbheokLlx?= =?us-ascii?Q?S7AHt3tRsgZOXjlP0rj0Nkfpbx2Gvx4BBY9zD/wHZWUxxY1YDD4yK+cdgRzl?= =?us-ascii?Q?75nZF4lno8HjqPZ3V2pZcTBCQ3mgFpAZFimwYltBEafy5nljBAHotYLJicot?= =?us-ascii?Q?opNJdXLWGvckmZqJ7TQ7PTxuOo+NqXTKkqV0y5pBZOSa8FicMyBhUv4zOas3?= =?us-ascii?Q?Z8LQmN2ZglOMrg2QGOWRqMNwhlFMjwQkwjUskWz2sMrvD9++RJsfoGCcy9p6?= =?us-ascii?Q?aA15UftslAZCgp5FrCjsokM5tgjGQ3n3Q2byJ7ku21U+XvW0VjCCtjoVi+0o?= =?us-ascii?Q?GVdlnDUMTOAaV3wp03pZgwn+cJ6wf47fLzG3kxiQezqe5HRWz8Jw1bwyQF1j?= =?us-ascii?Q?lcWYNDMhBwFL3CGbkPm7JcoVQ9TOML0+8eSN4c7rVZ/6XO+lIqEZO6iJgvdL?= =?us-ascii?Q?pHaHcP9ZILGO3uobzuy3IgUMLqb3AEAxkfVHiWlbwMfiX5WNSoGG+uGea1b4?= =?us-ascii?Q?62Na83QE1jsEIFQev/ZXmtt96sShKpWfxsktIEJ6dtRjjfRag5hfUhnkfDY9?= =?us-ascii?Q?3D53LuK+WtaGgdsDdKw/EYHymUiE7XXmfKJf2xd76/mokuj3zmQKYfSGAVb3?= =?us-ascii?Q?iHb6ICnUqRk1gHL0POMl5Y8=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN0PR11MB5696.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e93e3ec1-f510-4e99-10cf-08d9b85b126f X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Dec 2021 01:52:33.9125 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dLc5I3fJDNEyuRCVrqpMK8xUG2kjBrQM7PhI6x5hlb2vE/kEvB7SqJy4Jf5vL0GrVPB/Cxj/iNVCn1G6iXxxew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1101MB2067 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni -----Original Message----- From: Jiang, Guomin =20 Sent: Friday, December 3, 2021 1:17 PM To: devel@edk2.groups.io Cc: Dong, Guo ; Ni, Ray ; Ma, Maurice= ; You, Benjamin Subject: [PATCH v2 1/1] UefiPayloadPkg: Skip ModuleInfo HOB in Payload REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3754 1. DxeCore will use ModuleInfo to install LoadedImage protocol for DxeCore. 2. DxeIpl will create the ModuleInfo of UniversalPayload. and UniversalPayload will create the ModuleInfo of DxeCore. 3. UniversalPayload should skip the ModuleInfo from the DxeIpl to avoid the mismatched ModuleInfo for DxeCore. Changes: 1. Use function IsHobNeed to check if the HOB should be added 2. Add the Mo= duleInfo check logic in IsHobNeed function Signed-off-by: Guomin Jiang Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You --- .../UefiPayloadEntry/UniversalPayloadEntry.c | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/Uefi= PayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index 4d1096b32321..d743d29abe3f 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -238,6 +238,36 @@ FindAnotherHighestBelow4GResourceDescriptor ( return ReturnResourceHob; } =20 +/** + Check the HOB and decide if it is need inside Payload + + Payload maintainer may make decision which HOB is need or needn't =20 + Then add the check logic in the function. + + @param[in] Hob The HOB to check + + @retval TRUE If HOB is need inside Payload + @retval FALSE If HOB is needn't inside Payload **/ BOOLEAN IsHobNeed=20 +( + EFI_PEI_HOB_POINTERS Hob + ) +{ + if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_HANDOFF) { + return FALSE; + } + + if (Hob.Header->HobType =3D=3D EFI_HOB_TYPE_MEMORY_ALLOCATION) { + if (CompareGuid (&Hob.MemoryAllocationModule->MemoryAllocationHeader.N= ame, &gEfiHobMemoryAllocModuleGuid)) { + return FALSE; + } + } + + // Arrive here mean the HOB is need + return TRUE; +} + /** It will build HOBs based on information from bootloaders. =20 @@ -338,7 +368,7 @@ BuildHobs ( // Since payload created new Hob, move all hobs except PHIT from boot lo= ader hob list. // while (!END_OF_HOB_LIST (Hob)) { - if (Hob.Header->HobType !=3D EFI_HOB_TYPE_HANDOFF) { + if (IsHobNeed (Hob)) { // Add this hob to payload HOB AddNewHob (&Hob); } -- 2.30.0.windows.2