From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 3B065201B0419 for ; Tue, 12 Feb 2019 03:01:12 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Feb 2019 03:01:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,361,1544515200"; d="scan'208";a="299099981" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 12 Feb 2019 03:01:11 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 12 Feb 2019 03:01:11 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.162]) with mapi id 14.03.0415.000; Tue, 12 Feb 2019 19:01:09 +0800 From: "Gao, Liming" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: Max Knutsen , "Wang, Jian J" , "Wu, Hao A" , Michael Turner Thread-Topic: [patch] MdeModulePkg/ReportStatusCodeLib: Avoid using AllocatePool if possible Thread-Index: AQHUutPkDe8GV93Abk64LKMPMTBfoqXcDf7Q Date: Tue, 12 Feb 2019 11:01:08 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3DBBB3@SHSMSX104.ccr.corp.intel.com> References: <20190202084654.34868-1-dandan.bi@intel.com> In-Reply-To: <20190202084654.34868-1-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGUyNGU5ZTktZTYzMS00NzgzLWJkZjctNTc1NzNlNjY3NzExIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiM3RQdGlmNDhtVnk5QjVmaVBrT0VNblVwdUgzZHpDSzJMTDBiQmFoc24wU1ZaQnM1cUw3cEI2dTVPQ1MxR1ZGMyJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] 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: Tue, 12 Feb 2019 11:01:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Dandan: The last change in RuntimeDxeReportStatusCodeLib can be simplified. Other = change is good.=20 if (!mHaveExitedBootServices && (StatusCodeData !=3D (EFI_STATUS_CODE_DAT= A *) StatusCodeBuffer)) { gBS->FreePool (StatusCodeData); } =3D=3D> if (StatusCodeData !=3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer) { gBS->FreePool (StatusCodeData); } Thanks Liming > -----Original Message----- > From: Bi, Dandan > Sent: Saturday, February 2, 2019 4:47 PM > To: edk2-devel@lists.01.org > Cc: Max Knutsen ; Wang, Jian J ; Wu, Hao A ; Michael Turner > ; Gao, Liming > Subject: [patch] MdeModulePkg/ReportStatusCodeLib: Avoid using AllocatePo= ol if possible >=20 > From: Max Knutsen >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1114 >=20 > When report status code with ExtendedData data, > and the extended data can fit in the local static buffer, > there is no need to use AllocatePool to hold the ExtendedData data. >=20 > This patch is just to do the enhancement to avoid using AllocatePool. >=20 > 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(-) >=20 > diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCode= Lib.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 (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 TPL_NOTIFY){ > + // > + // If Buffer is not big enough, allocate space for the Status Code H= eader 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/ReportSta= tusCodeLib.c > b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCodeLib.= c > index b73103517a..3380469759 100644 > --- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCode= Lib.c > +++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/ReportStatusCode= Lib.c > @@ -635,11 +635,14 @@ ReportStatusCodeEx ( > if (mHaveExitedBootServices) { > if (sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize > MAX_EXTENDED_= DATA_SIZE) { > return EFI_OUT_OF_RESOURCES; > } > StatusCodeData =3D (EFI_STATUS_CODE_DATA *) StatusCodeBuffer; > - } else { > + } else if (sizeof (EFI_STATUS_CODE_DATA) + ExtendedDataSize > MAX_EXTE= NDED_DATA_SIZE) { > + // > + // Only use AllocatePool for larger ExtendedData. > + // > if (gBS =3D=3D NULL || gBS->AllocatePool =3D=3D NULL || gBS->FreePoo= l =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, = StatusCodeData); >=20 > // > // Free the allocated buffer > // > - if (!mHaveExitedBootServices) { > + if (!mHaveExitedBootServices && (StatusCodeData !=3D (EFI_STATUS_CODE_= DATA *) StatusCodeBuffer)) { > gBS->FreePool (StatusCodeData); > } >=20 > return Status; > } > -- > 2.18.0.windows.1