X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=2dc1684df8546aec80371f1ac4e4ce2c7639b73a;hb=926fe574cd42bb860c19fd04610451c24b6d42b6;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..2dc1684 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,7 +194,6 @@ 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"); @@ -207,7 +205,7 @@ static int tx_one_pkt(struct guest_info * core, 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; } @@ -265,11 +263,12 @@ 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; + int txed = 0, left = 0; + unsigned long flags; if (!q->ring_avail_addr) { return -1; @@ -314,8 +313,11 @@ static int handle_pkt_tx(struct guest_info * core, q->used->index ++; q->cur_avail_idx ++; - - txed ++; + + if(++txed >= quote && quote > 0){ + left = (q->cur_avail_idx != q->avail->index); + break; + } } v3_unlock_irqrestore(virtio_state->tx_lock, flags); @@ -328,10 +330,10 @@ static int handle_pkt_tx(struct guest_info * core, } if(txed > 0) { - V3_Net_Print(2, "Virtio Handle TX: txed pkts: %d\n", txed); + V3_Net_Print(2, "Virtio Handle TX: txed pkts: %d, left %d\n", txed, left); } - return 0; + return left; exit_error: @@ -420,8 +422,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 +451,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 +497,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 +505,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 +525,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 +545,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; @@ -578,7 +580,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 +597,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 +629,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; @@ -752,20 +754,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 +775,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 +792,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,7 +803,7 @@ 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); @@ -837,13 +832,14 @@ 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; } - #define RATE_UPPER_THRESHOLD 10 /* 10000 pkts per second, around 100Mbits */ #define RATE_LOWER_THRESHOLD 1 #define PROFILE_PERIOD 10000 /*us*/ @@ -929,22 +925,20 @@ 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); + &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,7 +952,7 @@ 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; }