X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=1afa8653dc6c828f8ab79ad3c500ce69eaee5cc0;hb=8382bdd7884a6d38f7529e0517dd9a7083f4ce73;hp=54a98d256236eb54fa2ba1a515949285b10d8085;hpb=8ed1dcfb47df08fa29070c8543453926cecdcd34;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index 54a98d2..1afa865 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -1,172 +1,290 @@ -#include "init.h" -#include -#include +#include "threads/init.h" +#include +#include #include -#include "debug.h" -#include "interrupt.h" -#include "io.h" -#include "kbd.h" -#include "lib.h" -#include "malloc.h" -#include "mmu.h" -#include "paging.h" -#include "palloc.h" -#include "random.h" -#include "serial.h" -#include "thread.h" -#include "timer.h" -#include "vga.h" +#include +#include +#include +#include +#include +#include +#include "devices/kbd.h" +#include "devices/serial.h" +#include "devices/timer.h" +#include "devices/vga.h" +#include "threads/interrupt.h" +#include "threads/io.h" +#include "threads/loader.h" +#include "threads/malloc.h" +#include "threads/mmu.h" +#include "threads/palloc.h" +#include "threads/test.h" +#include "threads/thread.h" +#ifdef USERPROG +#include "userprog/process.h" +#include "userprog/exception.h" +#include "userprog/gdt.h" +#include "userprog/syscall.h" +#include "userprog/tss.h" +#endif #ifdef FILESYS -#include "filesys.h" -#include "disk.h" +#include "devices/disk.h" +#include "filesys/filesys.h" +#include "filesys/fsutil.h" #endif -/* Size of kernel static code and data, in 4 kB pages. */ -size_t kernel_pages; - /* Amount of physical memory, in 4 kB pages. */ size_t ram_pages; -static void gdt_init (void); -void power_off (void); +/* Page directory with kernel mappings only. */ +uint32_t *base_page_dir; -static void -main_thread (void *aux UNUSED) -{ - disk_init (); - thread_execute ("a.out"); -} +#ifdef FILESYS +/* -f: Format the filesystem? */ +static bool format_filesys; +#endif + +#ifdef USERPROG +/* -ex: Initial program to run. */ +static char *initial_program; +#endif + +/* -q: Power off after running requested actions? */ +static bool do_power_off; + +static void ram_init (void); +static void paging_init (void); +static void argv_init (void); + +int main (void) NO_RETURN; int main (void) { - extern char _text, _end, __bss_start; - struct thread *t; - - /* Clear out the BSS segment. */ - memset (&__bss_start, 0, &_end - &__bss_start); - + /* Initialize everything needed for printf() first. */ + ram_init (); + thread_init (); vga_init (); - serial_init (); + serial_init_poll (); + console_init (); - /* Calculate how much RAM the kernel uses, and find out from - the bootloader how much RAM this machine has. */ - kernel_pages = (&_end - &_text + 4095) / 4096; - ram_pages = *(uint32_t *) (0x7e00 - 6); + /* Greet user. */ + printf ("Pintos booting with %'zd kB RAM...\n", ram_pages * (PGSIZE / 1024)); - printk ("Initializing nachos-x86, %d kB RAM detected.\n", - ram_pages * 4); + /* Parse command line. */ + argv_init (); - /* Memory from the end of the kernel through the end of memory - is free. Give it to the page allocator. */ - palloc_init ((void *) (KERN_BASE + kernel_pages * PGSIZE), - (void *) (PHYS_BASE + ram_pages * PGSIZE)); + /* Initialize memory system, segments, paging. */ + palloc_init (); paging_init (); +#ifdef USERPROG + tss_init (); gdt_init (); - +#endif malloc_init (); - random_init (); + /* Set random seed if argv_init() didn't. */ + random_init (0); + + /* Initialize interrupt handlers. */ intr_init (); timer_init (); kbd_init (); +#ifdef USERPROG + exception_init (); + syscall_init (); +#endif + + /* Start thread scheduler and enable interrupts. */ + thread_start (); + serial_init_queue (); #ifdef FILESYS - filesys_init (false); + /* Initialize filesystem. */ + disk_init (); + filesys_init (format_filesys); + fsutil_run (); #endif - thread_init (); + printf ("Boot complete.\n"); + +#ifdef USERPROG + /* Run a user program. */ + if (initial_program != NULL) + { + tid_t tid; + printf ("\nExecuting '%s':\n", initial_program); + tid = process_execute (initial_program); +#ifdef THREAD_JOIN_IMPLEMENTED + if (tid != TID_ERROR) + thread_join (tid); +#endif + } +#else + test (); +#endif - t = thread_create ("main", main_thread, NULL); - thread_start (t); + if (do_power_off) + power_off (); - printk ("Done!\n"); - return 0; + /* Terminate this thread. */ + thread_exit (); } - -static uint64_t -make_seg_desc (uint32_t base, - uint32_t limit, - enum seg_system system, - enum seg_type type, - int dpl, - enum seg_granularity granularity) + +/* Clear BSS and obtain RAM size from loader. */ +static void +ram_init (void) { - uint32_t e0 = ((limit & 0xffff) /* Limit 15:0. */ - | (base << 16)); /* Base 15:0. */ - uint32_t e1 = (((base >> 16) & 0xff) /* Base 23:16. */ - | (system << 12) /* 0=system, 1=code/data. */ - | (type << 8) /* Segment type. */ - | (dpl << 13) /* Descriptor privilege. */ - | (1 << 15) /* Present. */ - | (limit & 0xf0000) /* Limit 16:19. */ - | (1 << 22) /* 32-bit segment. */ - | (granularity << 23) /* Byte/page granularity. */ - | (base & 0xff000000)); /* Base 31:24. */ - return e0 | ((uint64_t) e1 << 32); -} + /* The "BSS" is a segment that should be initialized to zeros. + It isn't actually stored on disk or zeroed by the kernel + loader, so we have to zero it ourselves. -static uint64_t -make_code_desc (int dpl) -{ - return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_CODE | TYPE_READABLE, - dpl, GRAN_PAGE); -} + The start and end of the BSS segment is recorded by the + linker as _start_bss and _end_bss. See kernel.lds. */ + extern char _start_bss, _end_bss; + memset (&_start_bss, 0, &_end_bss - &_start_bss); -static uint64_t -make_data_desc (int dpl) -{ - return make_seg_desc (0, 0xfffff, SYS_CODE_DATA, TYPE_WRITABLE, - dpl, GRAN_PAGE); + /* Get RAM size from loader. See loader.S. */ + ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES); } -static uint64_t -make_tss_desc (void *vaddr) +/* Populates the base page directory and page table with the + kernel virtual mapping, and then sets up the CPU to use the + new page directory. Points base_page_dir to the page + directory it creates. + + At the time this function is called, the active page table + (set up by loader.S) only maps the first 4 MB of RAM, so we + should not try to use extravagant amounts of memory. + Fortunately, there is no need to do so. */ +static void +paging_init (void) { - return make_seg_desc ((uint32_t) vaddr, - 0x67, SYS_SYSTEM, TYPE_TSS_32_A, 0, GRAN_BYTE); -} + uint32_t *pd, *pt; + size_t page; -uint64_t gdt[SEL_CNT]; + pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO); + pt = NULL; + for (page = 0; page < ram_pages; page++) + { + uintptr_t paddr = page * PGSIZE; + void *vaddr = ptov (paddr); + size_t pde_idx = pd_no (vaddr); + size_t pte_idx = pt_no (vaddr); -struct tss *tss; + if (pd[pde_idx] == 0) + { + pt = palloc_get_page (PAL_ASSERT | PAL_ZERO); + pd[pde_idx] = pde_create (pt); + } + + pt[pte_idx] = pte_create_kernel (vaddr, true); + } + + asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir))); +} -/* Sets up a proper GDT. The bootstrap loader's GDT didn't - include user-mode selectors or a TSS. */ +/* Parses the command line. */ static void -gdt_init (void) +argv_init (void) { - uint64_t gdtr_operand; - - /* Our TSS is never used in a call gate or task gate, so only a - few fields of it are ever referenced, and those are the only - ones we initialize. */ - tss = palloc_get (PAL_ASSERT | PAL_ZERO); - tss->esp0 = (uint32_t) ptov(0x20000); - tss->ss0 = SEL_KDSEG; - tss->bitmap = 0xdfff; - - /* Initialize GDT. */ - gdt[SEL_NULL / sizeof *gdt] = 0; - gdt[SEL_KCSEG / sizeof *gdt] = make_code_desc (0); - gdt[SEL_KDSEG / sizeof *gdt] = make_data_desc (0); - gdt[SEL_UCSEG / sizeof *gdt] = make_code_desc (3); - gdt[SEL_UDSEG / sizeof *gdt] = make_data_desc (3); - gdt[SEL_TSS / sizeof *gdt] = make_tss_desc (tss); - - /* Load GDTR, TR. */ - gdtr_operand = make_dtr_operand (sizeof gdt - 1, gdt); - asm volatile ("lgdt %0" :: "m" (gdtr_operand)); - asm volatile ("ltr %w0" :: "r" (SEL_TSS)); + char *cmd_line, *pos; + char *argv[LOADER_CMD_LINE_LEN / 2 + 2]; + int argc = 0; + int i; + + /* The command line is made up of null terminated strings + followed by an empty string. Break it up into words. */ + cmd_line = pos = ptov (LOADER_CMD_LINE); + printf ("Kernel command line:"); + while (pos < cmd_line + LOADER_CMD_LINE_LEN) + { + ASSERT (argc < LOADER_CMD_LINE_LEN / 2); + if (*pos == '\0') + break; + argv[argc++] = pos; + printf (" %s", pos); + pos = strchr (pos, '\0') + 1; + } + printf ("\n"); + argv[argc] = ""; + argv[argc + 1] = ""; + + /* Parse the words. */ + for (i = 0; i < argc; i++) + if (!strcmp (argv[i], "-rs")) + random_init (atoi (argv[++i])); + else if (!strcmp (argv[i], "-d")) + debug_enable (argv[++i]); + else if (!strcmp (argv[i], "-q")) + do_power_off = true; +#ifdef USERPROG + else if (!strcmp (argv[i], "-ex")) + initial_program = argv[++i]; +#endif +#ifdef FILESYS + else if (!strcmp (argv[i], "-f")) + format_filesys = true; + else if (!strcmp (argv[i], "-ci")) + { + fsutil_copyin_file = argv[++i]; + fsutil_copyin_size = atoi (argv[++i]); + } + else if (!strcmp (argv[i], "-co")) + fsutil_copyout_file = argv[++i]; + else if (!strcmp (argv[i], "-p")) + fsutil_print_file = argv[++i]; + else if (!strcmp (argv[i], "-r")) + fsutil_remove_file = argv[++i]; + else if (!strcmp (argv[i], "-ls")) + fsutil_list_files = true; + else if (!strcmp (argv[i], "-D")) + fsutil_dump_filesys = true; +#endif + else if (!strcmp (argv[i], "-u")) + { + printf ( + "Kernel options:\n" + " -rs SEED Seed random seed to SEED.\n" + " -d CLASS[,...] Enable the given classes of debug messages.\n" +#ifdef USERPROG + " -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n" +#endif +#ifdef FILESYS + " -f Format the filesystem disk (hdb or hd0:1).\n" + " -ci FILENAME SIZE Copy SIZE bytes from the scratch disk (hdc\n" + " or hd1:0) into the filesystem as FILENAME\n" + " -co FILENAME Copy FILENAME to the scratch disk, with\n" + " size at start of sector 0 and data afterward\n" + " -p FILENAME Print the contents of FILENAME\n" + " -r FILENAME Delete FILENAME\n" + " -ls List the files in the filesystem\n" + " -D Dump complete filesystem contents\n" +#endif + " -q Power off after doing requested actions.\n" + " -u Print this help message and power off.\n" + ); + power_off (); + } + else + PANIC ("unknown option `%s' (use -u for help)", argv[i]); } - + +/* Powers down the machine we're running on, + as long as we're running on Bochs or qemu. */ void power_off (void) { const char s[] = "Shutdown"; const char *p; - printk ("Powering off...\n"); +#ifdef FILESYS + filesys_done (); +#endif + + printf ("Powering off...\n"); + serial_flush (); + for (p = s; *p != '\0'; p++) outb (0x8900, *p); for (;;);