X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=92dee7e9d89509a9bc932a2588449e32c0b00f8d;hb=d597d493eb303496f3bb32e2a73a094a8a20a022;hp=7a4eb4ab8644451165a78ff5e1c8914bfaf6c9c5;hpb=3265327285cf9896276ddf7fab7cbe0d3060bd10;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index 7a4eb4a..92dee7e 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -1,3 +1,4 @@ + /* * This file is part of the Palacios Virtual Machine Monitor developed * by the V3VEE Project with funding from the United States National @@ -131,8 +132,6 @@ struct virtio_net_state { uint8_t mergeable_rx_bufs; struct v3_timer * timer; - struct vnet_thread * poll_thread; - struct nic_statistics stats; struct v3_dev_net_ops * net_ops; @@ -195,26 +194,25 @@ static int tx_one_pkt(struct guest_info * core, { uint8_t * buf = NULL; uint32_t len = buf_desc->length; - int synchronize = virtio->tx_notify; if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { PrintDebug("Could not translate buffer address\n"); return -1; } - + V3_Net_Print(2, "Virtio-NIC: virtio_tx: size: %d\n", len); if(net_debug >= 4){ v3_hexdump(buf, len, NULL, 0); } - if(virtio->net_ops->send(buf, len, synchronize, virtio->backend_data) < 0){ + if(virtio->net_ops->send(buf, len, virtio->backend_data) < 0){ virtio->stats.tx_dropped ++; return -1; } - + virtio->stats.tx_pkts ++; virtio->stats.tx_bytes += len; - + return 0; } @@ -228,7 +226,7 @@ static inline int copy_data_to_desc(struct guest_info * core, uint_t dst_offset){ uint32_t len; uint8_t * desc_buf = NULL; - + if (v3_gpa_to_hva(core, desc->addr_gpa, (addr_t *)&(desc_buf)) == -1) { PrintDebug("Could not translate buffer address\n"); return -1; @@ -265,78 +263,80 @@ static inline void disable_cb(struct virtio_queue *queue) { } static int handle_pkt_tx(struct guest_info * core, - struct virtio_net_state * virtio_state) + struct virtio_net_state * virtio_state, + int quote) { - struct virtio_queue *q = &(virtio_state->tx_vq); - int txed = 0; - unsigned long flags; + struct virtio_queue * q; + int txed = 0, left = 0; + unsigned long flags; + q = &(virtio_state->tx_vq); if (!q->ring_avail_addr) { return -1; } - flags = v3_lock_irqsave(virtio_state->tx_lock); - while (q->cur_avail_idx != q->avail->index) { - struct virtio_net_hdr_mrg_rxbuf * hdr = NULL; + while (1) { 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]; - int desc_cnt = get_desc_count(q, desc_idx); + uint16_t desc_idx, tmp_idx; + int desc_cnt; + + flags = v3_lock_irqsave(virtio_state->tx_lock); + if(q->cur_avail_idx == q->avail->index || + (quote > 0 && txed >= quote)) { + left = (q->cur_avail_idx != q->avail->index); + v3_unlock_irqrestore(virtio_state->tx_lock, flags); + break; + } + + desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; + tmp_idx = q->cur_avail_idx ++; + + v3_unlock_irqrestore(virtio_state->tx_lock, flags); + + desc_cnt = get_desc_count(q, desc_idx); if(desc_cnt != 2){ PrintError("VNIC: merged rx buffer not supported, desc_cnt %d\n", desc_cnt); - goto exit_error; } hdr_desc = &(q->desc[desc_idx]); - if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { - PrintError("Could not translate block header address\n"); - goto exit_error; - } + if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) != -1) { + struct virtio_net_hdr_mrg_rxbuf * hdr; + struct vring_desc * buf_desc; - hdr = (struct virtio_net_hdr_mrg_rxbuf *)hdr_addr; - desc_idx = hdr_desc->next; + hdr = (struct virtio_net_hdr_mrg_rxbuf *)hdr_addr; + desc_idx = hdr_desc->next; - V3_Net_Print(2, "Virtio NIC: TX hdr count : %d\n", hdr->num_buffers); - - /* here we assumed that one ethernet pkt is not splitted into multiple buffer */ - struct vring_desc * buf_desc = &(q->desc[desc_idx]); - if (tx_one_pkt(core, virtio_state, buf_desc) == -1) { - PrintError("Virtio NIC: Error handling nic operation\n"); - goto exit_error; - } - if(buf_desc->next & VIRTIO_NEXT_FLAG){ - PrintError("Virtio NIC: TX more buffer need to read\n"); + /* here we assumed that one ethernet pkt is not splitted into multiple buffer */ + buf_desc = &(q->desc[desc_idx]); + if (tx_one_pkt(core, virtio_state, buf_desc) == -1) { + PrintError("Virtio NIC: Fails to send packet\n"); + } + } else { + PrintError("Could not translate block header address\n"); } - - 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 = buf_desc->length; /* What do we set this to???? */ + + flags = v3_lock_irqsave(virtio_state->tx_lock); + + q->used->ring[q->used->index % q->queue_size].id = + q->avail->ring[tmp_idx % q->queue_size]; + q->used->index ++; - q->cur_avail_idx ++; + v3_unlock_irqrestore(virtio_state->tx_lock, flags); txed ++; } - - v3_unlock_irqrestore(virtio_state->tx_lock, flags); - + if (txed && !(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, - 0, virtio_state->pci_dev); + virtio_state->pci_dev, 0); virtio_state->virtio_cfg.pci_isr = 0x1; virtio_state->stats.rx_interrupts ++; } - if(txed > 0) { - V3_Net_Print(2, "Virtio Handle TX: txed pkts: %d\n", txed); - } - - return 0; - -exit_error: - - v3_unlock_irqrestore(virtio_state->tx_lock, flags); - return -1; + return left; } @@ -420,8 +420,8 @@ static int virtio_io_write(struct guest_info *core, pfn, page_addr); if(virtio->tx_notify == 0){ disable_cb(&virtio->tx_vq); - vnet_thread_wakeup(virtio->poll_thread); } + virtio->status = 1; break; case 2: virtio_setup_queue(core, virtio, @@ -449,15 +449,15 @@ static int virtio_io_write(struct guest_info *core, /* receive queue refill */ virtio->stats.tx_interrupts ++; } else if (queue_idx == 1){ - if (handle_pkt_tx(core, virtio) == -1) { - PrintError("Could not handle Virtio NIC tx kick\n"); + if (handle_pkt_tx(core, virtio, 0) < 0) { + PrintError("Virtio NIC: Error to handle packet TX\n"); return -1; } virtio->stats.tx_interrupts ++; } else if (queue_idx == 2){ /* ctrl */ } else { - PrintError("Wrong queue index %d\n", queue_idx); + PrintError("Virtio NIC: Wrong queue index %d\n", queue_idx); } break; } @@ -495,7 +495,7 @@ static int virtio_io_read(struct guest_info *core, switch (port_idx) { case HOST_FEATURES_PORT: if (length != 4) { - PrintError("Illegal read length for host features\n"); + PrintError("Virtio NIC: Illegal read length for host features\n"); //return -1; } *(uint32_t *)dst = virtio->virtio_cfg.host_features; @@ -503,7 +503,7 @@ static int virtio_io_read(struct guest_info *core, case VRING_PG_NUM_PORT: if (length != 4) { - PrintError("Illegal read length for page frame number\n"); + PrintError("Virtio NIC: Illegal read length for page frame number\n"); return -1; } switch (queue_idx) { @@ -523,7 +523,7 @@ static int virtio_io_read(struct guest_info *core, case VRING_SIZE_PORT: if (length != 2) { - PrintError("Illegal read length for vring size\n"); + PrintError("Virtio NIC: Illegal read length for vring size\n"); return -1; } switch (queue_idx) { @@ -543,7 +543,7 @@ static int virtio_io_read(struct guest_info *core, case VIRTIO_STATUS_PORT: if (length != 1) { - PrintError("Illegal read length for status\n"); + PrintError("Virtio NIC: Illegal read length for status\n"); return -1; } *(uint8_t *)dst = virtio->virtio_cfg.status; @@ -553,7 +553,7 @@ static int virtio_io_read(struct guest_info *core, *(uint8_t *)dst = virtio->virtio_cfg.pci_isr; virtio->virtio_cfg.pci_isr = 0; v3_pci_lower_irq(virtio->virtio_dev->pci_bus, - 0, virtio->pci_dev); + virtio->pci_dev, 0); break; case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN: @@ -578,7 +578,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { unsigned long flags; uint8_t kick_guest = 0; - V3_Net_Print(2, "Virtio-NIC: virtio_rx: size: %d\n", size); + V3_Net_Print(2, "Virtio NIC: virtio_rx: size: %d\n", size); if (!q->ring_avail_addr) { V3_Net_Print(2, "Virtio NIC: RX Queue not set\n"); @@ -595,7 +595,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { uint16_t buf_idx; struct vring_desc * buf_desc; uint32_t hdr_len, len; - uint32_t offset = 0; + uint32_t offset = 0; hdr_len = (virtio->mergeable_rx_bufs)? sizeof(struct virtio_net_hdr_mrg_rxbuf): @@ -627,7 +627,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, buf+offset, size-offset, 0); if (len < 0){ - V3_Net_Print(2, "Virtio NIC:merged buffer, %d buffer size %d\n", + V3_Net_Print(2, "Virtio NIC: merged buffer, %d buffer size %d\n", hdr.num_buffers, len); q->cur_avail_idx = old_idx; goto err_exit; @@ -708,7 +708,7 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { virtio->pci_dev->config_header.intr_line); virtio->virtio_cfg.pci_isr = 0x1; - v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev); + v3_pci_raise_irq(virtio->virtio_dev->pci_bus, virtio->pci_dev, 0); virtio->stats.rx_interrupts ++; } @@ -752,20 +752,13 @@ static struct v3_device_ops dev_ops = { }; -static int virtio_tx_flush(void * args){ - struct virtio_net_state *virtio = (struct virtio_net_state *)args; +static int virtio_poll(int quote, void * data){ + struct virtio_net_state * virtio = (struct virtio_net_state *)data; - V3_Print("Virtio TX Poll Thread Starting for %s\n", - virtio->vm->name); + if (virtio->status) { - while(1){ - if(virtio->tx_notify == 0){ - handle_pkt_tx(&(virtio->vm->cores[0]), virtio); - v3_yield(NULL); - }else { - vnet_thread_sleep(-1); - } - } + return handle_pkt_tx(&(virtio->vm->cores[0]), virtio, quote); + } return 0; } @@ -780,7 +773,7 @@ static int register_dev(struct virtio_dev_state * virtio, int i; /* This gets the number of ports, rounded up to a power of 2 */ - net_state->io_range_size = 1; // must be a power of 2 + net_state->io_range_size = 1; while (tmp_ports > 0) { tmp_ports >>= 1; net_state->io_range_size <<= 1; @@ -797,7 +790,7 @@ static int register_dev(struct virtio_dev_state * virtio, bars[i].type = PCI_BAR_NONE; } - PrintDebug("Virtio-NIC io_range_size = %d\n", + PrintDebug("Virtio NIC: io_range_size = %d\n", net_state->io_range_size); bars[0].type = PCI_BAR_IO; @@ -808,9 +801,9 @@ static int register_dev(struct virtio_dev_state * virtio, bars[0].private_data = net_state; pci_dev = v3_pci_register_device(virtio->pci_bus, PCI_STD_DEVICE, - 0, 4/*PCI_AUTO_DEV_NUM*/, 0, + 0, PCI_AUTO_DEV_NUM, 0, "LNX_VIRTIO_NIC", bars, - NULL, NULL, NULL, net_state); + NULL, NULL, NULL, NULL, net_state); if (!pci_dev) { PrintError("Virtio NIC: Could not register PCI Device\n"); @@ -837,13 +830,15 @@ static int register_dev(struct virtio_dev_state * virtio, virtio_init_state(net_state); + V3_Print("Virtio NIC: Registered Intr Line %d\n", pci_dev->config_header.intr_line); + /* Add backend to list of devices */ list_add(&(net_state->dev_link), &(virtio->dev_list)); return 0; } - +#if 0 #define RATE_UPPER_THRESHOLD 10 /* 10000 pkts per second, around 100Mbits */ #define RATE_LOWER_THRESHOLD 1 #define PROFILE_PERIOD 10000 /*us*/ @@ -875,7 +870,6 @@ static void virtio_nic_timer(struct guest_info * core, V3_Print("Virtio NIC: Switch TX to VMM driven mode\n"); disable_cb(&(net_state->tx_vq)); net_state->tx_notify = 0; - vnet_thread_wakeup(net_state->poll_thread); } if(tx_rate < RATE_LOWER_THRESHOLD && net_state->tx_notify == 0){ @@ -912,7 +906,7 @@ static void virtio_nic_timer(struct guest_info * core, static struct v3_timer_ops timer_ops = { .update_timer = virtio_nic_timer, }; - +#endif static int connect_fn(struct v3_vm_info * info, void * frontend_data, @@ -922,6 +916,11 @@ static int connect_fn(struct v3_vm_info * info, struct virtio_dev_state * virtio = (struct virtio_dev_state *)frontend_data; struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state)); + if (!net_state) { + PrintError("Cannot allocate in connect\n"); + return -1; + } + memset(net_state, 0, sizeof(struct virtio_net_state)); register_dev(virtio, net_state); @@ -929,22 +928,19 @@ static int connect_fn(struct v3_vm_info * info, net_state->net_ops = ops; net_state->backend_data = private_data; net_state->virtio_dev = virtio; - net_state->tx_notify = 0; - net_state->rx_notify = 0; + + net_state->tx_notify = 1; + net_state->rx_notify = 1; - net_state->timer = v3_add_timer(&(info->cores[0]), - &timer_ops,net_state); - - PrintError("net_state 0x%p\n", (void *)net_state); + //net_state->timer = v3_add_timer(&(info->cores[0]), &timer_ops,net_state); ops->recv = virtio_rx; - ops->frontend_data = net_state; - memcpy(ops->fnt_mac, virtio->mac, ETH_ALEN); - - net_state->poll_thread = vnet_start_thread(virtio_tx_flush, - (void *)net_state, "Virtio_Poll"); - - net_state->status = 1; + ops->poll = virtio_poll; + ops->config.frontend_data = net_state; + ops->config.poll = 1; + ops->config.quote = 64; + ops->config.fnt_mac = V3_Malloc(ETH_ALEN); + memcpy(ops->config.fnt_mac, virtio->mac, ETH_ALEN); return 0; } @@ -958,11 +954,17 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { memcpy(macstr, str, strlen(str)); if (pci_bus == NULL) { - PrintError("Virtio NIC: VirtIO devices require a PCI Bus"); + PrintError("Virtio NIC: Virtio device require a PCI Bus"); return -1; } virtio_state = (struct virtio_dev_state *)V3_Malloc(sizeof(struct virtio_dev_state)); + + if (!virtio_state) { + PrintError("Cannot allocate in init\n"); + return -1; + } + memset(virtio_state, 0, sizeof(struct virtio_dev_state)); INIT_LIST_HEAD(&(virtio_state->dev_list));