X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=479593b97293906adb9d6f6e10a6298e6d72b254;hb=964e7836a6227341b5d895a830b7e36ad6debffb;hp=abdd227a38f55e4cfbe1c22dcc5640c6f288ceaf;hpb=ac31dc84e5e31187345ec6d66647b29975958a94;p=palacios.git diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c index abdd227..479593b 100644 --- a/palacios/src/devices/vnet_nic.c +++ b/palacios/src/devices/vnet_nic.c @@ -35,41 +35,44 @@ struct vnet_nic_state { char mac[6]; - struct guest_info * core; + struct v3_vm_info * vm; struct v3_dev_net_ops net_ops; + int vnet_dev_id; }; -//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){ - struct v3_vnet_pkt * pkt = NULL; - PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len); -#ifdef CONFIG_DEBUG_VNET_NIC - v3_hexdump(buf, len, NULL, 0); -#endif +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 = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_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; - if(pkt == NULL){ - PrintError("Malloc() fails"); - return -1; +#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); } +#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); - pkt->size = len; - memcpy(pkt->data, buf, pkt->size); - - v3_vnet_send_pkt(pkt); - - V3_Free(pkt); return 0; } - -// We need to make this dynamically allocated -//static struct v3_dev_net_ops net_ops = { -// .send = vnet_send, -//}; - 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; @@ -78,87 +81,14 @@ static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void return vnetnic->net_ops.recv(pkt->data, pkt->size, vnetnic->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; - } - - 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; -} - -/* - *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); - } - } +static int register_to_vnet(struct v3_vm_info * vm, + struct vnet_nic_state * vnet_nic, + char * dev_name, + uint8_t mac[6]) { - return 0; -} - - -/* - *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; -} - -#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); - - return 0; + return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic); } static int vnet_nic_free(struct vm_device * dev) { @@ -172,35 +102,79 @@ static struct v3_device_ops dev_ops = { .stop = NULL, }; + +static int str2mac(char * macstr, uint8_t mac[6]){ + uint8_t hex[2]; + int i = 0; + char * s = macstr; + + 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 * dev_id = v3_cfg_val(cfg, "ID"); + char * macstr = NULL; + int vnet_dev_id = 0; v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); + macstr = v3_cfg_val(frontend_cfg, "mac"); + + if (macstr == NULL) { + PrintDebug("Vnet-nic configuration error: No Mac specified\n"); + return -1; + } + 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_allocate_device(dev_id, &dev_ops, vnetnic); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + PrintError("Could not attach device %s\n", dev_id); return -1; } + + vnetnic->net_ops.send = vnet_send; + str2mac(macstr, vnetnic->mac); + 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", - name, v3_cfg_val(frontend_cfg, "tag")); + dev_id, v3_cfg_val(frontend_cfg, "tag")); return -1; } - if (register_to_vnet(vm, vnetnic, name, vnetnic->mac) == -1) { + PrintDebug("Vnet-nic: Connect %s to frontend %s\n", + dev_id, 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); return -1; } - PrintDebug("Vnet-nic device %s initialized\n", name); + vnetnic->vnet_dev_id = vnet_dev_id; + + PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", dev_id, macstr, *((uint32_t *)vnetnic->mac)); + return 0; }