2009-05-02 Vladimir Serbinenko <phcoder@gmail.com>

Mmap services

	* loader/i386/efi/linux.c (grub_linux_boot): use grub_mmap_iterate
	* loader/i386/linux.c (find_mmap_size): likewise
	(allocate_pages): likewise
	* loader/i386/multiboot.c (grub_get_multiboot_mmap_len): likewise
	(grub_fill_multiboot_mmap): likewise
	(grub_multiboot): use grub_mmap_get_lower and grub_mmap_get_upper
	* loader/i386/pc/linux.c (grub_cmd_linux): use grub_mmap_get_lower
	* include/grub/i386/bsd.h (OPENBSD_MMAP_AVAILABLE): new definition
	(OPENBSD_MMAP_RESERVED): likewise
	* include/grub/i386/pc/memory.h: include grub/memory.h
	(grub_lower_mem): removed
	(grub_upper_mem): likewise
	(GRUB_MACHINE_MEMORY_ACPI): new definition
	(GRUB_MACHINE_MEMORY_NVS): likewise
	(GRUB_MACHINE_MEMORY_MAX_TYPE): likewise
	(GRUB_MACHINE_MEMORY_HOLE): likewise
	(grub_machine_mmap_register): likewise
	(grub_machine_mmap_unregister): likewise
	(grub_machine_get_upper): likewise
	(grub_machine_get_lower): likewise
	(grub_machine_get_post64): likewise
	* include/grub/i386/efi/memory.h: new file
	* include/grub/x86_64/efi/memory.h: likewise
	* include/grub/efi/memory.h: likewise
	* conf/i386-pc.rmk (pkglib_MODULES): added mmap.mod
	(mmap_mod_SOURCES): new variable
	(mmap_mod_LDFLAGS): likewise
	(mmap_mod_ASFLAGS): likewise
	* conf/i386-coreboot.rmk: likewise
	* conf/i386-ieee1275.rmk: likewise
	* conf/i386-efi.rmk: likewise
	* conf/x86_64-efi.rmk: likewise
	* include/grub/types.h (UINT_TO_PTR): new macro
	(PTR_TO_UINT32): likewise
	(PTR_TO_UINT64): likewise
	* include/grub/memory.h: new file
	* mmap/i386/pc/mmap.c: likewise
	* mmap/i386/pc/mmap_helper.S: likewise
	* mmap/i386/uppermem.c: likewise
	* mmap/mmap.c: likewise
	* mmap/efi/mmap.c: likewise
	* kern/i386/coreboot/init.c (grub_machine_init): don't use 
	grub_upper_mem
	* kern/i386/pc/init.c (grub_lower_mem): removed variable
	(grub_upper_mem): likewise
	(grub_machine_init): don't use grub_upper_mem,
	make grub_lower_mem local
	* loader/i386/bsd.c (grub_openbsd_boot): use grub_mmap_get_lower,
	grub_mmap_iterate and grub_mmap_get_upper
	(grub_netbsd_boot): use grub_mmap_get_lower and grub_mmap_get_upper
This commit is contained in:
phcoder 2009-05-02 21:46:34 +00:00
parent d558e6b5ac
commit 09d842b9c6
27 changed files with 1579 additions and 128 deletions

98
mmap/i386/mmap.c Normal file
View file

@ -0,0 +1,98 @@
/* Mmap management. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2009 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/machine/memory.h>
#include <grub/memory.h>
#include <grub/err.h>
#include <grub/misc.h>
#include <grub/mm.h>
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
char *
grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
int *handle, int type, int flags)
{
grub_uint64_t highestlow = 0;
auto int NESTED_FUNC_ATTR find_hook (grub_uint64_t, grub_uint64_t,
grub_uint32_t);
int NESTED_FUNC_ATTR find_hook (grub_uint64_t start, grub_uint64_t rangesize,
grub_uint32_t memtype)
{
grub_uint64_t end = start + rangesize;
if (memtype != GRUB_MACHINE_MEMORY_AVAILABLE)
return 0;
if (end > 0x100000)
end = 0x100000;
if (end > start + size
&& highestlow < ((end - size) - ((end - size) & (align - 1))))
highestlow = (end - size) - ((end - size) & (align - 1));
return 0;
}
char * ret;
if (flags & GRUB_MMAP_MALLOC_LOW)
{
/* FIXME: use low-memory mm allocation once it's available. */
grub_mmap_iterate (find_hook);
ret = UINT_TO_PTR (highestlow);
}
else
ret = grub_memalign (align, size);
if (! ret)
{
*handle = 0;
return 0;
}
*handle = grub_mmap_register (PTR_TO_UINT64 (ret), size, type);
if (! *handle)
{
grub_free (ret);
return 0;
}
return ret;
}
void
grub_mmap_free_and_unregister (int handle)
{
struct grub_mmap_region *cur;
grub_uint64_t addr;
for (cur = grub_mmap_overlays; cur; cur = cur->next)
if (cur->handle == handle)
break;
if (! cur)
return;
addr = cur->start;
grub_mmap_unregister (handle);
if (addr >= 0x100000)
grub_free (UINT_TO_PTR (addr));
}
#endif

216
mmap/i386/pc/mmap.c Normal file
View file

@ -0,0 +1,216 @@
/* Mmap management. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2009 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/machine/memory.h>
#include <grub/memory.h>
#include <grub/misc.h>
#include <grub/term.h>
#include <grub/loader.h>
#define min(a,b) (((a) < (b)) ? (a) : (b))
static void *hooktarget = 0;
extern grub_uint8_t grub_machine_mmaphook_start;
extern grub_uint8_t grub_machine_mmaphook_end;
extern grub_uint8_t grub_machine_mmaphook_int12;
extern grub_uint8_t grub_machine_mmaphook_int15;
static grub_uint16_t grub_machine_mmaphook_int12offset = 0;
static grub_uint16_t grub_machine_mmaphook_int12segment = 0;
extern grub_uint16_t grub_machine_mmaphook_int15offset;
extern grub_uint16_t grub_machine_mmaphook_int15segment;
extern grub_uint16_t grub_machine_mmaphook_mmap_num;
extern grub_uint16_t grub_machine_mmaphook_kblow;
extern grub_uint16_t grub_machine_mmaphook_kbin16mb;
extern grub_uint16_t grub_machine_mmaphook_64kbin4gb;
struct grub_e820_mmap_entry
{
grub_uint64_t addr;
grub_uint64_t len;
grub_uint32_t type;
} __attribute__((packed));
static grub_err_t
preboot (int noreturn __attribute__ ((unused)))
{
struct grub_e820_mmap_entry *hookmmap, *hookmmapcur;
auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t,
grub_uint32_t);
int NESTED_FUNC_ATTR fill_hook (grub_uint64_t addr, grub_uint64_t size,
grub_uint32_t type)
{
grub_dprintf ("mmap", "mmap chunk %llx-%llx:%x\n", addr, addr + size, type);
hookmmapcur->addr = addr;
hookmmapcur->len = size;
hookmmapcur->type = type;
hookmmapcur++;
return 0;
}
if (! hooktarget)
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
"no space is allocated for memory hook");
grub_dprintf ("mmap", "installing preboot handlers\n");
hookmmapcur = hookmmap = (struct grub_e820_mmap_entry *)
((grub_uint8_t *) hooktarget + (&grub_machine_mmaphook_end
- &grub_machine_mmaphook_start));
grub_mmap_iterate (fill_hook);
grub_machine_mmaphook_mmap_num = hookmmapcur - hookmmap;
grub_machine_mmaphook_kblow = grub_mmap_get_lower () >> 10;
grub_machine_mmaphook_kbin16mb
= min (grub_mmap_get_upper (),0x3f00000ULL) >> 10;
grub_machine_mmaphook_64kbin4gb
= min (grub_mmap_get_post64 (), 0xfc000000ULL) >> 16;
/* Correct BDA. */
*((grub_uint16_t *) 0x413) = grub_mmap_get_lower () >> 10;
/* Save old interrupt handlers. */
grub_machine_mmaphook_int12offset = *((grub_uint16_t *) 0x48);
grub_machine_mmaphook_int12segment = *((grub_uint16_t *) 0x4a);
grub_machine_mmaphook_int15offset = *((grub_uint16_t *) 0x54);
grub_machine_mmaphook_int15segment = *((grub_uint16_t *) 0x56);
grub_dprintf ("mmap", "hooktarget = %p\n", hooktarget);
/* Install the interrupt handlers. */
grub_memcpy (hooktarget, &grub_machine_mmaphook_start,
&grub_machine_mmaphook_end - &grub_machine_mmaphook_start);
*((grub_uint16_t *) 0x4a) = PTR_TO_UINT32 (hooktarget) >> 4;
*((grub_uint16_t *) 0x56) = PTR_TO_UINT32 (hooktarget) >> 4;
*((grub_uint16_t *) 0x48) = &grub_machine_mmaphook_int12
- &grub_machine_mmaphook_start;
*((grub_uint16_t *) 0x54) = &grub_machine_mmaphook_int15
- &grub_machine_mmaphook_start;
return GRUB_ERR_NONE;
}
static grub_err_t
preboot_rest (void)
{
/* Restore old interrupt handlers. */
*((grub_uint16_t *) 0x48) = grub_machine_mmaphook_int12offset;
*((grub_uint16_t *) 0x4a) = grub_machine_mmaphook_int12segment;
*((grub_uint16_t *) 0x54) = grub_machine_mmaphook_int15offset;
*((grub_uint16_t *) 0x56) = grub_machine_mmaphook_int15segment;
return GRUB_ERR_NONE;
}
static grub_err_t
malloc_hook (void)
{
static int reentry = 0;
static int mmapregion = 0;
static int slots_available = 0;
int hooksize;
int regcount = 0;
auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t,
grub_uint32_t);
int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
grub_uint64_t size __attribute__ ((unused)),
grub_uint32_t type __attribute__ ((unused)))
{
regcount++;
return 0;
}
if (reentry)
return GRUB_ERR_NONE;
grub_dprintf ("mmap", "registering\n");
grub_mmap_iterate (count_hook);
/* Mapping hook itself may introduce up to 2 additional regions. */
regcount += 2;
if (regcount <= slots_available)
return GRUB_ERR_NONE;
if (mmapregion)
{
grub_mmap_free_and_unregister (mmapregion);
mmapregion = 0;
hooktarget = 0;
}
hooksize = &grub_machine_mmaphook_end - &grub_machine_mmaphook_start
+ regcount * sizeof (struct grub_e820_mmap_entry);
/* Allocate an integer number of KiB. */
hooksize = ((hooksize - 1) | 0x3ff) + 1;
slots_available = (hooksize - (&grub_machine_mmaphook_end
- &grub_machine_mmaphook_start))
/ sizeof (struct grub_e820_mmap_entry);
reentry = 1;
hooktarget
= grub_mmap_malign_and_register (16, hooksize, &mmapregion,
GRUB_MACHINE_MEMORY_RESERVED,
GRUB_MMAP_MALLOC_LOW);
reentry = 0;
if (! hooktarget)
{
slots_available = 0;
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "No space for mmap hook");
}
return GRUB_ERR_NONE;
}
grub_err_t
grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
grub_uint64_t size __attribute__ ((unused)),
int type __attribute__ ((unused)),
int handle __attribute__ ((unused)))
{
grub_err_t err;
static void *preb_handle = 0;
err = malloc_hook ();
if (err)
return err;
if (! preb_handle)
{
grub_dprintf ("mmap", "adding preboot\n");
preb_handle
= grub_loader_register_preboot_hook (preboot, preboot_rest,
GRUB_LOADER_PREBOOT_HOOK_PRIO_MEMORY);
if (! preb_handle)
return grub_errno;
}
return GRUB_ERR_NONE;
}
grub_err_t
grub_machine_mmap_unregister (int handle __attribute__ ((unused)))
{
return GRUB_ERR_NONE;
}

122
mmap/i386/pc/mmap_helper.S Normal file
View file

@ -0,0 +1,122 @@
/* Mmap management. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2009 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/symbol.h>
#define DS(x) ((x) - segstart)
segstart:
VARIABLE(grub_machine_mmaphook_start)
.code16
VARIABLE(grub_machine_mmaphook_int12)
push %ds
push %cs
pop %ds
movw DS (EXT_C (grub_machine_mmaphook_kblow)), %ax
pop %ds
iret
VARIABLE(grub_machine_mmaphook_int15)
pushf
cmpw $0xe801, %ax
jz e801
cmpw $0xe820, %ax
jz e820
cmpb $0x88, %ah
jz h88
popf
/* ljmp */
.byte 0xea
VARIABLE (grub_machine_mmaphook_int15offset)
.word 0
VARIABLE (grub_machine_mmaphook_int15segment)
.word 0
e801:
popf
push %ds
push %cs
pop %ds
movw DS (EXT_C (grub_machine_mmaphook_kbin16mb)), %ax
movw DS (EXT_C (grub_machine_mmaphook_64kbin4gb)), %bx
movw %ax, %cx
movw %bx, %dx
pop %ds
clc
iret
h88:
popf
push %ds
push %cs
pop %ds
movw DS (EXT_C (grub_machine_mmaphook_kbin16mb)), %ax
pop %ds
clc
iret
e820:
popf
push %ds
push %cs
pop %ds
cmpw $20, %cx
jb errexit
cmpw DS (EXT_C (grub_machine_mmaphook_mmap_num)), %bx
jae errexit
cmp $0x534d4150, %edx
jne errexit
push %si
push %di
movw $20, %cx
movw $(DS(mmaphook_mmap)), %si
mov %bx, %ax
imul $20, %ax
add %ax, %si
rep movsb
pop %di
pop %si
movl $20, %ecx
inc %bx
cmpw DS(EXT_C(grub_machine_mmaphook_mmap_num)), %bx
jb noclean
xor %bx, %bx
noclean:
mov $0x534d4150, %eax
pop %ds
clc
iret
errexit:
mov $0x534d4150, %eax
pop %ds
stc
xor %bx, %bx
iret
VARIABLE(grub_machine_mmaphook_mmap_num)
.word 0
VARIABLE(grub_machine_mmaphook_kblow)
.word 0
VARIABLE (grub_machine_mmaphook_kbin16mb)
.word 0
VARIABLE (grub_machine_mmaphook_64kbin4gb)
.word 0
mmaphook_mmap:
/* Memory map is placed just after the interrupt handlers. */
VARIABLE(grub_machine_mmaphook_end)

85
mmap/i386/uppermem.c Normal file
View file

@ -0,0 +1,85 @@
/* Compute amount of lower and upper memory till the first hole. */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2009 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/memory.h>
#include <grub/mm.h>
#include <grub/misc.h>
grub_uint64_t
grub_mmap_get_lower (void)
{
grub_uint64_t lower = 0;
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
grub_uint32_t type)
{
if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
return 0;
if (addr == 0)
lower = size;
return 0;
}
grub_mmap_iterate (hook);
if (lower > 0x100000)
lower = 0x100000;
return lower;
}
grub_uint64_t
grub_mmap_get_upper (void)
{
grub_uint64_t upper = 0;
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
grub_uint32_t type)
{
if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
return 0;
if (addr <= 0x100000 && addr + size > 0x100000)
upper = addr + size - 0x100000;
return 0;
}
grub_mmap_iterate (hook);
return upper;
}
/* Count the continous bytes after 64 MiB. */
grub_uint64_t
grub_mmap_get_post64 (void)
{
grub_uint64_t post64 = 0;
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
grub_uint32_t type)
{
if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
return 0;
if (addr <= 0x4000000 && addr + size > 0x4000000)
post64 = addr + size - 0x4000000;
return 0;
}
grub_mmap_iterate (hook);
return post64;
}