50e2064049
This commit removes all traces of Minix segments (the text/data/stack memory map abstraction in the kernel) and significance of Intel segments (hardware segments like CS, DS that add offsets to all addressing before page table translation). This ultimately simplifies the memory layout and addressing and makes the same layout possible on non-Intel architectures. There are only two types of addresses in the world now: virtual and physical; even the kernel and processes have the same virtual address space. Kernel and user processes can be distinguished at a glance as processes won't use 0xF0000000 and above. No static pre-allocated memory sizes exist any more. Changes to booting: . The pre_init.c leaves the kernel and modules exactly as they were left by the bootloader in physical memory . The kernel starts running using physical addressing, loaded at a fixed location given in its linker script by the bootloader. All code and data in this phase are linked to this fixed low location. . It makes a bootstrap pagetable to map itself to a fixed high location (also in linker script) and jumps to the high address. All code and data then use this high addressing. . All code/data symbols linked at the low addresses is prefixed by an objcopy step with __k_unpaged_*, so that that code cannot reference highly-linked symbols (which aren't valid yet) or vice versa (symbols that aren't valid any more). . The two addressing modes are separated in the linker script by collecting the unpaged_*.o objects and linking them with low addresses, and linking the rest high. Some objects are linked twice, once low and once high. . The bootstrap phase passes a lot of information (e.g. free memory list, physical location of the modules, etc.) using the kinfo struct. . After this bootstrap the low-linked part is freed. . The kernel maps in VM into the bootstrap page table so that VM can begin executing. Its first job is to make page tables for all other boot processes. So VM runs before RS, and RS gets a fully dynamic, VM-managed address space. VM gets its privilege info from RS as usual but that happens after RS starts running. . Both the kernel loading VM and VM organizing boot processes happen using the libexec logic. This removes the last reason for VM to still know much about exec() and vm/exec.c is gone. Further Implementation: . All segments are based at 0 and have a 4 GB limit. . The kernel is mapped in at the top of the virtual address space so as not to constrain the user processes. . Processes do not use segments from the LDT at all; there are no segments in the LDT any more, so no LLDT is needed. . The Minix segments T/D/S are gone and so none of the user-space or in-kernel copy functions use them. The copy functions use a process endpoint of NONE to realize it's a physical address, virtual otherwise. . The umap call only makes sense to translate a virtual address to a physical address now. . Segments-related calls like newmap and alloc_segments are gone. . All segments-related translation in VM is gone (vir2map etc). . Initialization in VM is simpler as no moving around is necessary. . VM and all other boot processes can be linked wherever they wish and will be mapped in at the right location by the kernel and VM respectively. Other changes: . The multiboot code is less special: it does not use mb_print for its diagnostics any more but uses printf() as normal, saving the output into the diagnostics buffer, only printing to the screen using the direct print functions if a panic() occurs. . The multiboot code uses the flexible 'free memory map list' style to receive the list of free memory if available. . The kernel determines the memory layout of the processes to a degree: it tells VM where the kernel starts and ends and where the kernel wants the top of the process to be. VM then uses this entire range, i.e. the stack is right at the top, and mmap()ped bits of memory are placed below that downwards, and the break grows upwards. Other Consequences: . Every process gets its own page table as address spaces can't be separated any more by segments. . As all segments are 0-based, there is no distinction between virtual and linear addresses, nor between userspace and kernel addresses. . Less work is done when context switching, leading to a net performance increase. (8% faster on my machine for 'make servers'.) . The layout and configuration of the GDT makes sysenter and syscall possible.
250 lines
6.9 KiB
C
250 lines
6.9 KiB
C
|
|
#define UNPAGED 1 /* for proper kmain() prototype */
|
|
|
|
#include "kernel.h"
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#include <minix/minlib.h>
|
|
#include <minix/const.h>
|
|
#include <minix/types.h>
|
|
#include <minix/type.h>
|
|
#include <minix/com.h>
|
|
#include <sys/param.h>
|
|
#include <sys/reboot.h>
|
|
#include <machine/partition.h>
|
|
#include "string.h"
|
|
#include "arch_proto.h"
|
|
#include "libexec.h"
|
|
#include "direct_utils.h"
|
|
#include "serial.h"
|
|
#include "glo.h"
|
|
#include <machine/multiboot.h>
|
|
|
|
#if USE_SYSDEBUG
|
|
#define MULTIBOOT_VERBOSE 1
|
|
#endif
|
|
|
|
/* to-be-built kinfo struct, diagnostics buffer */
|
|
kinfo_t kinfo;
|
|
struct kmessages kmess;
|
|
|
|
/* pg_utils.c uses this; in this phase, there is a 1:1 mapping. */
|
|
phys_bytes vir2phys(void *addr) { return (phys_bytes) addr; }
|
|
|
|
/* mb_utils.c uses this; we can reach it directly */
|
|
char *video_mem = (char *) MULTIBOOT_VIDEO_BUFFER;
|
|
|
|
/* String length used for mb_itoa */
|
|
#define ITOA_BUFFER_SIZE 20
|
|
|
|
static int mb_set_param(char *bigbuf, char *name, char *value, kinfo_t *cbi)
|
|
{
|
|
char *p = bigbuf;
|
|
char *bufend = bigbuf + MULTIBOOT_PARAM_BUF_SIZE;
|
|
char *q;
|
|
int namelen = strlen(name);
|
|
int valuelen = strlen(value);
|
|
|
|
/* Some variables we recognize */
|
|
if(!strcmp(name, SERVARNAME)) { cbi->do_serial_debug = 1; return 0; }
|
|
if(!strcmp(name, SERBAUDVARNAME)) { cbi->serial_debug_baud = atoi(value); return 0; }
|
|
|
|
/* Delete the item if already exists */
|
|
while (*p) {
|
|
if (strncmp(p, name, namelen) == 0 && p[namelen] == '=') {
|
|
q = p;
|
|
while (*q) q++;
|
|
for (q++; q < bufend; q++, p++)
|
|
*p = *q;
|
|
break;
|
|
}
|
|
while (*p++)
|
|
;
|
|
p++;
|
|
}
|
|
|
|
for (p = bigbuf; p < bufend && (*p || *(p + 1)); p++)
|
|
;
|
|
if (p > bigbuf) p++;
|
|
|
|
/* Make sure there's enough space for the new parameter */
|
|
if (p + namelen + valuelen + 3 > bufend)
|
|
return -1;
|
|
|
|
strcpy(p, name);
|
|
p[namelen] = '=';
|
|
strcpy(p + namelen + 1, value);
|
|
p[namelen + valuelen + 1] = 0;
|
|
p[namelen + valuelen + 2] = 0;
|
|
return 0;
|
|
}
|
|
|
|
int overlaps(multiboot_module_t *mod, int n, int cmp_mod)
|
|
{
|
|
multiboot_module_t *cmp = &mod[cmp_mod];
|
|
int m;
|
|
|
|
#define INRANGE(mod, v) ((v) >= mod->mod_start && (v) <= thismod->mod_end)
|
|
#define OVERLAP(mod1, mod2) (INRANGE(mod1, mod2->mod_start) || \
|
|
INRANGE(mod1, mod2->mod_end))
|
|
for(m = 0; m < n; m++) {
|
|
multiboot_module_t *thismod = &mod[m];
|
|
if(m == cmp_mod) continue;
|
|
if(OVERLAP(thismod, cmp))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void print_memmap(kinfo_t *cbi)
|
|
{
|
|
int m;
|
|
assert(cbi->mmap_size < MAXMEMMAP);
|
|
for(m = 0; m < cbi->mmap_size; m++) {
|
|
printf("%08lx-%08lx ",cbi->memmap[m].addr, cbi->memmap[m].addr + cbi->memmap[m].len);
|
|
}
|
|
printf("\nsize %08lx\n", cbi->mmap_size);
|
|
}
|
|
|
|
void get_parameters(u32_t ebx, kinfo_t *cbi)
|
|
{
|
|
multiboot_memory_map_t *mmap;
|
|
multiboot_info_t *mbi = &cbi->mbi;
|
|
int var_i,value_i, m, k;
|
|
char *p;
|
|
extern char _kern_phys_base, _kern_vir_base, _kern_size,
|
|
_kern_unpaged_start, _kern_unpaged_end;
|
|
phys_bytes kernbase = (phys_bytes) &_kern_phys_base,
|
|
kernsize = (phys_bytes) &_kern_size;
|
|
#define BUF 1024
|
|
static char cmdline[BUF];
|
|
|
|
/* get our own copy of the multiboot info struct and module list */
|
|
memcpy((void *) mbi, (void *) ebx, sizeof(*mbi));
|
|
|
|
/* Set various bits of info for the higher-level kernel. */
|
|
cbi->mem_high_phys = 0;
|
|
cbi->user_sp = (vir_bytes) &_kern_vir_base;
|
|
cbi->vir_kern_start = (vir_bytes) &_kern_vir_base;
|
|
cbi->bootstrap_start = (vir_bytes) &_kern_unpaged_start;
|
|
cbi->bootstrap_len = (vir_bytes) &_kern_unpaged_end -
|
|
cbi->bootstrap_start;
|
|
cbi->kmess = &kmess;
|
|
|
|
/* set some configurable defaults */
|
|
cbi->do_serial_debug = 0;
|
|
cbi->serial_debug_baud = 115200;
|
|
|
|
/* parse boot command line */
|
|
if (mbi->flags&MULTIBOOT_INFO_CMDLINE) {
|
|
static char var[BUF];
|
|
static char value[BUF];
|
|
|
|
/* Override values with cmdline argument */
|
|
memcpy(cmdline, (void *) mbi->cmdline, BUF);
|
|
p = cmdline;
|
|
while (*p) {
|
|
var_i = 0;
|
|
value_i = 0;
|
|
while (*p == ' ') p++;
|
|
if (!*p) break;
|
|
while (*p && *p != '=' && *p != ' ' && var_i < BUF - 1)
|
|
var[var_i++] = *p++ ;
|
|
var[var_i] = 0;
|
|
if (*p++ != '=') continue; /* skip if not name=value */
|
|
while (*p && *p != ' ' && value_i < BUF - 1)
|
|
value[value_i++] = *p++ ;
|
|
value[value_i] = 0;
|
|
|
|
mb_set_param(cbi->param_buf, var, value, cbi);
|
|
}
|
|
}
|
|
|
|
/* round user stack down to leave a gap to catch kernel
|
|
* stack overflow; and to distinguish kernel and user addresses
|
|
* at a glance (0xf.. vs 0xe..)
|
|
*/
|
|
cbi->user_sp &= 0xF0000000;
|
|
cbi->user_end = cbi->user_sp;
|
|
|
|
assert(!(cbi->bootstrap_start % I386_PAGE_SIZE));
|
|
cbi->bootstrap_len = rounddown(cbi->bootstrap_len, I386_PAGE_SIZE);
|
|
assert(mbi->flags & MULTIBOOT_INFO_MODS);
|
|
assert(mbi->mods_count < MULTIBOOT_MAX_MODS);
|
|
assert(mbi->mods_count > 0);
|
|
memcpy(&cbi->module_list, (void *) mbi->mods_addr,
|
|
mbi->mods_count * sizeof(multiboot_module_t));
|
|
|
|
memset(cbi->memmap, 0, sizeof(cbi->memmap));
|
|
/* mem_map has a variable layout */
|
|
if(mbi->flags & MULTIBOOT_INFO_MEM_MAP) {
|
|
cbi->mmap_size = 0;
|
|
for (mmap = (multiboot_memory_map_t *) mbi->mmap_addr;
|
|
(unsigned long) mmap < mbi->mmap_addr + mbi->mmap_length;
|
|
mmap = (multiboot_memory_map_t *)
|
|
((unsigned long) mmap + mmap->size + sizeof(mmap->size))) {
|
|
if(mmap->type != MULTIBOOT_MEMORY_AVAILABLE) continue;
|
|
add_memmap(cbi, mmap->addr, mmap->len);
|
|
}
|
|
} else {
|
|
assert(mbi->flags & MULTIBOOT_INFO_MEMORY);
|
|
add_memmap(cbi, 0, mbi->mem_lower_unused*1024);
|
|
add_memmap(cbi, 0x100000, mbi->mem_upper_unused*1024);
|
|
}
|
|
|
|
/* Sanity check: the kernel nor any of the modules may overlap
|
|
* with each other. Pretend the kernel is an extra module for a
|
|
* second.
|
|
*/
|
|
k = mbi->mods_count;
|
|
assert(k < MULTIBOOT_MAX_MODS);
|
|
cbi->module_list[k].mod_start = kernbase;
|
|
cbi->module_list[k].mod_end = kernbase + kernsize;
|
|
cbi->mods_with_kernel = mbi->mods_count+1;
|
|
cbi->kern_mod = k;
|
|
|
|
for(m = 0; m < cbi->mods_with_kernel; m++) {
|
|
#if 0
|
|
printf("checking overlap of module %08lx-%08lx\n",
|
|
cbi->module_list[m].mod_start, cbi->module_list[m].mod_end);
|
|
#endif
|
|
if(overlaps(cbi->module_list, cbi->mods_with_kernel, m))
|
|
panic("overlapping boot modules/kernel");
|
|
/* We cut out the bits of memory that we know are
|
|
* occupied by the kernel and boot modules.
|
|
*/
|
|
cut_memmap(cbi,
|
|
cbi->module_list[m].mod_start,
|
|
cbi->module_list[m].mod_end);
|
|
}
|
|
}
|
|
|
|
kinfo_t *pre_init(u32_t magic, u32_t ebx)
|
|
{
|
|
/* Get our own copy boot params pointed to by ebx.
|
|
* Here we find out whether we should do serial output.
|
|
*/
|
|
get_parameters(ebx, &kinfo);
|
|
|
|
/* Say hello. */
|
|
printf("MINIX loading\n");
|
|
|
|
assert(magic == MULTIBOOT_BOOTLOADER_MAGIC);
|
|
|
|
/* Make and load a pagetable that will map the kernel
|
|
* to where it should be; but first a 1:1 mapping so
|
|
* this code stays where it should be.
|
|
*/
|
|
pg_clear();
|
|
pg_identity();
|
|
kinfo.freepde_start = pg_mapkernel();
|
|
pg_load();
|
|
vm_enable_paging();
|
|
|
|
/* Done, return boot info so it can be passed to kmain(). */
|
|
return &kinfo;
|
|
}
|
|
|
|
int send_sig(endpoint_t proc_nr, int sig_nr) { return 0; }
|
|
void minix_shutdown(timer_t *t) { arch_shutdown(RBT_PANIC); }
|
|
void busy_delay_ms(int x) { }
|