X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=05117e53e2db49e6131c84d7a3b7575aedb92645;hb=fdb16aa5e99a19a91264ae84beaf77d3036548d5;hp=94c8a42d91a13fce2c327305127956ea50da489f;hpb=331eb3b042d3456e1eaf33eb9e32606774b715fb;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 94c8a42..05117e5 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -7,8 +7,8 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * - * Copyright (c) 2008, Lei Xia - * Copyright (c) 2008, The V3VEE Project + * Copyright (c) 2010, Lei Xia + * Copyright (c) 2010, The V3VEE Project * All rights reserved. * * Author: Lei Xia @@ -26,326 +26,113 @@ #include #include #include +#include #ifndef CONFIG_DEBUG_VNET_NIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif - struct vnet_nic_state { - char mac[6]; struct v3_vm_info * vm; struct v3_dev_net_ops net_ops; int vnet_dev_id; }; -#if 0 -//Malloc/Free version of send -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; - -#ifdef WCONFIG_DEBUG_VNET_NIC - { - PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len); - 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; - pkt->src_type = LINK_INTERFACE; - pkt->src_id = 0; - memcpy(pkt->data, buf, pkt->size); - -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(start); - core->vnet_times.memcpy_time = start - end; - core->vnet_times.time_copy_from_guest = start - core->vnet_times.virtio_handle_start - core->vnet_times.time_mallocfree; - } -#endif - - v3_vnet_send_pkt(pkt, (void *)core); - -#ifdef CONFIG_VNET_PROFILE - rdtscll(start); -#endif - - V3_Free(pkt); -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.time_mallocfree += end - start; - } -#endif - - return 0; -} +/* called by frontend, send pkt to VNET */ +static int vnet_nic_send(uint8_t * buf, uint32_t len, + int synchronize, void * private_data) { + struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data; -#endif - -#if 1 -//alternative way, no malloc/free -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; - struct guest_info *core = &(vnetnic->vm->cores[0]); - -#ifdef CONFIG_VNET_PROFILE - uint64_t start, end; - rdtscll(start); -#endif - pkt.size = len; pkt.src_type = LINK_INTERFACE; pkt.src_id = vnetnic->vnet_dev_id; - memcpy(pkt.data, buf, pkt.size); - -#ifdef CONFIG_DEBUG_VNET_NIC - { - 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 - - -#ifdef CONFIG_VNET_PROFILE - rdtscll(end); - core->vnet_times.time_copy_from_guest = end - core->vnet_times.virtio_handle_start; - core->vnet_times.memcpy_time = end - start; -#endif - - v3_vnet_send_pkt(&pkt, (void *)core); - - return 0; -} -#endif - -#if 0 -//alternative way, no malloc/free, no copy -//need to change pkt format -static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){ - struct v3_vnet_pkt pkt; - struct guest_info *core = (struct guest_info *)private_data; - - -#ifdef CONFIG_DEBUG_VNET_NIC - { - PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len); - v3_hexdump(buf, len, NULL, 0); - } -#endif - - pkt.size = len; + memcpy(pkt.header, buf, ETHERNET_HEADER_LEN); pkt.data = buf; -#ifdef CONFIG_VNET_PROFILE - uint64_t start, end; - rdtscll(start); -#endif - - v3_vnet_send_pkt(&pkt, (void *)core); - -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.vnet_handle_time = end - start; + V3_Net_Print(2, "VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", + pkt.size, pkt.src_id, pkt.src_type); + if(v3_net_debug >= 4){ + v3_hexdump(buf, len, NULL, 0); } -#endif - return 0; + return v3_vnet_send_pkt(&pkt, NULL, synchronize); } -#endif -static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){ +/* send pkt to frontend device */ +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; - - PrintDebug("Vnet-nic: In input: vnet_nic state %p\n", vnetnic); - return vnetnic->net_ops.recv(pkt->data, pkt->size, vnetnic->net_ops.frontend_data); -} - -static int register_to_vnet(struct v3_vm_info * vm, - struct vnet_nic_state *vnet_nic, - char *dev_name, - uchar_t mac[6]) { - - PrintDebug("Vnet-nic: register Vnet-nic device %s, state %p to VNET\n", dev_name, vnet_nic); + V3_Net_Print(2, "VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", + pkt->size, pkt->src_id, pkt->src_type, pkt->dst_id, pkt->dst_type); - return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); + return vnetnic->net_ops.recv(pkt->data, pkt->size, + vnetnic->net_ops.frontend_data); } -static int vnet_nic_free(struct vm_device * dev) { + +static int vnet_nic_free(struct vnet_nic_state * vnetnic) { + + v3_vnet_del_dev(vnetnic->vnet_dev_id); + V3_Free(vnetnic); + return 0; } static struct v3_device_ops dev_ops = { - .free = vnet_nic_free, - .reset = NULL, - .start = NULL, - .stop = NULL, -}; + .free = (int (*)(void *))vnet_nic_free, +}; -static int str2mac(char *macstr, char mac[6]){ - char hex[2], *s = macstr; - int i = 0; - - while(s){ - memcpy(hex, s, 2); - mac[i++] = (char)atox(hex); - if (i == 6) return 0; - s=strchr(s, ':'); - if(s) s++; - } +static struct v3_vnet_dev_ops vnet_dev_ops = { + .input = virtio_input, +}; - return -1; -} 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 = NULL; - char mac[6]; + char * dev_id = v3_cfg_val(cfg, "ID"); int vnet_dev_id; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); - macstr = v3_cfg_val(frontend_cfg, "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)); - struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic); - - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, vnetnic); + if (dev == NULL) { + PrintError("Could not attach device %s\n", dev_id); + V3_Free(vnetnic); return -1; } - vnetnic->net_ops.send = vnet_send; - memcpy(vnetnic->mac, mac, 6); + vnetnic->net_ops.send = vnet_nic_send; vnetnic->vm = vm; if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) { PrintError("Could not connect %s to frontend %s\n", - name, v3_cfg_val(frontend_cfg, "tag")); + dev_id, v3_cfg_val(frontend_cfg, "tag")); + v3_remove_device(dev); return -1; } PrintDebug("Vnet-nic: Connect %s to frontend %s\n", - name, v3_cfg_val(frontend_cfg, "tag")); + dev_id, v3_cfg_val(frontend_cfg, "tag")); - if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) { - PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr); + if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.fnt_mac, &vnet_dev_ops, (void *)vnetnic)) == -1) { + PrintError("Vnet-nic device %s fails to registered to VNET\n", dev_id); + + v3_remove_device(dev); + return 0; } vnetnic->vnet_dev_id = vnet_dev_id; - PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", name, macstr, *((ulong_t *)vnetnic->mac)); - - -//for temporary hack for vnet bridge test -#if 1 - { - uchar_t zeromac[6] = {0,0,0,0,0,0}; - - 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; - v3_vnet_add_route(route); - - - 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, zeromac, 6); - route.src_mac_qual = MAC_ANY; - - v3_vnet_add_route(route); - } - } -#endif -#if 0 //temporay hacking for vnet virtio bridge - { - 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; - memcpy(route.src_mac, zeromac, 6); - 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")){ - memcpy(route.dst_mac, zeromac, 6); - route.dst_mac_qual = MAC_ANY; - memcpy(route.src_mac, tapmac, 6); - route.src_mac_qual = MAC_NONE; - - v3_vnet_add_route(route); - } - } -#endif - return 0; }