From 82f3edf26a7f60e50b0133cdc5ec689d2b7f502e Mon Sep 17 00:00:00 2001 From: Samer El-Haj-Mahmoud Date: Mon, 21 Sep 2015 01:53:34 +0000 Subject: MdeModulePkg: Remove event from protocol database only if registered In a CloseEvent, an UnregisterProtocolNotify is done unconditionally. There is a penalty associated with searching the protocol database on every CloseEvent and impacts performance, especially during Network IO. Unregister needs to be done only if the Event is for a RegisterProtocolNotify. So extend the ExFlag in IEVENT to a UINT8 and define new flags that can be set to indicate if the Event is part of a group, or registered on a protocol notify. Then in CloseEvent, call UnregisterProtocolNotify only if the register protocol notify flag is set. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud Reviewed-by: Feng Tian git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18517 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/Dxe/Event/Event.c | 9 ++++++--- MdeModulePkg/Core/Dxe/Event/Event.h | 11 ++++++++++- MdeModulePkg/Core/Dxe/Hand/Notify.c | 5 +++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Event/Event.c b/MdeModulePkg/Core/Dxe/Event/Event.c index a8c4c34d83..34b34ac62f 100644 --- a/MdeModulePkg/Core/Dxe/Event/Event.c +++ b/MdeModulePkg/Core/Dxe/Event/Event.c @@ -2,6 +2,7 @@ UEFI Event support functions implemented in this file. Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -477,7 +478,7 @@ CoreCreateEventInternal ( IEvent->NotifyContext = (VOID *)NotifyContext; if (EventGroup != NULL) { CopyGuid (&IEvent->EventGroup, EventGroup); - IEvent->ExFlag = TRUE; + IEvent->ExFlag |= EVT_EXFLAG_EVENT_GROUP; } *Event = IEvent; @@ -554,7 +555,7 @@ CoreSignalEvent ( // If signalling type is a notify function, queue it // if ((Event->Type & EVT_NOTIFY_SIGNAL) != 0) { - if (Event->ExFlag) { + if ((Event->ExFlag & EVT_EXFLAG_EVENT_GROUP) != 0) { // // The CreateEventEx() style requires all members of the Event Group // to be signaled. @@ -764,7 +765,9 @@ CoreCloseEvent ( // // If the event is registered on a protocol notify, then remove it from the protocol database // - CoreUnregisterProtocolNotify (Event); + if ((Event->ExFlag & EVT_EXFLAG_EVENT_PROTOCOL_NOTIFICATION) != 0) { + CoreUnregisterProtocolNotify (Event); + } Status = CoreFreePool (Event); ASSERT_EFI_ERROR (Status); diff --git a/MdeModulePkg/Core/Dxe/Event/Event.h b/MdeModulePkg/Core/Dxe/Event/Event.h index c110f4d072..4c02900b93 100644 --- a/MdeModulePkg/Core/Dxe/Event/Event.h +++ b/MdeModulePkg/Core/Dxe/Event/Event.h @@ -2,6 +2,7 @@ UEFI Event support functions and structure. Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -19,6 +20,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define VALID_TPL(a) ((a) <= TPL_HIGH_LEVEL) extern UINTN gEventPending; +/// +/// Set if Event is part of an event group +/// +#define EVT_EXFLAG_EVENT_GROUP 0x01 +/// +/// Set if Event is registered on a protocol notify +/// +#define EVT_EXFLAG_EVENT_PROTOCOL_NOTIFICATION 0x02 // // EFI_EVENT @@ -50,7 +59,7 @@ typedef struct { VOID *NotifyContext; EFI_GUID EventGroup; LIST_ENTRY NotifyLink; - BOOLEAN ExFlag; + UINT8 ExFlag; /// /// A list of all runtime events /// diff --git a/MdeModulePkg/Core/Dxe/Hand/Notify.c b/MdeModulePkg/Core/Dxe/Hand/Notify.c index 53780f8e6b..f0837c403f 100644 --- a/MdeModulePkg/Core/Dxe/Hand/Notify.c +++ b/MdeModulePkg/Core/Dxe/Hand/Notify.c @@ -2,6 +2,7 @@ Support functions for UEFI protocol notification infrastructure. Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -14,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "DxeMain.h" #include "Handle.h" - +#include "Event.h" /** Signal event for every protocol in protocol entry. @@ -135,7 +136,7 @@ CoreRegisterProtocolNotify ( // ProtNotify = AllocatePool (sizeof(PROTOCOL_NOTIFY)); if (ProtNotify != NULL) { - + ((IEVENT *)Event)->ExFlag |= EVT_EXFLAG_EVENT_PROTOCOL_NOTIFICATION; ProtNotify->Signature = PROTOCOL_NOTIFY_SIGNATURE; ProtNotify->Protocol = ProtEntry; ProtNotify->Event = Event; -- cgit v1.2.3