Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755703Ab3H3NIN (ORCPT ); Fri, 30 Aug 2013 09:08:13 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:56323 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245Ab3H3NIL (ORCPT ); Fri, 30 Aug 2013 09:08:11 -0400 From: Grant Likely Subject: Re: [PATCH 06/16] Enforce minimum alignment of 1 page on allocations. The efi_high_alloc() and efi_low_alloc() functions use the EFI_ALLOCATE_ADDRESS option to the EFI function allocate_pages(), which requires a minimum of page alignment, and rejects all other requests. To: Roy Franz , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt.fleming@intel.com, linux@arm.linux.org.uk Cc: Roy Franz , dave.martin@arm.com, leif.lindholm@linaro.org, msalter@redhat.com In-Reply-To: <1376090777-20090-7-git-send-email-roy.franz@linaro.org> References: <1376090777-20090-1-git-send-email-roy.franz@linaro.org> <1376090777-20090-7-git-send-email-roy.franz@linaro.org> Date: Fri, 30 Aug 2013 14:08:11 +0100 Message-Id: <20130830130811.7D7453E102A@localhost> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2215 Lines: 61 On Fri, 9 Aug 2013 16:26:07 -0700, Roy Franz wrote: > The existing code could fail to allocate depending > on allocation size, as although repeated allocation > attempts were made, none were guaranteed to be page > aligned. Commit message. Otherwise looks reasonable. Reviewed-by: Grant Likely > Signed-off-by: Roy Franz > --- > drivers/firmware/efi/efi-stub-helper.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c > index 1d0a079..647b3ba 100644 > --- a/drivers/firmware/efi/efi-stub-helper.c > +++ b/drivers/firmware/efi/efi-stub-helper.c > @@ -105,6 +105,13 @@ static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg, > if (status != EFI_SUCCESS) > goto fail; > > + /* Enforce minimum alignment that EFI requires when requesting > + * a specific address. We are doing page-based allocations, > + * so we must be aligned to a page. > + */ > + if (align < EFI_PAGE_SIZE) > + align = EFI_PAGE_SIZE; > + > nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; > again: > for (i = 0; i < map_size / desc_size; i++) { > @@ -184,6 +191,13 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, > if (status != EFI_SUCCESS) > goto fail; > > + /* Enforce minimum alignment that EFI requires when requesting > + * a specific address. We are doing page-based allocations, > + * so we must be aligned to a page. > + */ > + if (align < EFI_PAGE_SIZE) > + align = EFI_PAGE_SIZE; > + > nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; > for (i = 0; i < map_size / desc_size; i++) { > efi_memory_desc_t *desc; > -- > 1.7.10.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/