X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=729003898d4dff16e64470103904b3f9d1c55c09;hb=966e433fd935e1ad837960e1b245d8506b2cf515;hp=8b1280de8203605e7cf00ed6cf76fc10b22c0af1;hpb=17f8752ad440dba7d414d0812e3680066dcb8c9e;p=palacios.releases.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 8b1280d..7290038 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -35,72 +35,37 @@ struct vnet_nic_state { char mac[6]; - struct guest_info * core; + struct v3_vm_info * vm; struct v3_dev_net_ops net_ops; + int vnet_dev_id; }; -//used when virtio_nic get a packet from guest and send it to the backend -static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){ - struct v3_vnet_pkt * pkt = NULL; - struct guest_info *core = (struct guest_info *)private_data; - - PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len); -#ifdef CONFIG_DEBUG_VNET_NIC - v3_hexdump(buf, len, NULL, 0); -#endif -#ifdef CONFIG_VNET_PROFILE - uint64_t start, end; - rdtscll(start); -#endif - - pkt = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_pkt)); - - if(pkt == NULL){ - PrintError("Malloc() fails"); - return -1; - } - -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.time_mallocfree = end - start; - } -#endif - - - pkt->size = len; - memcpy(pkt->data, buf, pkt->size); +static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){ + struct v3_vnet_pkt pkt; + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(start); - core->vnet_times.time_copy_from_guest = start - end; - } -#endif - v3_vnet_send_pkt(pkt, (void *)core); + pkt.size = len; + pkt.src_type = LINK_INTERFACE; + pkt.src_id = vnetnic->vnet_dev_id; + memcpy(pkt.header, buf, ETHERNET_HEADER_LEN); + pkt.data = buf; -#ifdef CONFIG_VNET_PROFILE +#ifdef CONFIG_DEBUG_VNET_NIC { - rdtscll(end); - core->vnet_times.vnet_handle_time = end - start; + PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d, src_type: %d\n", + len, pkt.src_id, pkt.src_type); + v3_hexdump(buf, len, NULL, 0); } #endif - V3_Free(pkt); -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(start); - core->vnet_times.time_mallocfree += start - end; - } -#endif + v3_vnet_send_pkt(&pkt, NULL); return 0; } - static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){ struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; @@ -149,13 +114,18 @@ static int str2mac(char *macstr, char mac[6]){ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vnet_nic_state * vnetnic = NULL; char * name = v3_cfg_val(cfg, "name"); - char * macstr; + char * macstr = NULL; char mac[6]; int vnet_dev_id; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); macstr = v3_cfg_val(frontend_cfg, "mac"); - str2mac(macstr, mac); + + if (macstr == NULL) { + PrintDebug("Vnet-nic: No Mac specified\n"); + } else { + str2mac(macstr, mac); + } vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state)); memset(vnetnic, 0, sizeof(struct vnet_nic_state)); @@ -169,6 +139,7 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { vnetnic->net_ops.send = vnet_send; memcpy(vnetnic->mac, mac, 6); + vnetnic->vm = vm; if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) { @@ -181,52 +152,44 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { name, v3_cfg_val(frontend_cfg, "tag")); if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) { - return -1; + PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr); } + vnetnic->vnet_dev_id = vnet_dev_id; - PrintDebug("Vnet-nic device %s (mac: %s, %ld) initialized\n", name, macstr, *((ulong_t *)vnetnic->mac)); + PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", name, macstr, *((ulong_t *)vnetnic->mac)); -//for temporary hack -#if 1 +//for temporary hack for vnet bridge test +#if 1 { - //uchar_t tapmac[6] = {0x00,0x02,0x55,0x67,0x42,0x39}; //for Intel-VT test HW - uchar_t tapmac[6] = {0x6e,0xa8,0x75,0xf4,0x82,0x95}; - uchar_t dstmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff}; uchar_t zeromac[6] = {0,0,0,0,0,0}; - - struct v3_vnet_route route; - route.dst_id = vnet_dev_id; - route.dst_type = LINK_INTERFACE; - route.src_id = -1; - route.src_type = LINK_ANY; - - if(!strcmp(name, "vnet_nicdom0")){ - memcpy(route.dst_mac, tapmac, 6); - route.dst_mac_qual = MAC_NONE; + + if(!strcmp(name, "vnet_nic")){ + struct v3_vnet_route route; + + route.dst_id = vnet_dev_id; + route.dst_type = LINK_INTERFACE; + route.src_id = 0; + route.src_type = LINK_EDGE; + memcpy(route.dst_mac, zeromac, 6); + route.dst_mac_qual = MAC_ANY; memcpy(route.src_mac, zeromac, 6); - route.src_mac_qual = MAC_ANY; - + route.src_mac_qual = MAC_ANY; v3_vnet_add_route(route); - memcpy(route.dst_mac, dstmac, 6); - route.dst_mac_qual = MAC_NONE; - memcpy(route.src_mac, tapmac, 6); - route.src_mac_qual = MAC_NOT; - - v3_vnet_add_route(route); - } - if (!strcmp(name, "vnet_nic0")){ + route.dst_id = 0; + route.dst_type = LINK_EDGE; + route.src_id = vnet_dev_id; + route.src_type = LINK_INTERFACE; memcpy(route.dst_mac, zeromac, 6); route.dst_mac_qual = MAC_ANY; - memcpy(route.src_mac, tapmac, 6); - route.src_mac_qual = MAC_NONE; - + memcpy(route.src_mac, zeromac, 6); + route.src_mac_qual = MAC_ANY; + v3_vnet_add_route(route); } } - #endif return 0;