| Message ID | 1376090777-20090-7-git-send-email-roy.franz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2013-08-09 at 16:26 -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. > > > > Signed-off-by: Roy Franz <roy.franz@linaro.org> > --- Tested on arm64. Acked-by: Mark Salter <msalter@redhat.com>
On Fri, 9 Aug 2013 16:26:07 -0700, Roy Franz <roy.franz@linaro.org> 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 <grant.likely@linaro.org> > Signed-off-by: Roy Franz <roy.franz@linaro.org> > --- > 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
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;
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. Signed-off-by: Roy Franz <roy.franz@linaro.org> --- drivers/firmware/efi/efi-stub-helper.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)