X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=526da07914570adb29d0963b31815aff6e2b3378;hb=d962f2be029772be3f21d9bd206ddf2a9f6a1d20;hp=ff039e2a735b3114584814ae149b01acdf756895;hpb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;p=palacios-OLD.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index ff039e2..526da07 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -42,23 +42,24 @@ struct vnet_nic_state { /* 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 void start_rx(void * private_data){ + //struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data; - v3_vnet_enable_device(vnetnic->vnet_dev_id); + //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; +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); + //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; +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; @@ -69,9 +70,9 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len, void * private_data, struc #ifdef CONFIG_DEBUG_VNET_NIC { - PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", - len, vnetnic->vnet_dev_id); - 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 @@ -79,74 +80,66 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len, void * private_data, struc } -/* 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){ +/* 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); + return vnetnic->net_ops.recv(pkt->data, pkt->size, + vnetnic->net_ops.frontend_data); } -/* called by VNET, - * tell frontend device to poll data from guest */ -static void virtio_poll(struct v3_vm_info *info, 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; vnetnic->net_ops.poll(info, vnetnic->net_ops.frontend_data); } -/* 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; - if(args->vm == vnetnic->vm) /*only do polling on the same Virtual Machine */ - virtio_poll(args->vm, args->private_data); -} - -/* called by VNET, - * tell the frontend to start sending pkt to VNET*/ -static void start_tx(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; vnetnic->net_ops.start_tx(vnetnic->net_ops.frontend_data); } -/* called by VNET - * tell the frontend device to stop sending pkt to VNET*/ -static void stop_tx(void *private_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) { +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, - .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]) { + 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); @@ -154,7 +147,7 @@ static int register_to_vnet(struct v3_vm_info * vm, } -static int str2mac(char *macstr, char mac[6]){ +static int str2mac(char * macstr, char mac[6]){ char hex[2], *s = macstr; int i = 0; @@ -171,7 +164,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; @@ -188,10 +181,11 @@ 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; } @@ -204,28 +198,32 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { 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) { - 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(dev); + 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)); + dev_id, macstr, *((ulong_t *)vnetnic->mac)); //for temporary hack for vnet bridge test -#if 0 +#if 1 { 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; @@ -254,16 +252,16 @@ 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 1 +#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(name, "vnet_nic")){ //domu + if(!strcmp(dev_id, "vnet_nic")){ //domu vnet_nic_guestid = vnet_dev_id; } - if (!strcmp(name, "vnet_nic_dom0")){ + if (!strcmp(dev_id, "vnet_nic_dom0")){ vnet_nic_dom0 = vnet_dev_id; }