X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=526da07914570adb29d0963b31815aff6e2b3378;hb=dea7fd2306231d09471958e2b00499d701723e17;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..526da07 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 @@ -35,103 +35,119 @@ 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; +/* 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; - 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 + //v3_vnet_enable_device(vnetnic->vnet_dev_id); +} - pkt = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_pkt)); +/* 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; - if(pkt == NULL){ - PrintError("Malloc() fails"); - return -1; - } - -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.time_mallocfree = end - start; - } -#endif + //v3_vnet_disable_device(vnetnic->vnet_dev_id); +} +/* called by frontend, send pkt to VNET */ +static int vnet_nic_send(uint8_t * buf, uint32_t len, + void * private_data) { + struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data; - pkt->size = len; - memcpy(pkt->data, buf, pkt->size); + struct v3_vnet_pkt pkt; + 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(start); - core->vnet_times.time_copy_from_guest = start - end; + PrintDebug("VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", + pkt.size, pkt.src_id, pkt.src_type); + //v3_hexdump(buf, len, NULL, 0); } #endif - v3_vnet_send_pkt(pkt, (void *)core); + return v3_vnet_send_pkt(&pkt, NULL);; +} -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(end); - core->vnet_times.vnet_handle_time = end - start; - } -#endif - V3_Free(pkt); +/* 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; -#ifdef CONFIG_VNET_PROFILE - { - rdtscll(start); - core->vnet_times.time_mallocfree += start - end; - } -#endif + PrintDebug("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 vnetnic->net_ops.recv(pkt->data, pkt->size, + vnetnic->net_ops.frontend_data); +} - return 0; +/* 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; + + vnetnic->net_ops.poll(info, vnetnic->net_ops.frontend_data); } -static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){ +/* 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; - - 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.start_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); +/* 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; + + vnetnic->net_ops.stop_tx(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_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 struct v3_vnet_dev_ops vnet_dev_ops = { + .input = virtio_input, + .poll = virtio_poll, + .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]){ +static int str2mac(char * macstr, char mac[6]){ char hex[2], *s = macstr; int i = 0; @@ -148,85 +164,133 @@ 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 * dev_id = v3_cfg_val(cfg, "ID"); + 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)); - struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, vnetnic); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + if (dev == NULL) { + PrintError("Could not attach device %s\n", dev_id); + V3_Free(vnetnic); 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; 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) { - return -1; + if ((vnet_dev_id = register_to_vnet(vm, vnetnic, dev_id, vnetnic->mac)) == -1) { + PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr); + v3_remove_device(dev); + return 0; } - PrintDebug("Vnet-nic device %s (mac: %s, %ld) initialized\n", name, macstr, *((ulong_t *)vnetnic->mac)); + vnetnic->vnet_dev_id = vnet_dev_id; + PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", + dev_id, 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}; + + if(!strcmp(dev_id, "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); - 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; + 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 - memcpy(route.dst_mac, dstmac, 6); - route.dst_mac_qual = MAC_NONE; - memcpy(route.src_mac, tapmac, 6); - route.src_mac_qual = MAC_NOT; +//for temporary hack for Linux bridge (w/o encapuslation) test +#if 0 + { + static int vnet_nic_guestid = -1; + static int vnet_nic_dom0 = -1; + uchar_t zeromac[6] = {0,0,0,0,0,0}; + + if(!strcmp(dev_id, "vnet_nic")){ //domu + vnet_nic_guestid = vnet_dev_id; + } + if (!strcmp(dev_id, "vnet_nic_dom0")){ + vnet_nic_dom0 = vnet_dev_id; + } + 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; 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); } } - #endif return 0;