X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=d66384dd61c11a8eade37c79bdaea070d88196f1;hb=f7e83e5d2d00ba107ccda346da4660ab523471bb;hp=921f18bb30aaaf0d06a454ca0478f54f85912fa4;hpb=89e97330b5358593b7e7d823ca017ef17a59d44d;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 921f18b..d66384d 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 @@ -19,180 +19,131 @@ */ //backend device for Virtio NIC -#include +#include #include #include #include #include #include +#include +#include - -#ifndef CONFIG_DEBUG_VNET_NIC +#ifndef V3_CONFIG_DEBUG_VNET_NIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif - struct vnet_nic_state { - char mac[6]; - struct guest_info * core; - - void *frontend_data; - int (*frontend_input)(struct v3_vm_info *info, - uchar_t * buf, - uint32_t size, - void *private_data); -}; - -//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){ - PrintDebug("Virito NIC: In vnet_send: guest net state %p\n", private_data); - struct v3_vnet_pkt * pkt = NULL; - - // fill in packet - - v3_vnet_send_pkt(pkt); - return 0; -} - - -// We need to make this dynamically allocated -static struct v3_dev_net_ops net_ops = { - .send = vnet_send, + struct v3_vm_info * vm; + struct v3_dev_net_ops net_ops; + int vnet_dev_id; }; -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 net_ops.recv(pkt->data, pkt->size, net_ops.frontend_data); -} +/* 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; -#if 0 -static int sendto_buf(struct vnet_nic_dev_state *vnetnic_dev, uchar_t * buf, uint_t size) { - struct eth_pkt *pkt; + 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; - pkt = (struct eth_pkt *)V3_Malloc(sizeof(struct eth_pkt)); - if(pkt == NULL){ - PrintError("Vnet NIC: Memory allocate fails\n"); - return -1; + 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(net_debug >= 4){ + v3_hexdump(buf, len, NULL, 0); } - - pkt->size = size; - memcpy(pkt->data, buf, size); - v3_enqueue(vnetnic_dev->inpkt_q, (addr_t)pkt); - - PrintDebug("Vnet NIC: sendto_buf: packet: (size:%d)\n", (int)pkt->size); - return pkt->size; + return v3_vnet_send_pkt(&pkt, NULL); } -/* - *called in svm/vmx handler - *iteative handled the unsent packet in incoming packet queues for - *all virtio nic devices in this guest - */ -int v3_virtionic_pktprocess(struct guest_info * info) -{ - struct eth_pkt *pkt = NULL; - struct virtio_net_state *net_state; - int i; - - //PrintDebug("Virtio NIC: processing guest %p\n", info); - for (i = 0; i < net_idx; i++) { - while (1) { - net_state = temp_net_states[i]; - if(net_state->dev->vm != info) - break; - - pkt = (struct eth_pkt *)v3_dequeue(net_state->inpkt_q); - if(pkt == NULL) - break; - - if (send_pkt_to_guest(net_state, pkt->data, pkt->size, 1, NULL)) { - PrintDebug("Virtio NIC: %p In pkt_handle: send one packet! pt length %d\n", - net_state, (int)pkt->size); - } else { - PrintDebug("Virtio NIC: %p In pkt_handle: Fail to send one packet, pt length %d, discard it!\n", - net_state, (int)pkt->size); - } - - V3_Free(pkt); - } - } - - return 0; -} +/* send pkt to frontend device */ +static int fnt_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; -/* - *called in svm/vmx handler - *iteative handled the unsent packet in incoming packet queues for - *all virtio nic devices in this guest - */ -int v3_vnetnic_pktprocess(struct guest_info * info) -{ - - return 0; + 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 vnetnic->net_ops.recv(pkt->data, pkt->size, + vnetnic->net_ops.config.frontend_data); } -#endif -//register a virtio device to the vnet as backend -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_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); +/* poll pkt from frontend device */ +static int fnt_poll(struct v3_vm_info * info, + int quote, void * private_data){ + struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; + return vnetnic->net_ops.poll(quote, vnetnic->net_ops.config.frontend_data); +} - return 0; -} +static int vnet_nic_free(struct vnet_nic_state * vnetnic) { -static int vnet_nic_free(struct vm_device * dev) { + 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 struct v3_vnet_dev_ops vnet_dev_ops = { + .input = fnt_input, + .poll = fnt_poll, +}; + + 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"); + int vnet_dev_id; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); 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_nic_send; + vnetnic->vm = vm; + if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), - &net_ops, frontend_cfg, vnetnic) == -1) { + &(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; } - if (register_to_vnet(vm, vnetnic, name, vnetnic->mac) == -1) { - return -1; - } + PrintDebug("Vnet-nic: Connect %s to frontend %s\n", + dev_id, v3_cfg_val(frontend_cfg, "tag")); - PrintDebug("Vnet-nic device %s initialized\n", name); + if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.config.fnt_mac, + &vnet_dev_ops, vnetnic->net_ops.config.quote, + vnetnic->net_ops.config.poll, (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; return 0; }