(cd $(PALACIOS_BUILD_DIR) && make $(DEBUG_SECTIONS) world)
palacios-full64:
- (cd $(PALACIOS_BUILD_DIR) && make ARCH=64 $(DEBUG_SECTIONS) world)`
+ (cd $(PALACIOS_BUILD_DIR) && make ARCH=64 $(DEBUG_SECTIONS) world)
palacios-lean:
(cd $(PALACIOS_BUILD_DIR) && make LEAN_AND_MEAN=1 world)
#include <palacios/vmm_io.h>
+#define MAGIC_CODE 0xf1e2d3c4
+
+
+struct layout_region {
+ ulong_t length;
+ ulong_t final_addr;
+};
+
+struct guest_mem_layout {
+ ulong_t magic;
+ ulong_t num_regions;
+ struct layout_region regions[0];
+};
+
+
extern void * g_ramdiskImage;
extern ulong_t s_ramdiskSize;
struct v3_ctrl_ops v3_ops;
struct guest_info * vm_info = 0;
struct v3_vm_config vm_config;
+ void * region_start;
memset(&os_hooks, 0, sizeof(struct v3_os_hooks));
memset(&v3_ops, 0, sizeof(struct v3_ctrl_ops));
extern char _binary___palacios_vm_kernel_start;
PrintBoth(" Guest Load Addr: 0x%x\n", &_binary___palacios_vm_kernel_start);
+
+ struct guest_mem_layout * layout = (struct guest_mem_layout *)&_binary___palacios_vm_kernel_start;
+
+ if (layout->magic != MAGIC_CODE) {
+
+ PrintBoth("Layout Magic Mismatch (0x%x)\n", layout->magic);
+ return -1;
+ }
- vm_config.vm_kernel = &_binary___palacios_vm_kernel_start;
+ PrintBoth("%d layout regions\n", layout->num_regions);
+ region_start = (void *)&(layout->regions[layout->num_regions]);
+ PrintBoth("region start = 0x%x\n", region_start);
+
+
+ {
+ struct layout_region * rombios = &(layout->regions[0]);
+ struct layout_region * vgabios = &(layout->regions[1]);
+
+ vm_config.rombios = region_start;
+ vm_config.rombios_size = rombios->length;
+
+ region_start += rombios->length;
+
+ vm_config.vgabios = region_start;
+ vm_config.vgabios_size = vgabios->length;
+ }
+
+
+
+
if (g_ramdiskImage != NULL) {
vm_config.use_ramdisk = 1;
vm_config.ramdisk = g_ramdiskImage;
+++ /dev/null
-78729af5bc58d0dab74128fba27f21d6bf851c83 304
-78729af5bc58d0dab74128fba27f21d6bf851c83 default
+++ /dev/null
-[paths]
-default = ssh://software.sandia.gov//home/ktpedre/kitten
+++ /dev/null
-revlogv1
-store
CFLAGS += -g
endif
+ifdef CONFIG_V3VEE
+CFLAGS += -I../palacios/include
+endif
+
+
include $(srctree)/arch/$(ARCH)/Makefile
# arch Makefile may override CC so keep this after arch Makefile is included
libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y))
libs-y := $(libs-y1) $(libs-y2)
-libs-$(CONFIG_V3VEE) += ../palacios/build/libv3vee.a
-libs-$(CONFIG_V3VEE) += ../palacios/lib/xed/libxed32e.a
-libs-$(CONFIG_V3VEE) += ../palacios/lib/xed/libxed.a
+libs-$(CONFIG_V3VEE) += palacios/libv3vee.a
+libs-$(CONFIG_V3VEE) += palacios/libxed32e.a
# Build vmlwk
# ---------------------------------------------------------------------------
# Set this if you want to pass append arguments to the isoimage kernel
FDARGS = console=vga,serial debug_mptable=1 init_argv="one two three" init_envp="one=1 two=2 three=3"
# Set this if you want an initrd included with the isoimage kernel
+ifdef CONFIG_V3VEE
+FDINITRD = /opt/vmm-tools/isos/puppy.iso
+else
FDINITRD = init_task
+endif
image_cmdline = default lwk $(FDARGS) $(if $(FDINITRD),initrd=initrd.img,)
{
int i;
char type[16];
+ size_t total_size = 0;
for (i = 0; i < e820.nr_map; i++) {
- switch (e820.map[i].type) {
+ const struct e820entry * entry = &e820.map[i];
+ switch (entry->type) {
case E820_RAM: sprintf(type, "(usable)\n");
+ total_size += entry->size;
break;
case E820_RESERVED:
sprintf(type, "(reserved)\n");
case E820_NVS:
sprintf(type, "(ACPI NVS)\n");
break;
- default: sprintf(type, "type %u\n", e820.map[i].type);
+ default: sprintf(type, "type %u\n", entry->type);
break;
}
printk(KERN_DEBUG
- " %s: %016Lx - %016Lx %s", who,
- (unsigned long long) e820.map[i].addr,
- (unsigned long long) (e820.map[i].addr + e820.map[i].size),
+ " %s: %016Lx - %016Lx %s",
+ who,
+ (unsigned long long) entry->addr,
+ (unsigned long long) (entry->addr + entry->size),
type);
}
+
+ printk( KERN_DEBUG "Total usable memory %ld bytes\n", total_size );
}
/*
--- /dev/null
+#!/bin/sh
+
+exec /usr/local/qemu/bin/qemu-system-x86_64 \
+ -m 1024 \
+ -nographic \
+ -cdrom ./arch/x86_64/boot/image.iso \
+ < /dev/null
+
--- /dev/null
+/* Copyright (c) 2007,2008 Sandia National Laboratories */
+
+#ifndef _LWK_PALACIOS_H_
+#define _LWK_PALACIOS_H_
+
+#ifdef CONFIG_V3VEE
+
+#include <palacios/vmm.h>
+
+extern uint8_t rombios_start, rombios_end;
+extern uint8_t vgabios_start, vgabios_end;
+
+
+/*
+ * OS Hooks required to interface with the V3VEE library
+ */
+extern void
+v3vee_print_config(
+ const char * fmt,
+ ...
+) __attribute__((format(printf,1,2)));
+
+
+extern void
+v3vee_print_debug(
+ const char * fmt,
+ ...
+) __attribute__((format(printf,1,2)));
+
+
+extern void
+v3vee_print_trace(
+ const char * fmt,
+ ...
+) __attribute__((format(printf,1,2)));
+
+
+extern void *
+v3vee_allocate_pages( int num_pages );
+
+
+extern void
+v3vee_free_page( void * page );
+
+
+extern void *
+v3vee_malloc( unsigned int size );
+
+
+extern void
+v3vee_free( void * addr );
+
+
+extern void *
+v3vee_paddr_to_vaddr( void * addr );
+
+
+extern void *
+v3vee_vaddr_to_paddr( void * addr );
+
+
+extern int
+v3vee_hook_interrupt(
+ struct guest_info * vm,
+ unsigned int irq
+);
+
+
+extern int
+v3vee_ack_irq(
+ int irq
+);
+
+
+unsigned int
+v3vee_get_cpu_khz( void );
+
+
+void
+v3vee_start_kernel_thread( void );
+
+
+void
+v3vee_yield_cpu( void );
+
+
+#endif // CONFIG_V3VEE
+
+#endif
#include <lwk/task.h>
#include <lwk/sched.h>
#include <lwk/timer.h>
+#include <lwk/palacios.h>
/**
* Pristine copy of the LWK boot command line.
panic("Failed to boot CPU %d.\n", cpu);
}
+#ifdef CONFIG_V3VEE
+ {
+ struct v3_os_hooks os_hooks;
+ struct v3_ctrl_ops v3_ops;
+ struct guest_info * vm_info = 0;
+ struct v3_vm_config vm_config;
+
+ memset(&os_hooks, 0, sizeof(struct v3_os_hooks));
+ memset(&v3_ops, 0, sizeof(struct v3_ctrl_ops));
+ memset(&vm_config, 0, sizeof(struct v3_vm_config));
+
+ printk( KERN_INFO "Calling Init_V3\n" );
+ Init_V3(&os_hooks, &v3_ops);
+ printk( KERN_INFO "Rombios: %p @ %d\n",
+ &rombios_start,
+ &rombios_end - &rombios_start
+ );
+
+ printk( KERN_INFO "VGA Bios: %p @ %d\n",
+ &vgabios_start,
+ &vgabios_end - &vgabios_start
+ );
+ }
+#endif
+
/*
* Start up user-space...
*/
# Clean build directories of generated files
clean :
- for d in palacios devices; do \
+ for d in palacios devices xed; do \
(cd $$d && rm -f *); \
done
int (*ack_irq)(int irq);
- unsigned int (*get_cpu_khz)();
+ unsigned int (*get_cpu_khz)(void);
- void (*start_kernel_thread)(); // include pointer to function
+ void (*start_kernel_thread)(void); // include pointer to function
- void (*yield_cpu)();
+ void (*yield_cpu)(void);
};
struct v3_vm_config {
- void * vm_kernel;
+ void * rombios;
+ int rombios_size;
+
+ void * vgabios;
+ int vgabios_size;
+
int use_ramdisk;
void * ramdisk;
int ramdisk_size;
/* This will contain Function pointers that control the VMs */
struct v3_ctrl_ops {
- struct guest_info *(*allocate_guest)();
+ struct guest_info *(*allocate_guest)(void);
int (*config_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
int (*init_guest)(struct guest_info * info);
int (*start_guest)(struct guest_info * info);
// int (*stop_vm)(uint_t vm_id);
- int (*has_nested_paging)();
+ int (*has_nested_paging)(void);
// v3_cpu_arch_t (*get_cpu_arch)();
};
#ifdef __V3_32BIT__
-void __inline__ v3_cpuid(uint_t target, uint_t * eax, uint_t * ebx, uint_t * ecx, uint_t * edx) {
+void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
__asm__ __volatile__ (
"pushl %%ebx\n\t"
"cpuid\n\t"
return;
}
+#elif __V3_64BIT__
+void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
+ __asm__ __volatile__ (
+ "pushq %%rbx\n\t"
+ "cpuid\n\t"
+ "movq %%rbx, %%rsi\n\t"
+ "popq %%rbx\n\t"
+ : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
+ : "a" (target)
+ );
+ return;
+}
+
+#endif
void __inline__ v3_set_msr(uint_t msr, uint_t high_byte, uint_t low_byte) {
__asm__ __volatile__ ("cli");
}
-#endif
#if 1
// Dinda
uint_t vm_cr_low = 0, vm_cr_high = 0;
- uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+ addr_t eax = 0, ebx = 0, ecx = 0, edx = 0;
v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
#else
uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
- uint_t vm_cr_low = 0, vm_cr_high = 0;
+ addr_t vm_cr_low = 0, vm_cr_high = 0;
v3_cpuid(CPUID_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
}
static int has_svm_nested_paging() {
- uint_t eax = 0, ebx = 0, ecx = 0, edx = 0;
+ addr_t eax = 0, ebx = 0, ecx = 0, edx = 0;
v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
popl %eax;
-
-#elif __V3_64BIT__
-
-#endif
-
-
-v3_stgi:
- stgi;
- ret;
-
-v3_clgi:
- clgi;
- ret;
-
-
v3_svm_launch:
push %ebp;
movl %esp, %ebp;
popf;
pop %ebp;
ret
+
+
+
+#elif __V3_64BIT__
+
+#define Save_SVM_Registers(location) \
+ pushl %eax; \
+ movl location, %eax; \
+ movl %edi, (%eax); \
+ movl %esi, 8(%eax); \
+ movl %ebp, 16(%eax); \
+ movl $0, 24(%eax); \
+ movl %ebx, 32(%eax); \
+ movl %edx, 40(%eax); \
+ movl %ecx, 48(%eax); \
+ pushl %ebx; \
+ movl 4(%esp), %ebx; \
+ movl %ebx, 56(%eax); \
+ popl %ebx; \
+ popl %eax;
+
+
+#define Restore_SVM_Registers(location) \
+ pushl %eax; \
+ movl location, %eax; \
+ movl (%eax), %edi; \
+ movl 8(%eax), %esi; \
+ movl 16(%eax), %ebp; \
+ movl 32(%eax), %ebx; \
+ movl 40(%eax), %edx; \
+ movl 48(%eax), %ecx; \
+ popl %eax;
+
+
+
+v3_svm_launch:
+
+ ret
+
+
+#endif
+
+
+v3_stgi:
+ stgi;
+ ret;
+
+v3_clgi:
+ clgi;
+ ret;
+
+
#define USE_GENERIC 1
-#define MAGIC_CODE 0xf1e2d3c4
-
-
-struct layout_region {
- ulong_t length;
- ulong_t final_addr;
-};
-
-struct guest_mem_layout {
- ulong_t magic;
- ulong_t num_regions;
- struct layout_region regions[0];
-};
+#define ROMBIOS_START 0x000f0000
+#define VGABIOS_START 0x000c0000
int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-
- struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr->vm_kernel;
extern v3_cpu_arch_t v3_cpu_type;
- void * region_start;
- uint_t i;
+
int use_ramdisk = config_ptr->use_ramdisk;
int use_generic = USE_GENERIC;
v3_init_host_events(info);
- // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000);
- //PrintDebugMemDump((unsigned char *)(0x100000), 261 * 1024);
- if (layout->magic != MAGIC_CODE) {
+
+ /* layout rombios */
+ {
+ uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+ void * guest_mem = V3_AllocPages(num_pages);
+
+ PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
+ memcpy(guest_mem, config_ptr->rombios, config_ptr->rombios_size);
+
+ add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
- PrintDebug("Layout Magic Mismatch (0x%x)\n", layout->magic);
- return -1;
+ PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n",
+ ROMBIOS_START,
+ ROMBIOS_START + (num_pages * PAGE_SIZE),
+ guest_mem);
}
-
- PrintDebug("%d layout regions\n", layout->num_regions);
-
- region_start = (void *)&(layout->regions[layout->num_regions]);
-
- PrintDebug("region start = 0x%x\n", region_start);
-
- for (i = 0; i < layout->num_regions; i++) {
- struct layout_region * reg = &(layout->regions[i]);
- uint_t num_pages = (reg->length / PAGE_SIZE) + ((reg->length % PAGE_SIZE) ? 1 : 0);
- void * guest_mem = V3_AllocPages(num_pages);
-
- PrintDebug("Layout Region %d bytes\n", reg->length);
- memcpy(guest_mem, region_start, reg->length);
-
- PrintDebugMemDump((unsigned char *)(guest_mem), 16);
-
- add_shadow_region_passthrough(info, reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-
- PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem);
+
+
+ /* layout vgabios */
+ {
+ uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+ void * guest_mem = V3_AllocPages(num_pages);
+
+ PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
+ memcpy(guest_mem, config_ptr->vgabios, config_ptr->vgabios_size);
+
+ add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
- region_start += reg->length;
+ PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n",
+ VGABIOS_START,
+ VGABIOS_START + (num_pages * PAGE_SIZE),
+ guest_mem);
}
-
+
//
add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160));