X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_vnet_core.c;h=a2d06f2ffeeab465ce9dc78b607f80864b56d1b0;hb=0a7690f54cb5bda83780dac26ce433ad24b1d766;hp=18720b10962b22c957a2641d91a8d39c3f46f2eb;hpb=da5c386c3153196bd0aa4610d8ad513d3f7f1bbc;p=palacios.git diff --git a/palacios/src/palacios/vmm_vnet_core.c b/palacios/src/palacios/vmm_vnet_core.c index 18720b1..a2d06f2 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,21 +32,24 @@ #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; int active; - uint8_t mode; //vmm_drivern or guest_drivern + nic_poll_type_t mode; /*vmm_drivern or guest_drivern */ + + uint64_t bytes_tx, bytes_rx; + uint32_t pkts_tx, pkt_rx; struct list_head node; } __attribute__((packed)); @@ -56,7 +60,7 @@ struct vnet_brg_dev { struct v3_vnet_bridge_ops brg_ops; uint8_t type; - uint8_t mode; + nic_poll_type_t mode; int active; void * private_data; } __attribute__((packed)); @@ -89,9 +93,10 @@ static struct { int num_routes; int num_devs; - struct vnet_brg_dev *bridge; + struct vnet_brg_dev * bridge; v3_lock_t lock; + struct vnet_stat stats; struct hashtable * route_cache; } vnet_state; @@ -99,47 +104,48 @@ static struct { #ifdef CONFIG_DEBUG_VNET -static inline void mac_to_string(char mac[6], char * buf) { - snprintf(buf, 100, "%d:%d:%d:%d:%d:%d", +static inline void mac_to_string(uint8_t * mac, char * buf) { + snprintf(buf, 100, "%2x:%2x:%2x:%2x:%2x:%2x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } -static void print_route(struct vnet_route_info * route){ +static void print_route(struct v3_vnet_route * route){ char str[50]; - mac_to_string(route->route_def.src_mac, str); + mac_to_string(route->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); + str, route->src_mac_qual); + mac_to_string(route->dst_mac, str); PrintDebug("Dst Mac (%s), dst_qual (%d)\n", - str, route->route_def.dst_mac_qual); + str, route->dst_mac_qual); PrintDebug("Src dev id (%d), src type (%d)", - route->route_def.src_id, - route->route_def.src_type); + route->src_id, + route->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_ops(%p), dst_dev_data (%p)\n", - route->dst_dev, - route->dst_dev->dev_id, - (void *)&(route->dst_dev->dev_ops), - route->dst_dev->private_data); - } + route->dst_id, + route->dst_type); } static void dump_routes(){ - struct vnet_route_info *route; + 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++); + 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); + print_route(&(route->route_def)); + if (route->route_def.dst_type == LINK_INTERFACE) { + 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, + (void *)&(route->dst_dev->dev_ops), + route->dst_dev->private_data); } - PrintDebug("\n========Dump routes end ============\n"); + } + + PrintDebug("\n========Dump routes end ============\n"); } #endif @@ -163,7 +169,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 +177,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 +184,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,25 +203,29 @@ 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 (!compare_ethaddr(dev->mac_addr, mac)){ return dev; + } } return NULL; } -int v3_vnet_id_by_mac(char mac[6]){ - struct vnet_dev *dev = find_dev_by_mac(mac); +int v3_vnet_find_dev(uint8_t * mac) { + struct vnet_dev * dev = NULL; - if (dev == NULL) - return -1; + dev = dev_by_mac(mac); + + if(dev != NULL) { + return dev->dev_id; + } - return dev->dev_id; + return -1; } @@ -228,26 +236,29 @@ 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); +#ifdef CONFIG_DEBUG_VNET + PrintDebug("VNET/P Core: add_route_entry:\n"); + print_route(&route); +#endif - 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; + new_route->route_def.src_id = route.src_id; + new_route->route_def.dst_id = route.dst_id; if (new_route->route_def.dst_type == LINK_INTERFACE) { - new_route->dst_dev = find_dev_by_id(new_route->route_def.dst_id); + 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); + new_route->src_dev = dev_by_id(new_route->route_def.src_id); } + flags = v3_lock_irqsave(vnet_state.lock); list_add(&(new_route->node), &(vnet_state.routes)); @@ -265,7 +276,7 @@ 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(int dev_id){ +static void inline del_routes_by_dev(int dev_id){ struct vnet_route_info * route = NULL; unsigned long flags; @@ -296,8 +307,8 @@ static struct route_list * match_route(const struct v3_vnet_pkt * pkt) { 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; + // uint8_t src_type = pkt->src_type; + // uint32_t src_link = pkt->src_id; #ifdef CONFIG_DEBUG_VNET { @@ -306,7 +317,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 @@ -329,14 +340,15 @@ static struct route_list * match_route(const struct v3_vnet_pkt * pkt) { list_for_each_entry(route, &(vnet_state.routes), node) { struct v3_vnet_route * route_def = &(route->route_def); +/* // 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)))) { + (route_def->src_id != -1)))) { continue; } - +*/ if ((route_def->dst_mac_qual == MAC_ANY) && (route_def->src_mac_qual == MAC_ANY)) { @@ -392,7 +404,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; @@ -422,7 +434,7 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) { #ifdef CONFIG_DEBUG_VNET { int cpu = V3_Get_CPU(); - PrintDebug("VNET-core: cpu %d: pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", + 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); @@ -431,17 +443,19 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) { flags = v3_lock_irqsave(vnet_state.lock); + vnet_state.stats.rx_bytes += pkt->size; + vnet_state.stats.rx_pkts++; + look_into_cache(pkt, &matched_routes); - if (matched_routes == NULL) { - PrintDebug("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?*/ } @@ -449,7 +463,7 @@ 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]; @@ -460,33 +474,37 @@ int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data) { pkt->dst_id = route->route_def.dst_id; if (bridge == NULL || (bridge->active == 0)) { - PrintDebug("VNET: No active bridge to sent data to\n"); - continue; + PrintDebug("VNET/P Core: No active bridge to sent data to\n"); + continue; } if(bridge->brg_ops.input(bridge->vm, pkt, bridge->private_data) < 0){ - PrintDebug("VNET: Packet not sent properly to bridge\n"); + PrintDebug("VNET/P Core: Packet not sent properly to bridge\n"); continue; } + vnet_state.stats.tx_bytes += pkt->size; + vnet_state.stats.tx_pkts ++; } else if (route->route_def.dst_type == LINK_INTERFACE) { if (route->dst_dev == NULL || route->dst_dev->active == 0){ - PrintDebug("VNET: No active device to sent data to\n"); + 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: Packet not sent properly\n"); + PrintDebug("VNET/P Core: Packet not sent properly\n"); continue; } + vnet_state.stats.tx_bytes += pkt->size; + vnet_state.stats.tx_pkts ++; } else { - PrintError("VNET: Wrong dst type\n"); + PrintError("VNET/P Core: Wrong dst type\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, struct v3_vnet_dev_ops *ops, void * priv_data){ struct vnet_dev * new_dev = NULL; @@ -495,7 +513,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; } @@ -510,7 +528,7 @@ int v3_vnet_add_dev(struct v3_vm_info * vm, uint8_t mac[6], 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; } @@ -519,11 +537,11 @@ 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 Already 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; } @@ -536,21 +554,30 @@ int v3_vnet_del_dev(int dev_id){ flags = v3_lock_irqsave(vnet_state.lock); - dev = find_dev_by_id(dev_id); + dev = dev_by_id(dev_id); if (dev != NULL){ list_del(&(dev->node)); - del_routes(dev_id); + del_routes_by_dev(dev_id); } v3_unlock_irqrestore(vnet_state.lock, flags); V3_Free(dev); - PrintDebug("Vnet: Remove Device: dev_id %d\n", dev_id); + PrintDebug("VNET/P Core: Remove Device: dev_id %d\n", dev_id); return 0; } +int v3_vnet_stat(struct vnet_stat * stats){ + + stats->rx_bytes = vnet_state.stats.rx_bytes; + stats->rx_pkts = vnet_state.stats.rx_pkts; + stats->tx_bytes = vnet_state.stats.tx_bytes; + stats->tx_pkts = vnet_state.stats.tx_pkts; + + return 0; +} static void free_devices(){ struct vnet_dev * dev = NULL; @@ -571,29 +598,6 @@ static void free_routes(){ } } - -void v3_vnet_poll(struct v3_vm_info * vm){ - struct vnet_dev * dev = NULL; - struct vnet_brg_dev *bridge = vnet_state.bridge; - - list_for_each_entry(dev, &(vnet_state.devs), node) { - if(dev->mode == VMM_DRIVERN && - dev->active && - dev->vm == vm){ - - dev->dev_ops.poll(vm, dev->private_data); - } - } - - if (bridge != NULL && - bridge->active && - bridge->mode == VMM_DRIVERN) { - - bridge->brg_ops.poll(bridge->vm, bridge->private_data); - } - -} - int v3_vnet_add_bridge(struct v3_vm_info * vm, struct v3_vnet_bridge_ops * ops, uint8_t type, @@ -612,7 +616,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; } @@ -641,6 +645,20 @@ int v3_vnet_add_bridge(struct v3_vm_info * vm, } +void v3_vnet_do_poll(struct v3_vm_info * vm){ + struct vnet_dev * dev = NULL; + + /* TODO: run this on separate threads + * round-robin schedule, with maximal budget for each poll + */ + list_for_each_entry(dev, &(vnet_state.devs), node) { + if(dev->mode == VMM_DRIVERN){ + dev->dev_ops.poll(vm, -1, dev->private_data); + } + } +} + + int v3_init_vnet() { memset(&vnet_state, 0, sizeof(vnet_state)); @@ -650,21 +668,18 @@ 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; }