From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5871D20886D9F for ; Fri, 15 Feb 2019 01:25:26 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2019 01:25:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,372,1544515200"; d="scan'208";a="134531819" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga002.jf.intel.com with ESMTP; 15 Feb 2019 01:25:25 -0800 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 15 Feb 2019 01:24:37 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 15 Feb 2019 01:24:37 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.207]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.172]) with mapi id 14.03.0415.000; Fri, 15 Feb 2019 17:24:35 +0800 From: "Zeng, Star" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: "Wu, Hao A" , Michael Turner , Max Knutsen , "Gao, Liming" , "Zeng, Star" Thread-Topic: [edk2] [patch V2] MdeModulePkg/ReportStatusCodeLib: Avoid using AllocatePool if possible Thread-Index: AQHUxA6LIJbGXMSrLEepj7OrpUtqaKXgl2wQ Date: Fri, 15 Feb 2019 09:24:35 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483104026BD16@shsmsx102.ccr.corp.intel.com> References: <20190214023907.52356-1-dandan.bi@intel.com> In-Reply-To: <20190214023907.52356-1-dandan.bi@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch V2] MdeModulePkg/ReportStatusCodeLib: Avoid using AllocatePool if possible X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2019 09:25:27 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable After applying the patch, the author is Max and the Signed-off-by is Dandan= , is it expected? And the code below is better to be into the else condition (stack buffer is= not enough), right? if (gBS =3D=3D NULL || gBS->AllocatePool =3D=3D NULL || gBS->FreePool =3D= =3D NULL) { return EFI_UNSUPPORTED; } // // Retrieve the current TPL // Tpl =3D gBS->RaiseTPL (TPL_HIGH_LEVEL); gBS->RestoreTPL (Tpl); Thanks, Star -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Dand= an Bi Sent: Thursday, February 14, 2019 10:39 AM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Michael Turner ; Max Knutsen ; Gao, Liming Subject: [edk2] [patch V2] MdeModulePkg/ReportStatusCodeLib: Avoid using Al= locatePool if possible From: Max Knutsen REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1114 V2: simplify the code logic. update if (!mHaveExitedBootServices && (StatusCodeData !=3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer)) { gBS->FreePool (StatusCodeData); } to if (StatusCodeData !=3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer) { gBS->FreePool (StatusCodeData); } When report status code with ExtendedData data, and the extended data can f= it in the local static buffer, there is no need to use AllocatePool to hold= the ExtendedData data. This patch is just to do the enhancement to avoid using AllocatePool. Cc: Jian J Wang Cc: Hao Wu Cc: Michael Turner Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c | 9 +++++++-- ..= ./RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLi= b.c b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c index b28dc5c3bb..c88be5a1a3 100644 --- a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c +++ b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c @@ -505,13 +505,18 @@ ReportStatusCodeEx ( // Tpl =3D gBS->RaiseTPL (TPL_HIGH_LEVEL); gBS->RestoreTPL (Tpl); =20 StatusCodeData =3D NULL; - if (Tpl <=3D TPL_NOTIFY) { + if (ExtendedDataSize <=3D (MAX_EXTENDED_DATA_SIZE - sizeof=20 + (EFI_STATUS_CODE_DATA))) { // - // Allocate space for the Status Code Header and its buffer + // Use Buffer instead of allocating if possible. + // + StatusCodeData =3D (EFI_STATUS_CODE_DATA *)Buffer; } else if (Tpl <= =3D=20 + TPL_NOTIFY){ + // + // If Buffer is not big enough, allocate space for the Status Code=20 + Header and its buffer // gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) = + ExtendedDataSize, (VOID **)&StatusCodeData); } =20 if (StatusCodeData =3D=3D NULL) { diff --git a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatu= sCodeLib.c b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatu= sCodeLib.c index b73103517a..75e2f88ad2 100644 --- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLi= b.c +++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCod +++ eLib.c @@ -635,11 +635,14 @@ ReportStatusCodeEx ( if (mHaveExitedBootServices) { if (sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize > MAX_EXTENDED_DA= TA_SIZE) { return EFI_OUT_OF_RESOURCES; } StatusCodeData =3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer; - } else { + } else if (sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize > MAX_EXTEND= ED_DATA_SIZE) { + // + // Only use AllocatePool for larger ExtendedData. + // if (gBS =3D=3D NULL || gBS->AllocatePool =3D=3D NULL || gBS->FreePool = =3D=3D NULL) { return EFI_UNSUPPORTED; } =20 // @@ -648,10 +651,12 @@ ReportStatusCodeEx ( StatusCodeData =3D NULL; gBS->AllocatePool (EfiBootServicesData, sizeof (EFI_STATUS_CODE_DATA) = + ExtendedDataSize, (VOID **)&StatusCodeData); if (StatusCodeData =3D=3D NULL) { return EFI_OUT_OF_RESOURCES; } + } else { + StatusCodeData =3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer; } =20 // // Fill in the extended data header // @@ -678,11 +683,11 @@ ReportStatusCodeEx ( Status =3D InternalReportStatusCode (Type, Value, Instance, CallerId, St= atusCodeData); =20 // // Free the allocated buffer // - if (!mHaveExitedBootServices) { + if (StatusCodeData !=3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer) { gBS->FreePool (StatusCodeData); } =20 return Status; } -- 2.18.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel