Date: Sat, 21 Sep 2002 01:34:06 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17841 for review Message-ID: <200209210834.g8L8Y66g096348@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17841 Change 17841 by peter@peter_overcee on 2002/09/21 01:33:35 copy sparc64's startup strategy so that we pass additional metadata through so we can stop being dependent on bootinfo. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#2 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#2 (text+ko) ==== @@ -176,43 +176,47 @@ * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ -#define COPY32(v, a) { \ +#define COPY32(v, a, c) { \ u_int32_t x = (v); \ - i386_copyin(&x, a, sizeof(x)); \ + if (c) \ + i386_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } -#define MOD_STR(t, a, s) { \ - COPY32(t, a); \ - COPY32(strlen(s) + 1, a); \ - i386_copyin(s, a, strlen(s) + 1); \ +#define MOD_STR(t, a, s, c) { \ + COPY32(t, a, c); \ + COPY32(strlen(s) + 1, a, c); \ + if (c) \ + i386_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(u_long));\ } -#define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s) -#define MOD_TYPE(a, s) MOD_STR(MODINFO_TYPE, a, s) -#define MOD_ARGS(a, s) MOD_STR(MODINFO_ARGS, a, s) +#define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) +#define MOD_TYPE(a, s, c) MOD_STR(MODINFO_TYPE, a, s, c) +#define MOD_ARGS(a, s, c) MOD_STR(MODINFO_ARGS, a, s, c) -#define MOD_VAR(t, a, s) { \ - COPY32(t, a); \ - COPY32(sizeof(s), a); \ - i386_copyin(&s, a, sizeof(s)); \ +#define MOD_VAR(t, a, s, c) { \ + COPY32(t, a, c); \ + COPY32(sizeof(s), a, c); \ + if (c) \ + i386_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(u_long)); \ } -#define MOD_ADDR(a, s) MOD_VAR(MODINFO_ADDR, a, s) -#define MOD_SIZE(a, s) MOD_VAR(MODINFO_SIZE, a, s) +#define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) +#define MOD_SIZE(a, s, c) MOD_VAR(MODINFO_SIZE, a, s, c) -#define MOD_METADATA(a, mm) { \ - COPY32(MODINFO_METADATA | mm->md_type, a); \ - COPY32(mm->md_size, a); \ - i386_copyin(mm->md_data, a, mm->md_size); \ +#define MOD_METADATA(a, mm, c) { \ + COPY32(MODINFO_METADATA | mm->md_type, a, c); \ + COPY32(mm->md_size, a, c); \ + if (c) \ + i386_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(u_long));\ } -#define MOD_END(a) { \ - COPY32(MODINFO_END, a); \ - COPY32(0, a); \ +#define MOD_END(a, c) { \ + COPY32(MODINFO_END, a, c); \ + COPY32(0, a, c); \ } vm_offset_t @@ -220,21 +224,23 @@ { struct preloaded_file *fp; struct file_metadata *md; + int c; + c = addr != 0; /* start with the first module on the list, should be the kernel */ for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) { - MOD_NAME(addr, fp->f_name); /* this field must come first */ - MOD_TYPE(addr, fp->f_type); + MOD_NAME(addr, fp->f_name, c); /* this field must come first */ + MOD_TYPE(addr, fp->f_type, c); if (fp->f_args) - MOD_ARGS(addr, fp->f_args); - MOD_ADDR(addr, fp->f_addr); - MOD_SIZE(addr, fp->f_size); + MOD_ARGS(addr, fp->f_args, c); + MOD_ADDR(addr, fp->f_addr, c); + MOD_SIZE(addr, fp->f_size, c); for (md = fp->f_metadata; md != NULL; md = md->md_next) if (!(md->md_type & MODINFOMD_NOCOPY)) - MOD_METADATA(addr, md); + MOD_METADATA(addr, md, c); } - MOD_END(addr); + MOD_END(addr, c); return(addr); } @@ -248,18 +254,20 @@ * - Module metadata are formatted and placed in kernel space. */ int -bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) +bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t *modulep) { struct preloaded_file *xp; struct i386_devdesc *rootdev; vm_offset_t addr; + vm_offset_t kernend; + vm_offset_t envp; + vm_offset_t size; char *rootdevname; - int bootdevnr, i; - u_int pad; + int bootdevnr, i, howto; char *kernelname; const char *kernelpath; - *howtop = bi_getboothowto(args); + howtop = bi_getboothowto(args); /* * Allow the environment variable 'rootdev' to override the supplied device @@ -305,20 +313,7 @@ return (EINVAL); } free(rootdev); - *bootdevp = bootdevnr; - /* legacy bootinfo structure */ - bi.bi_version = BOOTINFO_VERSION; - bi.bi_kernelname = 0; /* XXX char * -> kernel name */ - bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */ - bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */ - for (i = 0; i < N_BIOS_GEOM; i++) - bi.bi_bios_geom[i] = bd_getbigeom(i); - bi.bi_size = sizeof(bi); - bi.bi_memsizes_valid = 1; - bi.bi_basemem = bios_basemem / 1024; - bi.bi_extmem = bios_extmem / 1024; - /* find the last module in the chain */ addr = 0; for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { @@ -326,37 +321,59 @@ addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - pad = (u_int)addr & PAGE_MASK; - if (pad != 0) { - pad = PAGE_SIZE - pad; - addr += pad; - } + addr = roundup(addr, PAGE_SIZE); /* copy our environment */ - bi.bi_envp = addr; + envp = addr; addr = bi_copyenv(addr); /* pad to a page boundary */ - pad = (u_int)addr & PAGE_MASK; - if (pad != 0) { - pad = PAGE_SIZE - pad; - addr += pad; - } - /* copy module list and metadata */ - bi.bi_modulep = addr; - addr = bi_copymodules(addr); + addr = roundup(addr, PAGE_SIZE); + + kfp = file_findfile(NULL, "elf kernel"); + if (kfp == NULL) + panic("can't find kernel file"); + kernend = 0; /* fill it in later */ + file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); + file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); + file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); +#ifdef MODINFOMD_SMAP + file_addmetadata(kfp, MODINFOMD_SMAP, smapsize, smap); +#endif + + /* Figure out the size and location of the metadata */ + *modulep = addr; + size = bi_copymodules(0); + kernend = roundup(addr + size, PAGE_SIZE); - /* all done copying stuff in, save end of loaded object space */ - bi.bi_kernend = addr; + /* patch MODINFOMD_KERNEND */ + md = file_findmetadata(kfp, MODINFOMD_KERNEND); + bcopy(&kernend, md->md_data, sizeof kernend); - *howtop |= RB_BOOTINFO; /* it's there now */ + /* copy module list and metadata */ + (void)bi_copymodules(addr); - /* - * Get the kernel name, strip off any device prefix. - */ + /* legacy bootinfo structure */ kernelname = getenv("kernelname"); i386_getdev(NULL, kernelname, &kernelpath); + bi.bi_version = BOOTINFO_VERSION; + bi.bi_kernelname = 0; /* XXX char * -> kernel name */ + bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */ + bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */ + for (i = 0; i < N_BIOS_GEOM; i++) + bi.bi_bios_geom[i] = bd_getbigeom(i); + bi.bi_size = sizeof(bi); + bi.bi_memsizes_valid = 1; + bi.bi_basemem = bios_basemem / 1024; + bi.bi_extmem = bios_extmem / 1024; + bi.bi_envp = envp; + bi.bi_modulep = envp; + bi.bi_kernend = kernend; bi.bi_kernelname = VTOP(kernelpath); + + /* legacy boot arguments */ + *howtop = howto | RB_BOOTINFO; + *bootdevp = bootdevnr; *bip = VTOP(&bi); return(0); ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ { struct file_metadata *md; Elf_Ehdr *ehdr; - vm_offset_t entry, bootinfop; + vm_offset_t entry, bootinfop, modulep; int boothowto, err, bootdev; struct bootinfo *bi; vm_offset_t ssym, esym; @@ -62,7 +62,7 @@ return(EFTYPE); /* XXX actually EFUCKUP */ ehdr = (Elf_Ehdr *)&(md->md_data); - if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop)) != 0) + if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop, &modulep)) != 0) return(err); entry = ehdr->e_entry & 0xffffff; @@ -83,7 +83,7 @@ #endif dev_cleanup(); - __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop); + __exec((void *)entry, boothowto, bootdev, modulep, 0, 0, bootinfop); panic("exec returned"); } ==== //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#2 (text+ko) ==== @@ -97,6 +97,7 @@ int bi_getboothowto(char *kargs); vm_offset_t bi_copyenv(vm_offset_t addr); -int bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip); +int bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, + vm_offset_t *modulep); void pxe_enable(void *pxeinfo); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209210834.g8L8Y66g096348>