X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_vnet_core.c;h=6baef5ad04972bfabf9ba542903f86df7f8865e4;hb=a54d166ba28dae8eb26498794bd5e94fc43267a3;hp=5a4275f9afcdec5628b105e5b6022afd79244768;hpb=107d8f06c7083f58fc96d781efb0226edd82c7d9;p=palacios.git diff --git a/palacios/src/palacios/vmm_vnet_core.c b/palacios/src/palacios/vmm_vnet_core.c index 5a4275f..6baef5a 100644 --- a/palacios/src/palacios/vmm_vnet_core.c +++ b/palacios/src/palacios/vmm_vnet_core.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef CONFIG_DEBUG_VNET #undef PrintDebug @@ -31,15 +32,15 @@ #endif struct eth_hdr { - uint8_t dst_mac[6]; - uint8_t src_mac[6]; + uint8_t dst_mac[ETH_ALEN]; + uint8_t src_mac[ETH_ALEN]; uint16_t type; /* indicates layer 3 protocol type */ } __attribute__((packed)); struct vnet_dev { int dev_id; - uint8_t mac_addr[6]; + uint8_t mac_addr[ETH_ALEN]; struct v3_vm_info * vm; struct v3_vnet_dev_ops dev_ops; void * private_data; @@ -99,7 +100,7 @@ static struct { #ifdef CONFIG_DEBUG_VNET -static inline void mac_to_string(char mac[6], char * buf) { +static inline void mac_to_string(uint8_t * mac, char * buf) { snprintf(buf, 100, "%d:%d:%d:%d:%d:%d", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); @@ -135,7 +136,7 @@ static void dump_routes(){ int i = 0; PrintDebug("\n========Dump routes starts ============\n"); list_for_each_entry(route, &(vnet_state.routes), node) { - PrintDebug("\nroute %d:\n", ++i); + PrintDebug("\nroute %d:\n", i++); print_route(route); } @@ -163,7 +164,7 @@ static int add_route_to_cache(const struct v3_vnet_pkt * pkt, struct route_list 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"); + PrintError("VNET/P Core: Failed to insert new route entry to the cache\n"); return -1; } @@ -171,7 +172,6 @@ static int add_route_to_cache(const struct v3_vnet_pkt * pkt, struct route_list } static int clear_hash_cache() { - v3_free_htable(vnet_state.route_cache, 1, 1); vnet_state.route_cache = v3_create_htable(0, &hash_fn, &hash_eq); @@ -179,14 +179,13 @@ static int clear_hash_cache() { } 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)); return 0; } -static struct vnet_dev * find_dev_by_id(int idx) { +static struct vnet_dev * dev_by_id(int idx) { struct vnet_dev * dev = NULL; list_for_each_entry(dev, &(vnet_state.devs), node) { @@ -199,27 +198,17 @@ static struct vnet_dev * find_dev_by_id(int idx) { return NULL; } -static struct vnet_dev * find_dev_by_mac(char mac[6]) { +static struct vnet_dev * dev_by_mac(uint8_t * mac) { struct vnet_dev * dev = NULL; list_for_each_entry(dev, &(vnet_state.devs), node) { - if (!memcmp(dev->mac_addr, mac, 6)) + if (!memcmp(dev->mac_addr, mac, ETH_ALEN)) return dev; } return NULL; } -int v3_vnet_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; @@ -228,24 +217,38 @@ 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: dst_id: %d, dst_type: %d\n", - route.dst_id, route.dst_type); + PrintDebug("VNET/P Core: 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); + memcpy(new_route->route_def.src_mac, route.src_mac, ETH_ALEN); + memcpy(new_route->route_def.dst_mac, route.dst_mac, ETH_ALEN); 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; - - if (new_route->route_def.dst_type == LINK_INTERFACE) { - new_route->dst_dev = find_dev_by_id(new_route->route_def.dst_id); + + if(route.dst_id == -1){ + if (new_route->route_def.dst_type == LINK_INTERFACE) { + new_route->dst_dev = dev_by_mac(route.dst_mac); + } + new_route->route_def.dst_id = new_route->dst_dev->dev_id; + } else { + new_route->route_def.dst_id = route.dst_id; + if (new_route->route_def.dst_type == LINK_INTERFACE) { + new_route->dst_dev = dev_by_id(new_route->route_def.dst_id); + } } - if (new_route->route_def.src_type == LINK_INTERFACE) { - new_route->src_dev = find_dev_by_id(new_route->route_def.src_id); + if(route.src_id == -1){ + if (new_route->route_def.src_type == LINK_INTERFACE) { + new_route->src_dev = dev_by_mac(route.src_mac); + } + new_route->route_def.src_id = new_route->src_dev->dev_id; + } else { + new_route->route_def.src_id = route.src_id; + if (new_route->route_def.src_type == LINK_INTERFACE) { + new_route->src_dev = dev_by_id(new_route->route_def.src_id); + } } flags = v3_lock_irqsave(vnet_state.lock); @@ -264,6 +267,27 @@ int v3_vnet_add_route(struct v3_vnet_route route) { } +/* delete all route entries with specfied src or dst device id */ +static void inline del_routes_by_dev(int dev_id){ + struct vnet_route_info * route = NULL; + unsigned long flags; + + flags = v3_lock_irqsave(vnet_state.lock); + + list_for_each_entry(route, &(vnet_state.routes), node) { + if((route->route_def.dst_type == LINK_INTERFACE && + route->route_def.dst_id == dev_id) || + (route->route_def.src_type == LINK_INTERFACE && + route->route_def.src_id == dev_id)){ + + list_del(&(route->node)); + list_del(&(route->match_node)); + V3_Free(route); + } + } + + v3_unlock_irqrestore(vnet_state.lock, flags); +} /* At the end allocate a route_list * This list will be inserted into the cache so we don't need to free it @@ -285,7 +309,7 @@ static struct route_list * match_route(const struct v3_vnet_pkt * pkt) { 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); + PrintDebug("VNET/P Core: match_route. pkt: SRC(%s), DEST(%s)\n", src_str, dst_str); } #endif @@ -371,7 +395,7 @@ static struct route_list * match_route(const struct v3_vnet_pkt * pkt) { } } - PrintDebug("Vnet: match_route: Matches=%d\n", num_matches); + PrintDebug("VNET/P Core: match_route: Matches=%d\n", num_matches); if (num_matches == 0) { return NULL; @@ -400,30 +424,26 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) { #ifdef CONFIG_DEBUG_VNET { - 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); 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); + PrintDebug("VNET/P Core: cpu %d: pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", + cpu, pkt->size, pkt->src_id, + pkt->src_type, pkt->dst_id, pkt->dst_type); + //v3_hexdump(pkt->data, pkt->size, NULL, 0); } #endif flags = v3_lock_irqsave(vnet_state.lock); look_into_cache(pkt, &matched_routes); - if (matched_routes == NULL) { - PrintError("Vnet: send pkt Looking into routing table\n"); + PrintDebug("VNET/P Core: 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... discards packet\n"); + PrintDebug("VNET/P Core: Could not find route for packet... discards packet\n"); v3_unlock_irqrestore(vnet_state.lock, flags); return 0; /* do we return -1 here?*/ } @@ -431,43 +451,44 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) { v3_unlock_irqrestore(vnet_state.lock, flags); - PrintDebug("Vnet: send pkt route matches %d\n", matched_routes->num_routes); + PrintDebug("VNET/P Core: send pkt 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]; + struct vnet_route_info * route = matched_routes->routes[i]; if (route->route_def.dst_type == LINK_EDGE) { - struct vnet_brg_dev *bridge = vnet_state.bridge; + struct vnet_brg_dev *bridge = vnet_state.bridge; pkt->dst_type = LINK_EDGE; pkt->dst_id = route->route_def.dst_id; - if (bridge == NULL || (bridge->active == 0)) { - PrintError("VNET: No active bridge to sent data to links\n"); - continue; - } + if (bridge == NULL || (bridge->active == 0)) { + PrintDebug("VNET/P Core: No active bridge to sent data to\n"); + continue; + } - if(bridge->brg_ops.input(bridge->vm, pkt, bridge->private_data) == -1){ - PrintDebug("VNET: Packet not sent properly to bridge\n"); + if(bridge->brg_ops.input(bridge->vm, pkt, bridge->private_data) < 0){ + PrintDebug("VNET/P Core: Packet not sent properly to bridge\n"); continue; - } + } } else if (route->route_def.dst_type == LINK_INTERFACE) { - if (route->dst_dev && route->dst_dev->active){ - 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; - } - } + if (route->dst_dev == NULL || route->dst_dev->active == 0){ + PrintDebug("VNET/P Core: No active device to sent data to\n"); + continue; + } + + if(route->dst_dev->dev_ops.input(route->dst_dev->vm, pkt, route->dst_dev->private_data) < 0) { + PrintDebug("VNET/P Core: Packet not sent properly\n"); + continue; + } } else { - PrintError("VNET: Wrong dst type\n"); + PrintError("VNET/P Core: Wrong dst type\n"); } - - PrintDebug("VNET: Forward one packet according to Route %d\n", i); } 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, struct v3_vnet_dev_ops *ops, void * priv_data){ struct vnet_dev * new_dev = NULL; @@ -476,7 +497,7 @@ int v3_vnet_add_dev(struct v3_vm_info * vm, uint8_t mac[6], new_dev = (struct vnet_dev *)V3_Malloc(sizeof(struct vnet_dev)); if (new_dev == NULL) { - PrintError("VNET: Malloc fails\n"); + PrintError("Malloc fails\n"); return -1; } @@ -485,11 +506,13 @@ int v3_vnet_add_dev(struct v3_vm_info * vm, uint8_t mac[6], new_dev->dev_ops.poll = ops->poll; new_dev->private_data = priv_data; new_dev->vm = vm; - new_dev->dev_id = 0; + new_dev->dev_id = 0; + new_dev->active = 1; + new_dev->mode = GUEST_DRIVERN; flags = v3_lock_irqsave(vnet_state.lock); - if (!find_dev_by_mac(mac)) { + if (dev_by_mac(mac) == NULL) { list_add(&(new_dev->node), &(vnet_state.devs)); new_dev->dev_id = ++vnet_state.num_devs; } @@ -498,16 +521,59 @@ int v3_vnet_add_dev(struct v3_vm_info * vm, uint8_t mac[6], /* if the device was found previosly the id should still be 0 */ if (new_dev->dev_id == 0) { - PrintError("Device Alrady exists\n"); + PrintError("VNET/P Core: Device Already exists\n"); return -1; } - PrintDebug("Vnet: Add Device: dev_id %d\n", new_dev->dev_id); + PrintDebug("VNET/P Core: Add Device: dev_id %d\n", new_dev->dev_id); return new_dev->dev_id; } + +int v3_vnet_del_dev(int dev_id){ + struct vnet_dev * dev = NULL; + unsigned long flags; + + flags = v3_lock_irqsave(vnet_state.lock); + + dev = dev_by_id(dev_id); + if (dev != NULL){ + list_del(&(dev->node)); + del_routes_by_dev(dev_id); + } + + v3_unlock_irqrestore(vnet_state.lock, flags); + + V3_Free(dev); + + PrintDebug("VNET/P Core: Remove Device: dev_id %d\n", dev_id); + + return 0; +} + + +static void free_devices(){ + struct vnet_dev * dev = NULL; + + list_for_each_entry(dev, &(vnet_state.devs), node) { + list_del(&(dev->node)); + V3_Free(dev); + } +} + +static void free_routes(){ + struct vnet_route_info * route = NULL; + + list_for_each_entry(route, &(vnet_state.routes), node) { + list_del(&(route->node)); + list_del(&(route->match_node)); + V3_Free(route); + } +} + +/* TODO: Round-bin or ?? */ void v3_vnet_poll(struct v3_vm_info * vm){ struct vnet_dev * dev = NULL; struct vnet_brg_dev *bridge = vnet_state.bridge; @@ -548,7 +614,7 @@ int v3_vnet_add_bridge(struct v3_vm_info * vm, v3_unlock_irqrestore(vnet_state.lock, flags); if (bridge_free == 0) { - PrintError("Bridge already set\n"); + PrintError("VNET/P Core: Bridge already set\n"); return -1; } @@ -586,21 +652,32 @@ int v3_init_vnet() { vnet_state.num_devs = 0; vnet_state.num_routes = 0; - 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"); + PrintError("VNET/P Core: Fails to initiate lock\n"); } - PrintDebug("VNET: Locks initiated\n"); 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"); + PrintError("VNET/P Core: Fails to initiate route cache\n"); return -1; } - PrintDebug("VNET: initiated\n"); + PrintDebug("VNET/P Core is initiated\n"); return 0; } + + +void v3_deinit_vnet(){ + + v3_lock_deinit(&(vnet_state.lock)); + + free_devices(); + free_routes(); + + v3_free_htable(vnet_state.route_cache, 1, 1); + V3_Free(vnet_state.bridge); +} + +