diff options
Diffstat (limited to 'usr.sbin/vmd/vm.c')
| -rw-r--r-- | usr.sbin/vmd/vm.c | 97 |
1 files changed, 87 insertions, 10 deletions
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c index c28e50c4d52..37b62959fd2 100644 --- a/usr.sbin/vmd/vm.c +++ b/usr.sbin/vmd/vm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm.c,v 1.8 2017/03/25 15:47:37 mlarkin Exp $ */ +/* $OpenBSD: vm.c,v 1.9 2017/03/25 16:28:25 reyk Exp $ */ /* * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org> @@ -76,6 +76,7 @@ void init_emulated_hw(struct vmop_create_params *, int *, int *); void vcpu_exit_inout(struct vm_run_params *); uint8_t vcpu_exit_pci(struct vm_run_params *); int vcpu_pic_intr(uint32_t, uint32_t, uint8_t); +int loadfile_bios(FILE *, struct vcpu_reg_state *); static struct vm_mem_range *find_gpa_range(struct vm_create_params *, paddr_t, size_t); @@ -135,6 +136,76 @@ static const struct vcpu_reg_state vcpu_init_flat32 = { }; /* + * Represents a standard register set for an BIOS to be booted + * as a flat 16 bit address space. + */ +static const struct vcpu_reg_state vcpu_init_flat16 = { +#ifdef __i386__ + .vrs_gprs[VCPU_REGS_EFLAGS] = 0x2, + .vrs_gprs[VCPU_REGS_EIP] = 0xFFF0, + .vrs_gprs[VCPU_REGS_ESP] = 0x0, +#else + .vrs_gprs[VCPU_REGS_RFLAGS] = 0x2, + .vrs_gprs[VCPU_REGS_RIP] = 0xFFF0, + .vrs_gprs[VCPU_REGS_RSP] = 0x0, +#endif + .vrs_crs[VCPU_REGS_CR0] = 0x60000010, + .vrs_crs[VCPU_REGS_CR3] = 0, + .vrs_sregs[VCPU_REGS_CS] = { 0xF000, 0xFFFF, 0x809F, 0xF0000}, + .vrs_sregs[VCPU_REGS_DS] = { 0x0, 0xFFFF, 0x8093, 0x0}, + .vrs_sregs[VCPU_REGS_ES] = { 0x0, 0xFFFF, 0x8093, 0x0}, + .vrs_sregs[VCPU_REGS_FS] = { 0x0, 0xFFFF, 0x8093, 0x0}, + .vrs_sregs[VCPU_REGS_GS] = { 0x0, 0xFFFF, 0x8093, 0x0}, + .vrs_sregs[VCPU_REGS_SS] = { 0x0, 0xFFFF, 0x8093, 0x0}, + .vrs_gdtr = { 0x0, 0xFFFF, 0x0, 0x0}, + .vrs_idtr = { 0x0, 0xFFFF, 0x0, 0x0}, + .vrs_sregs[VCPU_REGS_LDTR] = { 0x0, 0xFFFF, 0x0082, 0x0}, + .vrs_sregs[VCPU_REGS_TR] = { 0x0, 0xFFFF, 0x008B, 0x0}, +}; + +/* + * loadfile_bios + * + * Alternatively to loadfile_elf, this function loads a non-ELF BIOS image + * directly into memory. + * + * Parameters: + * fp: file of a kernel file to load + * (out) vrs: register state to set on init for this kernel + * + * Return values: + * 0 if successful + * various error codes returned from read(2) or loadelf functions + */ +int +loadfile_bios(FILE *fp, struct vcpu_reg_state *vrs) +{ + off_t size, off; + + /* Set up a "flat 16 bit" register state for BIOS */ + memcpy(vrs, &vcpu_init_flat16, sizeof(*vrs)); + + /* Get the size of the BIOS image and seek to the beginning */ + if (fseeko(fp, 0, SEEK_END) == -1 || (size = ftello(fp)) == -1 || + fseeko(fp, 0, SEEK_SET) == -1) + return (-1); + + /* The BIOS image must end at 1M */ + if ((off = 1048576 - size) < 0) + return (-1); + + /* Read BIOS image into memory */ + if (mread(fp, off, size) != (size_t)size) { + errno = EIO; + return (-1); + } + + log_debug("%s: loaded BIOS image", __func__); + + return (0); +} + +/* * start_vm * * After forking a new VM process, starts the new VM with the creation @@ -163,7 +234,7 @@ start_vm(struct vmd_vm *vm, int fd) struct vcpu_reg_state vrs; int nicfds[VMM_MAX_NICS_PER_VM]; int ret; - FILE *kernfp; + FILE *fp; struct vmboot_params vmboot; size_t i; @@ -203,22 +274,28 @@ start_vm(struct vmd_vm *vm, int fd) * Set up default "flat 32 bit" register state - RIP, * RSP, and GDT info will be set in bootloader */ - memcpy(&vrs, &vcpu_init_flat32, sizeof(struct vcpu_reg_state)); + memcpy(&vrs, &vcpu_init_flat32, sizeof(vrs)); /* Find and open kernel image */ - if ((kernfp = vmboot_open(vm->vm_kernel, + if ((fp = vmboot_open(vm->vm_kernel, vm->vm_disks[0], &vmboot)) == NULL) fatalx("failed to open kernel - exiting"); /* Load kernel image */ - ret = loadelf_main(kernfp, vcp, &vrs, + ret = loadfile_elf(fp, vcp, &vrs, vmboot.vbp_bootdev, vmboot.vbp_howto); - if (ret) { - errno = ret; - fatal("failed to load kernel - exiting"); - } - vmboot_close(kernfp, &vmboot); + /* + * Try BIOS as a fallback (only if it was provided as an image + * with vm->vm_kernel and not loaded from the disk) + */ + if (ret && errno == ENOEXEC && vm->vm_kernel != -1) + ret = loadfile_bios(fp, &vrs); + + if (ret) + fatal("failed to load kernel or BIOS - exiting"); + + vmboot_close(fp, &vmboot); if (vm->vm_kernel != -1) close(vm->vm_kernel); |