X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_vnet.c;h=74164c9d91a1a30fec024b270f735a996a6f5ebe;hb=596d3c2aa2f0a5360baf1c921e4543f014809b78;hp=215e664df306659abb041cac23e0598e06920ac8;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_vnet.c b/palacios/src/devices/lnx_virtio_vnet.c index 215e664..74164c9 100644 --- a/palacios/src/devices/lnx_virtio_vnet.c +++ b/palacios/src/devices/lnx_virtio_vnet.c @@ -13,7 +13,7 @@ * All rights reserved. * * Author: Jack Lange - * Lei Xia + * Lei Xia * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "V3VEE_LICENSE". @@ -222,16 +222,11 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * } -static int vnet_pkt_input_cb(struct v3_vm_info * vm, struct v3_vnet_pkt vnet_pkts[], uint16_t pkt_num, void * private_data){ +static int vnet_pkt_input_cb(struct v3_vm_info * vm, struct v3_vnet_pkt *pkt, void * private_data){ struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; struct virtio_queue * q = &(vnet_state->queue[RECV_QUEUE]); int ret_val = -1; unsigned long flags; - uint16_t sent; - struct v3_vnet_pkt *pkt; - - if(pkt_num <= 0) - return 0; flags = v3_lock_irqsave(vnet_state->lock); @@ -240,45 +235,33 @@ static int vnet_pkt_input_cb(struct v3_vm_info * vm, struct v3_vnet_pkt vnet_pk goto exit; } - PrintDebug("VNET Bridge: RX: running on cpu: %d, num of pkts: %d\n", V3_Get_CPU(), pkt_num); - - for(sent = 0; sent < pkt_num; sent ++) { - pkt = &vnet_pkts[sent]; - vnet_state->pkt_recv ++; - - if (q->cur_avail_idx != q->avail->index) { - uint16_t pkt_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; - struct vring_desc * pkt_desc = NULL; - struct vnet_bridge_pkt * virtio_pkt = NULL; + if (q->cur_avail_idx != q->avail->index) { + uint16_t pkt_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; + struct vring_desc * pkt_desc = NULL; + struct vnet_bridge_pkt * virtio_pkt = NULL; - pkt_desc = &(q->desc[pkt_idx]); - PrintDebug("VNET Bridge RX: buffer desc len: %d\n", pkt_desc->length); + pkt_desc = &(q->desc[pkt_idx]); + PrintDebug("VNET Bridge RX: buffer desc len: %d\n", pkt_desc->length); - if (v3_gpa_to_hva(&(vm->cores[0]), pkt_desc->addr_gpa, (addr_t *)&(virtio_pkt)) == -1) { - PrintError("Could not translate buffer address\n"); - goto exit; - } + if (v3_gpa_to_hva(&(vm->cores[0]), pkt_desc->addr_gpa, (addr_t *)&(virtio_pkt)) == -1) { + PrintError("Could not translate buffer address\n"); + goto exit; + } - PrintDebug("VNET Bridge: RX: pkt sent to guest pkt size: %d, dst link: %d\n", pkt->size, pkt->dst_id); + PrintDebug("VNET Bridge: RX: pkt sent to guest pkt size: %d, dst link: %d\n", pkt->size, pkt->dst_id); - // Fill in dst packet buffer - virtio_pkt->link_id = pkt->dst_id; - virtio_pkt->pkt_size = pkt->size; - memcpy(virtio_pkt->pkt, pkt->data, pkt->size); + // Fill in dst packet buffer + virtio_pkt->link_id = pkt->dst_id; + virtio_pkt->pkt_size = pkt->size; + memcpy(virtio_pkt->pkt, pkt->data, pkt->size); - q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[q->cur_avail_idx % q->queue_size]; - q->used->ring[q->used->index % q->queue_size].length = sizeof(struct vnet_bridge_pkt); - - q->used->index++; - q->cur_avail_idx++; - } else { - vnet_state->pkt_drop ++; - v3_vnet_disable_bridge(); - } - } + q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[q->cur_avail_idx % q->queue_size]; + q->used->ring[q->used->index % q->queue_size].length = sizeof(struct vnet_bridge_pkt); - if(sent == 0){ - goto exit; + q->used->index++; + q->cur_avail_idx++; + } else { + vnet_state->pkt_drop ++; } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { @@ -288,19 +271,7 @@ static int vnet_pkt_input_cb(struct v3_vm_info * vm, struct v3_vnet_pkt vnet_pk } ret_val = 0; - -#ifdef CONFIG_VNET_PROFILE - if (vnet_state->pkt_recv % 200000 == 0) - PrintError("Vnet Bridge: sent: %ld, rxed: %ld, dropped: %ld, total exit: %ld, tx exit: %ld, rx exit: %ld\n", - vnet_state->pkt_sent, - vnet_state->pkt_recv, - vnet_state->pkt_drop, - vnet_state->total_exit, - vnet_state->tx_exit, - vnet_state->rx_exit); -#endif - exit: v3_unlock_irqrestore(vnet_state->lock, flags); @@ -308,22 +279,24 @@ exit: return ret_val; } -static void vnet_pkt_input_xcall(void *data){ - struct v3_vnet_bridge_input_args *args = (struct v3_vnet_bridge_input_args *)data; +static int vnet_pkt_input_xcall(void *data){ + struct v3_vnet_bridge_xcall_args *args = (struct v3_vnet_bridge_xcall_args *)data; + int i = 0; + + for(i = 0; i < args->pkt_num; i++) { + vnet_pkt_input_cb(args->vm, &(args->vnet_pkts[i]), args->private_data); + } - vnet_pkt_input_cb(args->vm, args->vnet_pkts, args->pkt_num, args->private_data); + return 0; } static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * vnet_state) { struct virtio_queue * q = &(vnet_state->queue[XMIT_QUEUE]); - unsigned long flags = 0; int recvd = 0; - flags = v3_lock_irqsave(vnet_state->lock); - if (q->ring_avail_addr == 0) { - goto exit; + return -1; } while (q->cur_avail_idx != q->avail->index) { @@ -340,10 +313,17 @@ static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * v return -1; } - PrintDebug("VNET Bridge: TX: on cpu %d pkt size: %d, dst link: %d\n", cpu, virtio_pkt->pkt_size, virtio_pkt->link_id); - - v3_vnet_rx(virtio_pkt->pkt, virtio_pkt->pkt_size, virtio_pkt->link_id, LINK_EDGE); + //PrintDebug("VNET Bridge: TX: on cpu %d pkt size: %d, dst link: %d\n", cpu, virtio_pkt->pkt_size, virtio_pkt->link_id); + + struct v3_vnet_pkt pkt; + pkt.size = virtio_pkt->pkt_size; + pkt.src_type = LINK_EDGE; + pkt.src_id = 0; + memcpy(pkt.header, virtio_pkt->pkt, ETHERNET_HEADER_LEN); + pkt.data = virtio_pkt->pkt; + v3_vnet_send_pkt(&pkt, NULL); + q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[q->cur_avail_idx % q->queue_size]; q->used->ring[q->used->index % q->queue_size].length = pkt_desc->length; // What do we set this to???? q->used->index++; @@ -355,54 +335,28 @@ static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * v } if(recvd == 0){ - goto exit; - } - - //PrintError("In polling get %d\n", recvd); - - //if on the dom0 core, interrupt the domU core to poll pkts - //otherwise, call the polling directly - int cpu = V3_Get_CPU(); - if(vnet_state->vm->cores[0].cpu_id == cpu){ - cpu = (cpu == 0)?1:0; - v3_interrupt_cpu(vnet_state->vm, cpu, V3_VNET_POLLING_VECTOR); - }else{ - v3_vnet_polling(); + return 0; } - if((vnet_state->pkt_sent % (QUEUE_SIZE/20)) == 0) { //optimized for guest's, batch the interrupts - if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - v3_pci_raise_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); - vnet_state->virtio_cfg.pci_isr = 0x1; - } + if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { + v3_pci_raise_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); + vnet_state->virtio_cfg.pci_isr = 0x1; } - -#ifdef CONFIG_VNET_PROFILE - if (vnet_state->pkt_sent % 200000 == 0) - PrintError("Vnet Bridge: sent: %ld, rxed: %ld, dropped: %ld, total exit: %ld, tx exit: %ld, rx exit: %ld\n", - vnet_state->pkt_sent, - vnet_state->pkt_recv, - vnet_state->pkt_drop, - vnet_state->total_exit, - vnet_state->tx_exit, - vnet_state->rx_exit); -#endif - -exit: - v3_unlock_irqrestore(vnet_state->lock,flags); - + return 0; } -static int polling_pkt_from_guest(struct v3_vm_info * vm, void *private_data){ +static void vnet_virtio_poll(struct v3_vm_info * vm, void *private_data){ struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; - - return handle_pkt_kick(&(vm->cores[0]), vnet_state); + + if(vm == vnet_state->vm){ + handle_pkt_kick(&(vm->cores[0]), vnet_state); + } } static int handle_rx_kick(struct guest_info *core, struct virtio_vnet_state * vnet_state) { - v3_vnet_enable_bridge(); + //v3_vnet_enable_bridge(); return 0; } @@ -413,10 +367,8 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * PrintDebug("VNET Bridge: VIRTIO VNET Write for port %d len=%d, value=%x\n", port, length, *(uint32_t *)src); - PrintDebug("VNET Bridge: port idx=%d\n", port_idx); vnet_state->total_exit ++; - switch (port_idx) { case GUEST_FEATURES_PORT: if (length != 4) { @@ -467,13 +419,14 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * if(vnet_state->queue[RECV_QUEUE].avail != NULL){ vnet_state->ready = 1; + vnet_state->queue[RECV_QUEUE].used->flags |= VRING_NO_NOTIFY_FLAG; } //No notify when there is pkt tx from guest + //palacios will do the polling if(vnet_state->queue[XMIT_QUEUE].used != NULL){ vnet_state->queue[XMIT_QUEUE].used->flags |= VRING_NO_NOTIFY_FLAG; } - } else { PrintError("Illegal write length for page frame number\n"); return -1; @@ -506,8 +459,7 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * PrintError("Could not handle Virtio VNET TX\n"); return -1; } - vnet_state->tx_exit ++; - //PrintError("Notify on TX\n"); + PrintError("Notify on TX\n"); } else if (queue_idx == 2) { if (handle_rx_kick(core, vnet_state) == -1){ PrintError("Could not handle Virtio RX buffer refills Kick\n"); @@ -679,7 +631,7 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { bars[0].private_data = vnet_state; pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE, - 0, PCI_AUTO_DEV_NUM, 0, + 0, 5 /*PCI_AUTO_DEV_NUM*/, 0, "LNX_VIRTIO_VNET", bars, NULL, NULL, NULL, vnet_state); @@ -704,9 +656,13 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { virtio_reset(vnet_state); - V3_Print("Registering Virtio device as vnet bridge\n"); - v3_vnet_add_bridge(vm, vnet_pkt_input_cb, vnet_pkt_input_xcall, polling_pkt_from_guest, 0, 500000, (void *)vnet_state); + struct v3_vnet_bridge_ops brg_ops; + brg_ops.input = vnet_pkt_input_cb; + brg_ops.polling_pkt = vnet_virtio_poll; + brg_ops.xcall_input = vnet_pkt_input_xcall; + V3_Print("Registering Virtio device as vnet bridge\n"); + v3_vnet_add_bridge(vm, &brg_ops, (void *)vnet_state); return 0; }