Date: Sun, 6 Apr 2003 22:36:45 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28404 for review Message-ID: <200304070536.h375ajls033731@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28404 Change 28404 by peter@peter_overcee on 2003/04/06 22:36:33 fix the module metadata. argh. Rounding by sizeof(long) is great fun when your loader and kernel disagree on the size of long (and the kernel does it in MI code). Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#5 edit .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#5 edit .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#1 add .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#1 add .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#8 edit .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#3 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#5 (text+ko) ==== @@ -4,7 +4,8 @@ INTERNALLIB= true SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ - biospci.c bootinfo.c comconsole.c devicename.c elf32_freebsd.c \ + biospci.c bootinfo.c bootinfo32.c bootinfo64.c \ + comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c x86_64_tramp.S ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#5 (text+ko) ==== @@ -30,13 +30,10 @@ #include <sys/param.h> #include <sys/reboot.h> #include <sys/linker.h> -#include <machine/bootinfo.h> #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" -static struct bootinfo bi; - /* * Return a 'boothowto' value corresponding to the kernel arguments in * (kargs) and any relevant environment variables. @@ -58,8 +55,6 @@ {NULL, 0} }; -vm_offset_t bi_copymodules(vm_offset_t addr); - int bi_getboothowto(char *kargs) { @@ -159,225 +154,3 @@ addr++; return(addr); } - -/* - * Copy module-related data into the load area, where it can be - * used as a directory for loaded modules. - * - * Module data is presented in a self-describing format. Each datum - * is preceded by a 32-bit identifier and a 32-bit size field. - * - * Currently, the following data are saved: - * - * MOD_NAME (variable) module name (string) - * MOD_TYPE (variable) module type (string) - * MOD_ARGS (variable) module parameters (string) - * MOD_ADDR sizeof(vm_offset_t) module load address - * MOD_SIZE sizeof(size_t) module size - * MOD_METADATA (variable) type-specific metadata - */ -#define COPY32(v, a, c) { \ - u_int32_t x = (v); \ - if (c) \ - i386_copyin(&x, a, sizeof(x)); \ - a += sizeof(x); \ -} - -#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, 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, 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, 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, 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, c) { \ - COPY32(MODINFO_END, a, c); \ - COPY32(0, a, c); \ -} - -vm_offset_t -bi_copymodules(vm_offset_t addr) -{ - 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, c); /* this field must come first */ - MOD_TYPE(addr, fp->f_type, c); - if (fp->f_args) - 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, c); - } - MOD_END(addr, c); - return(addr); -} - -/* - * Load the information expected by an i386 kernel. - * - * - The 'boothowto' argument is constructed - * - The 'bootdev' argument is constructed - * - The 'bootinfo' struct is constructed, and copied into the kernel space. - * - The kernel environment is copied into kernel space. - * - Module metadata are formatted and placed in kernel space. - */ -int -bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t *modulep) -{ - struct preloaded_file *xp, *kfp; - struct i386_devdesc *rootdev; - struct file_metadata *md; - vm_offset_t addr; - vm_offset_t kernend; - vm_offset_t envp; - vm_offset_t size; - char *rootdevname; - int bootdevnr, i, howto; - char *kernelname; - const char *kernelpath; - - howto = bi_getboothowto(args); - - /* - * Allow the environment variable 'rootdev' to override the supplied device - * This should perhaps go to MI code and/or have $rootdev tested/set by - * MI code before launching the kernel. - */ - rootdevname = getenv("rootdev"); - i386_getdev((void **)(&rootdev), rootdevname, NULL); - if (rootdev == NULL) { /* bad $rootdev/$currdev */ - printf("can't determine root device\n"); - return(EINVAL); - } - - /* Try reading the /etc/fstab file to select the root device */ - getrootmount(i386_fmtdev((void *)rootdev)); - - /* Do legacy rootdev guessing */ - - /* XXX - use a default bootdev of 0. Is this ok??? */ - bootdevnr = 0; - - switch(rootdev->d_type) { - case DEVT_CD: - /* Pass in BIOS device number. */ - bi.bi_bios_dev = bc_unit2bios(rootdev->d_kind.bioscd.unit); - bootdevnr = bc_getdev(rootdev); - break; - - case DEVT_DISK: - /* pass in the BIOS device number of the current disk */ - bi.bi_bios_dev = bd_unit2bios(rootdev->d_kind.biosdisk.unit); - bootdevnr = bd_getdev(rootdev); - break; - - case DEVT_NET: - break; - - default: - printf("WARNING - don't know how to boot from device type %d\n", rootdev->d_type); - } - if (bootdevnr == -1) { - printf("root device %s invalid\n", i386_fmtdev(rootdev)); - return (EINVAL); - } - free(rootdev); - - /* find the last module in the chain */ - addr = 0; - for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { - if (addr < (xp->f_addr + xp->f_size)) - addr = xp->f_addr + xp->f_size; - } - /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); - - /* copy our environment */ - envp = addr; - addr = bi_copyenv(addr); - - /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); - - kfp = file_findfile(NULL, "elf64 kernel"); - if (kfp == NULL) - kfp = file_findfile(NULL, "elf32 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); - - /* patch MODINFOMD_KERNEND */ - md = file_findmetadata(kfp, MODINFOMD_KERNEND); - bcopy(&kernend, md->md_data, sizeof kernend); - - /* copy module list and metadata */ - (void)bi_copymodules(addr); - - /* 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 = *modulep; - 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/elf32_freebsd.c#2 (text+ko) ==== @@ -52,37 +52,24 @@ { struct file_metadata *md; Elf_Ehdr *ehdr; - vm_offset_t entry, bootinfop, modulep; + vm_offset_t entry, bootinfop, modulep, kernend; int boothowto, err, bootdev; - struct bootinfo *bi; - vm_offset_t ssym, esym; if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) return(EFTYPE); /* XXX actually EFUCKUP */ ehdr = (Elf_Ehdr *)&(md->md_data); - if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop, &modulep)) != 0) + err = bi_load32(fp->f_args, &boothowto, &bootdev, &bootinfop, &modulep, &kernend); + if (err != 0) return(err); entry = ehdr->e_entry & 0xffffff; - ssym = esym = 0; - if ((md = file_findmetadata(fp, MODINFOMD_SSYM)) != NULL) - ssym = *((vm_offset_t *)&(md->md_data)); - if ((md = file_findmetadata(fp, MODINFOMD_ESYM)) != NULL) - esym = *((vm_offset_t *)&(md->md_data)); - if (ssym == 0 || esym == 0) - ssym = esym = 0; /* sanity */ - bi = (struct bootinfo *)PTOV(bootinfop); - bi->bi_symtab = ssym; /* XXX this is only the primary kernel symtab */ - bi->bi_esymtab = esym; - - #ifdef DEBUG printf("Start @ 0x%lx ...\n", entry); #endif dev_cleanup(); - __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, bi->bi_kernend); + __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, kernend); panic("exec returned"); } ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#8 (text+ko) ==== @@ -65,22 +65,18 @@ { struct file_metadata *md; Elf_Ehdr *ehdr; - vm_offset_t bootinfop, modulep, kernend; - int boothowto, err, bootdev; + vm_offset_t modulep, kernend; + int err; int i; if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) return(EFTYPE); /* XXX actually EFUCKUP */ ehdr = (Elf_Ehdr *)&(md->md_data); - if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop, &modulep)) != 0) + err = bi_load64(fp->f_args, &modulep, &kernend); + if (err != 0) return(err); - kernend = 0; - md = file_findmetadata(fp, MODINFOMD_KERNEND); - if (md != NULL) - kernend = *((vm_offset_t *)&(md->md_data)); - #define PG_V 0x001 #define PG_RW 0x002 #define PG_U 0x004 ==== //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#3 (text+ko) ==== @@ -97,7 +97,8 @@ 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, - vm_offset_t *modulep); +int bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, + vm_offset_t *modulep, vm_offset_t *kernend); +int bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernend); void pxe_enable(void *pxeinfo);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304070536.h375ajls033731>