From nobody Tue May 21 03:12:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57292+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57292+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1586838956; cv=none; d=zohomail.com; s=zohoarc; b=dY271dZNFWmX5R4f4/hcDw92ggGAxz8tLaWKrglDBHvxign5xJiHsFT2lBYQltQQLJAWd3MIeo5Je0Vff+hRDw1ZRzsAf/J4dOqxguxhjPRJ2ypYP9wtSSLRA9kN+fogRj+Ftv1KLTU0sEehRS4baL0W9S395aJyCQxtrT/8Qow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586838956; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=JEUVSq4eN4jeTA/wuipcaZtKG5RjaPJNjDEYStpYmHU=; b=BS+ravsiBQLhCQj6G37v3uQdCwN7w5BuzslF8gvMwVjo2Ww2G44+O4wxnsET1pBTQagIBUHrbkJKBWO+elKnrW4e1IN0inVe42U2k384gYWIAytl8bSNN9967cbCrIzPWiDn9TDZT+Eth8qq/8/7dMdDTSa9i3yTzayA9Rq6pR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57292+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1586838956851623.7697601098286; Mon, 13 Apr 2020 21:35:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id I0pcYY1788612xupa370YhFs; Mon, 13 Apr 2020 21:35:55 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web10.2481.1586487119169013758 for ; Thu, 09 Apr 2020 19:51:59 -0700 IronPort-SDR: S4qoO8DzTqbUZFCY6Kh08iYzwyn5oWwb3GQcc8mxZ+3Uddn39lTEh2QVdfezzXTI7DK/c7en1b U2SJ66EUwzbQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2020 19:51:58 -0700 IronPort-SDR: l8F70vTyLa3r55YN+JN+Wd+J8OFcxot/4jN/UaM49NLtgpLW6Sc3xtn2Fxf2zBBuLsaG2nINxj uPgQuUvBfT/w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,364,1580803200"; d="scan'208";a="398798806" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.158.43]) by orsmga004.jf.intel.com with ESMTP; 09 Apr 2020 19:51:57 -0700 From: Ray Ni To: devel@edk2.groups.io Cc: Ray Ni , Eric Dong , Star Zeng Subject: [edk2-devel] [PATCH v3] UefiCpuPkg/PiSmmCpuDxeSmm: Improve the performance of GetFreeToken() Date: Fri, 10 Apr 2020 10:51:26 +0800 Message-Id: <20200410025126.15460-1-niruiyu@users.noreply.github.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,niruiyu@users.noreply.github.com X-Gm-Message-State: SIaBE6y9KaN86ymzdvnaEKvox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1586838955; bh=aUUpUIpTZjOQKKuBn5/lcCsbjPxMM6QuLvmmQWW2h/4=; h=Cc:Date:From:Reply-To:Subject:To; b=aPZzA0YfCLeW8SAb156sHjzPujtce7mYjnISARnr0QFOHwEa70vFxDZ63NYv6kdK77W amvXS7j2SkMUomULLMQjkEdDRjzLdI0iImiNjFQWD3uZZfEjEuYUXw/cRfzILdEwXjSsD TafYva8NRzlHHA5qL+wO8tWULgspc0OvuMY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Today's GetFreeToken() runs at the algorithm complexity of O(n) where n is the size of the token list. The change introduces a new global variable FirstFreeToken and it always points to the first free token. So the algorithm complexity of GetFreeToken() decreases from O(n) to O(1). The improvement matters when some SMI code uses StartupThisAP() service for each of the AP such that the algorithm complexity becomes O(n) * O(m) where m is the AP count. As next steps, 1. PROCEDURE_TOKEN.Used field can be optimized out because all tokens before FirstFreeToken should have "Used" set while all after FirstFreeToken should have "Used" cleared. 2. ResetTokens() can be optimized to only reset tokens before FirstFreeToken. v2: add missing line in InitializeDataForMmMp. v3: update copyright year to 2020. Signed-off-by: Ray Ni Cc: Eric Dong Cc: Star Zeng Reviewed-by: Eric Dong Reviewed-by: Star Zeng --- UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 71 ++++++++-------------- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 3 +- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxe= Smm/MpService.c index c285a70ebb..93cac5e4fa 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c @@ -453,6 +453,11 @@ ResetTokens ( =20 Link =3D GetNextNode (&gSmmCpuPrivate->TokenList, Link); } + + // + // Reset the FirstFreeToken to the beginning of token list upon exiting = SMI. + // + gSmmCpuPrivate->FirstFreeToken =3D GetFirstNode (&gSmmCpuPrivate->TokenL= ist); } =20 /** @@ -1060,23 +1065,21 @@ IsTokenInUse ( /** Allocate buffer for the SPIN_LOCK and PROCEDURE_TOKEN. =20 + @return First token of the token buffer. **/ -VOID +LIST_ENTRY * AllocateTokenBuffer ( VOID ) { UINTN SpinLockSize; UINT32 TokenCountPerChunk; - UINTN ProcTokenSize; UINTN Index; - PROCEDURE_TOKEN *ProcToken; SPIN_LOCK *SpinLock; UINT8 *SpinLockBuffer; - UINT8 *ProcTokenBuffer; + PROCEDURE_TOKEN *ProcTokens; =20 SpinLockSize =3D GetSpinLockProperties (); - ProcTokenSize =3D sizeof (PROCEDURE_TOKEN); =20 TokenCountPerChunk =3D FixedPcdGet32 (PcdCpuSmmMpTokenCountPerChunk); ASSERT (TokenCountPerChunk !=3D 0); @@ -1092,49 +1095,22 @@ AllocateTokenBuffer ( SpinLockBuffer =3D AllocatePool (SpinLockSize * TokenCountPerChunk); ASSERT (SpinLockBuffer !=3D NULL); =20 - ProcTokenBuffer =3D AllocatePool (ProcTokenSize * TokenCountPerChunk); - ASSERT (ProcTokenBuffer !=3D NULL); + ProcTokens =3D AllocatePool (sizeof (PROCEDURE_TOKEN) * TokenCountPerChu= nk); + ASSERT (ProcTokens !=3D NULL); =20 for (Index =3D 0; Index < TokenCountPerChunk; Index++) { SpinLock =3D (SPIN_LOCK *)(SpinLockBuffer + SpinLockSize * Index); InitializeSpinLock (SpinLock); =20 - ProcToken =3D (PROCEDURE_TOKEN *)(ProcTokenBuffer + ProcTokenSize * In= dex); - ProcToken->Signature =3D PROCEDURE_TOKEN_SIGNATURE; - ProcToken->SpinLock =3D SpinLock; - ProcToken->Used =3D FALSE; - ProcToken->RunningApCount =3D 0; + ProcTokens[Index].Signature =3D PROCEDURE_TOKEN_SIGNATURE; + ProcTokens[Index].SpinLock =3D SpinLock; + ProcTokens[Index].Used =3D FALSE; + ProcTokens[Index].RunningApCount =3D 0; =20 - InsertTailList (&gSmmCpuPrivate->TokenList, &ProcToken->Link); + InsertTailList (&gSmmCpuPrivate->TokenList, &ProcTokens[Index].Link); } -} =20 -/** - Find first free token in the allocated token list. - - @retval return the first free PROCEDURE_TOKEN. - -**/ -PROCEDURE_TOKEN * -FindFirstFreeToken ( - VOID - ) -{ - LIST_ENTRY *Link; - PROCEDURE_TOKEN *ProcToken; - - Link =3D GetFirstNode (&gSmmCpuPrivate->TokenList); - while (!IsNull (&gSmmCpuPrivate->TokenList, Link)) { - ProcToken =3D PROCEDURE_TOKEN_FROM_LINK (Link); - - if (!ProcToken->Used) { - return ProcToken; - } - - Link =3D GetNextNode (&gSmmCpuPrivate->TokenList, Link); - } - - return NULL; + return &ProcTokens[0].Link; } =20 /** @@ -1154,12 +1130,15 @@ GetFreeToken ( { PROCEDURE_TOKEN *NewToken; =20 - NewToken =3D FindFirstFreeToken (); - if (NewToken =3D=3D NULL) { - AllocateTokenBuffer (); - NewToken =3D FindFirstFreeToken (); + // + // If FirstFreeToken meets the end of token list, enlarge the token list. + // Set FirstFreeToken to the first free token. + // + if (gSmmCpuPrivate->FirstFreeToken =3D=3D &gSmmCpuPrivate->TokenList) { + gSmmCpuPrivate->FirstFreeToken =3D AllocateTokenBuffer (); } - ASSERT (NewToken !=3D NULL); + NewToken =3D PROCEDURE_TOKEN_FROM_LINK (gSmmCpuPrivate->FirstFreeToken); + gSmmCpuPrivate->FirstFreeToken =3D GetNextNode (&gSmmCpuPrivate->TokenLi= st, gSmmCpuPrivate->FirstFreeToken); =20 NewToken->Used =3D TRUE; NewToken->RunningApCount =3D RunningApsCount; @@ -1781,7 +1760,7 @@ InitializeDataForMmMp ( =20 InitializeListHead (&gSmmCpuPrivate->TokenList); =20 - AllocateTokenBuffer (); + gSmmCpuPrivate->FirstFreeToken =3D AllocateTokenBuffer (); } =20 /** diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index fe7e8b0323..c9b3b739f3 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -1,7 +1,7 @@ /** @file Agent Module to load other modules to deploy SMM Entry Vector for X86 CPU. =20 -Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -255,6 +255,7 @@ typedef struct { =20 PROCEDURE_WRAPPER *ApWrapperFunc; LIST_ENTRY TokenList; + LIST_ENTRY *FirstFreeToken; } SMM_CPU_PRIVATE_DATA; =20 extern SMM_CPU_PRIVATE_DATA *gSmmCpuPrivate; --=20 2.21.0.windows.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 (#57292): https://edk2.groups.io/g/devel/message/57292 Mute This Topic: https://groups.io/mt/73004207/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-