X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=7a7dac01c91c7a4bc6083e7ac2388c362202a426;hb=abe79f30c8babe9d9e3989cf4a61ae4f3b5ce7e9;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..7a7dac0 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -25,7 +25,7 @@ #include #include #include - +#include #ifndef CONFIG_DEBUG_VNET_NIC #undef PrintDebug @@ -35,123 +35,60 @@ 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); -} - -#if 0 -static int sendto_buf(struct vnet_nic_dev_state *vnetnic_dev, uchar_t * buf, uint_t size) { - struct eth_pkt *pkt; - pkt = (struct eth_pkt *)V3_Malloc(sizeof(struct eth_pkt)); - if(pkt == NULL){ - PrintError("Vnet NIC: Memory allocate fails\n"); - return -1; +static int vnet_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; + 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; + +#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); } - - 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; -} - +#endif /* - *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_vnet_rx(buf, len, vnetnic->vnet_dev_id, LINK_INTERFACE); - V3_Free(pkt); - } - } - + //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; } +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); -/* - *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; + return vnetnic->net_ops.recv(pkt->data, pkt->size, vnetnic->net_ops.frontend_data); } -#endif - -//register a virtio device to the vnet as backend -int register_to_vnet(struct v3_vm_info * vm, +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); - v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); - - - - return 0; + return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); } static int vnet_nic_free(struct vm_device * dev) { @@ -165,11 +102,37 @@ static struct v3_device_ops dev_ops = { .stop = NULL, }; + +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 * name = v3_cfg_val(cfg, "name"); + 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: No Mac specified\n"); + } else { + str2mac(macstr, mac); + } vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state)); memset(vnetnic, 0, sizeof(struct vnet_nic_state)); @@ -181,18 +144,102 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { return -1; } + vnetnic->net_ops.send = vnet_send; + memcpy(vnetnic->mac, mac, 6); + 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")); return -1; } - if (register_to_vnet(vm, vnetnic, name, vnetnic->mac) == -1) { - return -1; + PrintDebug("Vnet-nic: Connect %s to frontend %s\n", + name, 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); } + 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)); + + +//for temporary hack for vnet bridge test +#if 1 + { + uchar_t zeromac[6] = {0,0,0,0,0,0}; + + if(!strcmp(name, "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 - PrintDebug("Vnet-nic device %s initialized\n", name); +//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(name, "vnet_nic")){ //domu + vnet_nic_guestid = vnet_dev_id; + } + 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; + + 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; }