null check in host_sched_yield

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

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 5ced6d2..ec58c04 100644 (file)
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -87,7 +87,7 @@ static int init_print_buffers(void)
 /**
  * Prints a message to the console.
  */
-void palacios_print(const char *fmt, ...) {
+void palacios_print_scoped(void * vm, int vcore, const char *fmt, ...) {
 
 #if V3_PRINTK_OLD_STYLE_OUTPUT
 
@@ -104,6 +104,7 @@ void palacios_print(const char *fmt, ...) {
   va_list ap;
   char *buf;
   unsigned int cpu = palacios_get_cpu();
+  struct v3_guest *guest = (struct v3_guest *)vm;
 
   buf = print_buffer[cpu];
 
@@ -132,8 +133,25 @@ void palacios_print(const char *fmt, ...) {
   }
 #endif
 
-  printk(KERN_INFO "palacios (pcore %u): %s",cpu,buf);
-
+  if (guest) {
+    if (vcore>=0) { 
+      printk(KERN_INFO "palacios (pcore %u vm %s vcore %u): %s",
+            cpu,
+            guest->name,
+            vcore,
+            buf);
+    } else {
+       printk(KERN_INFO "palacios (pcore %u vm %s): %s",
+            cpu,
+            guest->name,
+            buf);
+    }
+  } else {
+    printk(KERN_INFO "palacios (pcore %u): %s",
+          cpu,
+          buf);
+  }
+    
   return;
 
 #endif
@@ -141,7 +159,6 @@ void palacios_print(const char *fmt, ...) {
 }
 
 
-
 /*
  * Allocates a contiguous region of pages of the requested size.
  * Returns the physical address of the first page in the region.
@@ -268,10 +285,13 @@ palacios_xcall(
     return;
 }
 
+
+#define MAX_THREAD_NAME 32
+
 struct lnx_thread_arg {
     int (*fn)(void * arg);
     void * arg;
-    char * name;
+    char name[MAX_THREAD_NAME];
 };
 
 static int lnx_thread_target(void * arg) {
@@ -316,9 +336,10 @@ palacios_start_kernel_thread(
 
     thread_info->fn = fn;
     thread_info->arg = arg;
-    thread_info->name = thread_name;
+    strncpy(thread_info->name,thread_name,MAX_THREAD_NAME);
+    thread_info->name[MAX_THREAD_NAME-1] =0;
 
-    return kthread_run( lnx_thread_target, thread_info, thread_name );
+    return kthread_run( lnx_thread_target, thread_info, thread_info->name );
 }
 
 
@@ -340,13 +361,13 @@ palacios_start_thread_on_cpu(int cpu_id,
 
     thread_info->fn = fn;
     thread_info->arg = arg;
-    thread_info->name = thread_name;
+    strncpy(thread_info->name,thread_name,MAX_THREAD_NAME);
+    thread_info->name[MAX_THREAD_NAME-1] =0;
 
-
-    thread = kthread_create( lnx_thread_target, thread_info, thread_name );
+    thread = kthread_create( lnx_thread_target, thread_info, thread_info->name );
 
     if (IS_ERR(thread)) {
-       WARNING("Palacios error creating thread: %s\n", thread_name);
+       WARNING("Palacios error creating thread: %s\n", thread_info->name);
        palacios_free(thread_info);
        return NULL;
     }
@@ -563,19 +584,25 @@ palacios_yield_cpu(void)
  * Given now immediately if there is no other thread that is runnable
  * And there is no real bound on how long it will yield
  */
-void palacios_yield_cpu_timed(unsigned int us)
+void palacios_sleep_cpu(unsigned int us)
 {
 
-    unsigned int uspj = 1000000U/HZ;
-   
-    unsigned int jiffies = us/uspj + ((us%uspj) !=0);  // ceiling 
-
     set_current_state(TASK_INTERRUPTIBLE);
-    
-    schedule_timeout(jiffies);
-
+    if (us) {
+        unsigned int uspj = 1000000U/HZ;
+        unsigned int jiffies = us/uspj + ((us%uspj) !=0);  // ceiling 
+        schedule_timeout(jiffies);
+    } else {
+        schedule();
+    }
+    return;
 }
 
+void palacios_wakeup_cpu(void *thread)
+{
+    wake_up_process(thread);
+    return;
+}
 
 /**
  * Allocates a mutex.
@@ -653,7 +680,7 @@ palacios_mutex_unlock_irqrestore(void *mutex, void *flags)
  * Structure used by the Palacios hypervisor to interface with the host kernel.
  */
 static struct v3_os_hooks palacios_os_hooks = {
-       .print                  = palacios_print,
+       .print                  = palacios_print_scoped,
        .allocate_pages         = palacios_allocate_pages,
        .free_pages             = palacios_free_pages,
        .malloc                 = palacios_alloc,
@@ -665,7 +692,8 @@ static struct v3_os_hooks palacios_os_hooks = {
        .get_cpu_khz            = palacios_get_cpu_khz,
        .start_kernel_thread    = palacios_start_kernel_thread,
        .yield_cpu              = palacios_yield_cpu,
-       .yield_cpu_timed        = palacios_yield_cpu_timed,
+       .sleep_cpu              = palacios_sleep_cpu,
+       .wakeup_cpu             = palacios_wakeup_cpu,
        .mutex_alloc            = palacios_mutex_alloc,
        .mutex_free             = palacios_mutex_free,
        .mutex_lock             = palacios_mutex_lock, 
@@ -682,7 +710,7 @@ static struct v3_os_hooks palacios_os_hooks = {
 
 
 
-int palacios_vmm_init( void )
+int palacios_vmm_init( char *options )
 {
     int num_cpus = num_online_cpus();
     char * cpu_mask = NULL;
@@ -724,7 +752,7 @@ int palacios_vmm_init( void )
 
     INFO("palacios_init starting - calling init_v3\n");
 
-    Init_V3(&palacios_os_hooks, cpu_mask, num_cpus);
+    Init_V3(&palacios_os_hooks, cpu_mask, num_cpus, options);
 
     return 0;