040362e379
. make exec() callers (i.e. vfs and rs) determine the memory layout by explicitly reserving regions using mmap() calls on behalf of the exec()ing process, i.e. handling all of the exec logic, thereby eliminating all special exec() knowledge from VM. . the new procedure is: clear the exec()ing process first, then call third-party mmap()s to reserve memory, then copy the executable file section contents in, all using callbacks tailored to the caller's way of starting an executable . i.e. no more explicit EXEC_NEWMEM-style calls in PM or VM as with rigid 2-section arguments . this naturally allows generalizing exec() by simply loading all ELF sections . drop/merge of lots of duplicate exec() code into libexec . not copying the code sections to vfs and into the executable again is a measurable performance improvement (about 3.3% faster for 'make' in src/servers/)
477 lines
11 KiB
C
477 lines
11 KiB
C
#include "kernel/kernel.h"
|
|
#include <minix/minlib.h>
|
|
#include <minix/const.h>
|
|
/*
|
|
* == IMPORTANT ==
|
|
* Routines in this file can not use any variable in kernel BSS,
|
|
* since before image is extracted, no BSS is allocated.
|
|
* So pay attention to any external call (including library call).
|
|
*
|
|
* */
|
|
#include <minix/types.h>
|
|
#include <minix/type.h>
|
|
#include <minix/com.h>
|
|
#include <sys/param.h>
|
|
#include <machine/partition.h>
|
|
#include "string.h"
|
|
#include "arch_proto.h"
|
|
#include "libexec.h"
|
|
#include "mb_utils.h"
|
|
#include "serial.h"
|
|
#include <machine/multiboot.h>
|
|
|
|
#if USE_SYSDEBUG
|
|
#define MULTIBOOT_VERBOSE 1
|
|
#endif
|
|
|
|
/* FIXME: Share this define with kernel linker script */
|
|
#define MULTIBOOT_KERNEL_ADDR 0x00200000UL
|
|
|
|
/* Granularity used in image file and copying */
|
|
#define GRAN 512
|
|
#define SECT_CEIL(x) ((((x) - 1) / GRAN + 1) * GRAN)
|
|
|
|
/* String length used for mb_itoa */
|
|
#define ITOA_BUFFER_SIZE 20
|
|
|
|
#define mb_load_phymem(buf, phy, len) \
|
|
phys_copy((phy), (u32_t)(buf), (len))
|
|
|
|
#define mb_save_phymem(buf, phy, len) \
|
|
phys_copy((u32_t)(buf), (phy), (len))
|
|
|
|
#define mb_clear_memrange(start, end) \
|
|
phys_memset((start), 0, (end)-(start))
|
|
|
|
static void mb_itoa(u32_t val, char * out)
|
|
{
|
|
char ret[ITOA_BUFFER_SIZE];
|
|
int i = ITOA_BUFFER_SIZE - 2;
|
|
/* Although there's a library version of itoa(int n),
|
|
* we can't use it since that implementation relies on BSS segment
|
|
*/
|
|
ret[ITOA_BUFFER_SIZE - 2] = '0';
|
|
if (val) {
|
|
for (; i >= 0; i--) {
|
|
char c;
|
|
if (val == 0) break;
|
|
c = val % 10;
|
|
val = val / 10;
|
|
c += '0';
|
|
ret[i] = c;
|
|
}
|
|
}
|
|
else
|
|
i--;
|
|
ret[ITOA_BUFFER_SIZE - 1] = 0;
|
|
strcpy(out, ret + i + 1);
|
|
}
|
|
|
|
static void mb_itox(u32_t val, char *out)
|
|
{
|
|
char ret[9];
|
|
int i = 7;
|
|
/* Convert a number to hex string */
|
|
ret[7] = '0';
|
|
if (val) {
|
|
for (; i >= 0; i--) {
|
|
char c;
|
|
if (val == 0) break;
|
|
c = val & 0xF;
|
|
val = val >> 4;
|
|
if (c > 9)
|
|
c += 'A' - 10;
|
|
else
|
|
c += '0';
|
|
ret[i] = c;
|
|
}
|
|
}
|
|
else
|
|
i--;
|
|
ret[8] = 0;
|
|
strcpy(out, ret + i + 1);
|
|
}
|
|
|
|
static void mb_put_char(char c, int line, int col)
|
|
{
|
|
/* Write a char to vga display buffer. */
|
|
if (line<MULTIBOOT_CONSOLE_LINES&&col<MULTIBOOT_CONSOLE_COLS)
|
|
mb_save_phymem(
|
|
&c,
|
|
MULTIBOOT_VIDEO_BUFFER
|
|
+ line * MULTIBOOT_CONSOLE_COLS * 2
|
|
+ col * 2,
|
|
1);
|
|
}
|
|
|
|
static char mb_get_char(int line, int col)
|
|
{
|
|
char c;
|
|
/* Read a char to from display buffer. */
|
|
if (line < MULTIBOOT_CONSOLE_LINES && col < MULTIBOOT_CONSOLE_COLS)
|
|
mb_load_phymem(
|
|
&c,
|
|
MULTIBOOT_VIDEO_BUFFER
|
|
+ line * MULTIBOOT_CONSOLE_COLS * 2
|
|
+ col * 2,
|
|
1);
|
|
return c;
|
|
}
|
|
|
|
/* Give non-zero values to avoid them in BSS */
|
|
static int print_line = 1, print_col = 1;
|
|
|
|
#include <sys/video.h>
|
|
|
|
void mb_cls(void)
|
|
{
|
|
int i, j;
|
|
/* Clear screen */
|
|
for (i = 0; i < MULTIBOOT_CONSOLE_LINES; i++ )
|
|
for (j = 0; j < MULTIBOOT_CONSOLE_COLS; j++ )
|
|
mb_put_char(0, i, j);
|
|
print_line = print_col = 0;
|
|
|
|
/* Tell video hardware origin is 0. */
|
|
outb(C_6845+INDEX, VID_ORG);
|
|
outb(C_6845+DATA, 0);
|
|
outb(C_6845+INDEX, VID_ORG+1);
|
|
outb(C_6845+DATA, 0);
|
|
}
|
|
|
|
static void mb_scroll_up(int lines)
|
|
{
|
|
int i, j;
|
|
for (i = 0; i < MULTIBOOT_CONSOLE_LINES; i++ ) {
|
|
for (j = 0; j < MULTIBOOT_CONSOLE_COLS; j++ ) {
|
|
char c = 0;
|
|
if(i < MULTIBOOT_CONSOLE_LINES-lines)
|
|
c = mb_get_char(i + lines, j);
|
|
mb_put_char(c, i, j);
|
|
}
|
|
}
|
|
print_line-= lines;
|
|
}
|
|
|
|
void mb_print_char(char c)
|
|
{
|
|
while (print_line >= MULTIBOOT_CONSOLE_LINES)
|
|
mb_scroll_up(1);
|
|
|
|
if (c == '\n') {
|
|
while (print_col < MULTIBOOT_CONSOLE_COLS)
|
|
mb_put_char(' ', print_line, print_col++);
|
|
print_line++;
|
|
print_col = 0;
|
|
return;
|
|
}
|
|
|
|
mb_put_char(c, print_line, print_col++);
|
|
|
|
if (print_col >= MULTIBOOT_CONSOLE_COLS) {
|
|
print_line++;
|
|
print_col = 0;
|
|
}
|
|
|
|
while (print_line >= MULTIBOOT_CONSOLE_LINES)
|
|
mb_scroll_up(1);
|
|
}
|
|
|
|
void mb_print(char *str)
|
|
{
|
|
while (*str) {
|
|
mb_print_char(*str);
|
|
str++;
|
|
}
|
|
}
|
|
|
|
/* Standard and AT keyboard. (PS/2 MCA implies AT throughout.) */
|
|
#define KEYBD 0x60 /* I/O port for keyboard data */
|
|
#define KB_STATUS 0x64 /* I/O port for status on AT */
|
|
#define KB_OUT_FULL 0x01 /* status bit set when keypress char pending */
|
|
#define KB_AUX_BYTE 0x20 /* Auxiliary Device Output Buffer Full */
|
|
|
|
int mb_read_char(unsigned char *ch)
|
|
{
|
|
unsigned long b, sb;
|
|
#ifdef DEBUG_SERIAL
|
|
u8_t c, lsr;
|
|
|
|
if (do_serial_debug) {
|
|
lsr= inb(COM1_LSR);
|
|
if (!(lsr & LSR_DR))
|
|
return 0;
|
|
c = inb(COM1_RBR);
|
|
return 1;
|
|
}
|
|
#endif /* DEBUG_SERIAL */
|
|
|
|
sb = inb(KB_STATUS);
|
|
|
|
if (!(sb & KB_OUT_FULL)) {
|
|
return 0;
|
|
}
|
|
|
|
b = inb(KEYBD);
|
|
|
|
if (!(sb & KB_AUX_BYTE))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mb_print_hex(u32_t value)
|
|
{
|
|
int i;
|
|
char c;
|
|
char out[9] = "00000000";
|
|
/* Print a hex value */
|
|
for (i = 7; i >= 0; i--) {
|
|
c = value % 0x10;
|
|
value /= 0x10;
|
|
if (c < 10)
|
|
c += '0';
|
|
else
|
|
c += 'A'-10;
|
|
out[i] = c;
|
|
}
|
|
mb_print(out);
|
|
}
|
|
|
|
static int mb_set_param(char *name, char *value)
|
|
{
|
|
char *p = multiboot_param_buf;
|
|
char *q;
|
|
int namelen = strlen(name);
|
|
int valuelen = strlen(value);
|
|
|
|
/* Delete the item if already exists */
|
|
while (*p) {
|
|
if (strncmp(p, name, namelen) == 0 && p[namelen] == '=') {
|
|
q = p;
|
|
while (*q) q++;
|
|
for (q++;
|
|
q < multiboot_param_buf + MULTIBOOT_PARAM_BUF_SIZE;
|
|
q++, p++)
|
|
*p = *q;
|
|
break;
|
|
}
|
|
while (*p++)
|
|
;
|
|
p++;
|
|
}
|
|
|
|
for (p = multiboot_param_buf;
|
|
p < multiboot_param_buf + MULTIBOOT_PARAM_BUF_SIZE
|
|
&& (*p || *(p + 1));
|
|
p++)
|
|
;
|
|
if (p > multiboot_param_buf) p++;
|
|
|
|
/* Make sure there's enough space for the new parameter */
|
|
if (p + namelen + valuelen + 3
|
|
> multiboot_param_buf + MULTIBOOT_PARAM_BUF_SIZE)
|
|
return -1;
|
|
|
|
strcpy(p, name);
|
|
p[namelen] = '=';
|
|
strcpy(p + namelen + 1, value);
|
|
p[namelen + valuelen + 1] = 0;
|
|
p[namelen + valuelen + 2] = 0;
|
|
return 0;
|
|
}
|
|
|
|
static void get_parameters(multiboot_info_t *mbi)
|
|
{
|
|
char mem_value[40], temp[ITOA_BUFFER_SIZE];
|
|
int i;
|
|
int dev;
|
|
int ctrlr;
|
|
int disk, prim, sub;
|
|
int var_i,value_i;
|
|
char *p;
|
|
const static int dev_cNd0[] = { 0x0300, 0x0800, 0x0A00, 0x0C00, 0x1000 };
|
|
static char mb_cmd_buff[GRAN] = "add some value to avoid me in BSS";
|
|
static char var[GRAN] = "add some value to avoid me in BSS";
|
|
static char value[GRAN] = "add some value to avoid me in BSS";
|
|
for (i = 0; i < MULTIBOOT_PARAM_BUF_SIZE; i++)
|
|
multiboot_param_buf[i] = 0;
|
|
|
|
if (mbi->flags & MULTIBOOT_INFO_BOOTDEV) {
|
|
disk = ((mbi->boot_device&0xff000000) >> 24)-0x80;
|
|
prim = (mbi->boot_device & 0xff0000) >> 16;
|
|
if (prim == 0xff)
|
|
prim = 0;
|
|
sub = (mbi->boot_device & 0xff00) >> 8;
|
|
if (sub == 0xff)
|
|
sub = 0;
|
|
ctrlr = 0;
|
|
dev = dev_cNd0[ctrlr];
|
|
|
|
/* Determine the value of rootdev */
|
|
dev += 0x80
|
|
+ (disk * NR_PARTITIONS + prim) * NR_PARTITIONS + sub;
|
|
|
|
mb_itoa(dev, temp);
|
|
mb_set_param("rootdev", temp);
|
|
mb_set_param("ramimagedev", temp);
|
|
}
|
|
mb_set_param("hz", "60");
|
|
|
|
if (mbi->flags & MULTIBOOT_INFO_MEMORY)
|
|
{
|
|
strcpy(mem_value, "800:");
|
|
mb_itox(
|
|
mbi->mem_lower * 1024 > MULTIBOOT_LOWER_MEM_MAX ?
|
|
MULTIBOOT_LOWER_MEM_MAX : mbi->mem_lower * 1024,
|
|
temp);
|
|
strcat(mem_value, temp);
|
|
strcat(mem_value, ",100000:");
|
|
mb_itox(mbi->mem_upper * 1024, temp);
|
|
strcat(mem_value, temp);
|
|
mb_set_param("memory", mem_value);
|
|
}
|
|
|
|
if (mbi->flags&MULTIBOOT_INFO_CMDLINE) {
|
|
/* Override values with cmdline argument */
|
|
p = mb_cmd_buff;
|
|
mb_load_phymem(mb_cmd_buff, mbi->cmdline, GRAN);
|
|
while (*p) {
|
|
var_i = 0;
|
|
value_i = 0;
|
|
while (*p == ' ') p++;
|
|
if (!*p) break;
|
|
while (*p && *p != '=' && *p != ' ' && var_i < GRAN - 1)
|
|
var[var_i++] = *p++ ;
|
|
var[var_i] = 0;
|
|
if (*p++ != '=') continue; /* skip if not name=value */
|
|
while (*p && *p != ' ' && value_i < GRAN - 1)
|
|
value[value_i++] = *p++ ;
|
|
value[value_i] = 0;
|
|
|
|
mb_set_param(var, value);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void mb_extract_image(multiboot_info_t mbi)
|
|
{
|
|
multiboot_module_t *mb_module_info;
|
|
multiboot_module_t *module;
|
|
u32_t mods_count = mbi.mods_count;
|
|
int r, i;
|
|
vir_bytes text_vaddr, text_filebytes, text_membytes;
|
|
vir_bytes data_vaddr, data_filebytes, data_membytes;
|
|
phys_bytes text_paddr, data_paddr;
|
|
vir_bytes stack_bytes;
|
|
vir_bytes pc;
|
|
off_t text_offset, data_offset;
|
|
|
|
/* Save memory map for kernel tasks */
|
|
r = read_header_elf((char *) MULTIBOOT_KERNEL_ADDR,
|
|
4096, /* everything is there */
|
|
&text_vaddr, &text_paddr,
|
|
&text_filebytes, &text_membytes,
|
|
&data_vaddr, &data_paddr,
|
|
&data_filebytes, &data_membytes,
|
|
&pc, &text_offset, &data_offset);
|
|
|
|
for (i = 0; i < NR_TASKS; ++i) {
|
|
image[i].memmap.text_vaddr = trunc_page(text_vaddr);
|
|
image[i].memmap.text_paddr = trunc_page(text_paddr);
|
|
image[i].memmap.text_bytes = text_membytes;
|
|
image[i].memmap.data_vaddr = trunc_page(data_vaddr);
|
|
image[i].memmap.data_paddr = trunc_page(data_paddr);
|
|
image[i].memmap.data_bytes = data_membytes;
|
|
image[i].memmap.stack_bytes = 0;
|
|
image[i].memmap.entry = pc;
|
|
}
|
|
|
|
#ifdef MULTIBOOT_VERBOSE
|
|
mb_print("\nKernel: ");
|
|
mb_print_hex(trunc_page(text_paddr));
|
|
mb_print("-");
|
|
mb_print_hex(trunc_page(data_paddr) + data_membytes);
|
|
mb_print(" Entry: ");
|
|
mb_print_hex(pc);
|
|
#endif
|
|
|
|
mb_module_info = ((multiboot_module_t *)mbi.mods_addr);
|
|
module = &mb_module_info[0];
|
|
|
|
/* Load boot image services into memory and save memory map */
|
|
for (i = 0; module < &mb_module_info[mods_count]; ++module, ++i) {
|
|
r = read_header_elf((char *) module->mod_start,
|
|
module->mod_end - module->mod_start + 1,
|
|
&text_vaddr, &text_paddr,
|
|
&text_filebytes, &text_membytes,
|
|
&data_vaddr, &data_paddr,
|
|
&data_filebytes, &data_membytes,
|
|
&pc, &text_offset, &data_offset);
|
|
if (r) {
|
|
mb_print("fatal: ELF parse failure\n");
|
|
/* Spin here */
|
|
while (1)
|
|
;
|
|
}
|
|
|
|
stack_bytes = round_page(image[NR_TASKS+i].stack_kbytes * 1024);
|
|
|
|
/* Load text segment */
|
|
phys_copy(module->mod_start+text_offset, text_paddr,
|
|
text_filebytes);
|
|
mb_clear_memrange(text_paddr+text_filebytes,
|
|
trunc_page(text_paddr) + text_membytes);
|
|
|
|
/* Load data and stack segments */
|
|
phys_copy(module->mod_start+data_offset, data_paddr,
|
|
data_filebytes);
|
|
mb_clear_memrange(data_paddr+data_filebytes,
|
|
trunc_page(data_paddr) + data_membytes
|
|
+ stack_bytes);
|
|
|
|
/* Save memmap for non-kernel tasks, so subscript past kernel
|
|
tasks. */
|
|
image[NR_TASKS+i].memmap.text_vaddr = trunc_page(text_vaddr);
|
|
image[NR_TASKS+i].memmap.text_paddr = trunc_page(text_paddr);
|
|
image[NR_TASKS+i].memmap.text_bytes = text_membytes;
|
|
image[NR_TASKS+i].memmap.data_vaddr = trunc_page(data_vaddr);
|
|
image[NR_TASKS+i].memmap.data_paddr = trunc_page(data_paddr);
|
|
image[NR_TASKS+i].memmap.data_bytes = data_membytes;
|
|
image[NR_TASKS+i].memmap.stack_bytes = stack_bytes;
|
|
image[NR_TASKS+i].memmap.entry = pc;
|
|
|
|
#ifdef MULTIBOOT_VERBOSE
|
|
mb_print("\n");
|
|
mb_print_hex(i);
|
|
mb_print(": ");
|
|
mb_print_hex(trunc_page(text_paddr));
|
|
mb_print("-");
|
|
mb_print_hex(trunc_page(data_paddr) + data_membytes + stack_bytes);
|
|
mb_print(" Entry: ");
|
|
mb_print_hex(pc);
|
|
mb_print(" Stack: ");
|
|
mb_print_hex(stack_bytes);
|
|
mb_print(" ");
|
|
mb_print((char *)module->cmdline);
|
|
#endif
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
phys_bytes pre_init(u32_t ebx)
|
|
{
|
|
multiboot_info_t mbi;
|
|
|
|
/* Do pre-initialization for multiboot, returning physical address of
|
|
* of multiboot module info
|
|
*/
|
|
mb_cls();
|
|
mb_print("\nMINIX booting... ");
|
|
mb_load_phymem(&mbi, ebx, sizeof(mbi));
|
|
get_parameters(&mbi);
|
|
mb_print("\nLoading image... ");
|
|
mb_extract_image(mbi);
|
|
return mbi.mods_addr;
|
|
}
|