X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=c24eed70e193f487ba66799e3a272eacdf1c2f02;hb=107d8f06c7083f58fc96d781efb0226edd82c7d9;hp=2aa3ac4015bce240896417fc21442342f5558f61;hpb=e5e029575affad90c19ca038a3b780820535d421;p=palacios.releases.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 2aa3ac4..c24eed7 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,8 +40,26 @@ 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){ + //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 vm_device * dest_dev){ struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; struct v3_vnet_pkt pkt; @@ -58,39 +76,46 @@ static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm v3_hexdump(buf, len, NULL, 0); } #endif -/* - v3_vnet_rx(buf, len, vnetnic->vnet_dev_id, LINK_INTERFACE); - - //if on the dom0 core, interrupt the domU core to poll pkts - //otherwise, call the polling directly - int cpu = V3_Get_CPU(); - cpu = (cpu == 0)?1:0; - v3_interrupt_cpu(vnetnic->vm, cpu, V3_VNET_POLLING_VECTOR); - */ - - v3_vnet_send_pkt(&pkt, NULL); - return 0; + return v3_vnet_send_pkt(&pkt, NULL);; } -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); +} - return vnetnic->net_ops.recv(pkt->data, pkt->size, vnetnic->net_ops.frontend_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; + + 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; } @@ -102,8 +127,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, + .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; @@ -120,10 +162,10 @@ 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 * dev_id = v3_cfg_val(cfg, "ID"); + char * name = v3_cfg_val(cfg, "name"); char * macstr = NULL; char mac[6]; - int vnet_dev_id = 0; + int vnet_dev_id; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); macstr = v3_cfg_val(frontend_cfg, "mac"); @@ -137,41 +179,44 @@ 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(dev_id, &dev_ops, vnetnic); + 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", dev_id); + PrintError("Could not attach device %s\n", name); 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", - dev_id, v3_cfg_val(frontend_cfg, "tag")); + name, v3_cfg_val(frontend_cfg, "tag")); return -1; } PrintDebug("Vnet-nic: Connect %s to frontend %s\n", - dev_id, v3_cfg_val(frontend_cfg, "tag")); + name, v3_cfg_val(frontend_cfg, "tag")); - 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); + 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); } 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)); + 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}; - if(!strcmp(dev_id, "vnet_nic")){ + if(!strcmp(name, "vnet_nic")){ struct v3_vnet_route route; route.dst_id = vnet_dev_id; @@ -200,18 +245,18 @@ 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 +#if 1 { 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 + if(!strcmp(name, "vnet_nic")){ //domu vnet_nic_guestid = vnet_dev_id; } - if (!strcmp(dev_id, "vnet_nic_dom0")){ + if (!strcmp(name, "vnet_nic_dom0")){ vnet_nic_dom0 = vnet_dev_id; - } + } if(vnet_nic_guestid != -1 && vnet_nic_dom0 !=-1){ struct v3_vnet_route route;