X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=a391b5ecb70aeb91dc8ac580c07e5bde10b1bcf2;hb=c80aaab03156ec020bd4a76688ff6d2544955bf3;hp=86f5ba7c98969c4f55098216557061d9f7ee17e6;hpb=edd0131b7b8672c9c3a7ef8682d17a48d682a53f;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 86f5ba7..a391b5e 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,62 +40,111 @@ struct vnet_nic_state { int vnet_dev_id; }; +/* 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; -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; + //v3_vnet_enable_device(vnetnic->vnet_dev_id); +} +/* 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; + + //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; + + 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); - v3_hexdump(buf, len, NULL, 0); + 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 + return v3_vnet_send_pkt(&pkt, NULL);; +} - v3_vnet_send_pkt(&pkt, NULL); - return 0; +/* 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: 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); } -static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){ +/* 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; - - 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.poll(info, 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 to start sending pkt to VNET*/ +static void start_tx(void * private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; + + vnetnic->net_ops.start_tx(vnetnic->net_ops.frontend_data); +} + +/* 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) { return 0; } static struct v3_device_ops dev_ops = { .free = vnet_nic_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + +}; + +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 str2mac(char *macstr, char mac[6]){ +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; int i = 0; @@ -112,7 +161,7 @@ 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 * dev_id = v3_cfg_val(cfg, "ID"); char * macstr = NULL; char mac[6]; int vnet_dev_id; @@ -129,33 +178,41 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { 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(vnetnic); 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 = 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(vnetnic); + 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)); + PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", + dev_id, macstr, *((ulong_t *)vnetnic->mac)); //for temporary hack for vnet bridge test @@ -163,7 +220,7 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { { uchar_t zeromac[6] = {0,0,0,0,0,0}; - if(!strcmp(name, "vnet_nic")){ + if(!strcmp(dev_id, "vnet_nic")){ struct v3_vnet_route route; route.dst_id = vnet_dev_id; @@ -191,6 +248,48 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } #endif +//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); + + + 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, zeromac, 6); + route.src_mac_qual = MAC_ANY; + + v3_vnet_add_route(route); + } + } +#endif + return 0; }