Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


hardware multicore support
[palacios.git] / palacios / include / palacios / vmm.h
index c209185..81bad2c 100644 (file)
@@ -24,7 +24,7 @@
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
-#include <devices/vnic.h>
+
 
 
 #ifdef __V3VEE__
 /* utility definitions */
 
 
+#define V3_Print(fmt, args...)                                 \
+    do {                                                       \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->print) {                  \
+           (os_hooks)->print((fmt), ##args);                   \
+       }                                                       \
+    } while (0)        
+
+
 #define PrintDebug(fmt, args...)                       \
     do {                                               \
        extern struct v3_os_hooks * os_hooks;           \
-       if ((os_hooks) && (os_hooks)->print_debug) {    \
-           (os_hooks)->print_debug((fmt), ##args);     \
+       if ((os_hooks) && (os_hooks)->print) {  \
+           (os_hooks)->print((fmt), ##args);   \
        }                                               \
     } while (0)                                                
 
-#if 1
-#else
-#define PrintDebug(fmt,args ...)
-#endif
-
-
 
 #define PrintError(fmt, args...)                                       \
     do {                                                               \
        extern struct v3_os_hooks * os_hooks;                           \
-       if ((os_hooks) && (os_hooks)->print_debug) {                    \
-           (os_hooks)->print_debug("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
+       if ((os_hooks) && (os_hooks)->print) {                  \
+           (os_hooks)->print("%s(%d): " fmt, __FILE__, __LINE__, ##args); \
        }                                                               \
     } while (0)                                                
 
 
 
-#ifdef VMM_INFO
-#define PrintInfo(fmt, args...)                        \
-    do {                                               \
-       extern struct v3_os_hooks * os_hooks;           \
-       if ((os_hooks) && (os_hooks)->print_info) {     \
-           (os_hooks)->print_info((fmt), ##args);      \
-       }                                               \
-    } while (0)                                                
-#else
-#define PrintInfo(fmt, args...)
-#endif
-
-
-#ifdef VMM_TRACE
-#define PrintTrace(fmt, args...)                       \
-    do {                                               \
-       extern struct v3_os_hooks * os_hooks;           \
-       if ((os_hooks) && (os_hooks)->print_trace) {    \
-           (os_hooks)->print_trace(fmt, ##args);       \
-       }                                               \
-    } while (0)                                                
-#else
-#define PrintTrace(fmt, args...)
-#endif
-
-
 #define V3_AllocPages(num_pages)                               \
     ({                                                         \
        extern struct v3_os_hooks * os_hooks;                   \
        
 
 
+#define V3_CREATE_THREAD(fn, arg, name)                                \
+    do {                                                       \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->start_kernel_thread) {    \
+           (os_hooks)->start_kernel_thread(fn, arg, name);     \
+       }                                                       \
+    } while (0)
+
+
 #define V3_Hook_Interrupt(irq, opaque) ({                              \
            int ret = 0;                                                \
            extern struct v3_os_hooks * os_hooks;                       \
            ret;                                                        \
        })                                                              \
        
-#define V3_Yield(addr)                                 \
-    do {                                               \
-       extern struct v3_os_hooks * os_hooks;           \
-       if ((os_hooks) && (os_hooks)->yield_cpu) {      \
-           (os_hooks)->yield_cpu();                    \
-       }                                               \
-    } while (0)                                                \
-                                                       \
-                                                       \
-                                                       \
-                                                       \
-                                                       \
+
+#define V3_ACK_IRQ(irq)                                                \
+    do {                                                       \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->ack_irq) {                \
+           (os_hooks)->ack_irq(irq);                           \
+       }                                                       \
+    } while (0)
+
+
+
+
+
 /* ** */
 
 #define V3_ASSERT(x)                                                   \
     } while(0)                                                         \
        
 
-#define V3_REGISTER_PKT_DELIVERY(x) ({                                 \
-           int ret = 0;                                                \
-           extern struct v3_os_hooks * os_hooks;                       \
-           if ((os_hooks) && (os_hooks)->register_pkt_delivery) {      \
-               ret = (os_hooks)->register_pkt_delivery(x);             \
-           }                                                           \
-           ret;                                                        \
-       })
-
-#define V3_SEND_PKT(x, y) ({                                   \
-           int ret = 0;                                        \
-           extern struct v3_os_hooks * os_hooks;               \
-           if ((os_hooks) && (os_hooks)->ne2k_send_packet) {   \
-               ret = (os_hooks)->ne2k_send_packet(x, y);       \
-           }                                                   \
-           ret;                                                \
-       })
 
 
 #define VMM_INVALID_CPU 0
 
 
 // Maybe make this a define....
-typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU} v3_cpu_arch_t;
+typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CPU, V3_VMX_EPT_CPU} v3_cpu_arch_t;
+
+
+v3_cpu_mode_t v3_get_host_cpu_mode();
+
+void v3_yield(struct guest_info * info);
+void v3_yield_cond(struct guest_info * info);
+
+
+void v3_interrupt_cpu(struct guest_info * vm, int logical_cpu);
 
 
 #endif //!__V3VEE__
@@ -230,11 +209,7 @@ struct guest_info;
 
 /* This will contain function pointers that provide OS services */
 struct v3_os_hooks {
-    void (*print_info)(const char * format, ...)
-       __attribute__ ((format (printf, 1, 2)));
-    void (*print_debug)(const char * format, ...)
-       __attribute__ ((format (printf, 1, 2)));
-    void (*print_trace)(const char * format, ...)
+    void (*print)(const char * format, ...)
        __attribute__ ((format (printf, 1, 2)));
   
     void *(*allocate_pages)(int numPages);
@@ -246,44 +221,68 @@ struct v3_os_hooks {
     void *(*paddr_to_vaddr)(void *addr);
     void *(*vaddr_to_paddr)(void *addr);
 
-    //  int (*hook_interrupt)(struct guest_info *s, int irq);
-
     int (*hook_interrupt)(struct guest_info * vm, unsigned int irq);
 
     int (*ack_irq)(int irq);
 
-
     unsigned int (*get_cpu_khz)(void);
 
+    void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
 
-    void (*start_kernel_thread)(void); // include pointer to function
+    void (*yield_cpu)(void); 
 
-    void (*yield_cpu)(void);
+    void *(*mutex_alloc)(void);
+    void (*mutex_free)(void * mutex);
+    void (*mutex_lock)(void * mutex, int must_spin);
+    void (*mutex_unlock)(void * mutex);
 
-    //function by network card driver
-    int (*register_pkt_delivery)(int (*rcvd_fn)(uchar_t *packet, uint_t size));
-    int (*ne2k_send_packet)(uchar_t *packet, uint_t size);
+    void (*interrupt_cpu)(struct guest_info * vm, int logical_cpu);
+    void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
+    void (*start_thread_on_cpu)(int logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
 };
 
 
-struct v3_vm_config {
-    void * rombios;
-    int rombios_size;
 
-    void * vgabios;
-    int vgabios_size;
+typedef enum {NONE, HARDDRIVE, CDROM, VIRTIO} v3_disk_type_t;
+typedef enum {RAM, NETWORK} v3_disk_connection_t;
+
+union v3_disk_info {
+    struct {
+       void * data_ptr;
+       int size;
+    } ram;
+
+    struct {
+       char * ip_str;
+       int port;
+       char * disk_name;
+    } net;
+};
+
+struct v3_vm_config {
 
     unsigned long mem_size; // in bytes, var should be natural size of cpu
     // so we can specify maximum physical address size
     // (We're screwed if we want to do 32 bit host/64 bit guest)
 
+    int enable_telemetry;
+    int enable_nested_paging;
 
-    int enable_profiling;
+    int enable_pci;
 
-    int use_ramdisk;
-    void * ramdisk;
-    int ramdisk_size;
+    int enable_swap;
+
+    int guest_cpu;
+
+    unsigned long schedule_freq; // in HZ
+
+    v3_disk_type_t pri_disk_type;
+    v3_disk_connection_t pri_disk_con;
+    union v3_disk_info pri_disk_info;
+   
+    v3_disk_type_t sec_disk_type;
+    v3_disk_connection_t sec_disk_con;
+    union v3_disk_info sec_disk_info;
 };
 
 
@@ -292,8 +291,7 @@ struct v3_vm_config {
 struct v3_ctrl_ops {
     struct guest_info *(*allocate_guest)(void);
 
-    int (*config_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
-    int (*init_guest)(struct guest_info * info);
+    int (*init_guest)(struct guest_info * info, struct v3_vm_config * config_ptr);
     int (*start_guest)(struct guest_info * info);
     //  int (*stop_vm)(uint_t vm_id);
 
@@ -320,10 +318,10 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops);
+void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus);
 
 int v3_deliver_irq(struct guest_info * vm, struct v3_interrupt * intr);
-int v3_deliver_keyboard_evt(struct guest_info * vm);
+
 
 
 #endif