Remove nested functions from memory map iterators.
* grub-core/efiemu/mm.c (grub_efiemu_mmap_iterate): Add hook_data argument, passed to hook. * grub-core/kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Likewise. (grub_machine_mmap_iterate: iterate_linuxbios_table): Make static instead of nested. (grub_machine_mmap_iterate): Add hook_data argument. * grub-core/kern/i386/multiboot_mmap.c (grub_machine_mmap_iterate): Add hook_data argument, passed to hook. * grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Likewise. * grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate): Likewise. * grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate): Likewise. * grub-core/kern/mips/arc/init.c (grub_machine_mmap_iterate): Likewise. * grub-core/kern/mips/loongson/init.c (grub_machine_mmap_iterate): Likewise. * grub-core/kern/mips/qemu_mips/init.c (grub_machine_mmap_iterate): Likewise. * grub-core/mmap/efi/mmap.c (grub_efi_mmap_iterate): Likewise. (grub_machine_mmap_iterate): Likewise. * grub-core/mmap/mmap.c (grub_mmap_iterate): Likewise. * include/grub/efiemu/efiemu.h (grub_efiemu_mmap_iterate): Update prototype. * include/grub/memory.h (grub_memory_hook_t): Add data argument. Remove NESTED_FUNC_ATTR from here and from all users. (grub_mmap_iterate): Update prototype. (grub_efi_mmap_iterate): Update prototype. Update all callers to pass appropriate hook data. (grub_machine_mmap_iterate): Likewise. * grub-core/commands/acpi.c (grub_acpi_create_ebda: find_hook): Make static instead of nested. * grub-core/commands/lsmmap.c (grub_cmd_lsmmap: hook): Likewise. Rename to ... (lsmmap_hook): ... this. * grub-core/efiemu/mm.c (grub_efiemu_mmap_init: bounds_hook): Likewise. (grub_efiemu_mmap_fill: fill_hook): Likewise. * grub-core/kern/i386/coreboot/init.c (grub_machine_init: heap_init): Likewise. * grub-core/kern/i386/pc/init.c (grub_machine_init: hook): Likewise. Rename to ... (mmap_iterate_hook): ... this. * grub-core/kern/ieee1275/init.c (grub_claim_heap: heap_init): Likewise. * grub-core/lib/ieee1275/relocator.c (grub_relocator_firmware_get_max_events: count): Likewise. (grub_relocator_firmware_fill_events: fill): Likewise. Rename to ... (grub_relocator_firmware_fill_events_iter): ... this. * grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align: hook): Likewise. Rename to ... (grub_relocator_alloc_chunk_align_iter): ... this. * grub-core/loader/i386/bsd.c (generate_e820_mmap: hook): Likewise. Rename to ... (generate_e820_mmap_iter): ... this. * grub-core/loader/i386/linux.c (find_mmap_size: hook): Likewise. Rename to ... (count_hook): ... this. (grub_linux_boot: hook): Likewise. Rename to ... (grub_linux_boot_mmap_find): ... this. (grub_linux_boot: hook_fill): Likewise. Rename to ... (grub_linux_boot_mmap_fill): ... this. * grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap: hook): Likewise. Rename to ... (grub_fill_multiboot_mmap_iter): ... this. * grub-core/loader/multiboot.c (grub_get_multiboot_mmap_count: hook): Likewise. Rename to ... (count_hook): ... this. * grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap: hook): Likewise. Rename to ... (grub_fill_multiboot_mmap_iter): ... this. * grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_claimmap_iterate: alloc_mem): Likewise. * grub-core/loader/sparc64/ieee1275/linux.c (alloc_phys: choose): Likewise. Rename to ... (alloc_phys_choose): ... this. (determine_phys_base: get_physbase): Likewise. * grub-core/mmap/i386/mmap.c (grub_mmap_malign_and_register: find_hook): Likewise. * grub-core/mmap/i386/pc/mmap.c (preboot: fill_hook): Likewise. (malloc_hook: count_hook): Likewise. * grub-core/mmap/i386/uppermem.c (grub_mmap_get_lower: hook): Likewise. Rename to ... (lower_hook): ... this. (grub_mmap_get_upper: hook): Likewise. Rename to ... (upper_hook): ... this. (grub_mmap_get_post64: hook): Likewise. Rename to ... (post64_hook): ... this. * grub-core/mmap/mips/uppermem.c (grub_mmap_get_lower: hook): Likewise. Rename to ... (lower_hook): ... this. (grub_mmap_get_upper: hook): Likewise. Rename to ... (upper_hook): ... this. * grub-core/mmap/mmap.c (grub_mmap_iterate: count_hook): Likewise. (grub_mmap_iterate: fill_hook): Likewise. (fill_mask): Pass addr and mask within a single struct. (grub_cmd_badram: hook): Make static instead of nested. Rename to ... (badram_iter): ... this. (grub_cmd_cutmem: hook): Likewise. Rename to ... (cutmem_iter): ... this.
This commit is contained in:
Colin Watson
parent
22099030ad
commit
d0d4b8a063
32 changed files with 1315 additions and 1045 deletions
|
|
@ -21,65 +21,81 @@
|
|||
#include <grub/memory.h>
|
||||
#include <grub/ieee1275/ieee1275.h>
|
||||
|
||||
/* Helper for grub_relocator_firmware_get_max_events. */
|
||||
static int
|
||||
count (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t len __attribute__ ((unused)),
|
||||
grub_memory_type_t type __attribute__ ((unused)), void *data)
|
||||
{
|
||||
int *counter = data;
|
||||
|
||||
(*counter)++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned
|
||||
grub_relocator_firmware_get_max_events (void)
|
||||
{
|
||||
int counter = 0;
|
||||
auto int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t len __attribute__ ((unused)),
|
||||
grub_memory_type_t type __attribute__ ((unused)));
|
||||
int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t len __attribute__ ((unused)),
|
||||
grub_memory_type_t type __attribute__ ((unused)))
|
||||
{
|
||||
counter++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
|
||||
return 0;
|
||||
grub_machine_mmap_iterate (count);
|
||||
grub_machine_mmap_iterate (count, &counter);
|
||||
return 2 * counter;
|
||||
}
|
||||
|
||||
/* Context for grub_relocator_firmware_fill_events. */
|
||||
struct grub_relocator_firmware_fill_events_ctx
|
||||
{
|
||||
struct grub_relocator_mmap_event *events;
|
||||
int counter;
|
||||
};
|
||||
|
||||
/* Helper for grub_relocator_firmware_fill_events. */
|
||||
static int
|
||||
grub_relocator_firmware_fill_events_iter (grub_uint64_t addr,
|
||||
grub_uint64_t len,
|
||||
grub_memory_type_t type, void *data)
|
||||
{
|
||||
struct grub_relocator_firmware_fill_events_ctx *ctx = data;
|
||||
|
||||
if (type != GRUB_MEMORY_AVAILABLE)
|
||||
return 0;
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
|
||||
{
|
||||
if (addr + len <= 0x180000)
|
||||
return 0;
|
||||
|
||||
if (addr < 0x180000)
|
||||
{
|
||||
len = addr + len - 0x180000;
|
||||
addr = 0x180000;
|
||||
}
|
||||
}
|
||||
|
||||
ctx->events[ctx->counter].type = REG_FIRMWARE_START;
|
||||
ctx->events[ctx->counter].pos = addr;
|
||||
ctx->counter++;
|
||||
ctx->events[ctx->counter].type = REG_FIRMWARE_END;
|
||||
ctx->events[ctx->counter].pos = addr + len;
|
||||
ctx->counter++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
unsigned
|
||||
grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)
|
||||
{
|
||||
int counter = 0;
|
||||
auto int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
|
||||
grub_memory_type_t type);
|
||||
int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
if (type != GRUB_MEMORY_AVAILABLE)
|
||||
return 0;
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
|
||||
{
|
||||
if (addr + len <= 0x180000)
|
||||
return 0;
|
||||
|
||||
if (addr < 0x180000)
|
||||
{
|
||||
len = addr + len - 0x180000;
|
||||
addr = 0x180000;
|
||||
}
|
||||
}
|
||||
|
||||
events[counter].type = REG_FIRMWARE_START;
|
||||
events[counter].pos = addr;
|
||||
counter++;
|
||||
events[counter].type = REG_FIRMWARE_END;
|
||||
events[counter].pos = addr + len;
|
||||
counter++;
|
||||
|
||||
return 0;
|
||||
}
|
||||
struct grub_relocator_firmware_fill_events_ctx ctx = {
|
||||
.events = events,
|
||||
.counter = 0
|
||||
};
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
|
||||
return 0;
|
||||
grub_machine_mmap_iterate (fill);
|
||||
return counter;
|
||||
grub_machine_mmap_iterate (grub_relocator_firmware_fill_events_iter, &ctx);
|
||||
return ctx.counter;
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1313,6 +1313,45 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
|
|||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
/* Context for grub_relocator_alloc_chunk_align. */
|
||||
struct grub_relocator_alloc_chunk_align_ctx
|
||||
{
|
||||
grub_phys_addr_t min_addr, max_addr;
|
||||
grub_size_t size, align;
|
||||
int preference;
|
||||
struct grub_relocator_chunk *chunk;
|
||||
int found;
|
||||
};
|
||||
|
||||
/* Helper for grub_relocator_alloc_chunk_align. */
|
||||
static int
|
||||
grub_relocator_alloc_chunk_align_iter (grub_uint64_t addr, grub_uint64_t sz,
|
||||
grub_memory_type_t type, void *data)
|
||||
{
|
||||
struct grub_relocator_alloc_chunk_align_ctx *ctx = data;
|
||||
grub_uint64_t candidate;
|
||||
|
||||
if (type != GRUB_MEMORY_AVAILABLE)
|
||||
return 0;
|
||||
candidate = ALIGN_UP (addr, ctx->align);
|
||||
if (candidate < ctx->min_addr)
|
||||
candidate = ALIGN_UP (ctx->min_addr, ctx->align);
|
||||
if (candidate + ctx->size > addr + sz
|
||||
|| candidate > ALIGN_DOWN (ctx->max_addr, ctx->align))
|
||||
return 0;
|
||||
if (ctx->preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
|
||||
candidate = ALIGN_DOWN (min (addr + sz - ctx->size, ctx->max_addr),
|
||||
ctx->align);
|
||||
if (!ctx->found || (ctx->preference == GRUB_RELOCATOR_PREFERENCE_HIGH
|
||||
&& candidate > ctx->chunk->target))
|
||||
ctx->chunk->target = candidate;
|
||||
if (!ctx->found || (ctx->preference == GRUB_RELOCATOR_PREFERENCE_LOW
|
||||
&& candidate < ctx->chunk->target))
|
||||
ctx->chunk->target = candidate;
|
||||
ctx->found = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
grub_err_t
|
||||
grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
||||
grub_relocator_chunk_t *out,
|
||||
|
|
@ -1322,8 +1361,15 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
|||
int preference,
|
||||
int avoid_efi_boot_services)
|
||||
{
|
||||
struct grub_relocator_alloc_chunk_align_ctx ctx = {
|
||||
.min_addr = min_addr,
|
||||
.max_addr = max_addr,
|
||||
.size = size,
|
||||
.align = align,
|
||||
.preference = preference,
|
||||
.found = 0
|
||||
};
|
||||
grub_addr_t min_addr2 = 0, max_addr2;
|
||||
struct grub_relocator_chunk *chunk;
|
||||
|
||||
if (max_addr > ~size)
|
||||
max_addr = ~size;
|
||||
|
|
@ -1335,24 +1381,24 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
|||
|
||||
grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
|
||||
|
||||
chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
|
||||
if (!chunk)
|
||||
ctx.chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
|
||||
if (!ctx.chunk)
|
||||
return grub_errno;
|
||||
|
||||
if (malloc_in_range (rel, min_addr, max_addr, align,
|
||||
size, chunk,
|
||||
size, ctx.chunk,
|
||||
preference != GRUB_RELOCATOR_PREFERENCE_HIGH, 1))
|
||||
{
|
||||
grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
|
||||
(unsigned long long) chunk->src,
|
||||
(unsigned long long) chunk->src);
|
||||
(unsigned long long) ctx.chunk->src,
|
||||
(unsigned long long) ctx.chunk->src);
|
||||
grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
|
||||
chunk->target = chunk->src;
|
||||
chunk->size = size;
|
||||
chunk->next = rel->chunks;
|
||||
rel->chunks = chunk;
|
||||
chunk->srcv = grub_map_memory (chunk->src, chunk->size);
|
||||
*out = chunk;
|
||||
ctx.chunk->target = ctx.chunk->src;
|
||||
ctx.chunk->size = size;
|
||||
ctx.chunk->next = rel->chunks;
|
||||
rel->chunks = ctx.chunk;
|
||||
ctx.chunk->srcv = grub_map_memory (ctx.chunk->src, ctx.chunk->size);
|
||||
*out = ctx.chunk;
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
|
|
@ -1364,14 +1410,14 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
|||
do
|
||||
{
|
||||
if (malloc_in_range (rel, min_addr2, max_addr2, align,
|
||||
size, chunk, 1, 1))
|
||||
size, ctx.chunk, 1, 1))
|
||||
break;
|
||||
|
||||
if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
|
||||
size, chunk, 0, 1))
|
||||
size, ctx.chunk, 0, 1))
|
||||
{
|
||||
if (rel->postchunks > chunk->src)
|
||||
rel->postchunks = chunk->src;
|
||||
if (rel->postchunks > ctx.chunk->src)
|
||||
rel->postchunks = ctx.chunk->src;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1380,58 +1426,33 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
|||
while (0);
|
||||
|
||||
{
|
||||
int found = 0;
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_memory_type_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t sz,
|
||||
grub_memory_type_t type)
|
||||
{
|
||||
grub_uint64_t candidate;
|
||||
if (type != GRUB_MEMORY_AVAILABLE)
|
||||
return 0;
|
||||
candidate = ALIGN_UP (addr, align);
|
||||
if (candidate < min_addr)
|
||||
candidate = ALIGN_UP (min_addr, align);
|
||||
if (candidate + size > addr + sz
|
||||
|| candidate > ALIGN_DOWN (max_addr, align))
|
||||
return 0;
|
||||
if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
|
||||
candidate = ALIGN_DOWN (min (addr + sz - size, max_addr), align);
|
||||
if (!found || (preference == GRUB_RELOCATOR_PREFERENCE_HIGH
|
||||
&& candidate > chunk->target))
|
||||
chunk->target = candidate;
|
||||
if (!found || (preference == GRUB_RELOCATOR_PREFERENCE_LOW
|
||||
&& candidate < chunk->target))
|
||||
chunk->target = candidate;
|
||||
found = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef GRUB_MACHINE_EFI
|
||||
grub_efi_mmap_iterate (hook, avoid_efi_boot_services);
|
||||
grub_efi_mmap_iterate (grub_relocator_alloc_chunk_align_iter, &ctx,
|
||||
avoid_efi_boot_services);
|
||||
#elif defined (__powerpc__)
|
||||
(void) avoid_efi_boot_services;
|
||||
grub_machine_mmap_iterate (hook);
|
||||
grub_machine_mmap_iterate (grub_relocator_alloc_chunk_align_iter, &ctx);
|
||||
#else
|
||||
(void) avoid_efi_boot_services;
|
||||
grub_mmap_iterate (hook);
|
||||
grub_mmap_iterate (grub_relocator_alloc_chunk_align_iter, &ctx);
|
||||
#endif
|
||||
if (!found)
|
||||
if (!ctx.found)
|
||||
return grub_error (GRUB_ERR_BAD_OS, "couldn't find suitable memory target");
|
||||
}
|
||||
while (1)
|
||||
{
|
||||
struct grub_relocator_chunk *chunk2;
|
||||
for (chunk2 = rel->chunks; chunk2; chunk2 = chunk2->next)
|
||||
if ((chunk2->target <= chunk->target
|
||||
&& chunk->target < chunk2->target + chunk2->size)
|
||||
|| (chunk->target <= chunk2->target && chunk2->target
|
||||
< chunk->target + size))
|
||||
if ((chunk2->target <= ctx.chunk->target
|
||||
&& ctx.chunk->target < chunk2->target + chunk2->size)
|
||||
|| (ctx.chunk->target <= chunk2->target && chunk2->target
|
||||
< ctx.chunk->target + size))
|
||||
{
|
||||
if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
|
||||
chunk->target = ALIGN_DOWN (chunk2->target, align);
|
||||
ctx.chunk->target = ALIGN_DOWN (chunk2->target, align);
|
||||
else
|
||||
chunk->target = ALIGN_UP (chunk2->target + chunk2->size, align);
|
||||
ctx.chunk->target = ALIGN_UP (chunk2->target + chunk2->size,
|
||||
align);
|
||||
break;
|
||||
}
|
||||
if (!chunk2)
|
||||
|
|
@ -1441,23 +1462,23 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
|
|||
grub_dprintf ("relocator", "relocators_size=%ld\n",
|
||||
(unsigned long) rel->relocators_size);
|
||||
|
||||
if (chunk->src < chunk->target)
|
||||
if (ctx.chunk->src < ctx.chunk->target)
|
||||
rel->relocators_size += grub_relocator_backward_size;
|
||||
if (chunk->src > chunk->target)
|
||||
if (ctx.chunk->src > ctx.chunk->target)
|
||||
rel->relocators_size += grub_relocator_forward_size;
|
||||
|
||||
grub_dprintf ("relocator", "relocators_size=%ld\n",
|
||||
(unsigned long) rel->relocators_size);
|
||||
|
||||
chunk->size = size;
|
||||
chunk->next = rel->chunks;
|
||||
rel->chunks = chunk;
|
||||
ctx.chunk->size = size;
|
||||
ctx.chunk->next = rel->chunks;
|
||||
rel->chunks = ctx.chunk;
|
||||
grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
|
||||
rel->chunks->next);
|
||||
chunk->srcv = grub_map_memory (chunk->src, chunk->size);
|
||||
*out = chunk;
|
||||
ctx.chunk->srcv = grub_map_memory (ctx.chunk->src, ctx.chunk->size);
|
||||
*out = ctx.chunk;
|
||||
#ifdef DEBUG_RELOCATOR
|
||||
grub_memset (chunk->srcv, 0xfa, chunk->size);
|
||||
grub_memset (ctx.chunk->srcv, 0xfa, ctx.chunk->size);
|
||||
grub_mm_check ();
|
||||
#endif
|
||||
return GRUB_ERR_NONE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue