From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 262909410A5 for ; Wed, 7 May 2025 06:35:59 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=IYxoXjHPJfzDFYeJC0NVSObPphictjfykOgx7kbyBpw=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240830; t=1746599759; v=1; x=1746858958; b=Z+ekKB6ECv06Uj6EJySs2VuWuh28Spiqu+js1PsoyUqyUsHK7ZivuP/CUBK6yNEvNRnardma aRsTD0k2SyZQ0EyGNHSDcfIT2XEHr/HsBaD04zJA3kxhobiMJkWOT8Q2T0qOSO5Zp0Rp8ajSqR8 XVijJIGxTQElipnUzrU2mPS9MZdrBMpMz4WuV9MFWhSsyFQrplDTFP2/h6cq3mwRfwC1EAyygEX N859Evj7IpDuRqoJ3vokOMesnKFCgTdiRYfUR5S0n6B0/VKaUYq6FqHVqIF6M4gUvE9cXUeTfd+ L+uufiyOogV6EfG+lNm6o0u/tFJtvn2CQUmFs3ljl/o/w== X-Received: by 127.0.0.2 with SMTP id lhWKYY7687511xy5rjDgQTtj; Tue, 06 May 2025 23:35:58 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by mx.groups.io with SMTP id smtpd.web10.2157.1746599756807097659 for ; Tue, 06 May 2025 23:35:57 -0700 X-CSE-ConnectionGUID: mBWJsIu6S7ORy3SBFY3GDQ== X-CSE-MsgGUID: JMCf6uhcTSqAaV54o7D9sQ== X-IronPort-AV: E=McAfee;i="6700,10204,11425"; a="48457186" X-IronPort-AV: E=Sophos;i="6.15,268,1739865600"; d="scan'208";a="48457186" X-Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2025 23:35:17 -0700 X-CSE-ConnectionGUID: 8hN2dgGFT46hC14yLdwb/g== X-CSE-MsgGUID: zmsXq+F1TjumJo0ta/q5oQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,268,1739865600"; d="scan'208";a="136258857" X-Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa008.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2025 23:35:16 -0700 X-Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 6 May 2025 23:33:43 -0700 X-Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Tue, 6 May 2025 23:33:43 -0700 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.175) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Tue, 6 May 2025 23:32:36 -0700 X-Received: from MN0PR11MB6158.namprd11.prod.outlook.com (2603:10b6:208:3ca::18) by SA3PR11MB7413.namprd11.prod.outlook.com (2603:10b6:806:31a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 06:32:25 +0000 X-Received: from MN0PR11MB6158.namprd11.prod.outlook.com ([fe80::13cf:47a8:4737:84e9]) by MN0PR11MB6158.namprd11.prod.outlook.com ([fe80::13cf:47a8:4737:84e9%6]) with mapi id 15.20.8699.019; Wed, 7 May 2025 06:32:25 +0000 From: "Wu, Jiaxin via groups.io" To: "Zhou, Jianfeng" , "devel@edk2.groups.io" CC: "Ni, Ray" , Gerd Hoffmann , "Liu, Zhiguang" , "Tan, Dun" , "Kumar, Rahul R" , "Zeng, Star" , Liming Gao Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Fix SMRAM memory leak during S3 resume Thread-Topic: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Fix SMRAM memory leak during S3 resume Thread-Index: AQHbvoWnQyfh+sdP2kGmhroBYs6mG7PGtXBQ Date: Wed, 7 May 2025 06:32:25 +0000 Message-ID: References: <20250506125059.3343414-1-jianfeng.zhou@intel.com> In-Reply-To: <20250506125059.3343414-1-jianfeng.zhou@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN0PR11MB6158:EE_|SA3PR11MB7413:EE_ x-ms-office365-filtering-correlation-id: e39c40ab-4ea2-4904-52d7-08dd8d30ee7a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: =?us-ascii?Q?RIwWCcngJ8rGznYAp2ezHm71XkvnRthJSV/hzc50IYqcd93qTbGaPBORW8LK?= =?us-ascii?Q?J5U944zwxnITcTFa07HCI+ml+M1RIYiEi/NbzJqM9nCi2OU2BerlnQTwzu6C?= =?us-ascii?Q?HCuiisl01cLCuOUFMLqROt92uU9oJ/+UjGDCOKFI7iegWFz7k7oOK3+vleEh?= =?us-ascii?Q?kejT/X6aNCHW8KiNkUHHPvbnBDar3A7/QNeNoROlBxpv1/nAhLX7/aqWuBwv?= =?us-ascii?Q?4BD+YanNVzHcobJovisI4FQr3SmeY4BcKA12zOg1YQ35fwA2mAkXUh5WBkaC?= =?us-ascii?Q?9GnTK66uxhlG+UVP0Zf6M3Eik6FDy+1Q3qNF1M0jXwLS13PUYCJ1Vcj8RADO?= =?us-ascii?Q?P5+w1KY6wgkDd1zLn+BBhHa1ESLZpD9QiDQ/V/IPNp86k3TSSevpVNPUhCfh?= =?us-ascii?Q?0Ll2jIcmU9r6/fqUyHapSJ+1zgA31LrABLgSnBaC4j1G9WoD+cewDc737xu+?= =?us-ascii?Q?Y2R8IB5upxewFyDQ/zgUHuwl71XuZ7AjIdfm5t2arWNsG+vyqBM6E7u4k+hT?= =?us-ascii?Q?3dZ5q7xnJ5nTW56fb3gXzCrm082fuiZqsn89nfWxr6CSYOAgGuKIvcmgT8/s?= =?us-ascii?Q?Pqchx6cN343q27Oym7sU+wvYnHQeJbClCK670MJSnV8078Vbaco4qWnXADsP?= =?us-ascii?Q?sBNFiQVWNu71i6feOF4qufYcVPV4shhzzNWNJyVvJZwnj25g7CG8iW2N9oJt?= =?us-ascii?Q?s9rZN2VU2aGLHMYjFWKn5zPeIiHEsQueUeyVeLvlVtpxaTgB6Y2F5RSCHk71?= =?us-ascii?Q?QC7WJUNsffC3ekuhx5hr7SCP4mD0/8fxYiSgEOXYu4YYkIm8Yhv/fzQUgieH?= =?us-ascii?Q?QgvNZz5KXz4+zN4zTvaKt1F9wCQ3tLWtXKuggS6AMsu0saNdedsmmGm5NkQ4?= =?us-ascii?Q?dxDhqVyWSvRuuLgOCcNDEoTu9T99QyCrZ2d56gWUQOQ8gbZvSDgeUl3QvlIG?= =?us-ascii?Q?/GzTeIEb9HtBE//dHcZG7PscwxcjqMZuiEgkTZLB5hYvd2vSPO5EHugduZEL?= =?us-ascii?Q?PCJaoxx9WpYftYO2UcyqmKDppdpcMhW0jns3qg0kZ2wRqxDESkrI+nO7VQsP?= =?us-ascii?Q?ywZxKCHf3DrkICbmh7FO0OavPeW1G5vrQBlgE0xUrMf5rOChCKgUKxZ3lBgW?= =?us-ascii?Q?GU+WKw/FmtXMT9acbZ9a8vShSF81ufVbZ3IBijFnhk/f9Qg1OI1orwFP7Zlc?= =?us-ascii?Q?S3AesgSxT3OghhjYUlSdpTONej2sR7398ZovbntFfuiXjONN9eyJ4zRY9k9+?= =?us-ascii?Q?Gb6z+Ul9VN+rVqVLht3809s/hjzAHaMkN5uKIEYGWKamCEVoGf3wBlGlW9Ir?= =?us-ascii?Q?eErea7e4F1IUU94qpOI1QVw2sFkBKAu9zG2muhLDOCkq8rsuH87kX3bbEXrY?= =?us-ascii?Q?pWXfBpvY62/exArsJqtnHePnf+Vtph09gavo3EVGBhOotR67rtpACqrYma+s?= =?us-ascii?Q?qvIT4FWFJWU9qGwijPyBVOgJ8l+v4mQMuVRyM37okBFfTbbCJBUD6YeJH5SL?= =?us-ascii?Q?syZEXzjPdLmkwfg=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zkIcjoxIt7fltCqw7NP0dtJkw34SoryN+B/NTX8QWk1aUyV1S/onFqI0Joqs?= =?us-ascii?Q?t+u0iBQNIRBGEMILxabS98I7VJ16jZ4D2Rq6e5rKB0iekQNZWAis9WQXxhAE?= =?us-ascii?Q?QSNZT9ijW8nnzIcVBndX8kdr2ODWxYKqU28lAMncZrR8pilVr16fTD0jsMgO?= =?us-ascii?Q?Yzm54xlSm3BhpyOP3F9c0yoIBTcABTyjd5N3oAnBpnh6QMIcwJuSBOyLNYSB?= =?us-ascii?Q?O1bcj2ypRkMw4fC6t7dH/frAyDxVtbTs937SCq2JGY+6gCDIJgmf+Bq6YlDV?= =?us-ascii?Q?IT6+lU90glKX6XB0L5IYF+XlehQhpxstx6r6shbOSEluc+f2/BlIYf7OdIZl?= =?us-ascii?Q?wytjdXOX+jwyLW9WD8fAmspLHY9vGAAnRwySv34gCel0pY5gY09+kf6eNyr6?= =?us-ascii?Q?D8pmtrVh6z7sjzZLq0udO/sTEUWl2yxl7GC0blglhPUmUI3enjB5ghKBDnAY?= =?us-ascii?Q?t0sitEFLo9Ru/d+Zr7p3Z1+xldX98mQxyH8oDXWg9+G+MZYgUmMMHBuWZilw?= =?us-ascii?Q?/aLyiQjZkmIEN8UqWRsArI4rJgx1ABO/R7Abw+kUCyVCvGKbVePLPLj2vYzf?= =?us-ascii?Q?+nK02a4q9IfiC52qUnLgx4eUQEKfWSUcTblvs1VbuhdRtoPoeJU5t6rIVP/m?= =?us-ascii?Q?1kbuRyju9bM/8HjHxEXpyF0Dd27UjeBtNc2NXsMfFr7llSI3TR40L7uorSBK?= =?us-ascii?Q?BUR8GwkHYbA0hRuui56qDFdcQY12EdEZJmmwLngpGkBfxAk8gwWq5DwtLNLT?= =?us-ascii?Q?Nw0T7DYKEeLcVt+Yf6aFB0M58E3QlwwT3LSmzw+vpMxoNBUk/EEVl/lcZvwD?= =?us-ascii?Q?6xulvllkqKV78gXYV1MfPSHwC4xTCF3aTnwnuJBaRlxmXk1Qtds/agd/ov+j?= =?us-ascii?Q?AqkAm1Cs15kK94NGsgaWmAKIO15RyooB9JqM8RWqsCDliOZLM2u/oiApd+0f?= =?us-ascii?Q?+Ba/lKmPcaa0RU67Qdz3PAD0Vw094kCtIHUf19Om7rm5y4FfFpwRGvuS+q6a?= =?us-ascii?Q?7Hkv8u95or58298O7zmOdXPa7a9gr3ntkiUD+rLhtq2LQG14sS+R6A5SECu7?= =?us-ascii?Q?apLPJ82GgFNKzg4/RyRBzk+wwWfNMSDC8k3cJ2RxWzH0qtWroTd1OMxY5uTc?= =?us-ascii?Q?0ZNBTmxJw58gFR8FYJ92egsfrKmA+zQwQI3cDB/KYADyOcTq16fAFguDmnp1?= =?us-ascii?Q?RsUN1zMrbqHZh7EhDievzzDwcmn+zwIurshRmfALRNovyJErk28VIkAQSFGf?= =?us-ascii?Q?rV73kjd8D5lYPwnqYER8qUY5/T6hHp3g0KpnMiUuOP+jWrFk0/QZKcxJMLQw?= =?us-ascii?Q?y9R2j14uGTISzMBpoxnpaE+QoVDGRZEj1z0WZjDvjTh7zkV9UnD0lkGIHWQq?= =?us-ascii?Q?S7XGWDIRpzSfetSuBEzjBUXWjBJUSbQ5JmTpU2qeyjzDb8AuLlsM+zEFh6fV?= =?us-ascii?Q?EA5+gl2I0mZ0VIdVWxDRt5PjlVcReq4ZtTziH+5P2Tx6tZhbz6AcEwZeGnSR?= =?us-ascii?Q?g4PFNToWbG41S+/qEgNi1cXzNr8MVu2IdwreZKRnupAjWtkocTdaxPWDk9uN?= =?us-ascii?Q?USeq5qFPllgXxZ9jeZoP0UC/R4VNk9rB0Vaub5kS?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6158.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e39c40ab-4ea2-4904-52d7-08dd8d30ee7a X-MS-Exchange-CrossTenant-originalarrivaltime: 07 May 2025 06:32:25.4789 (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: Lm+Ugen5qlMfVEWSzUpLpyMAfB+nYbqPNFCzPOKMb1CqVWgosDJV7X2IAGL70Kx0g3JrMFfcROaYWDfeGG7UWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR11MB7413 X-OriginatorOrg: intel.com 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 Resent-Date: Tue, 06 May 2025 23:35:57 -0700 Resent-From: jiaxin.wu@intel.com Reply-To: devel@edk2.groups.io,jiaxin.wu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: smDZZdHauEhsPs2C8k6kszwNx7686176AA= 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=20240830 header.b=Z+ekKB6E; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io It looks good to me, Jianfeng, can you send the PR to the edk2 directly? Thanks, Jiaxin > -----Original Message----- > From: Zhou, Jianfeng > Sent: Tuesday, May 6, 2025 8:51 PM > To: devel@edk2.groups.io > Cc: Zhou, Jianfeng ; Ni, Ray ; > Gerd Hoffmann ; Wu, Jiaxin ; Liu, > Zhiguang ; Tan, Dun ; Kumar, > Rahul R ; Zeng, Star ; Limi= ng > Gao > Subject: [PATCH] UefiCpuPkg/PiSmmCpuDxeSmm: Fix SMRAM memory leak > during S3 resume >=20 > SyncContext of SMM_DISPATCHER_MP_SYNC_DATA was dynamically > allocated from > SMRAM. The memory was not freed before reallocation in S3 resume path. > This could lead to: > 1. Memory leak in SMRAM. > 2. Potential S3 resume failure after repeated S3 tests due to SMRAM > exhaustion. >=20 > This change releases the SyncContext memory before reallocating it >=20 > Cc: Ray Ni > Cc: Gerd Hoffmann > Cc: Jiaxin Wu > Cc: Zhiguang Liu > Cc: Dun Tan > Cc: Rahul Kumar > Cc: Star Zeng > Cc: Liming Gao > Cc: Rahul Kumar > Cc: Zhou Jianfeng >=20 > Signed-off-by: Zhou Jianfeng > --- > UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 5 +++++ > 1 file changed, 5 insertions(+) >=20 > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > index b19906b610..7bc68087ad 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > @@ -1868,6 +1868,10 @@ InitializeMpSyncData ( > UINTN CpuIndex; >=20 > if (mSmmMpSyncData !=3D NULL) { > + if (mSmmMpSyncData->SyncContext !=3D NULL) { > + SmmCpuSyncContextDeinit (mSmmMpSyncData->SyncContext); > + } > + > // > // mSmmMpSyncDataSize includes one structure of > SMM_DISPATCHER_MP_SYNC_DATA, one > // CpuData array of SMM_CPU_DATA_BLOCK and one CandidateBsp array > of BOOLEAN. > @@ -1968,6 +1972,7 @@ InitializeMpServiceData ( > mSmmMpSyncData =3D (SMM_DISPATCHER_MP_SYNC_DATA *)AllocatePages > (EFI_SIZE_TO_PAGES (mSmmMpSyncDataSize)); > ASSERT (mSmmMpSyncData !=3D NULL); >=20 > + ZeroMem (mSmmMpSyncData, mSmmMpSyncDataSize); > RelaxedMode =3D FALSE; > GetSmmCpuSyncConfigData (&RelaxedMode, NULL, NULL); > mCpuSmmSyncMode =3D RelaxedMode ? MmCpuSyncModeRelaxedAp : > MmCpuSyncModeTradition; > -- > 2.25.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 (#121316): https://edk2.groups.io/g/devel/message/121316 Mute This Topic: https://groups.io/mt/112647890/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-