--- Gnu-Mach/kern/bootstrap.c 2020/09/02 04:36:56 1.1.1.1 +++ Gnu-Mach/kern/bootstrap.c 2020/09/02 04:51:54 1.1.1.7 @@ -29,39 +29,63 @@ /* * Bootstrap the various built-in servers. */ -#include -#include + +#include +#include #include #include -#include "vm_param.h" +#include +#include +#include #include +#include +#include #include -#include +#include +#include #include #include +#include #include +#include +#include #include -#include - -#include -#include - #if MACH_KDB #include #include #endif +#if OSKIT_MACH +#include +#include +#include +#include +#define safe_gets(s, n) fgets((s),(n),stdin) +#else +#include +#include +#ifdef MACH_XEN +#include +extern struct start_info boot_info; /* XXX put this in a header! */ +#else /* MACH_XEN */ +extern struct multiboot_info boot_info; /* XXX put this in a header! */ +#endif /* MACH_XEN */ +#endif + +#include "boot_script.h" + static mach_port_t boot_device_port; /* local name */ static mach_port_t boot_host_port; /* local name */ -extern struct multiboot_info *boot_info; extern char *kernel_cmdline; -static void user_bootstrap(); /* forward */ -static void bootstrap_exec(void *exec_data); +static void user_bootstrap(void); /* forward */ +static void user_bootstrap_compat(void); /* forward */ +static void bootstrap_exec_compat(void *exec_data); /* forward */ +static void get_compat_strings(char *flags_str, char *root_str); /* forward */ static mach_port_t task_insert_send_right( @@ -74,7 +98,7 @@ task_insert_send_right( kern_return_t kr; kr = mach_port_insert_right(task->itk_space, name, - (ipc_object_t)port, MACH_MSG_TYPE_PORT_SEND); + port, MACH_MSG_TYPE_PORT_SEND); if (kr == KERN_SUCCESS) break; assert(kr == KERN_NAME_EXISTS); @@ -83,27 +107,184 @@ task_insert_send_right( return name; } -void bootstrap_create() +static void +free_bootstrap_pages(phys_addr_t start, phys_addr_t end) { - struct multiboot_module *bmod; + struct vm_page *page; - if (!(boot_info->flags & MULTIBOOT_MODS) - || (boot_info->mods_count == 0)) - panic("No bootstrap code loaded with the kernel!"); - if (boot_info->mods_count > 1) - printf("Warning: only one boot module currently used by Mach\n"); - bmod = (struct multiboot_module *)phystokv(boot_info->mods_addr); - bootstrap_exec((void*)phystokv(bmod->mod_start)); + while (start < end) + { + page = vm_page_lookup_pa(start); + assert(page != NULL); + vm_page_manage(page); + start += PAGE_SIZE; + } +} + +void bootstrap_create(void) +{ + int compat; + unsigned n = 0; +#ifdef MACH_XEN + struct multiboot_module *bmods = ((struct multiboot_module *) + boot_info.mod_start); + if (bmods) + for (n = 0; bmods[n].mod_start; n++) { + bmods[n].mod_start = kvtophys(bmods[n].mod_start + (vm_offset_t) bmods); + bmods[n].mod_end = kvtophys(bmods[n].mod_end + (vm_offset_t) bmods); + bmods[n].string = kvtophys(bmods[n].string + (vm_offset_t) bmods); + } + boot_info.mods_count = n; + boot_info.flags |= MULTIBOOT_MODS; +#else /* MACH_XEN */ + struct multiboot_module *bmods = ((struct multiboot_module *) + phystokv(boot_info.mods_addr)); + +#endif /* MACH_XEN */ + if (!(boot_info.flags & MULTIBOOT_MODS) + || (boot_info.mods_count == 0)) + panic ("No bootstrap code loaded with the kernel!"); + + compat = boot_info.mods_count == 1; + if (compat) + { + char *p = strchr((char*)phystokv(bmods[0].string), ' '); + if (p != 0) + do + ++p; + while (*p == ' ' || *p == '\n'); + compat = p == 0 || *p == '\0'; + } + + if (compat) + { + printf("Loading single multiboot module in compat mode: %s\n", + (char*)phystokv(bmods[0].string)); + bootstrap_exec_compat(&bmods[0]); + } + else + { + unsigned i; + int losers; + + /* Initialize boot script variables. We leak these send rights. */ + losers = boot_script_set_variable + ("host-port", VAL_PORT, + (long) realhost.host_priv_self); + if (losers) + panic ("cannot set boot-script variable host-port: %s", + boot_script_error_string (losers)); + losers = boot_script_set_variable + ("device-port", VAL_PORT, + (long) master_device_port); + if (losers) + panic ("cannot set boot-script variable device-port: %s", + boot_script_error_string (losers)); + + losers = boot_script_set_variable ("kernel-command-line", VAL_STR, + (long) kernel_cmdline); + if (losers) + panic ("cannot set boot-script variable %s: %s", + "kernel-command-line", boot_script_error_string (losers)); + + { + /* Set the same boot script variables that the old Hurd's + serverboot did, so an old Hurd and boot script previously + used with serverboot can be used directly with this kernel. */ - /* XXX at this point, we could free all the memory used - by the boot modules and the boot loader's descriptors and such. */ -} + char *flag_string = alloca(1024); + char *root_string = alloca(1024); -/* XXX won't work with more than one bootstrap service */ -static void *boot_exec; + /* + * Get the (compatibility) boot flags and root name strings. + */ + get_compat_strings(flag_string, root_string); + + losers = boot_script_set_variable ("boot-args", VAL_STR, + (long) flag_string); + if (losers) + panic ("cannot set boot-script variable %s: %s", + "boot-args", boot_script_error_string (losers)); + losers = boot_script_set_variable ("root-device", VAL_STR, + (long) root_string); + if (losers) + panic ("cannot set boot-script variable %s: %s", + "root-device", boot_script_error_string (losers)); + } + +#if OSKIT_MACH + { + /* The oskit's "environ" array contains all the words from + the multiboot command line that looked like VAR=VAL. + We set each of these as boot-script variables, which + can be used for things like ${root}. */ + + extern char **environ; + char **ep; + for (ep = environ; *ep != 0; ++ep) + { + size_t len = strlen (*ep) + 1; + char *var = memcpy (alloca (len), *ep, len); + char *val = strchr (var, '='); + *val++ = '\0'; + losers = boot_script_set_variable (var, VAL_STR, (long) val); + if (losers) + panic ("cannot set boot-script variable %s: %s", + var, boot_script_error_string (losers)); + } + } +#else /* GNUmach, not oskit-mach */ + { + /* Turn each `FOO=BAR' word in the command line into a boot script + variable ${FOO} with value BAR. This matches what we get from + oskit's environ in the oskit-mach case (above). */ + + int len = strlen (kernel_cmdline) + 1; + char *s = memcpy (alloca (len), kernel_cmdline, len); + char *word; + while ((word = strsep (&s, " \t")) != 0) + { + char *eq = strchr (word, '='); + if (eq == 0) + continue; + *eq++ = '\0'; + losers = boot_script_set_variable (word, VAL_STR, (long) eq); + if (losers) + panic ("cannot set boot-script variable %s: %s", + word, boot_script_error_string (losers)); + } + } +#endif + + for (i = 0; i < boot_info.mods_count; ++i) + { + int err; + char *line = (char*)phystokv(bmods[i].string); + printf ("module %d: %s\n", i, line); + err = boot_script_parse_line (&bmods[i], line); + if (err) + { + printf ("\n\tERROR: %s", boot_script_error_string (err)); + ++losers; + } + } + printf ("%d multiboot modules\n", i); + if (losers) + panic ("%d of %d boot script commands could not be parsed", + losers, boot_info.mods_count); + losers = boot_script_exec (); + if (losers) + panic ("ERROR in executing boot script: %s", + boot_script_error_string (losers)); + } + /* XXX we could free the memory used + by the boot loader's descriptors and such. */ + for (n = 0; n < boot_info.mods_count; n++) + free_bootstrap_pages(bmods[n].mod_start, bmods[n].mod_end); +} static void -bootstrap_exec(void *e) +bootstrap_exec_compat(void *e) { task_t bootstrap_task; thread_t bootstrap_thread; @@ -130,8 +311,8 @@ bootstrap_exec(void *e) /* * Start the bootstrap thread. */ - boot_exec = e; - thread_start(bootstrap_thread, user_bootstrap); + bootstrap_thread->saved.other = e; + thread_start(bootstrap_thread, user_bootstrap_compat); (void) thread_resume(bootstrap_thread); } @@ -149,7 +330,7 @@ itoa( vm_size_t num) { char buf[sizeof(vm_size_t)*2+3]; - register char *np; + char *np; np = buf + sizeof(buf); *--np = 0; @@ -169,7 +350,9 @@ itoa( */ static void get_compat_strings(char *flags_str, char *root_str) { - register char *ip, *cp; + char *ip, *cp; + + strcpy (root_str, "UNKNOWN"); cp = flags_str; *cp++ = '-'; @@ -209,6 +392,7 @@ static void get_compat_strings(char *fla *cp = '\0'; } +#if 0 /* * Copy boot_data (executable) to the user portion of this task. */ @@ -234,26 +418,39 @@ static boolean_t load_bootstrap_symbols #else static boolean_t load_bootstrap_symbols = FALSE; #endif +#endif -static int boot_read(void *handle, vm_offset_t file_ofs, void *buf, vm_size_t size, - vm_size_t *out_actual) +static int +boot_read(void *handle, vm_offset_t file_ofs, void *buf, vm_size_t size, + vm_size_t *out_actual) { - memcpy(buf, handle + file_ofs, size); - *out_actual = size; - return 0; + struct multiboot_module *mod = handle; + + if (mod->mod_start + file_ofs + size > mod->mod_end) + return -1; + + memcpy(buf, (const char*) phystokv (mod->mod_start) + file_ofs, size); + *out_actual = size; + return 0; } -static int read_exec(void *handle, vm_offset_t file_ofs, vm_size_t file_size, +static int +read_exec(void *handle, vm_offset_t file_ofs, vm_size_t file_size, vm_offset_t mem_addr, vm_size_t mem_size, exec_sectype_t sec_type) { + struct multiboot_module *mod = handle; + vm_map_t user_map = current_task()->map; vm_offset_t start_page, end_page; vm_prot_t mem_prot = sec_type & EXEC_SECTYPE_PROT_MASK; int err; + if (mod->mod_start + file_ofs + file_size > mod->mod_end) + return -1; + if (!(sec_type & EXEC_SECTYPE_ALLOC)) return 0; @@ -263,10 +460,10 @@ static int read_exec(void *handle, vm_of start_page = trunc_page(mem_addr); end_page = round_page(mem_addr + mem_size); - /* +#if 0 printf("reading bootstrap section %08x-%08x-%08x prot %d pages %08x-%08x\n", mem_addr, mem_addr+file_size, mem_addr+mem_size, mem_prot, start_page, end_page); - */ +#endif err = vm_allocate(user_map, &start_page, end_page - start_page, FALSE); assert(err == 0); @@ -274,7 +471,8 @@ static int read_exec(void *handle, vm_of if (file_size > 0) { - err = copyout(handle + file_ofs, mem_addr, file_size); + err = copyout((char *)phystokv (mod->mod_start) + file_ofs, + (void *)mem_addr, file_size); assert(err == 0); } @@ -283,14 +481,16 @@ static int read_exec(void *handle, vm_of err = vm_protect(user_map, start_page, end_page - start_page, FALSE, mem_prot); assert(err == 0); } + + return 0; } -static void copy_bootstrap(void *e, struct exec_info *boot_exec_info) +static void copy_bootstrap(void *e, exec_info_t *boot_exec_info) { - register vm_map_t user_map = current_task()->map; + //register vm_map_t user_map = current_task()->map; int err; - if (err = exec_load(boot_read, read_exec, e, boot_exec_info)) + if ((err = exec_load(boot_read, read_exec, e, boot_exec_info))) panic("Cannot load user-bootstrap image: error code %d", err); #if MACH_KDB @@ -316,8 +516,8 @@ static void copy_bootstrap(void *e, stru while (i < lenp) { - vm_fault(user_map, text_page_start +i, - load_protect_text ? + vm_fault(user_map, text_page_start +i, + load_protect_text ? VM_PROT_READ|VM_PROT_EXECUTE : VM_PROT_READ|VM_PROT_EXECUTE | VM_PROT_WRITE, 0,0,0); @@ -325,60 +525,54 @@ static void copy_bootstrap(void *e, stru } } #endif -#endif MACH_KDB +#endif /* MACH_KDB */ } /* * Allocate the stack, and build the argument list. */ -extern vm_offset_t user_stack_low(); -extern vm_offset_t set_user_regs(); - -void -static build_args_and_stack(boot_exec_info, va_alist) - struct exec_info *boot_exec_info; - va_dcl +static void +build_args_and_stack(struct exec_info *boot_exec_info, + char **argv, char **envp) { vm_offset_t stack_base; vm_size_t stack_size; - va_list argv_ptr; - register char * arg_ptr; + int arg_count, envc; int arg_len; - int arg_count; - register char * arg_pos; int arg_item_len; char * string_pos; char * zero = (char *)0; + int i; #define STACK_SIZE (64*1024) /* * Calculate the size of the argument list. */ - va_start(argv_ptr); arg_len = 0; arg_count = 0; - for (;;) { - arg_ptr = va_arg(argv_ptr, char *); - if (arg_ptr == 0) - break; - arg_count++; + while (argv[arg_count] != 0) { + arg_ptr = argv[arg_count++]; arg_len += strlen(arg_ptr) + 1; } - va_end(argv_ptr); + envc = 0; + if (envp != 0) + while (envp[envc] != 0) + arg_len += strlen (envp[envc++]) + 1; /* * Add space for: * arg count * pointers to arguments * trailing 0 pointer - * dummy 0 pointer to environment variables + * pointers to environment variables + * trailing 0 pointer * and align to integer boundary */ - arg_len += sizeof(integer_t) - + (2 + arg_count) * sizeof(char *); + arg_len += (sizeof(integer_t) + + (arg_count + 1 + envc + 1) * sizeof(char *)); arg_len = (arg_len + sizeof(integer_t) - 1) & ~(sizeof(integer_t)-1); /* @@ -397,15 +591,14 @@ static build_args_and_stack(boot_exec_in /* * Start the strings after the arg-count and pointers */ - string_pos = arg_pos - + sizeof(integer_t) - + arg_count * sizeof(char *) - + 2 * sizeof(char *); + string_pos = (arg_pos + + sizeof(integer_t) + + (arg_count + 1 + envc + 1) * sizeof(char *)); /* * first the argument count */ - (void) copyout((char *)&arg_count, + (void) copyout(&arg_count, arg_pos, sizeof(integer_t)); arg_pos += sizeof(integer_t); @@ -413,13 +606,12 @@ static build_args_and_stack(boot_exec_in /* * Then the strings and string pointers for each argument */ - va_start(argv_ptr); - while (--arg_count >= 0) { - arg_ptr = va_arg(argv_ptr, char *); + for (i = 0; i < arg_count; ++i) { + arg_ptr = argv[i]; arg_item_len = strlen(arg_ptr) + 1; /* include trailing 0 */ /* set string pointer */ - (void) copyout((char *)&string_pos, + (void) copyout(&string_pos, arg_pos, sizeof (char *)); arg_pos += sizeof(char *); @@ -428,29 +620,52 @@ static build_args_and_stack(boot_exec_in (void) copyout(arg_ptr, string_pos, arg_item_len); string_pos += arg_item_len; } - va_end(argv_ptr); /* - * last, the trailing 0 argument and a null environment pointer. + * Null terminator for argv. */ - (void) copyout((char *)&zero, arg_pos, sizeof(char *)); + (void) copyout(&zero, arg_pos, sizeof(char *)); arg_pos += sizeof(char *); - (void) copyout((char *)&zero, arg_pos, sizeof(char *)); + + /* + * Then the strings and string pointers for each environment variable + */ + for (i = 0; i < envc; ++i) { + arg_ptr = envp[i]; + arg_item_len = strlen(arg_ptr) + 1; /* include trailing 0 */ + + /* set string pointer */ + (void) copyout(&string_pos, + arg_pos, + sizeof (char *)); + arg_pos += sizeof(char *); + + /* copy string */ + (void) copyout(arg_ptr, string_pos, arg_item_len); + string_pos += arg_item_len; + } + + /* + * Null terminator for envp. + */ + (void) copyout(&zero, arg_pos, sizeof(char *)); } -static void user_bootstrap() + +static void +user_bootstrap_compat(void) { - struct exec_info boot_exec_info; + exec_info_t boot_exec_info; char host_string[12]; char device_string[12]; - char flag_string[12]; - char root_string[12]; + char flag_string[1024]; + char root_string[1024]; /* * Copy the bootstrap code from boot_exec into the user task. */ - copy_bootstrap(boot_exec, &boot_exec_info); + copy_bootstrap(current_thread()->saved.other, &boot_exec_info); /* * Convert the host and device ports to strings, @@ -468,14 +683,27 @@ static void user_bootstrap() * Build the argument list and insert in the user task. * Argument list is * "bootstrap - " + +$0 ${boot-args} ${host-port} ${device-port} ${root-device} $(task-create) $(task-resume) + */ - build_args_and_stack(&boot_exec_info, - "bootstrap", - flag_string, - host_string, - device_string, - root_string, - (char *)0); + { + char *argv[] = { "bootstrap", + flag_string, + host_string, + device_string, + root_string, + 0 }; + char *envp[] = { 0, 0 }; + if (kernel_cmdline[0] != '\0') + { + static const char cmdline_var[] = "MULTIBOOT_CMDLINE="; + envp[0] = alloca (sizeof cmdline_var + strlen (kernel_cmdline)); + memcpy (envp[0], cmdline_var, sizeof cmdline_var - 1); + strcpy (envp[0] + sizeof cmdline_var - 1, kernel_cmdline); + } + build_args_and_stack(&boot_exec_info, argv, envp); + } /* * Exit to user thread. @@ -484,3 +712,168 @@ static void user_bootstrap() /*NOTREACHED*/ } + +struct user_bootstrap_info +{ + struct multiboot_module *mod; + char **argv; + int done; + decl_simple_lock_data(,lock) +}; + +int +boot_script_exec_cmd (void *hook, task_t task, char *path, int argc, + char **argv, char *strings, int stringlen) +{ + struct multiboot_module *mod = hook; + + int err; + + if (task != MACH_PORT_NULL) + { + thread_t thread; + struct user_bootstrap_info info = { mod, argv, 0, }; + simple_lock_init (&info.lock); + + err = thread_create ((task_t)task, &thread); + assert(err == 0); + simple_lock (&info.lock); + thread->saved.other = &info; + thread_start (thread, user_bootstrap); + err = thread_resume (thread); + assert(err == 0); + + /* We need to synchronize with the new thread and block this + main thread until it has finished referring to our local state. */ + while (! info.done) + { + thread_sleep ((event_t) &info, simple_lock_addr(info.lock), FALSE); + simple_lock (&info.lock); + } + simple_unlock (&info.lock); + thread_deallocate (thread); + printf ("\n"); + } + + return 0; +} + +static void user_bootstrap(void) +{ + struct user_bootstrap_info *info = current_thread()->saved.other; + exec_info_t boot_exec_info; + int err; + char **av; + + /* Load this task up from the executable file in the module. */ + err = exec_load(boot_read, read_exec, info->mod, &boot_exec_info); + if (err) + panic ("Cannot load user executable module (error code %d): %s", + err, info->argv[0]); + + printf ("task loaded:"); + + /* Set up the stack with arguments. */ + build_args_and_stack(&boot_exec_info, info->argv, 0); + + for (av = info->argv; *av != 0; ++av) + printf (" %s", *av); + + task_suspend (current_task()); + + /* Tell the bootstrap thread running boot_script_exec_cmd + that we are done looking at INFO. */ + simple_lock (&info->lock); + assert (!info->done); + info->done = 1; + simple_unlock (&info->lock); + thread_wakeup ((event_t) info); + + /* + * Exit to user thread. + */ + thread_bootstrap_return(); + /*NOTREACHED*/ +} + + + +void * +boot_script_malloc (unsigned int size) +{ + return (void *) kalloc (size); +} + +void +boot_script_free (void *ptr, unsigned int size) +{ + kfree ((vm_offset_t)ptr, size); +} + +int +boot_script_task_create (struct cmd *cmd) +{ + kern_return_t rc = task_create(TASK_NULL, FALSE, &cmd->task); + if (rc) + { + printf("boot_script_task_create failed with %x\n", rc); + return BOOT_SCRIPT_MACH_ERROR; + } + task_set_name(cmd->task, cmd->path); + return 0; +} + +int +boot_script_task_resume (struct cmd *cmd) +{ + kern_return_t rc = task_resume (cmd->task); + if (rc) + { + printf("boot_script_task_resume failed with %x\n", rc); + return BOOT_SCRIPT_MACH_ERROR; + } + printf ("\nstart %s: ", cmd->path); + return 0; +} + +int +boot_script_prompt_task_resume (struct cmd *cmd) +{ +#if ! MACH_KDB + char xx[5]; +#endif + + printf ("Pausing for %s...\n", cmd->path); + +#if ! MACH_KDB + printf ("Hit to resume bootstrap."); + safe_gets (xx, sizeof xx); +#else + SoftDebugger("Hit `c' to resume bootstrap."); +#endif + + return boot_script_task_resume (cmd); +} + +void +boot_script_free_task (task_t task, int aborting) +{ + if (aborting) + task_terminate (task); + task_deallocate (task); +} + +int +boot_script_insert_right (struct cmd *cmd, mach_port_t port, mach_port_t *name) +{ + *name = task_insert_send_right (cmd->task, + ipc_port_make_send((ipc_port_t) port)); + return 0; +} + +int +boot_script_insert_task_port (struct cmd *cmd, task_t task, mach_port_t *name) +{ + *name = task_insert_send_right (cmd->task, task->itk_sself); + return 0; +}