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.


Minimize the copies for vnet and Virtio bridge
[palacios.git] / palacios / src / palacios / vmm_vnet.c
index e7a1a8d..38a9087 100644 (file)
  */
  
 #include <palacios/vmm_vnet.h>
-#include <palacios/vmm_hypercall.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_lock.h>
+#include <palacios/vmm_queue.h>
+#include <palacios/vmm_sprintf.h>
 
 #ifndef CONFIG_DEBUG_VNET
 #undef PrintDebug
 #endif
 
 
-#define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MIN   46
-#define ETHERNET_DATA_MAX   1500
-#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
 
+struct eth_hdr {
+    uint8_t dst_mac[6];
+    uint8_t src_mac[6];
+    uint16_t type; // indicates layer 3 protocol type
+} __attribute__((packed));
 
-typedef enum {TCP_TYPE, UDP_TYPE, NONE_TYPE} prot_type_t;
 
-#define VNET_INITAB_HCALL 0xca00
 
-struct eth_header {
-    uchar_t dest[6];
-    uchar_t src[6];
-    uint16_t type; // indicates layer 3 protocol 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));
-
-
-struct ethernet_pkt {
-    uint32_t size; //size of data field
-    uint16_t type;
-    uint8_t use_header;
-    struct udp_link_header ext_hdr;
-    char data[ETHERNET_PACKET_LEN];
-}__attribute__((packed));
-
-
-#define DEVICE_NAME_LEN 20
-struct vnet_if_device {
-    char name[DEVICE_NAME_LEN];
-    uchar_t mac_addr[6];
-    struct v3_vm_info *vm;
+
+
+struct vnet_dev {
+
+    uint8_t mac_addr[6];
+    struct v3_vm_info * vm;
     
-    int (*input)(struct v3_vm_info *vm, uchar_t *data, uint32_t len, void *private_data);
+    int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data);
+    void * private_data;
     
-    void *private_data;
-}__attribute__((packed));
-
-struct vnet_if_link {
-    prot_type_t pro_type; //transport layer protocal type of this link
-    unsigned long dest_ip;
-    uint16_t dest_port;
+    int dev_id;
+    struct list_head node;
+} __attribute__((packed));
 
-    struct udp_link_header vnet_header; //header applied to the packet in/out from this link
 
-    int (*input)(uchar_t *data, uint32_t len, void *private_data);
+struct vnet_brg_dev {
+    struct v3_vm_info * vm;
     
-    void *private_data;
-}__attribute__((packed));
+    int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data);
+    void * private_data;
+} __attribute__((packed));
 
 
-struct link_entry {
-    link_type_t type;
-  
-    union {
-       struct vnet_if_device *dst_dev;
-       struct vnet_if_link *dst_link;
-    } __attribute__((packed));
 
-    int use;
-}__attribute__((packed));
 
-//routing table entry
-struct routing_entry {
-    char src_mac[6];
-    char dest_mac[6];
 
-    mac_type_t src_mac_qual;
-    mac_type_t dest_mac_qual;
+struct vnet_route_info {
+    struct v3_vnet_route route_def;
 
-    int link_idx; //link[dest] is the link to be used to send pkt
-    link_type_t link_type; //EDGE|INTERFACE|ANY
-    int src_link_idx;
-    link_type_t src_type; //EDGE|INTERFACE|ANY
+    struct vnet_dev * dst_dev;
+    struct vnet_dev * src_dev;
+
+    struct list_head node;
+    struct list_head match_node; // used for route matching
 };
 
 
-// 14 (ethernet frame) + 20 bytes
-struct in_pkt_header {
-    uchar_t ethernetdest[6];
-    uchar_t ethernetsrc[6];
-    uchar_t ethernettype[2]; //layer 3 protocol type
-    char ip[20];
-}__attribute__((packed));
 
 
-#define MAX_LINKS 10
-#define MAX_ROUTES 10
-#define HASH_KEY_LEN 16
-#define MIN_CACHE_SIZE 100
-#define HASH_KEY_SIZE 16
+struct route_list {
+    uint8_t hash_buf[VNET_HASH_SIZE];
 
-struct link_table {
-    struct link_entry * links[MAX_LINKS];
-    uint16_t size;
-    v3_lock_t lock;
-}__attribute__((packed));
+    uint32_t num_routes;
+    struct vnet_route_info * routes[0];
+} __attribute__((packed));
 
-struct routing_table {
-    struct routing_entry * routes[MAX_ROUTES];
-    uint16_t size;
-    v3_lock_t lock;
-}__attribute__((packed));
 
-typedef char * route_hashkey_t;
 
-struct route_cache_entry {
-    int num_matched_routes;
-    int * matches; 
-};
+static struct {
+    struct list_head routes;
+    struct list_head devs;
+    
+    int num_routes;
+    int num_devs;
 
-struct vnet_state_t {
-    struct link_table g_links;
-    struct routing_table g_routes;
-    struct gen_queue * g_inpkt_q;
-    struct hashtable * g_route_cache;
-    v3_lock_t cache_lock;
-};
+    struct vnet_brg_dev *bridge;
 
-static struct vnet_state_t g_vnet_state;//global state for vnet
+    v3_lock_t lock;
 
-static uint16_t ip_xsum(struct ip_header *ip_hdr, int hdr_len){
-    long sum = 0;
+    struct gen_queue * inpkt_q;
+    struct hashtable * route_cache;
 
-    uint16_t *p = (uint16_t*) ip_hdr;
-    while(hdr_len > 1){
-        sum += *(p++);
-        if(sum & 0x80000000)
-            sum = (sum & 0xFFFF) + (sum >> 16);
-            hdr_len -= 2;
-        }
-    if(hdr_len) 
-        sum += (uint16_t) *(uchar_t *)p;
-          
-    while(sum>>16)
-        sum = (sum & 0xFFFF) + (sum >> 16);
+} vnet_state;
 
-    return (uint16_t)~sum;
-}
 
-static void ethernet_packet_init(struct ethernet_pkt *pt, 
-                                                              uchar_t *data, 
-                                                              const size_t size) {
-    pt->size = size;
-    pt->use_header = 0;
-    memset(&pt->ext_hdr, 0, sizeof(struct udp_link_header));
-    memcpy(pt->data, data, size);
-}
 
-static inline uint_t hash_from_key_fn(addr_t hashkey) {    
-    return v3_hash_buffer((uint8_t *)hashkey, HASH_KEY_LEN);
-}
 
-static inline int hash_key_equal(addr_t key1, addr_t key2) {
-    return (memcmp((uint8_t *)key1, (uint8_t *)key2, HASH_KEY_LEN) == 0);
+#ifdef CONFIG_DEBUG_VNET
+static inline void mac_to_string(char mac[6], char * buf) {
+    snprintf(buf, 50, "%x:%x:%x:%x:%x:%x", 
+            mac[0], mac[1], mac[2],
+            mac[3], mac[4], mac[5]);
 }
 
-static int init_route_cache(struct vnet_state_t *vnet_state) { 
-    vnet_state->g_route_cache = v3_create_htable(MIN_CACHE_SIZE, 
-                                                                      &hash_from_key_fn, 
-                                                                      &hash_key_equal);
-
-    if (vnet_state->g_route_cache == NULL) {
-        PrintError("Vnet: Route Cache Init Fails\n");
-        return -1;
+static void print_route(struct vnet_route_info *route){
+    char str[50];
+
+    mac_to_string(route->route_def.src_mac, str);
+    PrintDebug("Src Mac (%s),  src_qual (%d)\n", 
+                       str, route->route_def.src_mac_qual);
+    mac_to_string(route->route_def.dst_mac, str);
+    PrintDebug("Dst Mac (%s),  dst_qual (%d)\n", 
+                       str, route->route_def.dst_mac_qual);
+    PrintDebug("Src dev id (%d), src type (%d)", 
+                       route->route_def.src_id, 
+                       route->route_def.src_type);
+    PrintDebug("Dst dev id (%d), dst type (%d)\n", 
+                       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",
+                                       route->dst_dev,
+                                       route->dst_dev->dev_id,
+                                       route->dst_dev->input,
+                                       route->dst_dev->private_data);
     }
+}
 
-    return 0;
+static void dump_routes(){
+       struct vnet_route_info *route;
+
+       int i = 0;
+       PrintDebug("\n========Dump routes starts ============\n");
+       list_for_each_entry(route, &(vnet_state.routes), node) {
+               PrintDebug("\nroute %d:\n", ++i);
+               
+               print_route(route);
+       }
+       PrintDebug("\n========Dump routes end ============\n");
 }
 
-static void make_hash_key(route_hashkey_t hashkey,
-                                               char src_addr[6],
-                                               char dest_addr[6],
-                                               char src_type,
-                                               int src_index) {
-    int j;
+#endif
 
-    for (j = 0; j < 6; j++) {
-       hashkey[j] = src_addr[j];
-       hashkey[j + 6] = dest_addr[j] + 1;
-    }
 
-    hashkey[12] = src_type;
+/* 
+ * A VNET packet is a packed struct with the hashed fields grouped together.
+ * This means we can generate the hash from an offset into the pkt struct
+ */
+static inline uint_t hash_fn(addr_t hdr_ptr) {    
+    uint8_t * hdr_buf = (uint8_t *)hdr_ptr;
 
-    *(int *)(hashkey + 12) = src_index;
+    return v3_hash_buffer(hdr_buf, VNET_HASH_SIZE);
 }
 
-static int add_route_to_cache(route_hashkey_t hashkey, 
-                                                       int num_matched_r, 
-                                                       int * matches) {
-    struct route_cache_entry * new_entry = NULL;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
-    int i;
-    
-    new_entry = (struct route_cache_entry *)V3_Malloc(sizeof(struct route_cache_entry));
-    if (new_entry == NULL) {
-       PrintError("Vnet: Malloc fails\n");
-       return -1;
-    }
-    
-    new_entry->num_matched_routes = num_matched_r;
-    new_entry->matches = (int *)V3_Malloc(num_matched_r * sizeof(int));
-    
-    if (new_entry->matches == NULL) {
-       PrintError("Vnet: Malloc fails\n");
-       return -1;
-    }
-    
-    for (i = 0; i < num_matched_r; i++) {
-       new_entry->matches[i] = matches[i];
-    }
-    
-    if (v3_htable_insert(vnet_state->g_route_cache, (addr_t)hashkey, (addr_t)new_entry) == 0) {
+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(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) {
        PrintError("Vnet: Failed to insert new route entry to the cache\n");
-       V3_Free(new_entry->matches);
-       V3_Free(new_entry);
+       return -1;
     }
     
     return 0;
 }
 
 static int clear_hash_cache() {
-    struct vnet_state_t *vnet_state = &g_vnet_state;
 
-    v3_free_htable(vnet_state->g_route_cache, 1, 1);           
-    vnet_state->g_route_cache = v3_create_htable(MIN_CACHE_SIZE, 
-                                                                        hash_from_key_fn, 
-                                                                        hash_key_equal);
-    
-    if (vnet_state->g_route_cache == NULL) {
-        PrintError("Vnet: Route Cache Create Failurely\n");
-        return -1;
-    }
+    v3_free_htable(vnet_state.route_cache, 1, 1);
+    vnet_state.route_cache = v3_create_htable(0, &hash_fn, &hash_eq);
 
     return 0;
 }
 
-static int look_into_cache(route_hashkey_t hashkey, int * matches) {
-    struct route_cache_entry * found = NULL;
-    int n_matches = -1;
-    int i = 0;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
+static int look_into_cache(const struct v3_vnet_pkt * pkt, struct route_list ** routes) {
     
-    found = (struct route_cache_entry *)v3_htable_search(vnet_state->g_route_cache, 
-                                                                               (addr_t)hashkey);
+    *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)(pkt->hash_buf));
    
-    if (found != NULL) {
-        n_matches = found->num_matched_routes;
-
-        for (i = 0; i < n_matches; i++) {
-            matches[i] = found->matches[i];
-       }
-    }
-
-    return n_matches;
+    return 0;
 }
 
 
-#ifdef CONFIG_DEBUG_VNET
-
-static void print_packet(uchar_t *pkt, int size) {
-    PrintDebug("Vnet: data_packet: size: %d\n", size);
-    v3_hexdump(pkt, size, NULL, 0);
-}
-
-static inline uint8_t hex_nybble_to_nybble(const uint8_t hexnybble) {
-    uint8_t x = toupper(hexnybble);
+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;
 
-    if (isdigit(x)) {
-       return x - '0';
-    } else {
-       return 10 + (x - 'A');
+       if (dev_id == idx)
+           return dev;
     }
-}
 
-static inline uint8_t hex_byte_to_byte(const uint8_t hexbyte[2]) {
-    return ((hex_nybble_to_nybble(hexbyte[0]) << 4) + 
-           (hex_nybble_to_nybble(hexbyte[1]) & 0xf));
+    return NULL;
 }
 
-static inline void string_to_mac(const char *str, uint8_t mac[6]) {
-    int k;
-
-    for (k = 0; k < 6; k++) {
-       mac[k] = hex_byte_to_byte(&(str[(2 * k) + k]));
+static struct vnet_dev * find_dev_by_mac(char mac[6]) {
+    struct vnet_dev * dev = NULL; 
+    
+    list_for_each_entry(dev, &(vnet_state.devs), node) {
+       if (!memcmp(dev->mac_addr, mac, 6))
+           return dev;
     }
-}
 
-static inline void mac_to_string(char mac[6], char * buf) {
-    snprintf(buf, 20, "%02x:%02x:%02x:%02x:%02x:%02x", 
-            mac[0], mac[1], mac[2],
-            mac[3], mac[4], mac[5]);
+    return NULL;
 }
 
+int get_device_id_by_mac(char mac[6]){
 
-static void print_route(struct routing_entry *route){
-    char dest_str[18];
-    char src_str[18];
+    struct vnet_dev *dev = find_dev_by_mac(mac);
 
-    mac_to_string(route->src_mac, src_str);  
-    mac_to_string(route->dest_mac, dest_str);
+    if (dev == NULL)
+       return -1;
 
-    PrintDebug("SRC(%s), DEST(%s), src_mac_qual(%d), dst_mac_qual(%d)\n", 
-                 src_str, 
-                 dest_str, 
-                 route->src_mac_qual, 
-                 route->dest_mac_qual);
-    PrintDebug("Src_Link(%d), src_type(%d), dst_link(%d), dst_type(%d)\n\n", 
-                 route->src_link_idx, 
-                 route->src_type, 
-                 route->link_idx, 
-                 route->link_type);
+    return dev->dev_id;
 }
-       
 
-static void dump_routes(struct routing_entry **route_tables) {
-    int i;
-
-    PrintDebug("\nVnet: route table dump start =====\n");
-
-    for(i = 0; i < MAX_ROUTES; i++) {
-        if (route_tables[i] != NULL){
-            print_route(route_tables[i]);
-        }
-    }
 
-    PrintDebug("\nVnet: route table dump end =====\n");
-}
+int v3_vnet_add_route(struct v3_vnet_route route) {
+    struct vnet_route_info * new_route = NULL;
+    unsigned long flags; 
 
-static void dump_dom0_routes(struct routing_entry routes[], int size) {
-    int i;
+    new_route = (struct vnet_route_info *)V3_Malloc(sizeof(struct vnet_route_info));
+    memset(new_route, 0, sizeof(struct vnet_route_info));
 
-    PrintDebug("\nVnet: route table from dom0 guest =====\n");
+    PrintDebug("Vnet: vnet_add_route_entry: dst_id: %d, dst_type: %d\n",
+                       route.dst_id, route.dst_type);  
+    
+    memcpy(new_route->route_def.src_mac, route.src_mac, 6);
+    memcpy(new_route->route_def.dst_mac, route.dst_mac, 6);
+    new_route->route_def.src_mac_qual = route.src_mac_qual;
+    new_route->route_def.dst_mac_qual = route.dst_mac_qual;
+    new_route->route_def.dst_id = route.dst_id;
+    new_route->route_def.dst_type = route.dst_type;
+    new_route->route_def.src_id = route.src_id;
+    new_route->route_def.src_type = route.src_type;
 
-    for(i = 0; i <size; i++) {
-        print_route(&routes[i]);
+    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);
     }
 
-    PrintDebug("\nVnet: route table dom0 guest end =====\n");
-}
+    if (new_route->route_def.src_type == LINK_INTERFACE) {
+       new_route->src_dev = find_dev_by_id(new_route->route_def.src_id);
+    }
 
-static void dump_dom0_links(struct vnet_if_link links[], int size) {
-    struct vnet_if_link *link = NULL;
-    int i;
+    flags = v3_lock_irqsave(vnet_state.lock);
 
-    PrintDebug("\nVnet: link table from dom0 guest =====\n");
-
-    for(i = 0; i <size; i++) {
-        link = &links[i];
-        PrintDebug("link: %d\n", i);
-        PrintDebug("dest_ip(%ld), dst_port(%d), prot_type(%d)\n", 
-                     link->dest_ip, 
-                     link->dest_port, 
-                     link->pro_type);
-        PrintDebug("vnet_header:\n");
-        v3_hexdump(&link->vnet_header, sizeof(struct udp_link_header), NULL, 0);
-    }
+    list_add(&(new_route->node), &(vnet_state.routes));
+    clear_hash_cache();
 
-    PrintDebug("\nVnet: link table dom0 guest end =====\n");
-}
+    v3_unlock_irqrestore(vnet_state.lock, flags);
+   
 
+#ifdef CONFIG_DEBUG_VNET
+    dump_routes();
 #endif
 
-static int __add_link_entry(struct link_entry * link) {
-    int idx;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
+    return 0;
+}
 
-    v3_lock(vnet_state->g_links.lock);
-    for (idx = 0; idx < MAX_LINKS; idx++) {
-       if (vnet_state->g_links.links[idx] == NULL) {
-           vnet_state->g_links.links[idx] = link;
-           vnet_state->g_links.size++;
-           break;
-       }
-    }
-    v3_unlock(vnet_state->g_links.lock);
 
-    if (idx == MAX_LINKS) {
-       PrintDebug("VNET: No available Link entry for new link\n");
-       return -1;
-    }
 
-    return idx;
-}
+// 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;
+    int max_rank = 0;
+    struct list_head match_list;
+    struct eth_hdr * hdr = (struct eth_hdr *)(pkt->data);
+    uint8_t src_type = pkt->src_type;
+    uint32_t src_link = pkt->src_id;
 
-static int __add_route_entry(struct routing_entry * route) {
-    int idx;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
+#ifdef CONFIG_DEBUG_VNET
+    {
+       char dst_str[50];
+       char src_str[50];
 
-    v3_lock(vnet_state->g_routes.lock);
-    for (idx = 0; idx < MAX_ROUTES; idx++) {
-       if (vnet_state->g_routes.routes[idx] == NULL) {
-           vnet_state->g_routes.routes[idx] = route;
-           vnet_state->g_routes.size++;
-          break;
-       }
+       mac_to_string(hdr->src_mac, src_str);  
+       mac_to_string(hdr->dst_mac, dst_str);
+       PrintDebug("Vnet: match_route. pkt: SRC(%s), DEST(%s)\n", src_str, dst_str);
     }
-    v3_unlock(vnet_state->g_routes.lock);
+#endif
 
-    if(idx == MAX_LINKS){
-        PrintDebug("VNET: No available route entry for new route\n");
-        return -1;
-    }
+    INIT_LIST_HEAD(&match_list);
+    
+#define UPDATE_MATCHES(rank) do {                              \
+       if (max_rank < (rank)) {                                \
+           max_rank = (rank);                                  \
+           INIT_LIST_HEAD(&match_list);                        \
+                                                               \
+           list_add(&(route->match_node), &match_list);        \
+           num_matches = 1;                                    \
+       } else if (max_rank == (rank)) {                        \
+           list_add(&(route->match_node), &match_list);        \
+           num_matches++;                                      \
+       }                                                       \
+    } while (0)
+    
 
-#ifdef CONFIG_DEBUG_VNET
-    dump_routes(vnet_state->g_routes.routes);
-#endif
+    list_for_each_entry(route, &(vnet_state.routes), node) {
+       struct v3_vnet_route * route_def = &(route->route_def);
 
-    return idx;
-}
+       // CHECK SOURCE TYPE HERE
+       if ( (route_def->src_type != LINK_ANY) && 
+            ( (route_def->src_type != src_type) || 
+              ( (route_def->src_id != src_link) &&
+                (route_def->src_id != (uint32_t)-1)))) {
+           continue;
+       }
 
-int v3_vnet_add_route(struct v3_vnet_route *route){
-    struct routing_entry * new_route = (struct routing_entry *)V3_Malloc(sizeof(struct routing_entry));
-    int idx = -1;
 
-    PrintDebug("Vnet: vnet_add_route_entry\n");
+       if ((route_def->dst_mac_qual == MAC_ANY) &&
+           (route_def->src_mac_qual == MAC_ANY)) {      
+           UPDATE_MATCHES(3);
+       }
        
-    memset(new_route, 0, sizeof(struct routing_entry));
-    if ((route->src_mac_qual != MAC_ANY)) {
-        memcpy(new_route->src_mac, route->src_mac, 6);
-    }
+       if (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0) {
+           if (route_def->src_mac_qual != MAC_NOT) {
+               if (route_def->dst_mac_qual == MAC_ANY) {
+                   UPDATE_MATCHES(6);
+               } else if (route_def->dst_mac_qual != MAC_NOT &&
+                          memcmp(route_def->dst_mac, hdr->dst_mac, 6) == 0) {
+                   UPDATE_MATCHES(8);
+               }
+           }
+       }
            
-    if ((route->dest_mac_qual != MAC_ANY)) {
-        memcpy(new_route->dest_mac, route->dest_mac, 6);
-    }
+       if (memcmp(route_def->dst_mac, hdr->dst_mac, 6) == 0) {
+           if (route_def->dst_mac_qual != MAC_NOT) {
+               if (route_def->src_mac_qual == MAC_ANY) {
+                   UPDATE_MATCHES(6);
+               } else if ((route_def->src_mac_qual != MAC_NOT) && 
+                          (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0)) {
+                   UPDATE_MATCHES(8);
+               }
+           }
+       }
            
-    new_route->src_mac_qual = route->src_mac_qual;
-    new_route->dest_mac_qual = route->dest_mac_qual;
-    new_route->link_idx= route->link_idx;
-    new_route->link_type = route->link_type;
-    new_route->src_link_idx = route->src_link_idx;
-    new_route->src_type = route->src_type;
-
-    if ((idx = __add_route_entry(new_route)) == -1) {
-       PrintError("Could not add route entry\n");
-        return -1;
+       if ((route_def->dst_mac_qual == MAC_NOT) &&
+           (memcmp(route_def->dst_mac, hdr->dst_mac, 6) != 0)) {
+           if (route_def->src_mac_qual == MAC_ANY) {
+               UPDATE_MATCHES(5);
+           } else if ((route_def->src_mac_qual != MAC_NOT) && 
+                      (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0)) {     
+               UPDATE_MATCHES(7);
+           }
+       }
+       
+       if ((route_def->src_mac_qual == MAC_NOT) &&
+           (memcmp(route_def->src_mac, hdr->src_mac, 6) != 0)) {
+           if (route_def->dst_mac_qual == MAC_ANY) {
+               UPDATE_MATCHES(5);
+           } else if ((route_def->dst_mac_qual != MAC_NOT) &&
+                      (memcmp(route_def->dst_mac, hdr->dst_mac, 6) == 0)) {
+               UPDATE_MATCHES(7);
+           }
+       }
+       
+       // Default route
+       if ( (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0) &&
+            (route_def->dst_mac_qual == MAC_NONE)) {
+           UPDATE_MATCHES(4);
+       }
     }
-    
-    clear_hash_cache();
 
-    return idx;
+    PrintDebug("Vnet: match_route: Matches=%d\n", num_matches);
+
+    if (num_matches == 0) {
+       return NULL;
+    }
+
+    matches = V3_Malloc(sizeof(struct route_list) + 
+                       (sizeof(struct vnet_route_info *) * num_matches));
+
+    matches->num_routes = num_matches;
+
+    {
+       int i = 0;
+       list_for_each_entry(route, &match_list, match_node) {
+           matches->routes[i++] = route;
+       }
+    }
+
+    return matches;
 }
 
-static int match_route(uint8_t * src_mac, 
-                      uint8_t * dst_mac, 
-                      link_type_t src_type, 
-                      int src_index, 
-                      int * matches) {
-    struct routing_entry *route = NULL; 
-    struct vnet_state_t *vnet_state = &g_vnet_state;
-    int matched_routes[MAX_ROUTES];
-    int num_matches = 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
-    char dest_str[18];
-    char src_str[18];
-
-    mac_to_string(src_mac, src_str);  
-    mac_to_string(dst_mac, dest_str);
-    PrintDebug("Vnet: match_route. pkt: SRC(%s), DEST(%s)\n", src_str, dest_str);
+   {
+       struct eth_hdr * hdr = (struct eth_hdr *)(pkt->header);
+       char dest_str[30];
+       char src_str[30];
+
+       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);
+   }
 #endif
 
-    for(i = 0; i < MAX_ROUTES; i++) {
-        if (vnet_state->g_routes.routes[i] != NULL){
-            route = vnet_state->g_routes.routes[i];
+    flags = v3_lock_irqsave(vnet_state.lock);
 
-            if(src_type == LINK_ANY && src_index == -1) {
-                if ((route->dest_mac_qual == MAC_ANY) &&
-                      (route->src_mac_qual == MAC_ANY)) {      
-                    matched_routes[num_matches] = i;
-                    num_matches++;
-                }
+    look_into_cache(pkt, &matched_routes);
        
-                if (memcmp((void *)&route->src_mac, (void *)src_mac, 6) == 0) {
-                    if (route->src_mac_qual !=  MAC_NOT) {
-                         if (route->dest_mac_qual == MAC_ANY) {
-                             matched_routes[num_matches] = i;
-                             num_matches++;
-                         } else if (route->dest_mac_qual != MAC_NOT &&
-                                     memcmp((void *)&route->dest_mac, (void *)dst_mac, 6) == 0) {
-                            matched_routes[num_matches] = i;
-                            num_matches++;
-                        }
-                    }
-                }
-
-                if (memcmp((void *)&route->dest_mac, (void *)dst_mac, 6) == 0) {
-                    if (route->dest_mac_qual != MAC_NOT) {
-                        if (route->src_mac_qual == MAC_ANY) {
-                            matched_routes[num_matches] = i;
-                            num_matches++;
-                        } else if ((route->src_mac_qual != MAC_NOT) && 
-                                       (memcmp((void *)&route->src_mac, (void *)src_mac, 6) == 0)) {
-                            matched_routes[num_matches] = i;
-                            num_matches++;
-                        }
-                     }
-                }
-
-                if ((route->dest_mac_qual == MAC_NOT) &&
-                      (memcmp((void *)&route->dest_mac, (void *)dst_mac, 6) != 0)) {
-                    if (route->src_mac_qual == MAC_ANY) {
-                        matched_routes[num_matches] = i;           
-                        num_matches++;    
-                    } else if ((route->src_mac_qual != MAC_NOT) && 
-                                   (memcmp((void *)&route->src_mac, (void *)src_mac, 6) == 0)) {     
-                        matched_routes[num_matches] = i;     
-                        num_matches++;
-                     }
-                }
-
-                if ((route->src_mac_qual == MAC_NOT) &&
-                      (memcmp((void *)&route->src_mac, (void *)src_mac, 6) != 0)) {
-                    if (route->dest_mac_qual == MAC_ANY) {
-                        matched_routes[num_matches] = i;   
-                        num_matches++;
-                    } else if ((route->dest_mac_qual != MAC_NOT) &&
-                                   (memcmp((void *)&route->dest_mac, (void *)dst_mac, 6) == 0)) {
-                        matched_routes[num_matches] = i;
-                        num_matches++;
-                    }
-                }
-            }//end if src_type == Link_any
-        }      
-    }//end for
-
-    PrintDebug("Vnet: match_route: Matches=%d\n", num_matches);
+    if (matched_routes == NULL) {  
+       PrintDebug("Vnet: send pkt Looking into routing table\n");
        
-    for (i = 0; i < num_matches; i++) {
-        matches[i] = matched_routes[i];
+       matched_routes = match_route(pkt);
+               
+       if (matched_routes) {
+           add_route_to_cache(pkt, matched_routes);
+       } else {
+           PrintDebug("Could not find route for packet... discards packet\n");
+           v3_unlock_irqrestore(vnet_state.lock, flags);
+           return -1;
+       }
     }
-    
-    return num_matches;
-}
 
-static int handle_one_pkt(struct ethernet_pkt *pkt) {
-    int src_link_index = -1;   //the value of src_link_index of udp always is 0
-    char src_mac[6];
-    char dst_mac[6];
-    int matches[MAX_ROUTES];
-    int num_matched_routes = 0;
-    struct in_pkt_header header;
-    char hash_key[HASH_KEY_SIZE];
-    struct vnet_state_t *vnet_state = &g_vnet_state;
-    int i;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
 
-    // get the ethernet and ip headers from the packet
-    memcpy((void *)&header, (void *)pkt->data, sizeof(header));
-    memcpy(src_mac, header.ethernetsrc, 6);
-    memcpy(dst_mac, header.ethernetdest, 6);
 
-#ifdef CONFIG_DEBUG_VNET
-    char dest_str[18];
-    char src_str[18];
+    PrintDebug("Vnet: send pkt route matches %d\n", matched_routes->num_routes);
 
-    mac_to_string(src_mac, src_str);  
-    mac_to_string(dst_mac, dest_str);
-    PrintDebug("Vnet: HandleDataOverLink. SRC(%s), DEST(%s)\n", src_str, dest_str);
-#endif
+    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) {
+            pkt->dst_type = LINK_EDGE;
+            pkt->dst_id = route->route_def.dst_id;
 
-    make_hash_key(hash_key, src_mac, dst_mac, LINK_EDGE, src_link_index); 
-    num_matched_routes = look_into_cache((route_hashkey_t)hash_key, matches);
-    
-    if (num_matched_routes == -1) {  
-        num_matched_routes = match_route(src_mac, dst_mac, LINK_ANY, src_link_index, matches); 
-        if (num_matched_routes > 0) {
-            add_route_to_cache(hash_key, num_matched_routes,matches);      
-        }
-    }
-    
-    PrintDebug("Vnet: HandleDataOverLink: Matches=%d\n", num_matched_routes);
+            if (vnet_state.bridge == NULL) {
+                PrintDebug("VNET: No bridge to sent data to links\n");
+                continue;
+            }
 
-    if (num_matched_routes == 0) {
-        return -1;
-    }
-    
-    for (i = 0; i < num_matched_routes; i++) {//send packet to all destinations
-        int route_index = -1;
-        int link_index = -1;
-        int pkt_len = 0;
-        struct link_entry * link = NULL;
-
-        route_index = matches[i];
-        link_index = vnet_state->g_routes.routes[route_index]->link_idx;
-
-        if ((link_index < 0) || (link_index > MAX_LINKS) || 
-            (vnet_state->g_links.links[link_index] == NULL)) {
-            continue;
-        }
-       
-        link = vnet_state->g_links.links[link_index];
-        pkt_len = pkt->size;
-        if (link->type == LINK_EDGE) {
-
-             //apply the header in the beginning of the packet to be sent
-            if (link->dst_link->pro_type == UDP_TYPE) {
-                struct udp_link_header *hdr = &(link->dst_link->vnet_header);
-                struct ip_header *ip = &hdr->ip_hdr;
-                struct udp_header *udp = &hdr->udp_hdr;
-                  udp->len = pkt_len + sizeof(struct udp_header);
-                  ip->total_len = pkt_len + sizeof(struct udp_header) + sizeof(struct ip_header);
-                  ip->cksum = ip_xsum(ip, sizeof(struct ip_header));
-               
-                int hdr_size = sizeof(struct udp_link_header);
-                memcpy(&pkt->ext_hdr, hdr, hdr_size);
-
-                pkt_len += hdr_size;
-                if ((link->dst_link->input((uchar_t *)&pkt->ext_hdr, pkt_len, link->dst_link->private_data)) != pkt_len) {
-                    PrintDebug("VNET: Packet not sent properly to link: %d\n", link_index);
-                    continue;
-                }
-            }else {
-                PrintDebug("VNET: Link protocol type not support\n");
+            if (vnet_state.bridge->input(vnet_state.bridge->vm, pkt, vnet_state.bridge->private_data) == -1) {
+                PrintDebug("VNET: Packet not sent properly\n");
                 continue;
-            }
-        } else if (link->type == LINK_INTERFACE) {
-            if ((link->dst_dev->input(link->dst_dev->vm, pkt->data, pkt_len, link->dst_dev->private_data)) != pkt_len) {
-                PrintDebug("VNET: Packet not sent properly to link: %d\n", link_index);
+           } 
+
+        } 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;
             }
         } else {
-            PrintDebug("Vnet: Wrong Edge type of link: %d\n", link_index);
+            PrintDebug("Vnet: Wrong Edge type\n");
             continue;
         }
 
-        PrintDebug("Vnet: HandleDataOverLink: Forward packet according to Route entry %d to link %d\n", route_index, link_index);
+        PrintDebug("Vnet: HandleOnePacket: Forward packet according to Route\n");
     }
     
     return 0;
 }
 
-static int send_ethernet_pkt(uchar_t *data, int len, void *private_data) {
-    struct ethernet_pkt *pkt;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
-
-    pkt = (struct ethernet_pkt *)V3_Malloc(sizeof(struct ethernet_pkt));
-    if(pkt == NULL){
-        PrintError("VNET: Memory allocate fails\n");
-        return -1;
-    }
+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), 
+                   void * priv_data){
+    struct vnet_dev * new_dev = NULL;
+    unsigned long flags;
 
-    memset(pkt, 0, sizeof(struct ethernet_pkt));
-    ethernet_packet_init(pkt, data, len);
-    v3_enqueue(vnet_state->g_inpkt_q, (addr_t)pkt);
-  
-#ifdef CONFIG_DEBUG_VNET
-    PrintDebug("VNET: send_pkt: transmitting packet: (size:%d)\n", (int)pkt->size);
-    print_packet((char *)data, len);
-#endif
+    new_dev = (struct vnet_dev *)V3_Malloc(sizeof(struct vnet_dev)); 
 
-    return 0;
-}
+    if (new_dev == NULL) {
+       PrintError("VNET: Malloc fails\n");
+       return -1;
+    }
+   
+    memcpy(new_dev->mac_addr, mac, 6);
+    new_dev->input = netif_input;
+    new_dev->private_data = priv_data;
+    new_dev->vm = vm;
+    new_dev->dev_id = 0;       
 
-int v3_vnet_send_rawpkt(uchar_t * buf, 
-                                          int len, 
-                                          void *private_data) {
-    PrintDebug("VNET: In v3_vnet_send_rawpkt: pkt length %d\n", len);
-    
-    return send_ethernet_pkt(buf, len, private_data);
-}
+    flags = v3_lock_irqsave(vnet_state.lock);
 
-//sending the packet from Dom0, should remove the link header
-int v3_vnet_send_udppkt(uchar_t * buf, 
-                                           int len, 
-                                           void *private_data) {
-    uint_t hdr_len = sizeof(struct udp_link_header);
-       
-    PrintDebug("VNET: In v3_vnet_send_udppkt: pkt length %d\n", len);
-   
-    return send_ethernet_pkt((uchar_t *)(buf+hdr_len), len - hdr_len, private_data);
-}
+    if (!find_dev_by_mac(mac)) {
+       list_add(&(new_dev->node), &(vnet_state.devs));
+       new_dev->dev_id = ++vnet_state.num_devs;
+    }
 
-static int search_device(char * device_name) {
-    struct vnet_state_t *vnet_state = &g_vnet_state;
-    int i;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
 
-    for (i = 0; i < MAX_LINKS; i++) {
-        if ((vnet_state->g_links.links[i] != NULL) && (vnet_state->g_links.links[i]->type == LINK_INTERFACE)) {
-           if (strcmp(device_name, vnet_state->g_links.links[i]->dst_dev->name) == 0) {
-               return i;
-           }
-        }
+    // 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;
     }
 
-    return -1;
+    PrintDebug("Vnet: Add Device: dev_id %d, input : %p, private_data %p\n",
+                       new_dev->dev_id, new_dev->input, new_dev->private_data);
+
+    return new_dev->dev_id;
 }
 
-int v3_vnet_add_node(struct v3_vm_info *info, 
-                  char * dev_name, 
-                  uchar_t mac[6], 
-                   int (*netif_input)(struct v3_vm_info * vm, uchar_t * pkt, uint_t size, void * private_data), 
-                   void * priv_data){
-    struct vnet_if_device * if_dev;
 
-    int idx = search_device(dev_name);
-    if (idx != -1) {
-       PrintDebug("VNET: register device: Already has device with the name %s\n", dev_name);
-       return -1;
-    }
+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) {
+    unsigned long flags;
+    int bridge_free = 0;
+    struct vnet_brg_dev * tmp_bridge = NULL;
     
-    if_dev = (struct vnet_if_device *)V3_Malloc(sizeof(struct vnet_if_device)); 
-    if (if_dev == NULL) {
-       PrintError("VNET: Malloc fails\n");
-       return -1;
-    }
     
-    strcpy(if_dev->name, dev_name);
-    strncpy(if_dev->mac_addr, mac, 6);
-    if_dev->input = netif_input;
-    if_dev->private_data = priv_data;
-    if_dev->vm = info;
+    flags = v3_lock_irqsave(vnet_state.lock);
 
-    struct link_entry * link = (struct link_entry *)V3_Malloc(sizeof(struct link_entry));
-    link->type = LINK_INTERFACE;
-    link->dst_dev = if_dev;
-
-    idx = __add_link_entry(link);
+    if (vnet_state.bridge == NULL) {
+       bridge_free = 1;
+       vnet_state.bridge = (void *)1;
+    }
 
-    if (idx < 0) return -1;
+    v3_unlock_irqrestore(vnet_state.lock, flags);
 
-    return idx;
-}
+    if (bridge_free == 0) {
+       PrintError("Bridge already set\n");
+       return -1;
+    }
 
-int v3_vnet_pkt_process() {
-    struct ethernet_pkt * pkt;
-    struct vnet_state_t *vnet_state = &g_vnet_state;
+    tmp_bridge = (struct vnet_brg_dev *)V3_Malloc(sizeof(struct vnet_brg_dev));
 
-    while ((pkt = (struct ethernet_pkt *)v3_dequeue(vnet_state->g_inpkt_q))!= NULL) {
-        if (handle_one_pkt(pkt) != -1) {
-            PrintDebug("VNET: vnet_check: handle one packet! pt length %d, pt type %d\n", (int)pkt->size, (int)pkt->type);  
-        } else {
-            PrintDebug("VNET: vnet_check: Fail to forward one packet, discard it!\n"); 
-        }
-       
-        V3_Free(pkt); // be careful here
+    if (tmp_bridge == NULL) {
+       PrintError("Malloc Fails\n");
+       return -1;
     }
     
+    tmp_bridge->vm = vm;
+    tmp_bridge->input = input;
+    tmp_bridge->private_data = priv_data;
+
+    // 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);
+
     return 0;
 }
 
-static void vnet_state_init(struct vnet_state_t *vnet_state) {
-    int i;
+int V3_init_vnet() {
+       
+    INIT_LIST_HEAD(&(vnet_state.routes));
+    INIT_LIST_HEAD(&(vnet_state.devs));
 
-    /*initial links table */
-    for (i = 0; i < MAX_LINKS; i++) {
-        vnet_state->g_links.links[i] = NULL;
-    }
-    vnet_state->g_links.size = 0;
-    if(v3_lock_init(&(vnet_state->g_links.lock)) == -1){
-        PrintError("VNET: Failure to init lock for links table\n");
-    }
-    PrintDebug("VNET: Links table initiated\n");
+    vnet_state.num_devs = 0;
+    vnet_state.num_routes = 0;
 
-    /*initial routes table */
-    for (i = 0; i < MAX_ROUTES; i++) {
-        vnet_state->g_routes.routes[i] = NULL;
-    }
-    vnet_state->g_routes.size = 0;
-    if(v3_lock_init(&(vnet_state->g_routes.lock)) == -1){
+    PrintDebug("VNET: Links and Routes tables initiated\n");
+
+    if (v3_lock_init(&(vnet_state.lock)) == -1){
         PrintError("VNET: Failure to init lock for routes table\n");
     }
-    PrintDebug("VNET: Routes table initiated\n");
 
-    /*initial pkt receiving queue */
-    vnet_state->g_inpkt_q = v3_create_queue();
-    v3_init_queue(vnet_state->g_inpkt_q);
+    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");
 
-    /*initial routing cache */
-    init_route_cache(vnet_state);
-}
+    vnet_state.route_cache = v3_create_htable(0, &hash_fn, &hash_eq);
 
+    if (vnet_state.route_cache == NULL) {
+        PrintError("Vnet: Route Cache Init Fails\n");
+        return -1;
+    }
 
-int v3_init_vnet() {
-    vnet_state_init(&g_vnet_state);
-       
-    PrintDebug("VNET Initialized\n");
+    PrintDebug("VNET: initiated\n");
 
     return 0;
 }
-