added error checking to guest launch to handle core mapping bugs

[palacios.git] / linux_module / palacios-stubs.c

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 31fcdbf..2499339 100644 (file)
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -91,6 +91,7 @@ palacios_alloc(unsigned int size) {
        addr = kmalloc(size, GFP_KERNEL);
     }
     mallocs++;
+
  
     return addr;
 }
@@ -154,12 +155,11 @@ palacios_xcall(
 struct lnx_thread_arg {
     int (*fn)(void * arg);
     void * arg;
-    char * name;
 };
 
 static int lnx_thread_target(void * arg) {
     struct lnx_thread_arg * thread_info = (struct lnx_thread_arg *)arg;
-
+    int ret = 0;
     /*
       printk("Daemonizing new Palacios thread (name=%s)\n", thread_info->name);
 
@@ -168,18 +168,20 @@ static int lnx_thread_target(void * arg) {
     */
 
 
-    thread_info->fn(thread_info->arg);
+    ret = thread_info->fn(thread_info->arg);
 
     kfree(thread_info);
     // handle cleanup 
+
+    do_exit(ret);
     
-    return 0;
+    return 0; // should not get here.
 }
 
 /**
  * Creates a kernel thread.
  */
-static void 
+static void *
 palacios_start_kernel_thread(
        int (*fn)               (void * arg),
        void *                  arg,
@@ -189,10 +191,8 @@ palacios_start_kernel_thread(
 
     thread_info->fn = fn;
     thread_info->arg = arg;
-    thread_info->name = thread_name;
 
-    kthread_run( lnx_thread_target, thread_info, thread_name );
-    return;
+    return kthread_run( lnx_thread_target, thread_info, thread_name );
 }
 
 
@@ -209,7 +209,6 @@ palacios_start_thread_on_cpu(int cpu_id,
 
     thread_info->fn = fn;
     thread_info->arg = arg;
-    thread_info->name = thread_name;
 
 
     thread = kthread_create( lnx_thread_target, thread_info, thread_name );
@@ -219,7 +218,11 @@ palacios_start_thread_on_cpu(int cpu_id,
        return NULL;
     }
 
-    kthread_bind(thread, cpu_id);
+    if (set_cpus_allowed_ptr(thread, cpumask_of(cpu_id)) != 0) {
+       kthread_stop(thread);
+       return NULL;
+    }
+
     wake_up_process(thread);
 
     return thread;
@@ -233,10 +236,12 @@ palacios_start_thread_on_cpu(int cpu_id,
  */
 static int
 palacios_move_thread_to_cpu(int new_cpu_id, 
-                            void * thread_ptr) {
+                           void * thread_ptr) {
     struct task_struct * thread = (struct task_struct *)thread_ptr;
 
-    if(thread == NULL){
+    printk("Moving thread (%p) to cpu %d\n", thread, new_cpu_id);
+
+    if (thread == NULL) {
        thread = current;
     }
 
@@ -244,7 +249,7 @@ palacios_move_thread_to_cpu(int new_cpu_id,
      * Bind to the specified CPU.  When this call returns,
      * the thread should be running on the target CPU.
      */
-    return set_cpus_allowed(thread, cpumask_of_cpu(new_cpu_id));
+    return set_cpus_allowed_ptr(thread, cpumask_of(new_cpu_id));
 }
 
 
@@ -496,7 +501,7 @@ int palacios_vmm_init( void )
     
     printk("palacios_init starting - calling init_v3\n");
     
-    Init_V3(&palacios_os_hooks, nr_cpu_ids);
+    Init_V3(&palacios_os_hooks, num_online_cpus());
 
     return 0;