From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-x22c.google.com (mail-it0-x22c.google.com [IPv6:2607:f8b0:4001:c0b::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8B80C81FEA for ; Mon, 27 Feb 2017 00:15:35 -0800 (PST) Received: by mail-it0-x22c.google.com with SMTP id y135so63241850itc.1 for ; Mon, 27 Feb 2017 00:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=ezWChT04zqILZbWXVNl7htCn87934sc7HIEQRcDDKgc=; b=AbrpO6Euu5xqHnhlDgZ3wkD8KNloXdcPaZUWCrBwD8ZKYu+XTurN09z9BwPIqyGVcR NduqUzV+Z9/JIP439l/sht18DwMYGBrBWlXV1uBNsa6EA/6GULprVZRFvXha1qboMZd+ XgjuoyoDS2smtUP/MSTYePhee+TR38enzt+QQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=ezWChT04zqILZbWXVNl7htCn87934sc7HIEQRcDDKgc=; b=ZMcxAAXblXpHqUctgDhq9jktZ6gIse34U6Hcu6YVhLBnMDOwKp2H/7xsI6mKWryxl0 ZuPeH9pP4pTuHEe205oPaYMuKcFx6Rj4MaY7RYYGgW6PoKKk40Yty9bsg1+NKL7JpqFW coFyI3F6vEZVlbb+c2jtkbIn8PTYVZHzrnGoZfZ+jsaUhwXO96gz2vAjNSJ2wuQtPWHE eCeAu9k9N8+Dai/fd0TxTdW89QYACHq6tf0q0XmdvzU/dwJQjocG1k9wKZO0rRPJIGLy Fte5nczSvTjwsmOnc40lvoQSPWEOfCozw2KusAFnE4D7w1BXaA2kwuhwhPmmp14i6PMw 6J1A== X-Gm-Message-State: AMke39lMaFpwSZEQeWXaiOgrGYk61rSLdPcCsWpBN023e0Bt5vf7mJjI159UYeCazYVlVSiU86YI7dnGvOHl1pjY X-Received: by 10.36.23.74 with SMTP id 71mr12599673ith.37.1488183334655; Mon, 27 Feb 2017 00:15:34 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.10.27 with HTTP; Mon, 27 Feb 2017 00:15:33 -0800 (PST) In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B82C082@shsmsx102.ccr.corp.intel.com> References: <1488133805-4773-1-git-send-email-ard.biesheuvel@linaro.org> <1488133805-4773-5-git-send-email-ard.biesheuvel@linaro.org> <0C09AFA07DD0434D9E2A0C6AEB0483103B82C082@shsmsx102.ccr.corp.intel.com> From: Ard Biesheuvel Date: Mon, 27 Feb 2017 08:15:33 +0000 Message-ID: To: "Zeng, Star" Cc: "edk2-devel@lists.01.org" , "Yao, Jiewen" , "leif.lindholm@linaro.org" , "Tian, Feng" , "afish@apple.com" , "Gao, Liming" , "Kinney, Michael D" , "lersek@redhat.com" Subject: Re: [PATCH v3 4/6] MdeModulePkg/DxeCore: use separate lock for pool allocations X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 08:15:35 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 27 February 2017 at 01:56, Zeng, Star wrote: > Minor comment: CoreFreePoolPagesI() has no need to have PoolType paramete= r, how about to remove it? > I need it after patch 6. But perhaps it is better to only add it there, not here. > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ar= d Biesheuvel > Sent: Monday, February 27, 2017 2:30 AM > To: edk2-devel@lists.01.org; Yao, Jiewen ; leif.lin= dholm@linaro.org > Cc: Tian, Feng ; Ard Biesheuvel ; afish@apple.com; Gao, Liming ; Kinney, Micha= el D ; lersek@redhat.com; Zeng, Star > Subject: [edk2] [PATCH v3 4/6] MdeModulePkg/DxeCore: use separate lock fo= r pool allocations > > In preparation of adding memory permission attribute management to the po= ol allocator, split off the locking of the pool metadata into a separate lo= ck. This is an improvement in itself, given that pool allocation can only i= nterfere with the page allocation bookkeeping if pool pages are allocated o= r released. But it is also required to ensure that the permission attribute= management does not deadlock, given that it may trigger page table splits = leading to additional page tables being allocated. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel > --- > MdeModulePkg/Core/Dxe/Mem/Pool.c | 53 ++++++++++++++++---- > 1 file changed, 43 insertions(+), 10 deletions(-) > > diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem= /Pool.c > index 7afd2d312c1d..410615e0dee9 100644 > --- a/MdeModulePkg/Core/Dxe/Mem/Pool.c > +++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c > @@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITH= ER EXPRESS OR IMPLIED. > #include "DxeMain.h" > #include "Imem.h" > > +STATIC EFI_LOCK mPoolMemoryLock =3D EFI_INITIALIZE_LOCK_VARIABLE > +(TPL_NOTIFY); > + > #define POOL_FREE_SIGNATURE SIGNATURE_32('p','f','r','0') > typedef struct { > UINT32 Signature; > @@ -239,13 +241,13 @@ CoreInternalAllocatePool ( > // > // Acquire the memory lock and make the allocation > // > - Status =3D CoreAcquireLockOrFail (&gMemoryLock); > + Status =3D CoreAcquireLockOrFail (&mPoolMemoryLock); > if (EFI_ERROR (Status)) { > return EFI_OUT_OF_RESOURCES; > } > > *Buffer =3D CoreAllocatePoolI (PoolType, Size); > - CoreReleaseMemoryLock (); > + CoreReleaseLock (&mPoolMemoryLock); > return (*Buffer !=3D NULL) ? EFI_SUCCESS : EFI_OUT_OF_RESOURCES; } > > @@ -289,6 +291,23 @@ CoreAllocatePool ( > return Status; > } > > +STATIC > +VOID * > +CoreAllocatePoolPagesI ( > + IN EFI_MEMORY_TYPE PoolType, > + IN UINTN NoPages, > + IN UINTN Granularity > + ) > +{ > + VOID *Buffer; > + > + CoreAcquireMemoryLock (); > + Buffer =3D CoreAllocatePoolPages (PoolType, NoPages, Granularity); > + CoreReleaseMemoryLock (); > + > + return Buffer; > +} > + > /** > Internal function to allocate pool of a particular type. > Caller must have the memory lock held @@ -317,7 +336,7 @@ CoreAllocate= PoolI ( > UINTN NoPages; > UINTN Granularity; > > - ASSERT_LOCKED (&gMemoryLock); > + ASSERT_LOCKED (&mPoolMemoryLock); > > if (PoolType =3D=3D EfiACPIReclaimMemory || > PoolType =3D=3D EfiACPIMemoryNVS || > @@ -355,7 +374,7 @@ CoreAllocatePoolI ( > if (Index >=3D SIZE_TO_LIST (Granularity)) { > NoPages =3D EFI_SIZE_TO_PAGES(Size) + EFI_SIZE_TO_PAGES (Granularity= ) - 1; > NoPages &=3D ~(UINTN)(EFI_SIZE_TO_PAGES (Granularity) - 1); > - Head =3D CoreAllocatePoolPages (PoolType, NoPages, Granularity); > + Head =3D CoreAllocatePoolPagesI (PoolType, NoPages, Granularity); > goto Done; > } > > @@ -383,7 +402,7 @@ CoreAllocatePoolI ( > // > // Get another page > // > - NewPage =3D CoreAllocatePoolPages(PoolType, EFI_SIZE_TO_PAGES (Granu= larity), Granularity); > + NewPage =3D CoreAllocatePoolPagesI (PoolType, EFI_SIZE_TO_PAGES > + (Granularity), Granularity); > if (NewPage =3D=3D NULL) { > goto Done; > } > @@ -486,9 +505,9 @@ CoreInternalFreePool ( > return EFI_INVALID_PARAMETER; > } > > - CoreAcquireMemoryLock (); > + CoreAcquireLock (&mPoolMemoryLock); > Status =3D CoreFreePoolI (Buffer, PoolType); > - CoreReleaseMemoryLock (); > + CoreReleaseLock (&mPoolMemoryLock); > return Status; > } > > @@ -525,6 +544,19 @@ CoreFreePool ( > return Status; > } > > +STATIC > +VOID > +CoreFreePoolPagesI ( > + IN EFI_MEMORY_TYPE PoolType, > + IN EFI_PHYSICAL_ADDRESS Memory, > + IN UINTN NoPages > + ) > +{ > + CoreAcquireMemoryLock (); > + CoreFreePoolPages (Memory, NoPages); > + CoreReleaseMemoryLock (); > +} > + > /** > Internal function to free a pool entry. > Caller must have the memory lock held @@ -573,7 +605,7 @@ CoreFreePool= I ( > // > ASSERT (Tail->Signature =3D=3D POOL_TAIL_SIGNATURE); > ASSERT (Head->Size =3D=3D Tail->Size); > - ASSERT_LOCKED (&gMemoryLock); > + ASSERT_LOCKED (&mPoolMemoryLock); > > if (Tail->Signature !=3D POOL_TAIL_SIGNATURE) { > return EFI_INVALID_PARAMETER; > @@ -624,7 +656,7 @@ CoreFreePoolI ( > // > NoPages =3D EFI_SIZE_TO_PAGES(Size) + EFI_SIZE_TO_PAGES (Granularity= ) - 1; > NoPages &=3D ~(UINTN)(EFI_SIZE_TO_PAGES (Granularity) - 1); > - CoreFreePoolPages ((EFI_PHYSICAL_ADDRESS) (UINTN) Head, NoPages); > + CoreFreePoolPagesI (Pool->MemoryType, (EFI_PHYSICAL_ADDRESS) > + (UINTN) Head, NoPages); > > } else { > > @@ -680,7 +712,8 @@ CoreFreePoolI ( > // > // Free the page > // > - CoreFreePoolPages ((EFI_PHYSICAL_ADDRESS) (UINTN)NewPage, EFI_SI= ZE_TO_PAGES (Granularity)); > + CoreFreePoolPagesI (Pool->MemoryType, (EFI_PHYSICAL_ADDRESS) (UI= NTN)NewPage, > + EFI_SIZE_TO_PAGES (Granularity)); > } > } > } > -- > 2.7.4 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel