+
/*
* This file is part of the Palacios Virtual Machine Monitor developed
* by the V3VEE Project with funding from the United States National
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;
{
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;
}
/*copy data into ring buffer */
static inline 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,
- uint_t dst_offset){
+ struct virtio_net_state * virtio_state,
+ struct vring_desc * desc,
+ uchar_t * buf,
+ uint_t buf_len,
+ 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;
}
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;
/* 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;
+ PrintError("Virtio NIC: Fails to send packet\n");
}
if(buf_desc->next & VIRTIO_NEXT_FLAG){
PrintError("Virtio NIC: TX more buffer need to read\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???? */
- q->used->index ++;
+ 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???? */
+
+ 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);
-
+
if (txed && !(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
- v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, 0, virtio_state->pci_dev);
+ v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus,
+ 0, virtio_state->pci_dev);
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);
+ V3_Net_Print(2, "Virtio Handle TX: txed pkts: %d, left %d\n", txed, left);
}
- return 0;
-
-exit_error:
-
+ return left;
+
+ exit_error:
+
v3_unlock_irqrestore(virtio_state->tx_lock, flags);
return -1;
}
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);
+ PrintDebug("VIRTIO NIC %p Write for port %d (index=%d) len=%d, value=%x\n",
+ private_data, port, port_idx,
+ length, *(uint32_t *)src);
switch (port_idx) {
case GUEST_FEATURES_PORT:
uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector;
switch (queue_idx) {
case 0:
- virtio_setup_queue(core, virtio, &virtio->rx_vq, pfn, page_addr);
+ virtio_setup_queue(core, virtio,
+ &virtio->rx_vq,
+ pfn, page_addr);
break;
case 1:
- virtio_setup_queue(core, virtio, &virtio->tx_vq, pfn, page_addr);
+ virtio_setup_queue(core, virtio,
+ &virtio->tx_vq,
+ 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, &virtio->ctrl_vq, pfn, page_addr);
+ virtio_setup_queue(core, virtio,
+ &virtio->ctrl_vq,
+ pfn, page_addr);
break;
default:
break;
/* 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;
}
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 0x%x (index =%d), length=%d\n", private_data,
- port, port_idx, length);
+ PrintDebug("Virtio NIC %p: Read for port 0x%x (index =%d), length=%d\n",
+ private_data, port, port_idx, length);
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;
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) {
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) {
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;
case VIRTIO_ISR_PORT:
*(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);
+ v3_pci_lower_irq(virtio->virtio_dev->pci_bus,
+ 0, virtio->pci_dev);
break;
case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN:
break;
default:
- PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n", port_idx);
+ PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n",
+ port_idx);
return -1;
}
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");
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):sizeof(struct virtio_net_hdr);
+ sizeof(struct virtio_net_hdr_mrg_rxbuf):
+ sizeof(struct virtio_net_hdr);
if(virtio->mergeable_rx_bufs){/* merged buffer */
struct vring_desc * hdr_desc;
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", hdr.num_buffers, len);
+ 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;
}
len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]),
virtio, buf_desc, (uchar_t *)&(hdr.hdr), hdr_len, 0);
if(len < hdr_len){
- V3_Net_Print(2, "Virtio NIC: rx copy header error %d, hdr_len %d\n", len, hdr_len);
+ V3_Net_Print(2, "Virtio NIC: rx copy header error %d, hdr_len %d\n",
+ len, hdr_len);
goto err_exit;
}
buf_desc->flags &= ~VIRTIO_NEXT_FLAG;
if(offset < size){
- V3_Net_Print(2, "Virtio NIC: rx not enough ring buffer, buffer size %d\n", len);
+ V3_Net_Print(2, "Virtio NIC: rx not enough ring buffer, buffer size %d\n",
+ len);
goto err_exit;
}
v3_unlock_irqrestore(virtio->rx_lock, flags);
if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG) || kick_guest) {
- V3_Net_Print(2, "Virtio NIC: RX Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line);
+ V3_Net_Print(2, "Virtio NIC: RX Raising IRQ %d\n",
+ 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);
/* notify guest if it is in guest mode */
if((kick_guest || virtio->rx_notify == 1) &&
V3_Get_CPU() != virtio->virtio_dev->vm->cores[0].pcpu_id){
- v3_interrupt_cpu(virtio->virtio_dev->vm, virtio->virtio_dev->vm->cores[0].pcpu_id, 0);
+ v3_interrupt_cpu(virtio->virtio_dev->vm,
+ virtio->virtio_dev->vm->cores[0].pcpu_id,
+ 0);
}
return 0;
};
-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;
}
int tmp_ports = num_ports;
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
+ /* This gets the number of ports, rounded up to a power of 2 */
+ net_state->io_range_size = 1;
while (tmp_ports > 0) {
tmp_ports >>= 1;
net_state->io_range_size <<= 1;
}
/* this is to account for any low order bits being set in num_ports
- * if there are none, then num_ports was already a power of 2 so we shift right to reset it
- */
+ * if there are none, then num_ports was already a power of 2 so we shift right to reset it
+ */
if ((num_ports & ((net_state->io_range_size >> 1) - 1)) == 0) {
net_state->io_range_size >>= 1;
}
bars[i].type = PCI_BAR_NONE;
}
- PrintDebug("Virtio-NIC io_range_size = %d\n", net_state->io_range_size);
+ PrintDebug("Virtio NIC: io_range_size = %d\n",
+ net_state->io_range_size);
bars[0].type = PCI_BAR_IO;
bars[0].default_base_port = -1;
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);
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*/
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){
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;
}
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;
}
