X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios-stubs.c;h=10d2fdec858b466f681f5b865b803e4d4559d84e;hb=b58fe2254858e3ecc94be5d86f2a93f2cfe0a0d5;hp=90b3ad462e7d4c5cd399d280740a3875dca0b8af;hpb=ed88df2e8e304ac4b391521d47c192127ad9bc5a;p=palacios.git

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 90b3ad4..10d2fde 100644
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -8,6 +8,7 @@
 #include <linux/uaccess.h>
 #include <asm/irq_vectors.h>
 #include <asm/io.h>
+#include <asm/thread_info.h>
 
 #include <linux/init.h>
 #include <linux/module.h>
@@ -84,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);
     }
@@ -174,18 +175,18 @@ 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, int node_id, int constraints) {
+void *palacios_allocate_pages(int num_pages, unsigned int alignment, int node_id, int (*filter_func)(void *paddr, void *filter_state), void *filter_state) {
     void * pg_addr = NULL;
 
     if (num_pages<=0) { 
-	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);
+	ERROR("ALERT ALERT Attempt to allocate zero or fewer pages (%d pages, alignment %d, node %d, filter_func %p, filter_state %p)\n",num_pages, alignment, node_id, filter_func, filter_state);
       return NULL;
     }
 
-    pg_addr = (void *)alloc_palacios_pgs(num_pages, alignment, node_id, constraints);
+    pg_addr = (void *)alloc_palacios_pgs(num_pages, alignment, node_id, filter_func, filter_state);
 
     if (!pg_addr) { 
-	ERROR("ALERT ALERT  Page allocation has FAILED Warning (%d pages, alignment %d, node %d, constraints 0x%x)\n",num_pages, alignment, node_id, constraints);
+	ERROR("ALERT ALERT  Page allocation has FAILED Warning (%d pages, alignment %d, node %d, filter_func %p, filter_state %p)\n",num_pages, alignment, node_id, filter_func, filter_state);
 	return NULL;
     }
 
@@ -305,7 +306,7 @@ 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()) {
+    if (irqs_disabled() || in_atomic()) {
 	return palacios_alloc_extended(size,GFP_ATOMIC,-1);
     } else {
 	return palacios_alloc_extended(size,GFP_KERNEL,-1);
@@ -357,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),
@@ -417,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) {
@@ -484,6 +485,27 @@ palacios_start_thread(void * 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
  * The thread will be running on target CPU on return
@@ -810,10 +832,14 @@ palacios_mutex_unlock_irqrestore(void *mutex, void *flags)
 
 void palacios_used_fpu(void)
 {
-   struct thread_info *cur = current_thread_info();
-
    // We assume we are not preemptible here...
-   cur->status |= TS_USEDFPU;
+#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
@@ -842,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,
@@ -849,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,
@@ -862,7 +890,7 @@ static struct v3_os_hooks palacios_os_hooks = {
 	.get_cpu		= palacios_get_cpu,
 	.interrupt_cpu		= palacios_interrupt_cpu,
 	.call_on_cpu		= palacios_xcall,
-	.create_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,
 };