X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=8993066ba8f526c62ca0f179825fddfdd74aff00;hb=964e7836a6227341b5d895a830b7e36ad6debffb;hp=d3d5cfbe24510ae4f7ab8eec9059d67f4738b0dc;hpb=610d3af422ae2f0eb43d156984bf5d56d3352e46;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index d3d5cfb..8993066 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -36,8 +37,6 @@ #define PrintDebug(fmt, args...) #endif -#define VIRTIO_NIC_PROFILE - #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10)) @@ -66,7 +65,7 @@ struct virtio_net_config struct virtio_dev_state { struct vm_device * pci_bus; struct list_head dev_list; - struct guest_info *vm; + struct v3_vm_info *vm; }; struct virtio_net_state { @@ -83,6 +82,10 @@ struct virtio_net_state { ulong_t pkt_sent, pkt_recv, pkt_drop; +#if 1 //for temporary performance testing purpose + long last_sent_time, last_recv_time; +#endif + struct v3_dev_net_ops * net_ops; v3_lock_t lock; @@ -131,19 +134,19 @@ static int virtio_init_state(struct virtio_net_state * virtio) return 0; } -static int pkt_tx(struct virtio_net_state * virtio, struct vring_desc * buf_desc) +static int pkt_tx(struct guest_info *core, struct virtio_net_state * virtio, struct vring_desc * buf_desc) { uint8_t * buf = NULL; uint32_t len = buf_desc->length; - PrintDebug("Virtio NIC: Handling Virtio Write, net_state: %p\n", virtio); + PrintDebug("Virtio NIC: Virtio Pkt Sending, net_state: %p, pkt size: %d\n", virtio, len); - if (guest_pa_to_host_va(virtio->virtio_dev->vm, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { + if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { PrintError("Could not translate buffer address\n"); return -1; } - if (virtio->net_ops->send(buf, len, (void *)virtio, NULL) == -1) { + if (virtio->net_ops->send(buf, len, virtio->backend_data, NULL) == -1) { return -1; } @@ -162,12 +165,16 @@ static int build_receive_header(struct virtio_net_hdr * hdr, const void * buf, i return 0; } -static int copy_data_to_desc(struct virtio_net_state * virtio_state, struct vring_desc * desc, uchar_t * buf, uint_t buf_len) +static int copy_data_to_desc(struct guest_info *core, + struct virtio_net_state * virtio_state, + struct vring_desc * desc, + uchar_t * buf, + uint_t buf_len) { uint32_t len; uint8_t * desc_buf = NULL; - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, desc->addr_gpa, (addr_t *)&(desc_buf)) == -1) { + if (v3_gpa_to_hva(core, desc->addr_gpa, (addr_t *)&(desc_buf)) == -1) { PrintError("Could not translate buffer address\n"); return -1; } @@ -192,23 +199,18 @@ static int get_desc_count(struct virtio_queue * q, int index) { return cnt; } -static int handle_ctrl(struct virtio_net_state * dev) { +static int handle_ctrl(struct guest_info *core, struct virtio_net_state * dev) { return 0; } -static int handle_pkt_tx(struct virtio_net_state * virtio_state) +static int handle_pkt_tx(struct guest_info *core, struct virtio_net_state * virtio_state) { struct virtio_queue * q = &(virtio_state->tx_vq); struct virtio_net_hdr * hdr = NULL; - if (q->avail->index < q->last_avail_idx) { - q->idx_overflow = true; - } - - q->last_avail_idx = q->avail->index; + PrintDebug("Virtio NIC: TX: running on cpu: %d\n", V3_Get_CPU()); - while (q->cur_avail_idx < q->avail->index || - (q->idx_overflow && q->cur_avail_idx < (q->avail->index + 65536))) { + while (q->cur_avail_idx != q->avail->index) { struct vring_desc * hdr_desc = NULL; addr_t hdr_addr = 0; uint16_t desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; @@ -217,17 +219,17 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) int i = 0; hdr_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { + if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { PrintError("Could not translate block header address\n"); return -1; } hdr = (struct virtio_net_hdr*)hdr_addr; desc_idx = hdr_desc->next; - + for (i = 0; i < desc_cnt - 1; i++) { struct vring_desc * buf_desc = &(q->desc[desc_idx]); - if (pkt_tx(virtio_state, buf_desc) == -1) { + if (pkt_tx(core, virtio_state, buf_desc) == -1) { PrintError("Error handling nic operation\n"); return -1; } @@ -241,13 +243,7 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) q->used->ring[q->used->index % q->queue_size].length = req_len; // What do we set this to???? q->used->index++; - int last_idx = q->cur_avail_idx; - q->cur_avail_idx ++; - - if (q->cur_avail_idx < last_idx) { - q->idx_overflow = false; - } } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { @@ -255,15 +251,29 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) virtio_state->virtio_cfg.pci_isr = 0x1; } -#ifdef VIRTIO_NIC_PROFILE - if(virtio_state->pkt_sent % 10000 == 0) - PrintError("Virtio NIC: %p, pkt_sent: %ld\n", virtio_state, virtio_state->pkt_sent); -#endif +#ifdef CONFIG_VNET_PROFILE + if (virtio_state->pkt_sent % 50000 == 0){ + long cur_time, time; + rdtscll(cur_time); + time = cur_time - virtio_state->last_sent_time; + PrintError("Virtio NIC: last sent 50000 cycles: %ld\n",time); + //PrintError("Virtio NIC: sent: %ld, rxed: %ld, dropped: %ld\n", + // virtio_state->pkt_sent, + // virtio_state->pkt_recv, + // virtio_state->pkt_drop); + rdtscll(virtio_state->last_sent_time); + } +#endif return 0; } -static int virtio_setup_queue(struct virtio_net_state * virtio_state, struct virtio_queue * queue, addr_t pfn, addr_t page_addr) { + +static int virtio_setup_queue(struct guest_info *core, + struct virtio_net_state * virtio_state, + struct virtio_queue * queue, + addr_t pfn, + addr_t page_addr) { queue->pfn = pfn; queue->ring_desc_addr = page_addr; @@ -271,20 +281,20 @@ static int virtio_setup_queue(struct virtio_net_state * virtio_state, struct vir queue->ring_used_addr = ((queue->ring_avail_addr) + (sizeof(struct vring_avail)) + (queue->queue_size * sizeof(uint16_t))); - + // round up to next page boundary. queue->ring_used_addr = (queue->ring_used_addr + 0xfff) & ~0xfff; - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, queue->ring_desc_addr, (addr_t *)&(queue->desc)) == -1) { + if (v3_gpa_to_hva(core, queue->ring_desc_addr, (addr_t *)&(queue->desc)) == -1) { PrintError("Could not translate ring descriptor address\n"); return -1; } - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, queue->ring_avail_addr, (addr_t *)&(queue->avail)) == -1) { + if (v3_gpa_to_hva(core, queue->ring_avail_addr, (addr_t *)&(queue->avail)) == -1) { PrintError("Could not translate ring available address\n"); return -1; } - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, queue->ring_used_addr, (addr_t *)&(queue->used)) == -1) { + if (v3_gpa_to_hva(core, queue->ring_used_addr, (addr_t *)&(queue->used)) == -1) { PrintError("Could not translate ring used address\n"); return -1; } @@ -305,6 +315,7 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u struct virtio_net_state * virtio = (struct virtio_net_state *)private_data; int port_idx = port % virtio->io_range_size; + PrintDebug("VIRTIO NIC %p Write for port %d (index=%d) len=%d, value=%x\n", private_data, port, port_idx, length, *(uint32_t *)src); @@ -326,15 +337,18 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u addr_t pfn = *(uint32_t *)src; addr_t page_addr = (pfn << VIRTIO_PAGE_SHIFT); uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector; + + PrintDebug("Virtio Write: pfn: %p, page_addr %p, queue_idx %d\n", (void *)pfn, (void *)page_addr, queue_idx); + switch (queue_idx) { case 0: - virtio_setup_queue(virtio, &virtio->rx_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, &virtio->rx_vq, pfn, page_addr); break; case 1: - virtio_setup_queue(virtio, &virtio->tx_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, &virtio->tx_vq, pfn, page_addr); break; case 2: - virtio_setup_queue(virtio, &virtio->ctrl_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, &virtio->ctrl_vq, pfn, page_addr); break; default: break; @@ -356,12 +370,12 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u if (queue_idx == 0){ PrintDebug("receive queue notification 0, packet get by Guest\n"); } else if (queue_idx == 1){ - if (handle_pkt_tx(virtio) == -1) { + if (handle_pkt_tx(core, virtio) == -1) { PrintError("Could not handle NIC Notification\n"); return -1; } } else if (queue_idx == 2){ - if (handle_ctrl(virtio) == -1) { + if (handle_ctrl(core, virtio) == -1) { PrintError("Could not handle NIC Notification\n"); return -1; } @@ -397,7 +411,7 @@ static int virtio_io_read(struct guest_info *core, uint16_t port, void * dst, ui int port_idx = port % virtio->io_range_size; uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector; - PrintDebug("Virtio NIC %p: Read for port %d (index =%d), length=%d", private_data, + PrintDebug("Virtio NIC %p: Read for port %d (index =%d), length=%d\n", private_data, port, port_idx, length); switch (port_idx) { @@ -483,35 +497,37 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { uint32_t data_len = size; uint32_t offset = 0; unsigned long flags; + int ret_val = -1; + int raw = 1; flags = v3_lock_irqsave(virtio->lock); - - PrintDebug("VIRTIO NIC: sending packet to virtio nic %p, size:%d", virtio, size); + + PrintDebug("VIRTIO NIC: RX on cpu %d to virtio nic %p, size:%d\n", V3_Get_CPU(), virtio, size); virtio->pkt_recv ++; - data_len -= hdr_len; - build_receive_header(&hdr, buf, 1); + if (!raw){ + data_len -= hdr_len; + } + + build_receive_header(&hdr, buf, raw); if (q->ring_avail_addr == 0) { PrintError("Queue is not set\n"); - return -1; + goto exit; } - if (q->last_avail_idx > q->avail->index) - q->idx_overflow = true; - q->last_avail_idx = q->avail->index; - - if (q->cur_avail_idx < q->avail->index || (q->idx_overflow && q->cur_avail_idx < q->avail->index+65536)){ + if (q->cur_avail_idx != q->avail->index){ addr_t hdr_addr = 0; uint16_t hdr_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; uint16_t buf_idx = 0; struct vring_desc * hdr_desc = NULL; hdr_desc = &(q->desc[hdr_idx]); - if (guest_pa_to_host_va(virtio->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { + if (v3_gpa_to_hva(&(virtio->virtio_dev->vm->cores[0]), hdr_desc->addr_gpa, &(hdr_addr)) == -1) { PrintError("Could not translate receive buffer address\n"); - return -1; + ret_val = -1; + goto exit; } memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr)); @@ -523,7 +539,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { struct vring_desc * buf_desc = &(q->desc[buf_idx]); uint32_t len = 0; - len = copy_data_to_desc(virtio, buf_desc, buf + offset, data_len - offset); + len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, buf + offset, data_len - offset); offset += len; if (offset < data_len) { buf_desc->flags = VIRTIO_NEXT_FLAG; @@ -535,17 +551,10 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { q->used->ring[q->used->index % q->queue_size].length = data_len + hdr_len; // This should be the total length of data sent to guest (header+pkt_data) q->used->index++; - int last_idx = q->cur_avail_idx; q->cur_avail_idx++; - if (q->cur_avail_idx < last_idx) - q->idx_overflow = false; } else { virtio->pkt_drop++; - -#ifdef VIRTIO_NIC_PROFILE - PrintError("Virtio NIC: %p, one pkt dropped receieved: %ld, dropped: %ld, sent: %ld curidx: %d, avaiIdx: %d\n", - virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent, q->cur_avail_idx, q->avail->index); -#endif + goto exit; } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { @@ -554,16 +563,27 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { virtio->virtio_cfg.pci_isr = 0x1; } -#ifdef VIRTIO_NIC_PROFILE - if ((virtio->pkt_recv % 10000) == 0){ - PrintError("Virtio NIC: %p, receieved: %ld, dropped: %ld, sent: %ld\n", - virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent); + ret_val = offset; + +exit: + +#ifdef CONFIG_VNET_PROFILE + if (virtio->pkt_recv % 50000 == 0){ + long cur_time, time; + rdtscll(cur_time); + time = cur_time - virtio->last_recv_time; + PrintError("Virtio NIC: last recv 50000 cycles: %ld\n",time); + //PrintError("Virtio NIC: sent: %ld, rxed: %ld, dropped: %ld\n", + //virtio->pkt_sent, + //virtio->pkt_recv, + //virtio->pkt_drop); + rdtscll(virtio->last_recv_time); } #endif v3_unlock_irqrestore(virtio->lock, flags); - - return offset; + + return ret_val; } @@ -666,9 +686,9 @@ static int connect_fn(struct v3_vm_info * info, static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); struct virtio_dev_state * virtio_state = NULL; - char * name = v3_cfg_val(cfg, "name"); + char * dev_id = v3_cfg_val(cfg, "ID"); - PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name); + PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", dev_id); if (pci_bus == NULL) { PrintError("Virtio NIC: VirtIO devices require a PCI Bus"); @@ -680,15 +700,16 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { INIT_LIST_HEAD(&(virtio_state->dev_list)); virtio_state->pci_bus = pci_bus; + virtio_state->vm = vm; - struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state); + struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, virtio_state); if (v3_attach_device(vm, dev) == -1) { - PrintError("Virtio NIC: Could not attach device %s\n", name); + PrintError("Virtio NIC: Could not attach device %s\n", dev_id); return -1; } - if (v3_dev_add_net_frontend(vm, name, connect_fn, (void *)virtio_state) == -1) { - PrintError("Virtio NIC: Could not register %s as net frontend\n", name); + if (v3_dev_add_net_frontend(vm, dev_id, connect_fn, (void *)virtio_state) == -1) { + PrintError("Virtio NIC: Could not register %s as net frontend\n", dev_id); return -1; }