X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=ff039e2a735b3114584814ae149b01acdf756895;hb=8330d6bb32172ba7c50b4e242e0213c8a9e1424e;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..ff039e2 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 @@ -40,164 +40,88 @@ struct vnet_nic_state { 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 +/* called by frontend device, + * tell the VNET can start sending pkt to it */ +static void start_rx(void *private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; - V3_Free(pkt); + v3_vnet_enable_device(vnetnic->vnet_dev_id); +} -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.time_mallocfree += end - start; - } -#endif +/* called by frontend device, + * tell the VNET stop sending pkt to it */ +static void stop_rx(void *private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; - return 0; + v3_vnet_disable_device(vnetnic->vnet_dev_id); } -#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; +/* called by frontend, send pkt to VNET */ +static int vnet_nic_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){ 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 + struct v3_vnet_pkt pkt; pkt.size = len; pkt.src_type = LINK_INTERFACE; pkt.src_id = vnetnic->vnet_dev_id; - memcpy(pkt.data, buf, pkt.size); + memcpy(pkt.header, buf, ETHERNET_HEADER_LEN); + pkt.data = buf; #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); + PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", + len, vnetnic->vnet_dev_id); v3_hexdump(buf, len, NULL, 0); } #endif + return v3_vnet_send_pkt(&pkt, NULL);; +} -#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; +/* called by VNET, + * 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; + + return vnetnic->net_ops.recv(pkt->data, + pkt->size, + vnetnic->net_ops.frontend_data); } -#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 +/* called by VNET, + * tell frontend device to poll data from guest */ +static void virtio_poll(struct v3_vm_info *info, void * private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; - pkt.size = len; - pkt.data = buf; + vnetnic->net_ops.poll(info, vnetnic->net_ops.frontend_data); +} -#ifdef CONFIG_VNET_PROFILE - uint64_t start, end; - rdtscll(start); -#endif +/* called by VNET, from different processor */ +static void virtio_poll_xcall(void *data){ + struct v3_vnet_dev_xcall_args *args = (struct v3_vnet_dev_xcall_args *)data; + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)args->private_data; - v3_vnet_send_pkt(&pkt, (void *)core); + if(args->vm == vnetnic->vm) /*only do polling on the same Virtual Machine */ + virtio_poll(args->vm, args->private_data); +} -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.vnet_handle_time = end - start; - } -#endif +/* called by VNET, + * tell the frontend to start sending pkt to VNET*/ +static void start_tx(void *private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; - return 0; + vnetnic->net_ops.start_tx(vnetnic->net_ops.frontend_data); } -#endif - -static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){ +/* called by VNET + * tell the frontend device to stop sending pkt to VNET*/ +static void stop_tx(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); + vnetnic->net_ops.stop_tx(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); - - return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); -} static int vnet_nic_free(struct vm_device * dev) { return 0; @@ -210,6 +134,25 @@ static struct v3_device_ops dev_ops = { .stop = NULL, }; +static struct v3_vnet_dev_ops vnet_dev_ops = { + .input = virtio_input, + .poll = virtio_poll, + .poll_xcall = virtio_poll_xcall, + .start_tx = start_tx, + .stop_tx = stop_tx, +}; + + +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); + + return v3_vnet_add_dev(vm, mac, &vnet_dev_ops, (void *)vnet_nic); +} + static int str2mac(char *macstr, char mac[6]){ char hex[2], *s = macstr; @@ -252,7 +195,9 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { return -1; } - vnetnic->net_ops.send = vnet_send; + vnetnic->net_ops.send = vnet_nic_send; + vnetnic->net_ops.start_rx = start_rx; + vnetnic->net_ops.stop_rx = stop_rx; memcpy(vnetnic->mac, mac, 6); vnetnic->vm = vm; @@ -271,11 +216,12 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } 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)); + 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 +#if 0 { uchar_t zeromac[6] = {0,0,0,0,0,0}; @@ -306,41 +252,44 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } } #endif -#if 0 //temporay hacking for vnet virtio bridge + +//for temporary hack for Linux bridge (w/o encapuslation) 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}; + static int vnet_nic_guestid = -1; + static int vnet_nic_dom0 = -1; uchar_t zeromac[6] = {0,0,0,0,0,0}; + + if(!strcmp(name, "vnet_nic")){ //domu + vnet_nic_guestid = vnet_dev_id; + } + if (!strcmp(name, "vnet_nic_dom0")){ + vnet_nic_dom0 = vnet_dev_id; + } - 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(vnet_nic_guestid != -1 && vnet_nic_dom0 !=-1){ + struct v3_vnet_route route; + + route.src_id = vnet_nic_guestid; + route.src_type = LINK_INTERFACE; + route.dst_id = vnet_nic_dom0; + route.dst_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; - + 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.src_id = vnet_nic_dom0; + route.src_type = LINK_INTERFACE; + route.dst_id = vnet_nic_guestid; + route.dst_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); } }