From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 0CB57D80477 for ; Tue, 26 Dec 2023 02:18:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=eGDChn9K1XEjN7NCuwn+N2m9evbXcFIYgDyAbkxQm7w=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results: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:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1703557134; v=1; b=mv+6pJuq8JPiqAtsI+/xLa41iePcKdULlEbBDV2KrX6xiJsuvZRoIlp4X1/IAmhoPzeY5RB+ kBc/7vSSwYkdbWoZCuYMrIw3pJCX6LUWI0DG/NEjLQDTinKXdmeSTGdnMFGS3jM+PjnPLvSub5C j/8vitSz7EH1i30f9Tl+iqTE= X-Received: by 127.0.0.2 with SMTP id yhCrYY7687511xgpuy1UTTfy; Mon, 25 Dec 2023 18:18:54 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by mx.groups.io with SMTP id smtpd.web11.73502.1703557134102135121 for ; Mon, 25 Dec 2023 18:18:54 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="3397481" X-IronPort-AV: E=Sophos;i="6.04,304,1695711600"; d="scan'208";a="3397481" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2023 18:18:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="727630358" X-IronPort-AV: E=Sophos;i="6.04,304,1695711600"; d="scan'208";a="727630358" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga003.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 25 Dec 2023 18:18:53 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 25 Dec 2023 18:18:52 -0800 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Mon, 25 Dec 2023 18:18:52 -0800 X-Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.169) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 25 Dec 2023 18:18:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MMRCKONehGMQZwvjDSj1I2P70tUmiCZhSFdtjGUyL4uExZdJTweigoAQJQO9BfjJFFecbEZu9fm4sdp6xhy19W+CgHiwZBrct2gWV1oREy70S0tZli6FZI+4/MivKIOCbu7lFkZp4tbxE+p26NkB3gXqYqdchTrpJWFji/i6qpLiTcTx327uveHoVRJBivmLBr2lOWpJxgqI/VdRkP9zQ5jD47g+YIy/ySMSivgJoYb2ovY2JbeV8qtoJVb+KdbPLr3I5L6YLaotmtyrp6FD/xD7jDrCxvB+bMQo86wbh1AClc+3iIKZh1M7OIKqoaRTNiPbREKAUs/tiCtjKMUu0Q== 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=7AaGD2dlK21t0U1l78PgiUUHbOUFYroJrgepIEqLw18=; b=lf3L5MHyLDvBCzbtIQ5jkCLmgdtVxKRt+mfWy5lnZlmFNZeMKg9RBp2sCRZKILcCkx4Vpi+3Ib9+y/52peCSmpnsCiB+4TYFwEGRGZOxOhoH3HpFy2XFv4U2eLfYdZP8q7TDzALYy6Q3dPzOTRdDvJi/tpMVqrpV6f5H1XB5WErSYSQmiDsioa91btBgS8DFq56sSu7MUIJeyl7c9b0dyLElJBk8risadwTEp5fJ7JSe8/lvw3MAl1pIiz926a6ErmqdMfo8Hf8VSrYQn229StfRdwR4ig6cKdNWJcdk4C8IK4fI7nH1L8WErWPzCIpfeUx6kCw3719bFj+d+/s1EA== 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 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by DS0PR11MB7804.namprd11.prod.outlook.com (2603:10b6:8:f3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.27; Tue, 26 Dec 2023 02:18:49 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858%4]) with mapi id 15.20.7113.026; Tue, 26 Dec 2023 02:18:49 +0000 From: "Ni, Ray" To: "Wu, Jiaxin" , "devel@edk2.groups.io" CC: Laszlo Ersek , "Dong, Eric" , "Zeng, Star" , Gerd Hoffmann , "Kumar, Rahul R" Subject: Re: [edk2-devel] [PATCH v2 3/6] UefiCpuPkg/PiSmmCpuDxeSmm: Check SMM Debug Agent support or not Thread-Topic: [PATCH v2 3/6] UefiCpuPkg/PiSmmCpuDxeSmm: Check SMM Debug Agent support or not Thread-Index: AQHaN05S0b8O3tBTgEORk+l/hRUGt7C61RGg Date: Tue, 26 Dec 2023 02:18:49 +0000 Message-ID: References: <20231225162034.2052-1-jiaxin.wu@intel.com> <20231225162034.2052-4-jiaxin.wu@intel.com> In-Reply-To: <20231225162034.2052-4-jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|DS0PR11MB7804:EE_ x-ms-office365-filtering-correlation-id: 7c410d02-fd05-4fe8-b448-08dc05b8ff40 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: p9YwkP5gsGzU0+JfopPmj7fvntT6RRx9Ix1du7vsmFSHjvlvL/Ac8uZOHnXJdMWj7ExWMWlmk4vMiPgVSZ9/ahcpJfzm61h9Y12b6XO5tEgd/vgYOr1Qz4Xet3Tkjqi7aCkB3SWdWRA8dFmvLLwGf7fluxRlHnaWg4oPB5hNkGHl0YRqt2g3vygtImqBKaJhze7GA95cG/u78zF+/+XfvFB4NWPr2P3+DeDqobw4L2jQgpOVHxY7Uu7btK9Z+ihpRuGxsdQS8bdUIh0CGWwoLRQGvWHi8tuSQvMDykNQb7FhDdn1lG/5tA2zVL6NZeXI8irzmvVCWbwbXu1o5YhBrERUVjDrHhZH96JXiyZQxqeT/scnleA5r+mtV2gBOY/OuQfpJeKdD+ax3IQgFQXQ0m8K3M8hXtc0R/WzWQ3yt6oCVokebygqc8hHLNDxDpiOWcue2l7acKzW1W0l+fX/hV5Np32FmCnAA57DRH9g5QKFzRiznGM/MjCenHNcVBj58PoQOygp+9Z53k3qya7fSZh0QjFJu6YVi7yvESyG1YPYGvWFwufv2JRlwYPlanhX/QbqbVBOU1RYuIUGzAG2aJSDOd6TVottvDdYz5ABzbyOo1mAyr6CWWFsk0CnbVNr x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?TAY4gXdHQDR1KjobK6/oA2HgP0cbtBtExDOb0S2nVhFyfPtI68TlQ91ld4wh?= =?us-ascii?Q?tls8S3OkywTrPwISJ2DrI7ZUOLDIQWcKetjkyNMCqPbCjBUuGEuuVx6bfwBp?= =?us-ascii?Q?rnV/mPOrntsowONZxtKOb5oAMQvq6z/bA8IhmoKtRkFSZEX3RV0MSK75ubZX?= =?us-ascii?Q?ZJn3KwzXmH7NGfbRaLYu5IN+e+gSICl+rbhJ5TOLl6LdlgdgGyooCyxoBjpm?= =?us-ascii?Q?J3EKpU39ugZkrrkvyUQHZEfMYgSoYTy4pBu/11+59XRE9cy5qo6QlW7/kDY4?= =?us-ascii?Q?kLQVmaKBnv06XAaWi0iBy3MEz2B2MKRXMF7ighgQ8oR85D7nbqhYyKx6vUDQ?= =?us-ascii?Q?IiJcOHJJ9yBwylEIaJtGAreBslpAyoBUmfKI78GjHEJYywrcUHecojeHOgpn?= =?us-ascii?Q?37wzs1bRDMl5ee2F6l6eTdoe+yC6nBNKc3h9siCLxsCykQGOkE55fDupf47W?= =?us-ascii?Q?tCnfBD5QaC4b9iIMuUdZeeFM2A2QsmU6TnbQpG7iSFoilL56WhxersZNaT4H?= =?us-ascii?Q?acz45+rZEDli8C3HEbC3YdUCMz0Fzqgj80QkOUgO+zF56dDJk2T4y2fEtGS1?= =?us-ascii?Q?zt4oDrZU9skd0z3YkBCI0/EFc3dvUke0ZPd2lUNn42m3ztk8LhgOtxPsJLWz?= =?us-ascii?Q?3qee0SyZRj3J0P+9gyRg8GTR4F+zR6McllHaLxFkYMsYF3PHRvSJb/U7Es3x?= =?us-ascii?Q?aWWEtIY+64U+Tj9qKYrQBQGoFMTRYx2LreFTUDym+aVnzCCRfrKAii0MMOAE?= =?us-ascii?Q?weTNjJG0GjNlx8a1nKeKSSR4xpawgxeZNSNB4EWomZF0IEST9y67oTePNYnG?= =?us-ascii?Q?vbTU74/YZq1eZUu8/OxchcMRjRr64oOJZ0pd8njZ2rFVT+twbC3qnQHW4wG4?= =?us-ascii?Q?KyqSFEzkEFAm6SkaWPpCXO7aTgWs4BLMZnPBFlNCchvkvK5C6PylCEhaY3xm?= =?us-ascii?Q?eQ6EGa6HxdarqvQRuzjMQ+PaiSEiwNQ3vHjEMrzmXiYyZRhcMsKuOLSzAyyn?= =?us-ascii?Q?s1IT8c1AK66XP6Cp9eB1MBT+oNJL3JaplQJN+GE2/MpcqaCv3GqTQ2PNcVMc?= =?us-ascii?Q?K8Kbsk5sBT4MBu9AGC9KugMkt4jQ11PzQpNHI0uIBMuQAFqSqTyz/ycKmZgO?= =?us-ascii?Q?TcXJGmps7US5brtM7Gt2lXvFfc0/vOv4mbf+DQzy7Pz//wgvedzIxAGmPEaR?= =?us-ascii?Q?NA0vnrhY69tLzDrYB5aiwXj6+TBrjk19NM5rT5mEXwnvQa3HI3/J4kxwLQL5?= =?us-ascii?Q?Z/sSg38STHm7JU14b2AImrKBjOyX8Z1tJ5Up9JIWQN15Lash+192ciAFVbNT?= =?us-ascii?Q?KALHeXS0LeaiaZy6/jxAJcoCek4h2wlM6yN99MwiTR2cLb23rOptzKOpTuTc?= =?us-ascii?Q?jLiw2FCI8Gw6kfbDa2zXgkrRPTtj9jdicGLZuhS0Fl8lttym/AZER63FS9Ni?= =?us-ascii?Q?rY1gCj+ektbepwpPNgPjgCWOq9ondLN8kFr8RC9WnVAsiJDiThx9zPjy6Le9?= =?us-ascii?Q?g9Z80ilz19IUNFx9efXc1ayucsA7gr+Fd4o6DQnx+KiN+iduHIvY2d5AdyFg?= =?us-ascii?Q?/jlPzhzW2/5W7xRIJos=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c410d02-fd05-4fe8-b448-08dc05b8ff40 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Dec 2023 02:18:49.4247 (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: 3pw7yboUdNK9inSWSDVYxZRikV8n9WR9QZrdbjjwrJrS2LLM2pObTI3GL7FXNUVACCyiJbzlQGjg9w6La58Zjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7804 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 Reply-To: devel@edk2.groups.io,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: kOXu3vBCuFrEoUL7dUdYfhWyx7686176AA= 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=20140610 header.b=mv+6pJuq; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Reviewed-by: Ray Ni Thanks, Ray > -----Original Message----- > From: Wu, Jiaxin > Sent: Tuesday, December 26, 2023 12:21 AM > To: devel@edk2.groups.io > Cc: Laszlo Ersek ; Dong, Eric ; N= i, > Ray ; Zeng, Star ; Gerd Hoffmann > ; Kumar, Rahul R > Subject: [PATCH v2 3/6] UefiCpuPkg/PiSmmCpuDxeSmm: Check SMM Debug > Agent support or not >=20 > This patch is to check SMM Debug Agent support or not before > InitializeDebugAgent. >=20 > Cc: Laszlo Ersek > Cc: Eric Dong > Cc: Ray Ni > Cc: Zeng Star > Cc: Gerd Hoffmann > Cc: Rahul Kumar > Signed-off-by: Jiaxin Wu > --- > UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 4 +++- > UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 22 +++++++++++++-------- > - > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 7 ++++++- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 1 + > 4 files changed, 23 insertions(+), 11 deletions(-) >=20 > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > index 0bae0e33f1..b14c289a27 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c > @@ -835,11 +835,13 @@ SmmRestoreCpu ( > ASSERT_EFI_ERROR (Status); >=20 > // > // Initialize Debug Agent to support source level debug > // > - InitializeDebugAgent (DEBUG_AGENT_INIT_THUNK_PEI_IA32TOX64, (VOID > *)&Ia32Idtr, NULL); > + if (mSmmDebugAgentSupport) { > + InitializeDebugAgent (DEBUG_AGENT_INIT_THUNK_PEI_IA32TOX64, > (VOID *)&Ia32Idtr, NULL); > + } > } >=20 > mBspApicId =3D GetApicId (); > // > // Skip AP initialization if mAcpiCpuData is not valid > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > index 4fbb0bba87..324e85d6b5 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > @@ -474,14 +474,16 @@ BSPHandler ( > // > // Flag BSP's presence > // > *mSmmMpSyncData->InsideSmm =3D TRUE; >=20 > - // > - // Initialize Debug Agent to start source level debug in BSP handler > - // > - InitializeDebugAgent (DEBUG_AGENT_INIT_ENTER_SMI, NULL, NULL); > + if (mSmmDebugAgentSupport) { > + // > + // Initialize Debug Agent to start source level debug in BSP handler > + // > + InitializeDebugAgent (DEBUG_AGENT_INIT_ENTER_SMI, NULL, NULL); > + } >=20 > // > // Mark this processor's presence > // > *(mSmmMpSyncData->CpuData[CpuIndex].Present) =3D TRUE; > @@ -646,15 +648,17 @@ BSPHandler ( > // Wait for all APs to complete MTRR programming > // > SmmCpuSyncWaitForAPs (mSmmMpSyncData->SyncContext, ApCount, > CpuIndex); > } >=20 > - // > - // Stop source level debug in BSP handler, the code below will not be > - // debugged. > - // > - InitializeDebugAgent (DEBUG_AGENT_INIT_EXIT_SMI, NULL, NULL); > + if (mSmmDebugAgentSupport) { > + // > + // Stop source level debug in BSP handler, the code below will not b= e > + // debugged. > + // > + InitializeDebugAgent (DEBUG_AGENT_INIT_EXIT_SMI, NULL, NULL); > + } >=20 > // > // Signal APs to Reset states/semaphore for this processor > // > ReleaseAllAPs (); > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > index 209a2e4810..9b230772cb 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c > @@ -110,10 +110,15 @@ BOOLEAN mSmmReadyToLock =3D FALSE; > // > // Global used to cache PCD for SMM Code Access Check enable > // > BOOLEAN mSmmCodeAccessCheckEnable =3D FALSE; >=20 > +// > +// Global used to cache SMM Debug Agent Supported ot not > +// > +BOOLEAN mSmmDebugAgentSupport =3D FALSE; > + > // > // Global copy of the PcdPteMemoryEncryptionAddressOrMask > // > UINT64 mAddressEncMask =3D 0; >=20 > @@ -895,11 +900,11 @@ PiCpuSmmEntry ( > PiSmmCpuSmiEntryFixupAddress (); >=20 > // > // Initialize Debug Agent to support source level debug in SMM code > // > - InitializeDebugAgent (DEBUG_AGENT_INIT_SMM, NULL, NULL); > + InitializeDebugAgent (DEBUG_AGENT_INIT_SMM, > &mSmmDebugAgentSupport, NULL); >=20 > // > // Report the start of CPU SMM initialization. > // > REPORT_STATUS_CODE ( > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > index a2fa4f6734..7f244ea803 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > @@ -481,10 +481,11 @@ extern UINTN mSemaphoreSize= ; > extern SPIN_LOCK *mPFLock; > extern SPIN_LOCK *mConfigSmmCodeAccessCheckLock; > extern EFI_SMRAM_DESCRIPTOR *mSmmCpuSmramRanges; > extern UINTN mSmmCpuSmramRangeCount; > extern UINT8 mPhysicalAddressBits; > +extern BOOLEAN mSmmDebugAgentSupport; >=20 > // > // Copy of the PcdPteMemoryEncryptionAddressOrMask > // > extern UINT64 mAddressEncMask; > -- > 2.16.2.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 (#112901): https://edk2.groups.io/g/devel/message/112901 Mute This Topic: https://groups.io/mt/103360804/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-