X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-stubs.c;h=54b2ad14730a492c2cc3a8a773210463672f89b9;hb=659151a0b655c619f3acbb98a45e9eeb8002a4b3;hp=a7f1607d779c5852eb69ddd3f03d7b0491618092;hpb=2a666e7e1a1aac879f68bc2662675bdf57b66678;p=palacios.git diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c index a7f1607..54b2ad1 100644 --- a/linux_module/palacios-stubs.c +++ b/linux_module/palacios-stubs.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -16,8 +17,15 @@ #include #include +#include + #include #include + +#ifdef V3_CONFIG_HOST_LAZY_FPU_SWITCH +#include +#endif + #include "palacios.h" #include "mm.h" @@ -25,10 +33,12 @@ #include "memcheck.h" #include "lockcheck.h" -// The following can be used to track heap bugs -// zero memory after allocation -#define ALLOC_ZERO_MEM 0 -// pad allocations by this many bytes on both ends of block + + +// The following can be used to track memory bugs +// zero memory after allocation (now applies to valloc and page alloc as well) +#define ALLOC_ZERO_MEM 1 +// pad allocations by this many bytes on both ends of block (heap only) #define ALLOC_PAD 0 @@ -75,7 +85,7 @@ static int init_print_buffers(void) if (!print_buffer[i]) { ERROR("Cannot allocate print buffer for cpu %d\n",i); deinit_print_buffers(); - return -1; + return -1; } memset(print_buffer[i],0,V3_PRINTK_BUF_SIZE); } @@ -165,23 +175,27 @@ void palacios_print_scoped(void * vm, int vcore, const char *fmt, ...) { * Allocates a contiguous region of pages of the requested size. * Returns the physical address of the first page in the region. */ -void *palacios_allocate_pages(int num_pages, unsigned int alignment) { +void *palacios_allocate_pages(int num_pages, unsigned int alignment, int node_id, int constraints) { void * pg_addr = NULL; if (num_pages<=0) { - ERROR("ALERT ALERT Attempt to allocate zero or fewer pages\n"); + ERROR("ALERT ALERT Attempt to allocate zero or fewer pages (%d pages, alignment %d, node %d, constraints 0x%x)\n",num_pages, alignment, node_id, constraints); return NULL; } - pg_addr = (void *)alloc_palacios_pgs(num_pages, alignment); + pg_addr = (void *)alloc_palacios_pgs(num_pages, alignment, node_id, constraints); if (!pg_addr) { - ERROR("ALERT ALERT Page allocation has FAILED Warning\n"); + ERROR("ALERT ALERT Page allocation has FAILED Warning (%d pages, alignment %d, node %d, constraints 0x%x)\n",num_pages, alignment, node_id, constraints); return NULL; } pg_allocs += num_pages; +#if ALLOC_ZERO_MEM + memset(__va(pg_addr),0,num_pages*4096); +#endif + MEMCHECK_ALLOC_PAGES(pg_addr,num_pages*4096); return pg_addr; @@ -195,6 +209,11 @@ void *palacios_allocate_pages(int num_pages, unsigned int alignment) { */ void palacios_free_pages(void * page_paddr, int num_pages) { + if (!page_paddr) { + ERROR("Ignoring free pages: 0x%p (0x%lx)for %d pages\n", page_paddr, (uintptr_t)page_paddr, num_pages); + dump_stack(); + return; + } pg_frees += num_pages; free_palacios_pgs((uintptr_t)page_paddr, num_pages); MEMCHECK_FREE_PAGES(page_paddr,num_pages*4096); @@ -203,7 +222,7 @@ void palacios_free_pages(void * page_paddr, int num_pages) { void * -palacios_alloc_extended(unsigned int size, unsigned int flags) { +palacios_alloc_extended(unsigned int size, unsigned int flags, int node) { void * addr = NULL; if (size==0) { @@ -214,9 +233,13 @@ palacios_alloc_extended(unsigned int size, unsigned int flags) { return NULL; } - addr = kmalloc(size+2*ALLOC_PAD, flags); + if (node==-1) { + addr = kmalloc(size+2*ALLOC_PAD, flags); + } else { + addr = kmalloc_node(size+2*ALLOC_PAD, flags, node); + } - if (!addr) { + if (!addr || IS_ERR(addr)) { ERROR("ALERT ALERT kmalloc has FAILED FAILED FAILED\n"); return NULL; } @@ -244,13 +267,17 @@ palacios_valloc(unsigned int size) addr = vmalloc(size); - if (!addr) { + if (!addr || IS_ERR(addr)) { ERROR("ALERT ALERT vmalloc has FAILED FAILED FAILED\n"); return NULL; } vmallocs++; +#if ALLOC_ZERO_MEM + memset(addr,0,size); +#endif + MEMCHECK_VMALLOC(addr,size); return addr; @@ -258,6 +285,11 @@ palacios_valloc(unsigned int size) void palacios_vfree(void *p) { + if (!p) { + ERROR("Ignoring vfree: 0x%p\n",p); + dump_stack(); + return; + } vfree(p); vfrees++; MEMCHECK_VFREE(p); @@ -274,10 +306,10 @@ palacios_alloc(unsigned int size) { // this function is used extensively throughout palacios and the linux // module, both in places where interrupts are off and where they are on // a GFP_KERNEL call, when done with interrupts off can lead to DEADLOCK - if (irqs_disabled()) { - return palacios_alloc_extended(size,GFP_ATOMIC); + if (irqs_disabled() || in_atomic()) { + return palacios_alloc_extended(size,GFP_ATOMIC,-1); } else { - return palacios_alloc_extended(size,GFP_KERNEL); + return palacios_alloc_extended(size,GFP_KERNEL,-1); } } @@ -290,6 +322,11 @@ palacios_free( void * addr ) { + if (!addr) { + ERROR("Ignoring free : 0x%p\n", addr); + dump_stack(); + return; + } frees++; kfree(addr-ALLOC_PAD); MEMCHECK_KFREE(addr-ALLOC_PAD); @@ -321,7 +358,7 @@ palacios_paddr_to_vaddr( /** * Runs a function on the specified CPU. */ -static void +void palacios_xcall( int cpu_id, void (*fn)(void *arg), @@ -355,17 +392,25 @@ static int lnx_thread_target(void * arg) { allow_signal(SIGKILL); */ +#ifdef V3_CONFIG_HOST_LAZY_FPU_SWITCH + // We are a kernel thread that needs FPU save/restore state + // vcores definitely need this, all the other threads get it too, + // but they just won't use it + fpu_alloc(&(current->thread.fpu)); +#endif ret = thread_info->fn(thread_info->arg); - INFO("Palacios Thread (%s) EXITING\n", thread_info->name); palacios_free(thread_info); // handle cleanup + // We rely on do_exit to free the fpu data + // since we could get switched at any point until the thread is done... + do_exit(ret); - + return 0; // should not get here. } @@ -373,7 +418,7 @@ static int lnx_thread_target(void * arg) { * Creates a kernel thread. */ void * -palacios_start_kernel_thread( +palacios_create_and_start_kernel_thread( int (*fn) (void * arg), void * arg, char * thread_name) { @@ -398,7 +443,7 @@ palacios_start_kernel_thread( * Starts a kernel thread on the specified CPU. */ void * -palacios_start_thread_on_cpu(int cpu_id, +palacios_create_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name ) { @@ -417,7 +462,7 @@ palacios_start_thread_on_cpu(int cpu_id, thread = kthread_create( lnx_thread_target, thread_info, thread_info->name ); - if (IS_ERR(thread)) { + if (!thread || IS_ERR(thread)) { WARNING("Palacios error creating thread: %s\n", thread_info->name); palacios_free(thread_info); return NULL; @@ -430,11 +475,36 @@ palacios_start_thread_on_cpu(int cpu_id, return NULL; } - wake_up_process(thread); - return thread; } +void +palacios_start_thread(void * th){ + + struct task_struct * thread = (struct task_struct *)th; + wake_up_process(thread); + +} + +/* + Convenience wrapper +*/ +void * +palacios_create_and_start_thread_on_cpu(int cpu_id, + int (*fn)(void * arg), + void * arg, + char * thread_name ) { + + void *t = palacios_create_thread_on_cpu(cpu_id, fn, arg, thread_name); + + if (t) { + palacios_start_thread(t); + } + + return t; +} + + /** * Rebind a kernel thread to the specified CPU @@ -760,6 +830,37 @@ palacios_mutex_unlock_irqrestore(void *mutex, void *flags) LOCKCHECK_UNLOCK_IRQRESTORE_POST(mutex,(unsigned long)flags); } +void palacios_used_fpu(void) +{ + // We assume we are not preemptible here... +#ifndef TS_USEDFPU + struct task_struct *tsk = current; + tsk->thread.fpu.has_fpu = 1; +#else + struct thread_info *cur = current_thread_info(); + cur->status |= TS_USEDFPU; +#endif + clts(); + // After this, FP Save should be handled by Linux if it + // switches to a different task and that task uses FPU +} + +inline int ists(void) +{ + return read_cr0() & X86_CR0_TS; + +} +void palacios_need_fpu(void) +{ + // We assume we are not preemptible here... + if (ists()) { + // we have been switched back to from somewhere else... + // Do a restore now - this will also do a clts() + math_state_restore(); + } +} + + /** * Structure used by the Palacios hypervisor to interface with the host kernel. */ @@ -767,6 +868,8 @@ static struct v3_os_hooks palacios_os_hooks = { .print = palacios_print_scoped, .allocate_pages = palacios_allocate_pages, .free_pages = palacios_free_pages, + .vmalloc = palacios_valloc, + .vfree = palacios_vfree, .malloc = palacios_alloc, .free = palacios_free, .vaddr_to_paddr = palacios_vaddr_to_paddr, @@ -774,7 +877,7 @@ static struct v3_os_hooks palacios_os_hooks = { .hook_interrupt = palacios_hook_interrupt, .ack_irq = palacios_ack_interrupt, .get_cpu_khz = palacios_get_cpu_khz, - .start_kernel_thread = palacios_start_kernel_thread, + .start_kernel_thread = palacios_create_and_start_kernel_thread, .yield_cpu = palacios_yield_cpu, .sleep_cpu = palacios_sleep_cpu, .wakeup_cpu = palacios_wakeup_cpu, @@ -787,11 +890,21 @@ static struct v3_os_hooks palacios_os_hooks = { .get_cpu = palacios_get_cpu, .interrupt_cpu = palacios_interrupt_cpu, .call_on_cpu = palacios_xcall, - .start_thread_on_cpu = palacios_start_thread_on_cpu, + .create_thread_on_cpu = palacios_create_thread_on_cpu, + .start_thread = palacios_start_thread, .move_thread_to_cpu = palacios_move_thread_to_cpu, }; +#ifdef V3_CONFIG_HOST_LAZY_FPU_SWITCH +// Note that this host interface is defined here since it's +// intertwined with thread creation... +static struct v3_lazy_fpu_iface palacios_fpu_hooks = { + .used_fpu = palacios_used_fpu, + .need_fpu = palacios_need_fpu +}; + +#endif int palacios_vmm_init( char *options ) @@ -838,6 +951,10 @@ int palacios_vmm_init( char *options ) Init_V3(&palacios_os_hooks, cpu_mask, num_cpus, options); +#ifdef V3_CONFIG_HOST_LAZY_FPU_SWITCH + V3_Init_Lazy_FPU(&palacios_fpu_hooks); +#endif + return 0; }