X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_vnet.c;h=bdc47190d784800ed35895a3cd8b5cc01d17ade9;hb=edd0131b7b8672c9c3a7ef8682d17a48d682a53f;hp=d2602c5bb5819b4bbc769d68e7dba1048199358a;hpb=ac31dc84e5e31187345ec6d66647b29975958a94;p=palacios.git diff --git a/palacios/src/palacios/vmm_vnet.c b/palacios/src/palacios/vmm_vnet.c index d2602c5..bdc4719 100644 --- a/palacios/src/palacios/vmm_vnet.c +++ b/palacios/src/palacios/vmm_vnet.c @@ -47,7 +47,7 @@ struct vnet_dev { 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); + int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data); void * private_data; int dev_id; @@ -55,6 +55,14 @@ struct vnet_dev { } __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); + void * private_data; +} __attribute__((packed)); + + @@ -83,10 +91,12 @@ struct route_list { static struct { struct list_head routes; struct list_head devs; - + int num_routes; int num_devs; + struct vnet_brg_dev *bridge; + v3_lock_t lock; struct gen_queue * inpkt_q; @@ -99,11 +109,48 @@ static struct { #ifdef CONFIG_DEBUG_VNET static inline void mac_to_string(char mac[6], char * buf) { - snprintf(buf, 20, "%02x:%02x:%02x:%02x:%02x:%02x", + snprintf(buf, 50, "%x:%x:%x:%x:%x:%x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } +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); + } +} + +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"); +} + #endif @@ -112,12 +159,12 @@ static inline void mac_to_string(char mac[6], char * buf) { * 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); - + uint8_t * hdr_buf = (uint8_t *)hdr_ptr; + return v3_hash_buffer(hdr_buf, VNET_HASH_SIZE); } -static inline int hash_eq(addr_t key1, addr_t key2) { +static inline int hash_eq(addr_t key1, addr_t key2) { return (memcmp((uint8_t *)key1, (uint8_t *)key2, VNET_HASH_SIZE) == 0); } @@ -143,13 +190,13 @@ static int clear_hash_cache() { static int look_into_cache(struct v3_vnet_pkt * pkt, struct route_list ** routes) { - *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)pkt); + *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)(pkt->hash_buf)); return 0; } -struct vnet_dev * find_dev_by_id(int idx) { +static struct vnet_dev * find_dev_by_id(int idx) { struct vnet_dev * dev = NULL; list_for_each_entry(dev, &(vnet_state.devs), node) { @@ -162,17 +209,27 @@ struct vnet_dev * find_dev_by_id(int idx) { return NULL; } -static struct vnet_dev * find_dev_by_mac(char * name) { +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, name, 6)) + if (!memcmp(dev->mac_addr, mac, 6)) return dev; } return NULL; } +int get_device_id_by_mac(char mac[6]){ + + struct vnet_dev *dev = find_dev_by_mac(mac); + + if (dev == NULL) + return -1; + + return dev->dev_id; +} + int v3_vnet_add_route(struct v3_vnet_route route) { struct vnet_route_info * new_route = NULL; @@ -181,13 +238,22 @@ int v3_vnet_add_route(struct v3_vnet_route route) { new_route = (struct vnet_route_info *)V3_Malloc(sizeof(struct vnet_route_info)); memset(new_route, 0, sizeof(struct vnet_route_info)); - PrintDebug("Vnet: vnet_add_route_entry\n"); + PrintDebug("Vnet: vnet_add_route_entry: dst_id: %d, dst_type: %d\n", + route.dst_id, route.dst_type); - new_route->route_def = route; + 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; - /* TODO: Find devices */ 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) { @@ -195,10 +261,16 @@ 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(); +#endif return 0; } @@ -219,8 +291,8 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) { #ifdef CONFIG_DEBUG_VNET { - char dst_str[18]; - char src_str[18]; + char dst_str[50]; + char src_str[50]; mac_to_string(hdr->src_mac, src_str); mac_to_string(hdr->dst_mac, dst_str); @@ -304,7 +376,7 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) { } // Default route - if ( (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0) & + if ( (memcmp(route_def->src_mac, hdr->src_mac, 6) == 0) && (route_def->dst_mac_qual == MAC_NONE)) { UPDATE_MATCHES(4); } @@ -323,7 +395,7 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) { { int i = 0; - list_for_each_entry(route, &match_list, node) { + list_for_each_entry(route, &match_list, match_node) { matches->routes[i++] = route; } } @@ -331,17 +403,17 @@ static struct route_list * match_route(struct v3_vnet_pkt * pkt) { return matches; } -static int handle_one_pkt(struct v3_vnet_pkt * pkt) { + +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[18]; - char src_str[18]; + char dest_str[30]; + char src_str[30]; mac_to_string(hdr->src_mac, src_str); mac_to_string(hdr->dst_mac, dest_str); @@ -354,24 +426,40 @@ static int handle_one_pkt(struct v3_vnet_pkt * pkt) { look_into_cache(pkt, &matched_routes); if (matched_routes == NULL) { - matched_routes = match_route(pkt); + PrintDebug("Vnet: can not find route in cache, looking into routing table\n"); + + matched_routes = match_route(pkt); - if (matched_routes) { + if (matched_routes) { add_route_to_cache(pkt, matched_routes); } else { - PrintError("Could not find route for packet...\n"); + PrintDebug("Could not find route for packet...\n"); v3_unlock_irqrestore(vnet_state.lock, flags); return -1; } } v3_unlock_irqrestore(vnet_state.lock, flags); - - - for (i = 0; i < matched_routes->num_routes; i++) { - struct vnet_route_info * route = matched_routes->routes[i]; + + 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) { + 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"); + 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) { @@ -383,39 +471,18 @@ static int handle_one_pkt(struct v3_vnet_pkt * pkt) { continue; } - PrintDebug("Vnet: HandleDataOverLink: Forward packet according to Route\n"); + PrintDebug("Vnet: HandleOnePacket: Forward packet according to Route\n"); } return 0; } -int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt) { - - PrintDebug("In Vnet Send: pkt size: %d\n", pkt->size); - - if (handle_one_pkt(pkt) != -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 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; - new_dev = find_dev_by_mac(mac); - - PrintDebug("VNET: register device\n"); - - if (new_dev) { - PrintDebug("VNET: register device: Already has device with the same mac\n"); - return -1; - } - new_dev = (struct vnet_dev *)V3_Malloc(sizeof(struct vnet_dev)); if (new_dev == NULL) { @@ -427,33 +494,70 @@ int v3_vnet_add_dev(struct v3_vm_info *vm,uint8_t mac[6], new_dev->input = netif_input; new_dev->private_data = priv_data; new_dev->vm = vm; + new_dev->dev_id = 0; - PrintDebug("VNET: register device new_dev22 %p\n", (void *)new_dev); - - list_add(&(new_dev->node), &(vnet_state.devs)); - vnet_state.num_devs ++; - new_dev->dev_id = vnet_state.num_devs; + flags = v3_lock_irqsave(vnet_state.lock); - return 0; + if (!find_dev_by_mac(mac)) { + list_add(&(new_dev->node), &(vnet_state.devs)); + new_dev->dev_id = ++vnet_state.num_devs; + } + + v3_unlock_irqrestore(vnet_state.lock, flags); + + // 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, input : %p, private_data %p\n", + new_dev->dev_id, new_dev->input, new_dev->private_data); + + return new_dev->dev_id; } -#if 0 -static int v3_vnet_pkt_process() { - struct v3_vnet_pkt * pkt = NULL; - while ((pkt = (struct v3_vnet_pkt *)v3_dequeue(vnet_state.inpkt_q)) != NULL) { - if (handle_one_pkt(pkt) != -1) { - PrintDebug("VNET: vnet_check: handle one packet! pt length %d\n", (int)pkt->size); - } else { - PrintDebug("VNET: vnet_check: Fail to forward one packet, discard it!\n"); - } - - V3_Free(pkt); // be careful here +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; + + + 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"); + 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; } -#endif int V3_init_vnet() { @@ -471,7 +575,6 @@ int V3_init_vnet() { PrintDebug("VNET: Locks initiated\n"); - /*initial pkt receiving queue */ vnet_state.inpkt_q = v3_create_queue(); v3_init_queue(vnet_state.inpkt_q); PrintDebug("VNET: Receiving queue initiated\n");