X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=05117e53e2db49e6131c84d7a3b7575aedb92645;hb=fdb16aa5e99a19a91264ae84beaf77d3036548d5;hp=2a2ae6dbbee05845080fdb5958e0ea0b4a93c58f;hpb=906a0bf4003eb267398462dbc834b0ab85bca13a;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index 2a2ae6d..05117e5 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -26,39 +26,23 @@ #include #include #include +#include #ifndef CONFIG_DEBUG_VNET_NIC #undef PrintDebug #define PrintDebug(fmt, args...) #endif - struct vnet_nic_state { - char mac[6]; struct v3_vm_info * vm; struct v3_dev_net_ops net_ops; 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; - - //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) { + int synchronize, void * private_data) { struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data; struct v3_vnet_pkt pkt; @@ -68,15 +52,13 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len, memcpy(pkt.header, buf, ETHERNET_HEADER_LEN); pkt.data = buf; -#ifdef CONFIG_DEBUG_VNET_NIC - { - PrintDebug("VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", + 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); - v3_hexdump(buf, len, NULL, 0); + if(v3_net_debug >= 4){ + v3_hexdump(buf, len, NULL, 0); } -#endif - return v3_vnet_send_pkt(&pkt, NULL);; + return v3_vnet_send_pkt(&pkt, NULL, synchronize); } @@ -86,36 +68,13 @@ static int virtio_input(struct v3_vm_info * info, 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", + 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.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); -} - - -/* 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 vnet_nic_state * vnetnic) { @@ -132,40 +91,15 @@ static struct v3_device_ops dev_ops = { 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]){ - char hex[2], *s = macstr; - int i = 0; - - while(s){ - memcpy(hex, s, 2); - mac[i++] = (char)atox(hex); - if (i == 6) return 0; - s=strchr(s, ':'); - if(s) s++; - } - - return -1; -} 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 * 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"); - - if (macstr != NULL) { - PrintDebug("Vnet-nic: Mac specified %s\n", macstr); - str2mac(macstr, mac); - } vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state)); memset(vnetnic, 0, sizeof(struct vnet_nic_state)); @@ -178,9 +112,6 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } 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"), @@ -194,92 +125,14 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { PrintDebug("Vnet-nic: Connect %s to frontend %s\n", dev_id, v3_cfg_val(frontend_cfg, "tag")); - if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->mac, &vnet_dev_ops, (void *)vnetnic)) == -1) { - PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr); + if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.fnt_mac, &vnet_dev_ops, (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; - 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 -#if 0 - { - 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); - - - 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 - -//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; }