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.


add the virtual console input as a host event
[palacios.git] / palacios / src / palacios / vmm_vnet.c
index 7f9248b..e263735 100644 (file)
@@ -7,7 +7,7 @@
  * and the University of New Mexico.  You can find out more at 
  * http://www.v3vee.org
  *
- * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu>  
  * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
 #endif
 
 
+/* for UDP encapuslation */
+struct eth_header {
+    uchar_t dest[6];
+    uchar_t src[6];
+    uint16_t type;
+}__attribute__((packed));
+
+struct ip_header {
+    uint8_t version: 4;
+    uint8_t hdr_len: 4;
+    uchar_t tos;
+    uint16_t total_len;
+    uint16_t id;
+    uint8_t flags:     3;
+    uint16_t offset: 13;
+    uchar_t ttl;
+    uchar_t proto;
+    uint16_t cksum;
+    uint32_t src_addr;
+    uint32_t dst_addr;
+}__attribute__((packed));
+
+struct udp_header {
+    uint16_t src_port;
+    uint16_t dst_port;
+    uint16_t len;
+    uint16_t csum;//set to zero, disable the xsum
+}__attribute__((packed));
+
+struct udp_link_header {
+    struct eth_header eth_hdr;
+    struct ip_header ip_hdr;
+    struct udp_header udp_hdr;
+}__attribute__((packed));
+/* end with UDP encapuslation structures */
+
+
+
 
 struct eth_hdr {
     uint8_t dst_mac[6];
     uint8_t src_mac[6];
-    uint16_t type; // indicates layer 3 protocol type
+    uint16_t type; /* indicates layer 3 protocol type */
 } __attribute__((packed));
 
 
-
-
-
 struct vnet_dev {
-
+    int dev_id;
     uint8_t mac_addr[6];
     struct v3_vm_info * vm;
-    
-    int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data);
+    struct v3_vnet_dev_ops dev_ops;
     void * private_data;
+
+    int rx_disabled;
     
-    int dev_id;
     struct list_head node;
 } __attribute__((packed));
 
 
 struct vnet_brg_dev {
     struct v3_vm_info * vm;
-    
-    int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data);
+    struct v3_vnet_bridge_ops brg_ops;
+
+    int disabled;
     void * private_data;
 } __attribute__((packed));
 
 
 
-
-
 struct vnet_route_info {
     struct v3_vnet_route route_def;
 
@@ -77,8 +111,6 @@ struct vnet_route_info {
 };
 
 
-
-
 struct route_list {
     uint8_t hash_buf[VNET_HASH_SIZE];
 
@@ -87,6 +119,14 @@ struct route_list {
 } __attribute__((packed));
 
 
+#define BUF_SIZE 4096
+struct pkts_buf {
+    int start, end;
+    int num; 
+    v3_lock_t lock;
+    struct v3_vnet_pkt pkts[BUF_SIZE];
+};
+
 
 static struct {
     struct list_head routes;
@@ -99,9 +139,10 @@ static struct {
 
     v3_lock_t lock;
 
-    struct gen_queue * inpkt_q;
-    struct hashtable * route_cache;
+    uint8_t sidecores; /* 0 -vnet not running on sidecore, > 0, number of extra cores that can be used by VNET */
+    uint64_t cores_map; /* bitmaps for which cores can be used by VNET for sidecore, maxium 64 */
 
+    struct hashtable * route_cache;
 } vnet_state;
 
 
@@ -109,7 +150,7 @@ static struct {
 
 #ifdef CONFIG_DEBUG_VNET
 static inline void mac_to_string(char mac[6], char * buf) {
-    snprintf(buf, 50, "%x:%x:%x:%x:%x:%x", 
+    snprintf(buf, 100, "%d:%d:%d:%d:%d:%d", 
             mac[0], mac[1], mac[2],
             mac[3], mac[4], mac[5]);
 }
@@ -130,10 +171,10 @@ static void print_route(struct vnet_route_info *route){
                        route->route_def.dst_id, 
                        route->route_def.dst_type);
     if (route->route_def.dst_type == LINK_INTERFACE) {
-       PrintDebug("dst_dev (%p), dst_dev_id (%d), dst_dev_input (%p), dst_dev_data (%p)\n",
+       PrintDebug("dst_dev (%p), dst_dev_id (%d), dst_dev_ops(%p), dst_dev_data (%p)\n",
                                        route->dst_dev,
                                        route->dst_dev->dev_id,
-                                       route->dst_dev->input,
+                                       (void *)&(route->dst_dev->dev_ops),
                                        route->dst_dev->private_data);
     }
 }
@@ -168,8 +209,7 @@ static inline int hash_eq(addr_t key1, addr_t key2) {
     return (memcmp((uint8_t *)key1, (uint8_t *)key2, VNET_HASH_SIZE) == 0);
 }
 
-
-static int add_route_to_cache(struct v3_vnet_pkt * pkt, struct route_list * routes) {
+static int add_route_to_cache(const struct v3_vnet_pkt * pkt, struct route_list * routes) {
     memcpy(routes->hash_buf, pkt->hash_buf, VNET_HASH_SIZE);    
 
     if (v3_htable_insert(vnet_state.route_cache, (addr_t)routes->hash_buf, (addr_t)routes) == 0) {
@@ -188,7 +228,7 @@ static int clear_hash_cache() {
     return 0;
 }
 
-static int look_into_cache(struct v3_vnet_pkt * pkt, struct route_list ** routes) {
+static int look_into_cache(const struct v3_vnet_pkt * pkt, struct route_list ** routes) {
     
     *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)(pkt->hash_buf));
    
@@ -198,7 +238,7 @@ static int look_into_cache(struct v3_vnet_pkt * pkt, struct route_list ** routes
 
 static struct vnet_dev * find_dev_by_id(int idx) {
     struct vnet_dev * dev = NULL; 
-    
+
     list_for_each_entry(dev, &(vnet_state.devs), node) {
        int dev_id = dev->dev_id;
 
@@ -220,7 +260,7 @@ static struct vnet_dev * find_dev_by_mac(char mac[6]) {
     return NULL;
 }
 
-int get_device_id_by_mac(char mac[6]){
+int v3_vnet_id_by_mac(char mac[6]){
 
     struct vnet_dev *dev = find_dev_by_mac(mac);
 
@@ -252,8 +292,6 @@ int v3_vnet_add_route(struct v3_vnet_route route) {
 
     if (new_route->route_def.dst_type == LINK_INTERFACE) {
        new_route->dst_dev = find_dev_by_id(new_route->route_def.dst_id);
-       PrintDebug("Vnet: Add route, get device: dev_id %d, input : %p, private_data %p\n",
-                       new_route->dst_dev->dev_id, new_route->dst_dev->input, new_route->dst_dev->private_data);
     }
 
     if (new_route->route_def.src_type == LINK_INTERFACE) {
@@ -261,10 +299,12 @@ int v3_vnet_add_route(struct v3_vnet_route route) {
     }
 
     flags = v3_lock_irqsave(vnet_state.lock);
+
     list_add(&(new_route->node), &(vnet_state.routes));
+    clear_hash_cache();
+
     v3_unlock_irqrestore(vnet_state.lock, flags);
    
-    clear_hash_cache();
 
 #ifdef CONFIG_DEBUG_VNET
     dump_routes();
@@ -275,9 +315,10 @@ int v3_vnet_add_route(struct v3_vnet_route route) {
 
 
 
-// At the end allocate a route_list
-// This list will be inserted into the cache so we don't need to free it
-static struct route_list * match_route(struct v3_vnet_pkt * pkt) {
+/* At the end allocate a route_list
+ * This list will be inserted into the cache so we don't need to free it
+ */
+static struct route_list * match_route(const struct v3_vnet_pkt * pkt) {
     struct vnet_route_info * route = NULL; 
     struct route_list * matches = NULL;
     int num_matches = 0;
@@ -289,8 +330,8 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) {
 
 #ifdef CONFIG_DEBUG_VNET
     {
-       char dst_str[50];
-       char src_str[50];
+       char dst_str[100];
+       char src_str[100];
 
        mac_to_string(hdr->src_mac, src_str);  
        mac_to_string(hdr->dst_mac, dst_str);
@@ -386,8 +427,8 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) {
        return NULL;
     }
 
-    matches = V3_Malloc(sizeof(struct route_list) + 
-                       (sizeof(struct vnet_route_info *) * num_matches));
+    matches = (struct route_list *)V3_Malloc(sizeof(struct route_list) + 
+                               (sizeof(struct vnet_route_info *) * num_matches));
 
     matches->num_routes = num_matches;
 
@@ -401,180 +442,282 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) {
     return matches;
 }
 
-static int handle_one_pkt(struct v3_vnet_pkt * pkt, void *private_data) {
+static int send_to_bridge(struct v3_vnet_pkt * pkt){
+    struct vnet_brg_dev *bridge = vnet_state.bridge;
+
+    if (bridge == NULL) {
+       PrintError("VNET: No bridge to sent data to links\n");
+       return -1;
+    }
+
+    return bridge->brg_ops.input(bridge->vm, pkt, bridge->private_data);
+}
+
+
+/* enable a vnet device, notify VNET it can send pkts to it */
+int v3_vnet_enable_device(int dev_id){
+    struct vnet_dev *dev = find_dev_by_id(dev_id);
+    unsigned long flags;
+
+    if(!dev)
+       return -1;
+
+    if(!dev->rx_disabled)
+       return 0;
+
+    flags = v3_lock_irqsave(vnet_state.lock);
+    dev->rx_disabled = 0;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
+
+    /* TODO: Wake up all other guests who are trying to send pkts */
+    dev = NULL;
+    list_for_each_entry(dev, &(vnet_state.devs), node) {
+       if (dev->dev_id != dev_id)
+           dev->dev_ops.start_tx(dev->private_data);
+    }
+
+    return 0;
+}
+
+/* Notify VNET to stop sending pkts to it */
+int v3_vnet_disable_device(int dev_id){
+    struct vnet_dev *dev = find_dev_by_id(dev_id);
+    unsigned long flags;
+
+    if(!dev)
+       return -1;
+
+    flags = v3_lock_irqsave(vnet_state.lock);
+    dev->rx_disabled = 1;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
+
+
+    /* TODO: Notify all other guests to stop send pkts */
+    dev = NULL;
+    list_for_each_entry(dev, &(vnet_state.devs), node) {
+       if (dev->dev_id != dev_id)
+           dev->dev_ops.stop_tx(dev->private_data);
+    }
+
+    return 0;
+}
+
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) {
     struct route_list * matched_routes = NULL;
     unsigned long flags;
     int i;
 
-
 #ifdef CONFIG_DEBUG_VNET
    {
-       struct eth_hdr * hdr = (struct eth_hdr *)(pkt->data);
-       char dest_str[30];
-       char src_str[30];
+       struct eth_hdr * hdr = (struct eth_hdr *)(pkt->header);
+       char dest_str[100];
+       char src_str[100];
 
        mac_to_string(hdr->src_mac, src_str);  
        mac_to_string(hdr->dst_mac, dest_str);
-       PrintDebug("Vnet: HandleDataOverLink. SRC(%s), DEST(%s)\n", src_str, dest_str);
+       int cpu = V3_Get_CPU();
+       PrintDebug("Vnet: on cpu %d, HandleDataOverLink. SRC(%s), DEST(%s), pkt size: %d\n", cpu, src_str, dest_str, pkt->size);
    }
 #endif
 
-#ifdef CONFIG_VNET_PROFILE
-    struct guest_info *core = (struct guest_info *)private_data;
-    uint64_t start, end;
-    rdtscll(start);
-#endif
-
     flags = v3_lock_irqsave(vnet_state.lock);
 
     look_into_cache(pkt, &matched_routes);
        
     if (matched_routes == NULL) {  
-       PrintDebug("Vnet: can not find route in cache, looking into routing table\n");
+       PrintError("Vnet: send pkt Looking into routing table\n");
        
        matched_routes = match_route(pkt);
-               
+       
        if (matched_routes) {
            add_route_to_cache(pkt, matched_routes);
        } else {
-           PrintDebug("Could not find route for packet...\n");
+           PrintDebug("Could not find route for packet... discards packet\n");
            v3_unlock_irqrestore(vnet_state.lock, flags);
-           return -1;
+           return 0; /* do we return -1 here?*/
        }
     }
 
     v3_unlock_irqrestore(vnet_state.lock, flags);
 
-#ifdef CONFIG_VNET_PROFILE
-    {
-       rdtscll(end);
-       core->vnet_times.time_route_lookup = end - start;
-    }
-#endif
+    PrintDebug("Vnet: send pkt route matches %d\n", matched_routes->num_routes);
 
-    PrintDebug("Vnet: HandleOnePacket: route matches %d\n", matched_routes->num_routes);
     for (i = 0; i < matched_routes->num_routes; i++) {
         struct vnet_route_info * route = matched_routes->routes[i];
        
-        if (route->route_def.dst_type == LINK_EDGE) {
+        if (route->route_def.dst_type == LINK_EDGE) {                  
             pkt->dst_type = LINK_EDGE;
             pkt->dst_id = route->route_def.dst_id;
-            if (vnet_state.bridge == NULL) {
-                PrintDebug("VNET: No bridge to sent data to links\n");
-                continue;
-            }
-            if (vnet_state.bridge->input(vnet_state.bridge->vm, pkt, vnet_state.bridge->private_data) == -1) {
-                PrintDebug("VNET: Packet not sent properly\n");
+
+            if (send_to_bridge(pkt) == -1) {
+                PrintDebug("VNET: Packet not sent properly to bridge\n");
                 continue;
-             } 
+            }         
         } else if (route->route_def.dst_type == LINK_INTERFACE) {
-            if (route->dst_dev->input(route->dst_dev->vm, pkt, route->dst_dev->private_data) == -1) {
-                PrintDebug("VNET: Packet not sent properly\n");
-                continue;
+            if (!route->dst_dev->rx_disabled){ 
+                 if(route->dst_dev->dev_ops.input(route->dst_dev->vm, pkt, route->dst_dev->private_data) == -1) {
+                       PrintDebug("VNET: Packet not sent properly\n");
+                       continue;
+                 }
             }
         } else {
-            PrintDebug("Vnet: Wrong Edge type\n");
-            continue;
+            PrintError("VNET: Wrong Edge type\n");
         }
 
-        PrintDebug("Vnet: HandleOnePacket: Forward packet according to Route\n");
+        PrintDebug("VNET: Forward one packet according to Route %d\n", i);
     }
-
-#ifdef CONFIG_VNET_PROFILE
-    {
-       rdtscll(start);
-       core->vnet_times.time_copy_to_guest = start - end;
-    }
-#endif
     
     return 0;
 }
 
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data) {
-    PrintDebug("In Vnet Send: pkt size: %d\n", pkt->size);
-               
-    if (handle_one_pkt(pkt, private_data) != -1) {
-        PrintDebug("VNET: send one packet! pt length %d\n", pkt->size);  
-    } else {
-        PrintDebug("VNET: Fail to forward one packet, discard it!\n"); 
-    }
-
-    return 0;
-}
-
-int v3_vnet_add_dev(struct v3_vm_info *vm,uint8_t mac[6], 
-                   int (*netif_input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data), 
+int v3_vnet_add_dev(struct v3_vm_info *vm, uint8_t mac[6], 
+                   struct v3_vnet_dev_ops *ops,
                    void * priv_data){
     struct vnet_dev * new_dev = NULL;
     unsigned long flags;
-    int dev_id;
-
-    flags = v3_lock_irqsave(vnet_state.lock);
-       
-    new_dev = find_dev_by_mac(mac);
 
-    if (new_dev) {
-       PrintDebug("VNET: register device: Already has device with the same mac\n");
-       dev_id = -1;
-       goto exit;
-    }
-    
     new_dev = (struct vnet_dev *)V3_Malloc(sizeof(struct vnet_dev)); 
 
     if (new_dev == NULL) {
        PrintError("VNET: Malloc fails\n");
-       dev_id = -1;
-       goto exit;
+       return -1;
     }
    
     memcpy(new_dev->mac_addr, mac, 6);
-    new_dev->input = netif_input;
+    new_dev->dev_ops.input = ops->input;
+    new_dev->dev_ops.poll = ops->poll;
     new_dev->private_data = priv_data;
     new_dev->vm = vm;
-       
-    list_add(&(new_dev->node), &(vnet_state.devs));
-    vnet_state.num_devs ++;
-    new_dev->dev_id = vnet_state.num_devs;
-    dev_id = new_dev->dev_id;
+    new_dev->dev_id = 0;       
 
-    PrintDebug("Vnet: Add Device: dev_id %d, input : %p, private_data %p\n",
-                       new_dev->dev_id, new_dev->input, new_dev->private_data);
+    flags = v3_lock_irqsave(vnet_state.lock);
+
+    if (!find_dev_by_mac(mac)) {
+       list_add(&(new_dev->node), &(vnet_state.devs));
+       new_dev->dev_id = ++vnet_state.num_devs;
+    }
 
-exit:
-       
     v3_unlock_irqrestore(vnet_state.lock, flags);
-    return dev_id;
+
+    /* if the device was found previosly the id should still be 0 */
+    if (new_dev->dev_id == 0) {
+       PrintError("Device Alrady exists\n");
+       return -1;
+    }
+
+    PrintDebug("Vnet: Add Device: dev_id %d\n", new_dev->dev_id);
+
+    return new_dev->dev_id;
 }
 
 
+/* TODO: Still need to figure out how to handle this multicore part --Lei
+  */
+void  v3_vnet_poll(struct v3_vm_info *vm){
+    struct vnet_dev * dev = NULL; 
+
+    switch (vnet_state.sidecores) {
+       case 0:
+               list_for_each_entry(dev, &(vnet_state.devs), node) {
+                   if(dev->vm == vm){
+                       dev->dev_ops.poll(vm, dev->private_data);
+                   }
+              }
+               break;
+       case 1:
+               break;
+       case 2:
+           list_for_each_entry(dev, &(vnet_state.devs), node) {
+               int cpu_id = vm->cores[0].cpu_id + 2; /* temporary here, should use vnet_state.cores_map */
+                struct v3_vnet_dev_xcall_args dev_args; /* could cause problem here -LX */
+                dev_args.vm = vm;
+               dev_args.private_data = dev->private_data;
+               V3_Call_On_CPU(cpu_id, dev->dev_ops.poll_xcall, (void *)&dev_args);
+           }
+           break;
+       default:
+           break;
+    }
+}
+
 int v3_vnet_add_bridge(struct v3_vm_info * vm,
-                               int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data), 
-                               void * priv_data){
+                      struct v3_vnet_bridge_ops *ops,
+                      void * priv_data) {
     unsigned long flags;
+    int bridge_free = 0;
+    struct vnet_brg_dev * tmp_bridge = NULL;    
+    
+    flags = v3_lock_irqsave(vnet_state.lock);
+
+    if (vnet_state.bridge == NULL) {
+       bridge_free = 1;
+       vnet_state.bridge = (void *)1;
+    }
+
+    v3_unlock_irqrestore(vnet_state.lock, flags);
+
+    if (bridge_free == 0) {
+       PrintError("Bridge already set\n");
+       return -1;
+    }
+
+    tmp_bridge = (struct vnet_brg_dev *)V3_Malloc(sizeof(struct vnet_brg_dev));
+
+    if (tmp_bridge == NULL) {
+       PrintError("Malloc Fails\n");
+       vnet_state.bridge = NULL;
+       return -1;
+    }
+    
+    tmp_bridge->vm = vm;
+    tmp_bridge->brg_ops.input = ops->input;
+    tmp_bridge->brg_ops.xcall_input = ops->xcall_input;
+    tmp_bridge->brg_ops.polling_pkt = ops->polling_pkt;
+    tmp_bridge->private_data = priv_data;
+    tmp_bridge->disabled = 0;
        
+    /* make this atomic to avoid possible race conditions */
     flags = v3_lock_irqsave(vnet_state.lock);
+    vnet_state.bridge = tmp_bridge;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
 
-    if(vnet_state.bridge != NULL){
-       PrintDebug("Vnet: Replace current bridge with a new one\n");
-    } else {
-       vnet_state.bridge = (struct vnet_brg_dev *)V3_Malloc(sizeof(struct vnet_brg_dev));
-       if (vnet_state.bridge == NULL) {
-           PrintError("Malloc Fails\n");
-           return -1;
-       }
+    return 0;
+}
+
+
+#if 0
+int v3_vnet_disable_bridge() {
+    unsigned long flags; 
+    
+    flags = v3_lock_irqsave(vnet_state.lock);
+
+    if (vnet_state.bridge != NULL) {
+       vnet_state.bridge->disabled = 1;
     }
 
-    vnet_state.bridge->vm = vm;
-    vnet_state.bridge->input = input;
-    vnet_state.bridge->private_data = priv_data;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
+
+    return 0;
+}
+
+
+int v3_vnet_enable_bridge() {
+    unsigned long flags; 
+    
+    flags = v3_lock_irqsave(vnet_state.lock);
+
+    if (vnet_state.bridge != NULL) {
+       vnet_state.bridge->disabled = 0;
+    }
 
     v3_unlock_irqrestore(vnet_state.lock, flags);
 
     return 0;
 }
+#endif
 
-int V3_init_vnet() {
+int v3_init_vnet() {
+    memset(&vnet_state, 0, sizeof(vnet_state));
        
     INIT_LIST_HEAD(&(vnet_state.routes));
     INIT_LIST_HEAD(&(vnet_state.devs));
@@ -587,13 +730,8 @@ int V3_init_vnet() {
     if (v3_lock_init(&(vnet_state.lock)) == -1){
         PrintError("VNET: Failure to init lock for routes table\n");
     }
-
     PrintDebug("VNET: Locks initiated\n");
 
-    vnet_state.inpkt_q = v3_create_queue();
-    v3_init_queue(vnet_state.inpkt_q);
-    PrintDebug("VNET: Receiving queue initiated\n");
-
     vnet_state.route_cache = v3_create_htable(0, &hash_fn, &hash_eq);
 
     if (vnet_state.route_cache == NULL) {
@@ -601,6 +739,9 @@ int V3_init_vnet() {
         return -1;
     }
 
+    vnet_state.sidecores = 0;
+    vnet_state.cores_map = 0;
+
     PrintDebug("VNET: initiated\n");
 
     return 0;