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 143C9D8017E for ; Mon, 18 Mar 2024 02:20:24 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=WbksZAJPgcPLk+aYXaRDuWVhnILxD8pPHc5qAvgVRTA=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1710728423; v=1; b=2BClebhFjbwPwf00TX25ggX/b6+VJJZeHrTJvG+Jkly0P/7wano2KR5N3Qdiv2qvUx4uvO+J iHWhTG2yvGxzlLuUMvB3l6DMMpXnB9CrFwIK4nURhb8lcF5U8WW3jKriNXxS0MDBuG/p0MbyIB7 oHBBRCpaz5KRtmr4ytD+wmoKjFZyzULfULNltjj7nGX1oTw3PBBmx6m6WSEKWfh6SFB+v99Y2tg C+n/eS1yb7XqIpaxKvJzRG0Xg2NkiAusMcAYQfguVh5ZCG599J1P13jS0c0/F+PiwUzWqEwp4ga Js6xLm18knPLPVTGwtHrMCEICxpOoexs0h1HOKVferTgg== X-Received: by 127.0.0.2 with SMTP id OXYrYY7687511xrohDPcc3Tk; Sun, 17 Mar 2024 19:20:23 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by mx.groups.io with SMTP id smtpd.web11.34038.1710728416304381805 for ; Sun, 17 Mar 2024 19:20:23 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="5363115" X-IronPort-AV: E=Sophos;i="6.07,133,1708416000"; d="scan'208";a="5363115" X-Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 19:20:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,133,1708416000"; d="scan'208";a="13356216" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 19:20:21 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Liming Gao , Jiaxin Wu , Ray Ni , Laszlo Ersek , Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH 3/6] Revert 17b28722008eab745ce186b72cd325944cbe6bf0 Date: Mon, 18 Mar 2024 10:19:53 +0800 Message-Id: <20240318021956.2787-4-zhiguang.liu@intel.com> In-Reply-To: <20240318021956.2787-1-zhiguang.liu@intel.com> References: <20240318021956.2787-1-zhiguang.liu@intel.com> MIME-Version: 1.0 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: Sun, 17 Mar 2024 19:20:23 -0700 Reply-To: devel@edk2.groups.io,zhiguang.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: hPtbFFvWXjoYXuDeLpNPRbx9x7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=2BClebhF; 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) This reverts commit "MdeModulePkg/SMM: Disallow unregister SMI handler in other SMI handler" for better design later. Cc: Liming Gao Cc: Jiaxin Wu Cc: Ray Ni Cc: Laszlo Ersek Cc: Ray Ni Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Sami Mujawar Signed-off-by: Zhiguang Liu --- MdeModulePkg/Core/PiSmmCore/Smi.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCore/Smi.c index b3a81ac877..3489c130fd 100644 --- a/MdeModulePkg/Core/PiSmmCore/Smi.c +++ b/MdeModulePkg/Core/PiSmmCore/Smi.c @@ -8,8 +8,7 @@ #include "PiSmmCore.h" -SMI_HANDLER *mCurrentSmiHandler = NULL; -LIST_ENTRY mSmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mSmiEntryList); +LIST_ENTRY mSmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mSmiEntryList); SMI_ENTRY mRootSmiEntry = { SMI_ENTRY_SIGNATURE, @@ -143,18 +142,13 @@ SmiManage ( // Link points to may be freed if unregister SMI handler. // Link = Link->ForwardLink; - // - // Assign gCurrentSmiHandle before calling the SMI handler and - // set to NULL when it returns. - // - mCurrentSmiHandler = SmiHandler; - Status = SmiHandler->Handler ( - (EFI_HANDLE)SmiHandler, - Context, - CommBuffer, - CommBufferSize - ); - mCurrentSmiHandler = NULL; + + Status = SmiHandler->Handler ( + (EFI_HANDLE)SmiHandler, + Context, + CommBuffer, + CommBufferSize + ); switch (Status) { case EFI_INTERRUPT_PENDING: @@ -334,13 +328,6 @@ SmiHandlerUnRegister ( return EFI_INVALID_PARAMETER; } - // - // Do not allow to unregister SMI Handler inside other SMI Handler - // - if ((mCurrentSmiHandler != NULL) && (mCurrentSmiHandler != SmiHandler)) { - return EFI_INVALID_PARAMETER; - } - SmiEntry = SmiHandler->SmiEntry; RemoveEntryList (&SmiHandler->Link); -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116829): https://edk2.groups.io/g/devel/message/116829 Mute This Topic: https://groups.io/mt/104996182/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-