* and the University of New Mexico. You can find out more at
* http://www.v3vee.org
*
- * Copyright (c) 2008, Lei Xia <lxia@northwestern.edu>
- * Copyright (c) 2008, Cui Zheng <cuizheng@cs.unm.edu>
- * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org>
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu>
+ * Copyright (c) 2010, Cui Zheng <cuizheng@cs.unm.edu>
+ * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org>
* All rights reserved.
*
* Author: Lei Xia <lxia@northwestern.edu>
- * Cui Zheng <cuizheng@cs.unm.edu>
+ * Cui Zheng <cuizheng@cs.unm.edu>
*
*
* This is free software. You are permitted to use,
#include <palacios/vmm_vnet.h>
#include <palacios/vmm_lock.h>
#include <palacios/vmm_util.h>
-
#include <devices/pci.h>
+#include <palacios/vmm_ethernet.h>
+#include <palacios/vmm_time.h>
#ifndef CONFIG_DEBUG_VIRTIO_NET
#define PrintDebug(fmt, args...)
#endif
-#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */
#define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10))
+
struct virtio_net_hdr {
uint8_t flags;
-
-#define VIRTIO_NET_HDR_GSO_NONE 0 /* Not a GSO frame */
+
uint8_t gso_type;
uint16_t hdr_len; /* Ethernet + IP + tcp/udp hdrs */
uint16_t gso_size; /* Bytes to append to hdr_len per frame */
- uint16_t csum_start; /* Position to start checksumming from */
- uint16_t csum_offset; /* Offset after that to place checksum */
+ uint16_t csum_start; /* Position to start checksumming from */
+ uint16_t csum_offset; /* Offset after that to place checksum */
}__attribute__((packed));
+
+struct virtio_net_hdr_mrg_rxbuf {
+ struct virtio_net_hdr hdr;
+ uint16_t num_buffers; /* Number of merged rx buffers */
+};
+
-#define QUEUE_SIZE 1024
+#define TX_QUEUE_SIZE 256
+#define RX_QUEUE_SIZE 4096
#define CTRL_QUEUE_SIZE 64
-#define ETH_ALEN 6
+
+#define VIRTIO_NET_F_MRG_RXBUF 15 /* Host can merge receive buffers. */
+#define VIRTIO_NET_F_MAC 5 /* Host has given MAC address. */
+#define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */
+#define VIRTIO_NET_F_HOST_TSO4 11 /* Host can handle TSOv4 in. */
+#define VIRTIO_NET_F_HOST_UFO 14 /* Host can handle UFO in. */
+
+/* Port to get virtio config */
+#define VIRTIO_NET_CONFIG 20
struct virtio_net_config
{
- uint8_t mac[ETH_ALEN]; //VIRTIO_NET_F_MAC
+ uint8_t mac[ETH_ALEN]; /* VIRTIO_NET_F_MAC */
uint16_t status;
} __attribute__((packed));
struct vm_device * pci_bus;
struct list_head dev_list;
struct v3_vm_info *vm;
+
+ uint8_t mac[ETH_ALEN];
};
struct virtio_net_state {
struct pci_device * pci_dev;
int io_range_size;
- struct virtio_queue rx_vq; //index 0, rvq in Linux virtio driver, handle packet to guest
- struct virtio_queue tx_vq; //index 1, svq in Linux virtio driver, handle packet from guest
- struct virtio_queue ctrl_vq; //index 2, ctrol info from guest
+ struct virtio_queue rx_vq; /* idx 0*/
+ struct virtio_queue tx_vq; /* idx 1*/
+ struct virtio_queue ctrl_vq; /* idx 2*/
+
+ struct v3_timer * timer;
- ulong_t pkt_sent, pkt_recv, pkt_drop;
+ struct nic_statistics statistics;
struct v3_dev_net_ops * net_ops;
+ v3_lock_t rx_lock, tx_lock;
- v3_lock_t lock;
+ uint8_t tx_notify, rx_notify;
+ uint32_t tx_pkts, rx_pkts;
+ uint64_t past_ms;
void * backend_data;
struct virtio_dev_state * virtio_dev;
struct list_head dev_link;
};
-static int virtio_free(struct vm_device * dev)
-{
-
- return -1;
-}
-
static int virtio_init_state(struct virtio_net_state * virtio)
{
+ virtio->rx_vq.queue_size = RX_QUEUE_SIZE;
+ virtio->tx_vq.queue_size = TX_QUEUE_SIZE;
+ virtio->ctrl_vq.queue_size = CTRL_QUEUE_SIZE;
+
virtio->rx_vq.ring_desc_addr = 0;
virtio->rx_vq.ring_avail_addr = 0;
virtio->rx_vq.ring_used_addr = 0;
virtio->ctrl_vq.pfn = 0;
virtio->ctrl_vq.cur_avail_idx = 0;
- virtio->virtio_cfg.host_features = 0;
- //virtio->virtio_cfg.status = VIRTIO_NET_S_LINK_UP;
virtio->virtio_cfg.pci_isr = 0;
+
+ virtio->virtio_cfg.host_features = 0 | (1 << VIRTIO_NET_F_MAC) |
+ (1 << VIRTIO_NET_F_HOST_UFO) |
+ (1 << VIRTIO_NET_F_HOST_TSO4);
- if (v3_lock_init(&(virtio->lock)) == -1){
- PrintError("Virtio NIC: Failure to init lock for net_state\n");
+ if ((v3_lock_init(&(virtio->rx_lock)) == -1) ||
+ (v3_lock_init(&(virtio->tx_lock)) == -1)){
+ PrintError("Virtio NIC: Failure to init locks for net_state\n");
}
- virtio->pkt_sent = virtio->pkt_recv = virtio->pkt_drop = 0;
-
return 0;
}
-static int pkt_tx(struct guest_info *core, struct virtio_net_state * virtio, struct vring_desc * buf_desc)
+static int tx_one_pkt(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: Virtio Pkt Sending, net_state: %p, pkt size: %d\n", virtio, len);
-
- if (guest_pa_to_host_va(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) {
- PrintError("Could not translate buffer address\n");
+ if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) {
+ PrintDebug("Could not translate buffer address\n");
return -1;
}
- if (virtio->net_ops->send(buf, len, virtio->backend_data, NULL) == -1) {
- return -1;
- }
-
- return 0;
-}
+ if(virtio->net_ops->send(buf, len, virtio->backend_data) >= 0){
+ virtio->statistics.tx_pkts ++;
+ virtio->statistics.tx_bytes += len;
-static int build_receive_header(struct virtio_net_hdr * hdr, const void * buf, int raw) {
- hdr->flags = 0;
-
- if (!raw) {
- memcpy(hdr, buf, sizeof(struct virtio_net_hdr));
- } else {
- memset(hdr, 0, sizeof(struct virtio_net_hdr));
+ return 0;
}
- return 0;
+ virtio->statistics.tx_dropped ++;
+
+ return -1;
}
-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)
+
+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,
+ uint_t offset)
{
uint32_t len;
uint8_t * desc_buf = NULL;
- if (guest_pa_to_host_va(core, 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;
}
- len = (desc->length < buf_len)?desc->length:buf_len;
- memcpy(desc_buf, buf, len);
+ len = (desc->length < buf_len)?(desc->length - offset):buf_len;
+ memcpy(desc_buf+offset, buf, len);
return len;
}
-
-
static int get_desc_count(struct virtio_queue * q, int index) {
struct vring_desc * tmp_desc = &(q->desc[index]);
int cnt = 1;
return cnt;
}
-static int handle_ctrl(struct guest_info *core, struct virtio_net_state * dev) {
+static inline void enable_cb(struct virtio_queue *queue){
+ queue->used->flags &= ~ VRING_NO_NOTIFY_FLAG;
+}
+
+static inline void disable_cb(struct virtio_queue *queue) {
+ queue->used->flags |= VRING_NO_NOTIFY_FLAG;
+}
+
+
+/* interrupt the guest, so the guest core get EXIT to Palacios */
+static inline void notify_guest(struct virtio_net_state * virtio){
+ v3_interrupt_cpu(virtio->virtio_dev->vm, virtio->virtio_dev->vm->cores[0].cpu_id, 0);
+}
+
+
+/* guest free some pkts for rx queue */
+static int handle_rx_queue_kick(struct guest_info * core,
+ struct virtio_net_state * virtio)
+{
return 0;
}
-static int handle_pkt_tx(struct guest_info *core, struct virtio_net_state * virtio_state)
+
+static int handle_ctrl(struct guest_info * core,
+ struct virtio_net_state * virtio) {
+
+ return 0;
+}
+
+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;
+ struct virtio_queue *q = &(virtio_state->tx_vq);
+ struct virtio_net_hdr *hdr = NULL;
+ int txed = 0;
+ unsigned long flags;
+ if (!q->ring_avail_addr) {
+ return -1;
+ }
+ flags = v3_lock_irqsave(virtio_state->tx_lock);
while (q->cur_avail_idx != q->avail->index) {
struct vring_desc * hdr_desc = NULL;
addr_t hdr_addr = 0;
int i = 0;
hdr_desc = &(q->desc[desc_idx]);
- if (guest_pa_to_host_va(core, 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;
+ goto exit_error;
}
- hdr = (struct virtio_net_hdr*)hdr_addr;
+ hdr = (struct virtio_net_hdr *)hdr_addr;
desc_idx = hdr_desc->next;
-
+
+ if(desc_cnt > 2){
+ PrintError("VNIC: merged rx buffer not supported, desc_cnt %d\n", desc_cnt);
+ goto exit_error;
+ }
+
+ /* here we assumed that one ethernet pkt is not splitted into multiple virtio buffer */
for (i = 0; i < desc_cnt - 1; i++) {
struct vring_desc * buf_desc = &(q->desc[desc_idx]);
- if (pkt_tx(core, virtio_state, buf_desc) == -1) {
+ if (tx_one_pkt(core, virtio_state, buf_desc) == -1) {
PrintError("Error handling nic operation\n");
- return -1;
+ goto exit_error;
}
req_len += buf_desc->length;
desc_idx = buf_desc->next;
}
- virtio_state->pkt_sent ++;
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 = req_len; // What do we set this to????
- q->used->index++;
-
+ q->used->ring[q->used->index % q->queue_size].length = req_len; /* What do we set this to???? */
+ q->used->index ++;
+
q->cur_avail_idx ++;
+
+ txed ++;
}
- if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
+ 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->virtio_cfg.pci_isr = 0x1;
+
+ virtio_state->statistics.interrupts ++;
}
return 0;
+
+exit_error:
+
+ v3_unlock_irqrestore(virtio_state->tx_lock, flags);
+ return -1;
}
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) {
+ 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;
// round up to next page boundary.
queue->ring_used_addr = (queue->ring_used_addr + 0xfff) & ~0xfff;
- if (guest_pa_to_host_va(core, 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(core, 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(core, 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;
}
return 0;
}
-static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, uint_t length, void * private_data)
+static int virtio_io_write(struct guest_info *core,
+ uint16_t port, void * src,
+ uint_t length, void * private_data)
{
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);
return -1;
}
virtio->virtio_cfg.guest_features = *(uint32_t *)src;
- PrintDebug("Setting Guest Features to %x\n", virtio->virtio_cfg.guest_features);
break;
case VRING_PG_NUM_PORT:
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(core, virtio, &virtio->rx_vq, pfn, page_addr);
case VRING_Q_SEL_PORT:
virtio->virtio_cfg.vring_queue_selector = *(uint16_t *)src;
if (virtio->virtio_cfg.vring_queue_selector > 2) {
- PrintError("Virtio NIC device only uses 3 queue, selected %d\n",
+ PrintError("Virtio NIC: wrong queue idx: %d\n",
virtio->virtio_cfg.vring_queue_selector);
return -1;
}
{
uint16_t queue_idx = *(uint16_t *)src;
if (queue_idx == 0){
- PrintDebug("receive queue notification 0, packet get by Guest\n");
+ if(handle_rx_queue_kick(core, virtio) == -1){
+ PrintError("Could not handle Virtio NIC rx kick\n");
+ return -1;
+ }
} else if (queue_idx == 1){
if (handle_pkt_tx(core, virtio) == -1) {
- PrintError("Could not handle NIC Notification\n");
+ PrintError("Could not handle Virtio NIC tx kick\n");
return -1;
}
} else if (queue_idx == 2){
if (handle_ctrl(core, virtio) == -1) {
- PrintError("Could not handle NIC Notification\n");
+ PrintError("Could not handle Virtio NIC ctrl kick\n");
return -1;
}
} else {
- PrintError("Virtio NIC device only uses 3 queue, selected %d\n",
- queue_idx);
+ PrintError("Wrong queue index %d\n", queue_idx);
}
break;
}
case VIRTIO_STATUS_PORT:
virtio->virtio_cfg.status = *(uint8_t *)src;
if (virtio->virtio_cfg.status == 0) {
- PrintDebug("Resetting device\n");
virtio_init_state(virtio);
}
break;
case VIRTIO_ISR_PORT:
virtio->virtio_cfg.pci_isr = *(uint8_t *)src;
break;
+
default:
return -1;
break;
return length;
}
-static int virtio_io_read(struct guest_info *core, uint16_t port, void * dst, uint_t length, void * private_data)
+static int virtio_io_read(struct guest_info *core,
+ uint16_t port, void * dst,
+ uint_t length, void * private_data)
{
struct virtio_net_state * virtio = (struct virtio_net_state *)private_data;
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\n", private_data,
+ PrintDebug("Virtio NIC %p: Read for port 0x%x (index =%d), length=%d\n", private_data,
port, port_idx, length);
switch (port_idx) {
default:
break;
}
- PrintDebug("queue index: %d, value=0x%x\n", (int)queue_idx, *(uint16_t *)dst);
break;
case VIRTIO_STATUS_PORT:
v3_pci_lower_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev);
break;
+ case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN:
+ *(uint8_t *)dst = virtio->net_cfg.mac[port_idx-VIRTIO_NET_CONFIG];
+ break;
+
default:
- PrintError("Virtio NIC: Read of Unhandled Virtio Read\n");
+ PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n", port_idx);
return -1;
}
}
-
-
+/* receiving raw ethernet pkt from backend */
static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
struct virtio_net_state * virtio = (struct virtio_net_state *)private_data;
struct virtio_queue * q = &(virtio->rx_vq);
- struct virtio_net_hdr hdr;
- uint32_t hdr_len = sizeof(struct virtio_net_hdr);
- uint32_t data_len = size;
+ struct virtio_net_hdr_mrg_rxbuf hdr;
+ uint32_t hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);
+ uint32_t data_len;
uint32_t offset = 0;
unsigned long flags;
- int ret_val = -1;
- int raw = 1;
- flags = v3_lock_irqsave(virtio->lock);
-
- PrintDebug("VIRTIO NIC: receiving packet to virtio nic %p, size:%d\n", virtio, size);
-
- virtio->pkt_recv ++;
+#ifdef CONFIG_DEBUG_VIRTIO_NET
+ PrintDebug("Virtio-NIC: virtio_rx: size: %d\n", size);
+ v3_hexdump(buf, size, NULL, 0);
+#endif
- if (!raw){
- data_len -= hdr_len;
- }
+ flags = v3_lock_irqsave(virtio->rx_lock);
- build_receive_header(&hdr, buf, raw);
+ data_len = size;
+ memset(&hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf));
if (q->ring_avail_addr == 0) {
- PrintError("Queue is not set\n");
- goto exit;
+ PrintDebug("Queue is not set\n");
+ goto err_exit;
}
if (q->cur_avail_idx != q->avail->index){
struct vring_desc * hdr_desc = NULL;
hdr_desc = &(q->desc[hdr_idx]);
- if (guest_pa_to_host_va(&(virtio->virtio_dev->vm->cores[0]), hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
- PrintError("Could not translate receive buffer address\n");
- ret_val = -1;
- goto exit;
+ if (v3_gpa_to_hva(&(virtio->virtio_dev->vm->cores[0]), hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
+ PrintDebug("Could not translate receive buffer address\n");
+ goto err_exit;
}
-
- memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr));
+ hdr.num_buffers = 1;
+ memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr_mrg_rxbuf));
if (offset >= data_len) {
hdr_desc->flags &= ~VIRTIO_NEXT_FLAG;
}
+ struct vring_desc * buf_desc = NULL;
for (buf_idx = hdr_desc->next; offset < data_len; buf_idx = q->desc[hdr_idx].next) {
- struct vring_desc * buf_desc = &(q->desc[buf_idx]);
uint32_t len = 0;
+ buf_desc = &(q->desc[buf_idx]);
- len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), 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, 0);
offset += len;
if (offset < data_len) {
buf_desc->flags = VIRTIO_NEXT_FLAG;
}
buf_desc->length = len;
}
+ buf_desc->flags &= ~VIRTIO_NEXT_FLAG;
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 = data_len + hdr_len; // This should be the total length of data sent to guest (header+pkt_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++;
-
q->cur_avail_idx++;
+
+ virtio->statistics.rx_pkts ++;
+ virtio->statistics.rx_bytes += size;
} else {
- virtio->pkt_drop++;
+ virtio->statistics.rx_dropped ++;
+
+ goto err_exit;
}
if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
PrintDebug("Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line);
+
v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev);
virtio->virtio_cfg.pci_isr = 0x1;
+ virtio->statistics.interrupts ++;
}
- ret_val = offset;
+ v3_unlock_irqrestore(virtio->rx_lock, flags);
+
+ /* notify guest if guest is running */
+ if(virtio->rx_notify == 1){
+ v3_interrupt_cpu(virtio->virtio_dev->vm, virtio->virtio_dev->vm->cores[0].cpu_id, 0);
+ }
+
+ return 0;
-exit:
+err_exit:
- v3_unlock_irqrestore(virtio->lock, flags);
+ v3_unlock_irqrestore(virtio->rx_lock, flags);
- return ret_val;
+ return -1;
+}
+
+static int virtio_free(struct virtio_dev_state * virtio) {
+ struct virtio_net_state * backend = NULL;
+ struct virtio_net_state * tmp = NULL;
+
+
+ list_for_each_entry_safe(backend, tmp, &(virtio->dev_list), dev_link) {
+
+ // unregister from PCI
+
+ list_del(&(backend->dev_link));
+ V3_Free(backend);
+ }
+
+ V3_Free(virtio);
+ return 0;
}
static struct v3_device_ops dev_ops = {
- .free = virtio_free,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))virtio_free,
};
-static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_state * net_state)
+
+static void virtio_nic_poll(struct v3_vm_info * vm, int budget, void * data){
+ struct virtio_net_state * virtio = (struct virtio_net_state *)data;
+
+ if(virtio->tx_notify == 0){
+ handle_pkt_tx(&(vm->cores[0]), virtio);
+ }
+}
+
+static int register_dev(struct virtio_dev_state * virtio,
+ struct virtio_net_state * net_state)
{
struct pci_device * pci_dev = NULL;
struct v3_pci_bar bars[6];
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
+ /* 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 ((num_ports & ((net_state->io_range_size >> 1) - 1)) == 0) {
net_state->io_range_size >>= 1;
}
bars[0].private_data = net_state;
pci_dev = v3_pci_register_device(virtio->pci_bus, PCI_STD_DEVICE,
- 0, PCI_AUTO_DEV_NUM, 0,
+ 0, 4/*PCI_AUTO_DEV_NUM*/, 0,
"LNX_VIRTIO_NIC", bars,
NULL, NULL, NULL, net_state);
pci_dev->config_header.intr_pin = 1;
pci_dev->config_header.max_latency = 1; // ?? (qemu does it...)
- net_state->pci_dev = pci_dev;
- net_state->virtio_cfg.host_features = 0; //no features support now
- net_state->rx_vq.queue_size = QUEUE_SIZE;
- net_state->tx_vq.queue_size = QUEUE_SIZE;
- net_state->ctrl_vq.queue_size = CTRL_QUEUE_SIZE;
+ net_state->pci_dev = pci_dev;
net_state->virtio_dev = virtio;
-
+
+ memcpy(net_state->net_cfg.mac, virtio->mac, 6);
+
virtio_init_state(net_state);
+ /* 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 50 /*50ms*/
+
+/* Timer Functions */
+static void virtio_nic_timer(struct guest_info * core,
+ uint64_t cpu_cycles, uint64_t cpu_freq,
+ void * priv_data) {
+ struct virtio_net_state * net_state = (struct virtio_net_state *)priv_data;
+ uint64_t period_ms;
+
+ period_ms = cpu_cycles/cpu_freq;
+ net_state->past_ms += period_ms;
+
+ if(net_state->past_ms > PROFILE_PERIOD){
+ uint32_t tx_rate, rx_rate;
+
+ tx_rate = (net_state->statistics.tx_pkts - net_state->tx_pkts)/net_state->past_ms; /* pkts/per ms */
+ rx_rate = (net_state->statistics.rx_pkts - net_state->rx_pkts)/net_state->past_ms;
+
+ net_state->tx_pkts = net_state->statistics.tx_pkts;
+ net_state->rx_pkts = net_state->statistics.rx_pkts;
+
+ if(tx_rate > RATE_UPPER_THRESHOLD && net_state->tx_notify == 1){
+ V3_Print("Virtio NIC: Switch TX to VMM driven mode\n");
+ disable_cb(&(net_state->tx_vq));
+ net_state->tx_notify = 0;
+ }
+
+ if(tx_rate < RATE_LOWER_THRESHOLD && net_state->tx_notify == 0){
+ V3_Print("Virtio NIC: Switch TX to Guest driven mode\n");
+ enable_cb(&(net_state->tx_vq));
+ net_state->tx_notify = 1;
+ }
+
+ if(rx_rate > RATE_UPPER_THRESHOLD && net_state->rx_notify == 1){
+ PrintDebug("Virtio NIC: Switch RX to VMM None notify mode\n");
+ net_state->rx_notify = 0;
+ }
+
+ if(rx_rate < RATE_LOWER_THRESHOLD && net_state->rx_notify == 0){
+ PrintDebug("Virtio NIC: Switch RX to VMM notify mode\n");
+ net_state->rx_notify = 1;
+ }
+
+ net_state->past_ms = 0;
+ }
+}
+
+
+static struct v3_timer_ops timer_ops = {
+ .update_timer = virtio_nic_timer,
+};
+
+
static int connect_fn(struct v3_vm_info * info,
void * frontend_data,
struct v3_dev_net_ops * ops,
net_state->net_ops = ops;
net_state->backend_data = private_data;
+ net_state->virtio_dev = virtio;
+ net_state->tx_notify = 1;
+ net_state->rx_notify = 1;
+
+ net_state->timer = v3_add_timer(&(info->cores[0]),&timer_ops,net_state);
ops->recv = virtio_rx;
+ ops->poll = virtio_nic_poll;
ops->frontend_data = net_state;
+ memcpy(ops->fnt_mac, virtio->mac, ETH_ALEN);
return 0;
}
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");
-
- PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name);
+ char * dev_id = v3_cfg_val(cfg, "ID");
+ char macstr[128];
+ char * str = v3_cfg_val(cfg, "mac");
+ memcpy(macstr, str, strlen(str));
if (pci_bus == NULL) {
PrintError("Virtio NIC: VirtIO devices require a PCI Bus");
virtio_state->pci_bus = pci_bus;
virtio_state->vm = vm;
- struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state);
- if (v3_attach_device(vm, dev) == -1) {
- PrintError("Virtio NIC: Could not attach device %s\n", name);
+ if (macstr != NULL && !str2mac(macstr, virtio_state->mac)) {
+ PrintDebug("Virtio NIC: Mac specified %s\n", macstr);
+ PrintDebug("MAC: %x:%x:%x:%x:%x:%x\n", virtio_state->mac[0],
+ virtio_state->mac[1],
+ virtio_state->mac[2],
+ virtio_state->mac[3],
+ virtio_state->mac[4],
+ virtio_state->mac[5]);
+ }else {
+ PrintDebug("Virtio NIC: MAC not specified\n");
+ random_ethaddr(virtio_state->mac);
+ }
+
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state);
+
+ if (dev == NULL) {
+ PrintError("Virtio NIC: Could not attach device %s\n", dev_id);
+ V3_Free(virtio_state);
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);
+ v3_remove_device(dev);
return -1;
}