X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=cebec2c817f5954b9accf9558dbd36822c1fb8f4;hp=2684d17d5023621594e89bc35a2e647da20178a1;hb=a03618133f7df0954802a470a4bee7674f7aed45;hpb=1873780194ed34a0c8c71a09671938e6e2468afd diff --git a/src/threads/init.c b/src/threads/init.c index 2684d17..cebec2c 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -1,85 +1,115 @@ #include "threads/init.h" +#include #include +#include #include #include #include -#include #include #include #include #include "devices/kbd.h" +#include "devices/input.h" #include "devices/serial.h" +#include "devices/shutdown.h" #include "devices/timer.h" #include "devices/vga.h" +#include "devices/rtc.h" #include "threads/interrupt.h" #include "threads/io.h" #include "threads/loader.h" #include "threads/malloc.h" -#include "threads/mmu.h" -#include "threads/paging.h" #include "threads/palloc.h" +#include "threads/pte.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" +#else +#include "tests/threads/tests.h" #endif #ifdef FILESYS -#include "devices/disk.h" +#include "devices/block.h" +#include "devices/ide.h" #include "filesys/filesys.h" #include "filesys/fsutil.h" #endif -/* Amount of physical memory, in 4 kB pages. */ -size_t ram_pages; +/* Page directory with kernel mappings only. */ +uint32_t *init_page_dir; #ifdef FILESYS -/* Format the filesystem? */ +/* -f: Format the file system? */ static bool format_filesys; -#endif -#ifdef USERPROG -/* Initial program to run. */ -static char *initial_program; +/* -filesys, -scratch, -swap: Names of block devices to use, + overriding the defaults. */ +static const char *filesys_bdev_name; +static const char *scratch_bdev_name; +#ifdef VM +static const char *swap_bdev_name; #endif +#endif /* FILESYS */ + +/* -ul: Maximum number of pages to put into palloc's user pool. */ +static size_t user_page_limit = SIZE_MAX; -static void ram_init (void); -static void argv_init (void); +static void bss_init (void); +static void paging_init (void); + +static char **read_command_line (void); +static char **parse_options (char **argv); +static void run_actions (char **argv); +static void usage (void); + +#ifdef FILESYS +static void locate_block_devices (void); +static void locate_block_device (enum block_type, const char *name); +#endif int main (void) NO_RETURN; +/* Pintos main program. */ int main (void) { - /* Needed by printf(), so initialize them very early. */ - ram_init (); - vga_init (); - serial_init (1); + char **argv; - /* Greet user. */ - printf ("Booting cnachos86 with %'d kB RAM...\n", ram_pages * 4); + /* Clear BSS. */ + bss_init (); - /* Parse command line. */ - argv_init (); + /* Break command line into arguments and parse options. */ + argv = read_command_line (); + argv = parse_options (argv); - /* Initialize memory system, segments, paging. */ + /* Initialize ourselves as a thread so we can use locks, + then enable console locking. */ thread_init (); - palloc_init (); + console_init (); + + /* Greet user. */ + printf ("Pintos booting with %'"PRIu32" kB RAM...\n", + init_ram_pages * PGSIZE / 1024); + + /* Initialize memory system. */ + palloc_init (user_page_limit); + malloc_init (); paging_init (); + + /* Segmentation. */ #ifdef USERPROG tss_init (); gdt_init (); #endif - malloc_init (); - - /* Set random seed if not already done. */ - random_init (0); /* Initialize interrupt handlers. */ intr_init (); timer_init (); kbd_init (); + input_init (); #ifdef USERPROG exception_init (); syscall_init (); @@ -87,116 +117,313 @@ main (void) /* Start thread scheduler and enable interrupts. */ thread_start (); - serial_init (2); + serial_init_queue (); + timer_calibrate (); #ifdef FILESYS - /* Initialize filesystem. */ - disk_init (); + /* Initialize file system. */ + ide_init (); + locate_block_devices (); filesys_init (format_filesys); - fsutil_run (); #endif printf ("Boot complete.\n"); - for (;;) - putchar (serial_getc ()); - -#ifdef USERPROG - /* Run a user program. */ - if (initial_program != NULL) - { - printf ("\nExecuting '%s':\n", initial_program); - thread_execute (initial_program); - } -#endif + /* Run actions specified on kernel command line. */ + run_actions (argv); - /* Terminate this thread. */ + /* Finish up. */ + shutdown (); thread_exit (); } -/* Clear BSS and obtain RAM size from loader. */ +/* Clear the "BSS", 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. + + The start and end of the BSS segment is recorded by the + linker as _start_bss and _end_bss. See kernel.lds. */ static void -ram_init (void) +bss_init (void) { - /* 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. - - 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); - - /* Get RAM size from loader. See loader.S. */ - ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES); } -/* Parses the command line. */ +/* 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 init_page_dir to the page + directory it creates. */ static void -argv_init (void) +paging_init (void) +{ + uint32_t *pd, *pt; + size_t page; + extern char _start, _end_kernel_text; + + pd = init_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO); + pt = NULL; + for (page = 0; page < init_ram_pages; page++) + { + uintptr_t paddr = page * PGSIZE; + char *vaddr = ptov (paddr); + size_t pde_idx = pd_no (vaddr); + size_t pte_idx = pt_no (vaddr); + bool in_kernel_text = &_start <= vaddr && vaddr < &_end_kernel_text; + + 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, !in_kernel_text); + } + + /* Store the physical address of the page directory into CR3 + aka PDBR (page directory base register). This activates our + new page tables immediately. See [IA32-v2a] "MOV--Move + to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address + of the Page Directory". */ + asm volatile ("movl %0, %%cr3" : : "r" (vtop (init_page_dir))); +} + +/* Breaks the kernel command line into words and returns them as + an argv-like array. */ +static char ** +read_command_line (void) { - char *cmd_line, *pos; - char *argv[LOADER_CMD_LINE_LEN / 2 + 1]; - int argc = 0; + static char *argv[LOADER_ARGS_LEN / 2 + 1]; + char *p, *end; + int argc; 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); - while (pos < cmd_line + LOADER_CMD_LINE_LEN) + argc = *(uint32_t *) ptov (LOADER_ARG_CNT); + p = ptov (LOADER_ARGS); + end = p + LOADER_ARGS_LEN; + for (i = 0; i < argc; i++) { - ASSERT (argc < LOADER_CMD_LINE_LEN / 2); - if (*pos == '\0') - break; - argv[argc++] = pos; - pos = strchr (pos, '\0') + 1; + if (p >= end) + PANIC ("command line arguments overflow"); + + argv[i] = p; + p += strnlen (p, end - p) + 1; } - argv[argc] = ""; + argv[argc] = NULL; - /* Parse the words. */ + /* Print kernel command line. */ + printf ("Kernel command line:"); 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]); + if (strchr (argv[i], ' ') == NULL) + printf (" %s", argv[i]); + else + printf (" '%s'", argv[i]); + printf ("\n"); + + return argv; +} + +/* Parses options in ARGV[] + and returns the first non-option argument. */ +static char ** +parse_options (char **argv) +{ + for (; *argv != NULL && **argv == '-'; argv++) + { + char *save_ptr; + char *name = strtok_r (*argv, "=", &save_ptr); + char *value = strtok_r (NULL, "", &save_ptr); + + if (!strcmp (name, "-h")) + usage (); + else if (!strcmp (name, "-q")) + shutdown_configure (SHUTDOWN_POWER_OFF); + else if (!strcmp (name, "-r")) + shutdown_configure (SHUTDOWN_REBOOT); +#ifdef FILESYS + else if (!strcmp (name, "-f")) + format_filesys = true; + else if (!strcmp (name, "-filesys")) + filesys_bdev_name = value; + else if (!strcmp (name, "-scratch")) + scratch_bdev_name = value; +#ifdef VM + else if (!strcmp (name, "-swap")) + swap_bdev_name = value; +#endif +#endif + else if (!strcmp (name, "-rs")) + random_init (atoi (value)); + else if (!strcmp (name, "-mlfqs")) + thread_mlfqs = true; #ifdef USERPROG - else if (!strcmp (argv[i], "-ex")) - initial_program = argv[++i]; + else if (!strcmp (name, "-ul")) + user_page_limit = atoi (value); #endif + else + PANIC ("unknown option `%s' (use -h for help)", name); + } + + /* Initialize the random number generator based on the system + time. This has no effect if an "-rs" option was specified. + + When running under Bochs, this is not enough by itself to + get a good seed value, because the pintos script sets the + initial time to a predictable value, not to the local time, + for reproducibility. To fix this, give the "-r" option to + the pintos script to request real-time execution. */ + random_init (rtc_get_time ()); + + return argv; +} + +/* Runs the task specified in ARGV[1]. */ +static void +run_task (char **argv) +{ + const char *task = argv[1]; + + printf ("Executing '%s':\n", task); +#ifdef USERPROG + process_wait (process_execute (task)); +#else + run_test (task); +#endif + printf ("Execution of '%s' complete.\n", task); +} + +/* Executes all of the actions specified in ARGV[] + up to the null pointer sentinel. */ +static void +run_actions (char **argv) +{ + /* An action. */ + struct action + { + char *name; /* Action name. */ + int argc; /* # of args, including action name. */ + void (*function) (char **argv); /* Function to execute action. */ + }; + + /* Table of supported actions. */ + static const struct action actions[] = + { + {"run", 2, run_task}, #ifdef FILESYS - else if (!strcmp (argv[i], "-f")) - format_filesys = true; - else if (!strcmp (argv[i], "-cp")) - fsutil_copy_arg = 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" + {"ls", 1, fsutil_ls}, + {"cat", 2, fsutil_cat}, + {"rm", 2, fsutil_rm}, + {"extract", 1, fsutil_extract}, + {"append", 2, fsutil_append}, +#endif + {NULL, 0, NULL}, + }; + + while (*argv != NULL) + { + const struct action *a; + int i; + + /* Find action name. */ + for (a = actions; ; a++) + if (a->name == NULL) + PANIC ("unknown action `%s' (use -h for help)", *argv); + else if (!strcmp (*argv, a->name)) + break; + + /* Check for required arguments. */ + for (i = 1; i < a->argc; i++) + if (argv[i] == NULL) + PANIC ("action `%s' requires %d argument(s)", *argv, a->argc - 1); + + /* Invoke action and advance. */ + a->function (argv); + argv += a->argc; + } + +} + +/* Prints a kernel command line help message and powers off the + machine. */ +static void +usage (void) +{ + printf ("\nCommand line syntax: [OPTION...] [ACTION...]\n" + "Options must precede actions.\n" + "Actions are executed in the order specified.\n" + "\nAvailable actions:\n" #ifdef USERPROG - " -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n" + " run 'PROG [ARG...]' Run PROG and wait for it to complete.\n" +#else + " run TEST Run TEST.\n" #endif #ifdef FILESYS - " -f Format the filesystem disk (hdb or hd0:1).\n" - " -cp FILENAME:SIZE Copy SIZE bytes from the scratch disk (hdc\n" - " or hd1:0) into the filesystem as FILENAME\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" + " ls List files in the root directory.\n" + " cat FILE Print FILE to the console.\n" + " rm FILE Delete FILE.\n" + "Use these actions indirectly via `pintos' -g and -p options:\n" + " extract Untar from scratch device into file system.\n" + " append FILE Append FILE to tar file on scratch device.\n" +#endif + "\nOptions:\n" + " -h Print this help message and power off.\n" + " -q Power off VM after actions or on panic.\n" + " -r Reboot after actions.\n" +#ifdef FILESYS + " -f Format file system device during startup.\n" + " -filesys=BDEV Use BDEV for file system instead of default.\n" + " -scratch=BDEV Use BDEV for scratch instead of default.\n" +#ifdef VM + " -swap=BDEV Use BDEV for swap instead of default.\n" +#endif +#endif + " -rs=SEED Set random number seed to SEED.\n" + " -mlfqs Use multi-level feedback queue scheduler.\n" +#ifdef USERPROG + " -ul=COUNT Limit user memory to COUNT pages.\n" #endif ); - } - else - PANIC ("unknown option `%s'", argv[i]); + shutdown_power_off (); +} + +#ifdef FILESYS +/* Figure out what block devices to cast in the various Pintos roles. */ +static void +locate_block_devices (void) +{ + locate_block_device (BLOCK_FILESYS, filesys_bdev_name); + locate_block_device (BLOCK_SCRATCH, scratch_bdev_name); +#ifdef VM + locate_block_device (BLOCK_SWAP, swap_bdev_name); +#endif } + +/* Figures out what block device to use for the given ROLE: the + block device with the given NAME, if NAME is non-null, + otherwise the first block device in probe order of type + ROLE. */ +static void +locate_block_device (enum block_type role, const char *name) +{ + struct block *block = NULL; + + if (name != NULL) + { + block = block_get_by_name (name); + if (block == NULL) + PANIC ("No such block device \"%s\"", name); + } + else + { + for (block = block_first (); block != NULL; block = block_next (block)) + if (block_type (block) == role) + break; + } + + if (block != NULL) + { + printf ("%s: using %s\n", block_type_name (role), block_name (block)); + block_set_role (role, block); + } +} +#endif