From: Peter Dinda <pdinda@northwestern.edu>
Date: Sun, 24 Jun 2012 20:54:04 +0000 (-0500)
Subject: Further printing cleanup
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=b21e50b2ddee22d01640350b676e48ac2b0d579d;p=palacios.releases.git

Further printing cleanup
---

diff --git a/linux_module/palacios-stubs.c b/linux_module/palacios-stubs.c
index 554fb9b..0d4240b 100644
--- a/linux_module/palacios-stubs.c
+++ b/linux_module/palacios-stubs.c
@@ -40,12 +40,47 @@ extern int cpu_list[NR_CPUS];
 extern int cpu_list_len;
 
 
+static char *print_buffer[NR_CPUS];
 
+static void deinit_print_buffers(void)
+{
+    int i;
+    for (i=0;i<NR_CPUS;i++) {
+	if (print_buffer[i]) { 
+	    kfree(print_buffer[i]);
+	    print_buffer[i]=0;
+	}
+    }
+}
+
+static int init_print_buffers(int num_cpus)
+{
+    int i;
+    
+    memset(print_buffer,0,sizeof(char*)*NR_CPUS);
+
+#if !V3_PRINTK_OLD_STYLE_OUTPUT
+
+    for (i=0;i<num_cpus;i++) { 
+	print_buffer[i] = kmalloc(V3_PRINTK_BUF_SIZE,GFP_KERNEL);
+	if (!print_buffer[i]) { 
+	    ERROR("Cannot allocate print buffer for cpu %d\n",i);
+	    deinit_print_buffers();
+	    return -1;
+	}
+	memset(print_buffer[i],0,V3_PRINTK_BUF_SIZE);
+    }
+
+#endif
+    
+    return 0;
 
+}
+ 
 /**
  * Prints a message to the console.
  */
-static void palacios_print(const char *	fmt, ...) {
+void palacios_print(const char *fmt, ...) {
 
 #if V3_PRINTK_OLD_STYLE_OUTPUT
 
@@ -61,12 +96,12 @@ static void palacios_print(const char *	fmt, ...) {
 
   va_list ap;
   char *buf;
+  unsigned int cpu = palacios_get_cpu();
+
+  buf = print_buffer[cpu];
 
-  // Allocate space atomically, in case we are called
-  // with a lock held
-  buf = kmalloc(V3_PRINTK_BUF_SIZE, GFP_ATOMIC);
   if (!buf) { 
-      printk("palacios: output skipped - unable to allocate\n");
+      printk(KERN_INFO "palacios (pcore %u): output skipped - no allocated buffer\n",cpu);
       return;
   } 
 
@@ -74,9 +109,23 @@ static void palacios_print(const char *	fmt, ...) {
   vsnprintf(buf,V3_PRINTK_BUF_SIZE, fmt, ap);
   va_end(ap);
 
-  printk(KERN_INFO "palacios: %s",buf);
+#if V3_PRINTK_CHECK_7BIT
+  {
+      char c=0;
+      int i;
+      for (i=0;i<strlen(buf);i++) { 
+	  if (buf[i] < 0) {
+	      c=buf[i];
+	      break;
+	  }
+      }
+      if (c!=0) { 
+	  printk(KERN_INFO "palacios (pcore %u): ALERT - 8 BIT CHAR (c=%d) DETECTED\n", cpu,c);
+      }
+  }
+#endif
 
-  kfree(buf);
+  printk(KERN_INFO "palacios (pcore %u): %s",cpu,buf);
 
   return;
 
@@ -297,7 +346,7 @@ palacios_move_thread_to_cpu(int new_cpu_id,
 /**
  * Returns the CPU ID that the caller is running on.
  */
-static unsigned int 
+unsigned int 
 palacios_get_cpu(void) 
 {
 
@@ -529,7 +578,7 @@ static struct v3_os_hooks palacios_os_hooks = {
 	.interrupt_cpu		= palacios_interrupt_cpu,
 	.call_on_cpu		= palacios_xcall,
 	.start_thread_on_cpu	= palacios_start_thread_on_cpu,
-	.move_thread_to_cpu = palacios_move_thread_to_cpu,
+	.move_thread_to_cpu     = palacios_move_thread_to_cpu,
 };
 
 
@@ -546,6 +595,12 @@ int palacios_vmm_init( void )
 	int i = 0;
 
         cpu_mask = kmalloc((num_cpus / 8) + 1, GFP_KERNEL);
+
+	if (!cpu_mask) { 
+	    ERROR("Cannot allocate cpu mask\n");
+	    return -1;
+	}
+
 	memset(cpu_mask, 0, (num_cpus / 8) + 1);
         
         for (i = 0; i < cpu_list_len; i++) {
@@ -563,8 +618,14 @@ int palacios_vmm_init( void )
 
     memset(irq_to_guest_map, 0, sizeof(struct v3_vm_info *) * 256);
 
+    if (init_print_buffers(num_cpus)) {
+	ERROR("Cannot initialize print buffers\n");
+	kfree(cpu_mask);
+	return -1;
+    }
+
     INFO("palacios_init starting - calling init_v3\n");
-    
+
     Init_V3(&palacios_os_hooks, cpu_mask, num_cpus);
 
     return 0;
@@ -576,5 +637,9 @@ int palacios_vmm_exit( void ) {
 
     Shutdown_V3();
 
+    INFO("palacios shutdown complete\n");
+
+    deinit_print_buffers();
+
     return 0;
 }
diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 4933028..e57fbd4 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -38,26 +38,6 @@
 
 #define V3_VM_KSTREAM_USER_CONNECT 11245
 
-// KERN_EMERG    "<0>"  /* system is unusable               */
-// KERN_ALERT    "<1>"  /* action must be taken immediately */
-// KERN_CRIT     "<2>"  /* critical conditions              */
-// KERN_ERR      "<3>"  /* error conditions                 */
-// KERN_WARNING  "<4>"  /* warning conditions               */
-// KERN_NOTICE   "<5>"  /* normal but significant condition */
-// KERN_INFO     "<6>"  /* informational                    */
-// KERN_DEBUG    "<7>"  /* debug-level messages             */
-
-// All 'printk's should be changed to one of these macros, for easier control
-#define ERROR(fmt, args...) printk((KERN_ERR "palacios: " fmt), ##args)
-#define WARNING(fmt, args...) printk((KERN_WARNING "palacios: " fmt), ##args)
-#define NOTICE(fmt, args...) printk((KERN_NOTICE "palacios: " fmt), ##args)
-#define INFO(fmt, args...) printk((KERN_INFO "palacios: " fmt), ##args)
-#define DEBUG(fmt, args...) printk((KERN_DEBUG "palacios: " fmt), ##args)
-
-// Turn this on for unprefaced output
-#define V3_PRINTK_OLD_STYLE_OUTPUT 0
-// Maximum length output from printk
-#define V3_PRINTK_BUF_SIZE 1024
 
 struct v3_guest_img {
     unsigned long long size;
@@ -118,5 +98,31 @@ int palacios_vmm_init( void );
 int palacios_vmm_exit( void );
 
 
+// Exported stubs, for use in other palacios components, like vnet
+void         palacios_print(const char *fmt, ...);
+unsigned int palacios_get_cpu(void);
+
+
+
+// Palacios Printing Support
+
+// These macros affect how palacios_print will generate output
+// Turn this on for unprefaced output from palacios_print
+#define V3_PRINTK_OLD_STYLE_OUTPUT 0
+// Maximum length output from palacios_print
+#define V3_PRINTK_BUF_SIZE 1024
+// Turn this on to check if new-style output for palacios_print  contains only 7-bit chars
+#define V3_PRINTK_CHECK_7BIT 1
+
+//
+// The following macros are for printing in the linux module itself, even before
+// Palacios is initialized and after it it deinitialized
+// All printk's in linux_module use these macros, for easier control
+#define ERROR(fmt, args...) printk((KERN_ERR "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
+#define WARNING(fmt, args...) printk((KERN_WARNING "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
+#define NOTICE(fmt, args...) printk((KERN_NOTICE "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
+#define INFO(fmt, args...) printk((KERN_INFO "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
+#define DEBUG(fmt, args...) printk((KERN_DEBUG "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
+
 
 #endif