From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/16] Add minimum address parameter to efi_low_alloc()
Date: Fri, 30 Aug 2013 14:01:31 +0100 [thread overview]
Message-ID: <20130830130131.D7CE63E102A@localhost> (raw)
In-Reply-To: <1376090777-20090-5-git-send-email-roy.franz@linaro.org>
On Fri, 9 Aug 2013 16:26:05 -0700, Roy Franz <roy.franz@linaro.org> wrote:
> This allows allocations to be made low in memory while
> avoiding allocations at the base of memory.
Your commit message should include /why/ the change is needed. From the
above I understand what the patch does, but I don't understand why it is
necessary.
The patch looks fine to me, but it would be worth investigating merging
alloc_low and alloc_high. It looks like they both do pretty close to the
same calculations. A single core function could do both, could have both
minimum and maximum constraints, and could have a flag to determine if
low or high addresses should be preferred.
g.
Reviewed-by: Grant Likely <grant.likely@linaro.org>
>
> Signed-off-by: Roy Franz <roy.franz@linaro.org>
> ---
> arch/x86/boot/compressed/eboot.c | 11 ++++++-----
> drivers/firmware/efi/efi-stub-helper.c | 7 +++++--
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
> index 2a4430a..f44ef2f 100644
> --- a/arch/x86/boot/compressed/eboot.c
> +++ b/arch/x86/boot/compressed/eboot.c
> @@ -458,7 +458,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
> }
>
> status = efi_low_alloc(sys_table, 0x4000, 1,
> - (unsigned long *)&boot_params);
> + (unsigned long *)&boot_params, 0);
> if (status != EFI_SUCCESS) {
> efi_printk(sys_table, "Failed to alloc lowmem for boot params\n");
> return NULL;
> @@ -505,7 +505,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
> options_size++; /* NUL termination */
>
> status = efi_low_alloc(sys_table, options_size, 1,
> - &cmdline);
> + &cmdline, 0);
> if (status != EFI_SUCCESS) {
> efi_printk(sys_table, "Failed to alloc mem for cmdline\n");
> goto fail;
> @@ -563,7 +563,8 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
> again:
> size += sizeof(*mem_map) * 2;
> _size = size;
> - status = efi_low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);
> + status = efi_low_alloc(sys_table, size, 1,
> + (unsigned long *)&mem_map, 0);
> if (status != EFI_SUCCESS)
> return status;
>
> @@ -697,7 +698,7 @@ static efi_status_t relocate_kernel(struct setup_header *hdr)
> nr_pages, &start);
> if (status != EFI_SUCCESS) {
> status = efi_low_alloc(sys_table, hdr->init_size,
> - hdr->kernel_alignment, &start);
> + hdr->kernel_alignment, &start, 0);
> if (status != EFI_SUCCESS)
> efi_printk(sys_table, "Failed to alloc mem for kernel\n");
> }
> @@ -745,7 +746,7 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
>
> gdt->size = 0x800;
> status = efi_low_alloc(sys_table, gdt->size, 8,
> - (unsigned long *)&gdt->address);
> + (unsigned long *)&gdt->address, 0);
> if (status != EFI_SUCCESS) {
> efi_printk(sys_table, "Failed to alloc mem for gdt\n");
> goto fail;
> diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
> index 0218d535..40cd16e 100644
> --- a/drivers/firmware/efi/efi-stub-helper.c
> +++ b/drivers/firmware/efi/efi-stub-helper.c
> @@ -163,11 +163,11 @@ fail:
> }
>
> /*
> - * Allocate at the lowest possible address.
> + * Allocate at the lowest possible address, that is not below min.
> */
> static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
> unsigned long size, unsigned long align,
> - unsigned long *addr)
> + unsigned long *addr, unsigned long min)
> {
> unsigned long map_size, desc_size;
> efi_memory_desc_t *map;
> @@ -204,6 +204,9 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
> if (start == 0x0)
> start += 8;
>
> + if (start < min)
> + start = min;
> +
> start = round_up(start, align);
> if ((start + size) > end)
> continue;
> --
> 1.7.10.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2013-08-30 13:01 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-09 23:26 [PATCH V3 RFC 00/16] EFI stub for ARM Roy Franz
2013-08-09 23:26 ` [PATCH 01/16] Move common EFI stub code from x86 arch code to common location Roy Franz
2013-08-13 13:56 ` Mark Salter
2013-08-30 12:45 ` Grant Likely
2013-08-09 23:26 ` [PATCH 02/16] Add system pointer argument to shared EFI stub related functions so they no longer use global system table pointer as they did when part of eboot.c. This code is now shared, so using a global variable as part of the interface is not that nice. Also, by avoiding any global variables in the ARM EFI stub, this allows the code to be position independent without requiring GOT fixups Roy Franz
2013-08-13 13:56 ` Mark Salter
2013-08-30 12:53 ` Grant Likely
2013-08-30 21:46 ` Roy Franz
2013-08-09 23:26 ` [PATCH 03/16] Rename memory allocation/free functions Roy Franz
2013-08-13 13:56 ` Mark Salter
2013-08-30 12:54 ` Grant Likely
2013-08-09 23:26 ` [PATCH 04/16] Add minimum address parameter to efi_low_alloc() Roy Franz
2013-08-13 13:56 ` Mark Salter
2013-08-30 13:01 ` Grant Likely [this message]
2013-08-30 22:12 ` Roy Franz
2013-08-30 22:55 ` Grant Likely
2013-08-09 23:26 ` [PATCH 05/16] rename __get_map() to efi_get_memory_map(), add parameter to optionally return mmap key. The mmap key is required to exit EFI boot services, and allows efi_get_memory_map() to be used for getting final memory map Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:06 ` Grant Likely
2013-08-09 23:26 ` [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 Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:08 ` Grant Likely
2013-08-09 23:26 ` [PATCH 07/16] Allow efi_free() to be called with size of 0, and do nothing in that case Roy Franz
2013-08-09 23:26 ` [PATCH 08/16] Generalize handle_ramdisks() and rename to handle_cmdline_files() Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:31 ` Grant Likely
2013-08-09 23:26 ` [PATCH 09/16] Renames in handle_cmdline_files() to complete generalization Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:32 ` Grant Likely
2013-08-09 23:26 ` [PATCH 10/16] Move EFI_READ_CHUNK_SIZE define to shared location Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:33 ` Grant Likely
2013-08-30 22:49 ` Roy Franz
2013-08-09 23:26 ` [PATCH 11/16] Add proper definitions for some EFI function pointers Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:34 ` Grant Likely
2013-08-09 23:26 ` [PATCH 12/16] Fix types in EFI calls to match EFI function definitions Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:39 ` Grant Likely
2013-08-30 23:12 ` Roy Franz
2013-08-30 23:14 ` Grant Likely
2013-08-30 23:16 ` Roy Franz
2013-08-09 23:26 ` [PATCH 13/16] resolve warnings found on ARM compile Roy Franz
2013-08-13 13:57 ` Mark Salter
2013-08-30 13:41 ` Grant Likely
2013-08-09 23:26 ` [PATCH 14/16] Add strstr to compressed string.c for ARM Roy Franz
2013-08-30 13:43 ` Grant Likely
2013-08-30 13:47 ` Russell King - ARM Linux
2013-08-30 14:02 ` Grant Likely
2013-08-30 14:16 ` Roy Franz
2013-08-09 23:26 ` [PATCH 15/16] Add EFI stub " Roy Franz
2013-08-12 14:51 ` Mark Salter
2013-08-13 0:01 ` Roy Franz
2013-08-13 14:19 ` Dave Martin
[not found] ` <CAFECyb_bZYE5tCss8u4RkO=pdpMApo=KV0L0ORMfOnYHuiNf6w@mail.gmail.com>
2013-08-14 2:07 ` Roy Franz
2013-08-30 14:36 ` Grant Likely
2013-08-31 0:35 ` Roy Franz
2013-08-09 23:26 ` [PATCH 16/16] Add config EFI_STUB for ARM to Kconfig Roy Franz
2013-08-13 13:18 ` Dave Martin
2013-08-13 17:37 ` Roy Franz
2013-08-30 11:17 ` Grant Likely
2013-08-12 14:02 ` [PATCH V3 RFC 00/16] EFI stub for ARM Mark Salter
2013-08-13 1:13 ` Roy Franz
2013-08-13 15:46 ` Mark Salter
2013-08-13 17:58 ` Roy Franz
2013-08-17 0:16 ` Roy Franz
2013-08-23 22:40 ` Roy Franz
2013-09-02 7:36 ` Matt Fleming
2013-09-02 10:33 ` Matt Fleming
2013-09-02 15:49 ` Roy Franz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130830130131.D7CE63E102A@localhost \
--to=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).