X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=7bcd9bba6ead03479cda968e0f03c4fa6f6baf8b;hb=58a5fd180f52b2d9e15c3613324c17123672ee19;hp=6652c7b3e68737e806442cd5ca59738efd50d419;hpb=d475d585a594df8ef7b438a08e3fa16ed3dcb0e0;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index 6652c7b..7bcd9bb 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -7,13 +7,13 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * - * Copyright (c) 2008, Jack Lange * Copyright (c) 2008, Lei Xia + * Copyright (c) 2008, Cui Zheng * Copyright (c) 2008, The V3VEE Project * All rights reserved. * - * Author: Jack Lange - * Lei Xia + * Author: Lei Xia + * Cui Zheng * * * This is free software. You are permitted to use, @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include @@ -34,28 +37,7 @@ #define PrintDebug(fmt, args...) #endif -/* The feature bitmap for virtio net */ -#define VIRTIO_NET_F_CSUM 0 /* Host handles pkts w/ partial csum */ -#define VIRTIO_NET_F_GUEST_CSUM 1 /* Guest handles pkts w/ partial csum */ -#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_GUEST_TSO4 7 /* Guest can handle TSOv4 in. */ -#define VIRTIO_NET_F_GUEST_TSO6 8 /* Guest can handle TSOv6 in. */ -#define VIRTIO_NET_F_GUEST_ECN 9 /* Guest can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_GUEST_UFO 10 /* Guest can handle UFO in. */ -#define VIRTIO_NET_F_HOST_TSO4 11 /* Host can handle TSOv4 in. */ -#define VIRTIO_NET_F_HOST_TSO6 12 /* Host can handle TSOv6 in. */ -#define VIRTIO_NET_F_HOST_ECN 13 /* Host can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_HOST_UFO 14 /* Host can handle UFO in. */ -#define VIRTIO_NET_F_MRG_RXBUF 15 /* Host can merge receive buffers. */ -#define VIRTIO_NET_F_STATUS 16 /* virtio_net_config.status available */ -#define VIRTIO_NET_F_CTRL_VQ 17 /* Control channel available */ -#define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */ -#define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */ -#define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ - -/* Maximum packet size we can receive from tap device: header + 64k */ #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10)) struct virtio_net_hdr { @@ -63,7 +45,6 @@ struct virtio_net_hdr { #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 */ @@ -71,7 +52,7 @@ struct virtio_net_hdr { }__attribute__((packed)); -#define QUEUE_SIZE 256 +#define QUEUE_SIZE 1024 #define CTRL_QUEUE_SIZE 64 #define ETH_ALEN 6 @@ -84,13 +65,14 @@ 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 { struct virtio_net_config net_cfg; struct virtio_config virtio_cfg; + struct vm_device * dev; struct pci_device * pci_dev; int io_range_size; @@ -98,43 +80,24 @@ struct virtio_net_state { 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 + ulong_t pkt_sent, pkt_recv, pkt_drop; + struct v3_dev_net_ops * net_ops; + v3_lock_t lock; + void * backend_data; struct virtio_dev_state * virtio_dev; struct list_head dev_link; }; -#if 1 -//Temporarly for debug -static void print_packet(uchar_t *pkt, int size) { - PrintDebug("Vnet: print_data_packet: size: %d\n", size); - v3_hexdump(pkt, size, NULL, 0); -} - -static int send(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev) -{ - PrintDebug("Virito NIC: In sending stub\n"); - print_packet(buf, count); - - return count; -} - -static int receive(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *src_dev) -{ - PrintDebug("Virito NIC: In receiveing stub\n"); - - return 0; -} -#endif - static int virtio_free(struct vm_device * dev) { return -1; } -static int virtio_reset(struct virtio_net_state * virtio) +static int virtio_init_state(struct virtio_net_state * virtio) { virtio->rx_vq.ring_desc_addr = 0; virtio->rx_vq.ring_avail_addr = 0; @@ -157,38 +120,35 @@ static int virtio_reset(struct virtio_net_state * virtio) virtio->virtio_cfg.host_features = 0; //virtio->virtio_cfg.status = VIRTIO_NET_S_LINK_UP; virtio->virtio_cfg.pci_isr = 0; - virtio->private_data = NULL; + + if (v3_lock_init(&(virtio->lock)) == -1){ + PrintError("Virtio NIC: Failure to init lock for net_state\n"); + } + + virtio->pkt_sent = virtio->pkt_recv = virtio->pkt_drop = 0; return 0; } - -//sending guest's packet to network sink -static int pkt_write(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) { - //struct virtio_net_state * virtio = (struct virtio_net_state *)dev->private_data; uint8_t * buf = NULL; uint32_t len = buf_desc->length; - PrintDebug("Handling Virtio Net write\n"); + 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 (guest_pa_to_host_va(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { PrintError("Could not translate buffer address\n"); return -1; } - PrintDebug("Length=%d\n", buf_desc->length); - PrintDebug("Buffer Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d, buf address: %p, send address: %p\n", buf_desc, - (void *)(buf_desc->addr_gpa), buf_desc->length, buf_desc->flags, buf_desc->next, buf, virtio->net_ops->send); - - 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; } return 0; } - static int build_receive_header(struct virtio_net_hdr * hdr, const void * buf, int raw) { hdr->flags = 0; @@ -201,111 +161,26 @@ static int build_receive_header(struct virtio_net_hdr * hdr, const void * buf, i return 0; } - -//sending guest's packet to network sink -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 (guest_pa_to_host_va(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); - PrintDebug("Length=%d\n", len); - return len; } -//send data to guest -static int send_pkt_to_guest(struct vm_device * dev, uchar_t * buf, uint_t size, int raw, void * private_data) -{ - // TODO: This should not be like this - struct virtio_net_state * virtio = (struct virtio_net_state *)dev->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; - uint32_t offset = 0; - - PrintDebug("VIRTIO Handle RX: cur_index=%d (mod=%d), avail_index=%d\n", - q->cur_avail_idx, q->cur_avail_idx % q->queue_size, q->avail->index); - - - - if (!raw) { - data_len -= hdr_len; - } - - build_receive_header(&hdr, buf, 1); - - //queue is not set yet - if (q->ring_avail_addr == 0) { - PrintError("Queue is not set\n"); - return -1; - } - - - 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; - - PrintDebug("Descriptor index=%d\n", q->cur_avail_idx % q->queue_size); - - hdr_desc = &(q->desc[hdr_idx]); - - PrintDebug("Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", hdr_desc, - (void *)(hdr_desc->addr_gpa), hdr_desc->length, hdr_desc->flags, hdr_desc->next); - - if (guest_pa_to_host_va(virtio->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { - PrintError("Could not translate receive buffer address\n"); - return -1; - } - - //copy header to the header descriptor - memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr)); - - //copy data to the next descriptors - for (buf_idx = 0; 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->flags = VIRTIO_NEXT_FLAG; - - len = copy_data_to_desc(virtio, buf_desc, buf + offset, data_len - offset); - - offset += len; - buf_desc->length = len; // TODO: do we need this? - } - - 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; // What do we set this to???? - - q->used->index++; - q->cur_avail_idx++; - } - - 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; - } - - return offset; -} - - -int virtio_send(struct vm_device * dev, uchar_t * buf, uint_t size) { - return send_pkt_to_guest(dev, buf, size, 1, NULL); -} static int get_desc_count(struct virtio_queue * q, int index) { @@ -320,23 +195,17 @@ 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; } -//get packet from guest -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_net_state *virtio = (struct virtio_net_state *)dev->private_data; struct virtio_queue * q = &(virtio_state->tx_vq); - - PrintDebug("VIRTIO NIC pkt_tx: cur_index=%d (mod=%d), avail_index=%d\n", - q->cur_avail_idx, q->cur_avail_idx % q->queue_size, q->avail->index); - struct virtio_net_hdr * hdr = NULL; - while (q->cur_avail_idx < q->avail->index) { + + 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]; @@ -344,32 +213,18 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) uint32_t req_len = 0; int i = 0; - PrintDebug("Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % q->queue_size); - hdr_desc = &(q->desc[desc_idx]); - - PrintDebug("Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", hdr_desc, - (void *)(hdr_desc->addr_gpa), hdr_desc->length, hdr_desc->flags, hdr_desc->next); - - if (guest_pa_to_host_va(virtio_state->virtio_dev->vm, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { + if (guest_pa_to_host_va(core, hdr_desc->addr_gpa, &(hdr_addr)) == -1) { PrintError("Could not translate block header address\n"); return -1; } - //memcpy(&hdr, (void *)hdr_addr, sizeof(struct virtio_net_hdr)); hdr = (struct virtio_net_hdr*)hdr_addr; - - PrintDebug("NIC Op Hdr (ptr=%p) header len =%x\n", (void *)hdr_addr, (int)hdr->hdr_len); - desc_idx = hdr_desc->next; for (i = 0; i < desc_cnt - 1; i++) { struct vring_desc * buf_desc = &(q->desc[desc_idx]); - - PrintDebug("Buffer Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", buf_desc, - (void *)(buf_desc->addr_gpa), buf_desc->length, buf_desc->flags, buf_desc->next); - - if (pkt_write(virtio_state, buf_desc) == -1) { + if (pkt_tx(core, virtio_state, buf_desc) == -1) { PrintError("Error handling nic operation\n"); return -1; } @@ -377,16 +232,16 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) 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->cur_avail_idx++; + + q->cur_avail_idx ++; } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - PrintDebug("Raising IRQ %d\n", virtio_state->pci_dev->config_header.intr_line); v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, 0, virtio_state->pci_dev); virtio_state->virtio_cfg.pci_isr = 0x1; } @@ -395,7 +250,11 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state) } -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; @@ -403,23 +262,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 (guest_pa_to_host_va(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 (guest_pa_to_host_va(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 (guest_pa_to_host_va(core, queue->ring_used_addr, (addr_t *)&(queue->used)) == -1) { PrintError("Could not translate ring used address\n"); return -1; } @@ -435,100 +291,88 @@ static int virtio_setup_queue(struct virtio_net_state * virtio_state, struct vir return 0; } - - -static int virtio_io_write(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 vm_device * dev = (struct vm_device *)private_data; struct virtio_net_state * virtio = (struct virtio_net_state *)private_data; int port_idx = port % virtio->io_range_size; - PrintDebug("VIRTIO NIC Write for port %d (index=%d) len=%d, value=%x\n", + 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: if (length != 4) { PrintError("Illegal write length for guest features\n"); 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: - if (length != 4) { PrintError("Illegal write length for page frame number\n"); return -1; } - 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); - break; - + virtio_setup_queue(core, virtio, &virtio->ctrl_vq, pfn, page_addr); + break; default: break; } - break; + 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", virtio->virtio_cfg.vring_queue_selector); return -1; } - break; + case VRING_Q_NOTIFY_PORT: { - uint16_t queue_idx = *(uint16_t *)src; - - PrintDebug("Handling Kick\n"); - + uint16_t queue_idx = *(uint16_t *)src; if (queue_idx == 0){ - PrintError("receive queue notification\n"); + 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; } } else { PrintError("Virtio NIC device only uses 3 queue, selected %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_reset(virtio); + virtio_init_state(virtio); } - break; case VIRTIO_ISR_PORT: @@ -542,15 +386,13 @@ static int virtio_io_write(uint16_t port, void * src, uint_t length, void * priv return length; } - -static int virtio_io_read(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 vm_device * dev = (struct vm_device *)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: Read for port %d (index =%d), length=%d", + PrintDebug("Virtio NIC %p: Read for port %d (index =%d), length=%d\n", private_data, port, port_idx, length); switch (port_idx) { @@ -559,19 +401,14 @@ static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * priva PrintError("Illegal read length for host features\n"); return -1; } - *(uint32_t *)dst = virtio->virtio_cfg.host_features; - - PrintDebug("value=0x%x\n", *(uint32_t *)dst); - break; - case VRING_PG_NUM_PORT: + case VRING_PG_NUM_PORT: if (length != 4) { PrintError("Illegal read length for page frame number\n"); return -1; } - switch (queue_idx) { case 0: *(uint32_t *)dst = virtio->rx_vq.pfn; @@ -585,17 +422,13 @@ static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * priva default: break; } - - PrintDebug(", value=0x%x\n", *(uint32_t *)dst); - break; - case VRING_SIZE_PORT: + case VRING_SIZE_PORT: if (length != 2) { PrintError("Illegal read length for vring size\n"); return -1; } - switch (queue_idx) { case 0: *(uint16_t *)dst = virtio->rx_vq.queue_size; @@ -609,29 +442,21 @@ static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * priva default: break; } - PrintDebug("queue index: %d, value=0x%x\n", (int)queue_idx, *(uint16_t *)dst); - break; - case VIRTIO_STATUS_PORT: + case VIRTIO_STATUS_PORT: if (length != 1) { PrintError("Illegal read length for status\n"); return -1; } - *(uint8_t *)dst = virtio->virtio_cfg.status; - - PrintDebug(", value=0x%x\n", *(uint8_t *)dst); break; - + 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); - - PrintDebug(", value=0x%x\n", *(uint8_t *)dst); - break; default: @@ -643,6 +468,91 @@ static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * priva } + + +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; + 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 ++; + + if (!raw){ + data_len -= hdr_len; + } + + build_receive_header(&hdr, buf, raw); + + if (q->ring_avail_addr == 0) { + PrintError("Queue is not set\n"); + goto exit; + } + + 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->cores[0]), hdr_desc->addr_gpa, &(hdr_addr)) == -1) { + PrintError("Could not translate receive buffer address\n"); + ret_val = -1; + goto exit; + } + + memcpy((void *)hdr_addr, &hdr, sizeof(struct virtio_net_hdr)); + if (offset >= data_len) { + hdr_desc->flags &= ~VIRTIO_NEXT_FLAG; + } + + 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; + + 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; + } + buf_desc->length = len; + } + + 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->index++; + + q->cur_avail_idx++; + } else { + virtio->pkt_drop++; + } + + 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; + } + + ret_val = offset; + +exit: + + v3_unlock_irqrestore(virtio->lock, flags); + + return ret_val; +} + + static struct v3_device_ops dev_ops = { .free = virtio_free, .reset = NULL, @@ -650,7 +560,6 @@ static struct v3_device_ops dev_ops = { .stop = NULL, }; - static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_state * net_state) { struct pci_device * pci_dev = NULL; @@ -661,7 +570,6 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat // 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 - while (tmp_ports > 0) { tmp_ports >>= 1; net_state->io_range_size <<= 1; @@ -673,7 +581,6 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat net_state->io_range_size >>= 1; } - for (i = 0; i < 6; i++) { bars[i].type = PCI_BAR_NONE; } @@ -683,7 +590,6 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat bars[0].type = PCI_BAR_IO; bars[0].default_base_port = -1; bars[0].num_ports = net_state->io_range_size; - bars[0].io_read = virtio_io_read; bars[0].io_write = virtio_io_write; bars[0].private_data = net_state; @@ -706,34 +612,24 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat pci_dev->config_header.device_id = VIRTIO_NET_DEV_ID; pci_dev->config_header.class = PCI_CLASS_NETWORK; - pci_dev->config_header.subclass = PCI_NET_SUBCLASS_OTHER; - - pci_dev->config_header.subsystem_id = VIRTIO_NET_SUBDEVICE_ID;; - + pci_dev->config_header.subclass = PCI_NET_SUBCLASS_OTHER; + pci_dev->config_header.subsystem_id = VIRTIO_NET_SUBDEVICE_ID; 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->pci_bus = pci_bus; - + 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->virtio_dev = virtio; - - virtio_reset(net_state); + + virtio_init_state(net_state); return 0; } - - -static int connect_fn(struct guest_info * info, +static int connect_fn(struct v3_vm_info * info, void * frontend_data, struct v3_dev_net_ops * ops, v3_cfg_tree_t * cfg, @@ -742,22 +638,23 @@ static int connect_fn(struct guest_info * info, struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state)); memset(net_state, 0, sizeof(struct virtio_net_state)); - register_dev(virtio, net_state); net_state->net_ops = ops; net_state->backend_data = private_data; + ops->recv = virtio_rx; + ops->frontend_data = net_state; + return 0; } - -static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { +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\n"); + PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name); if (pci_bus == NULL) { PrintError("Virtio NIC: VirtIO devices require a PCI Bus"); @@ -781,27 +678,7 @@ static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { PrintError("Virtio NIC: Could not register %s as net frontend\n", name); return -1; } - - - //for temporary testing, add a backend - #if 1 - - struct virtio_net_state * net_state = (struct virtio_net_state *)V3_Malloc(sizeof(struct virtio_net_state)); - memset(net_state, 0, sizeof(struct virtio_net_state)); - - net_state->net_ops = (struct v3_dev_net_ops *)V3_Malloc(sizeof(struct v3_dev_net_ops)); - - net_state->net_ops->send = &send; - net_state->net_ops->receive = &receive; - - register_dev(virtio_state, net_state); - PrintDebug("Virtio NIC After register Device: queue size: %d, %d\n", - net_state->rx_vq.queue_size, net_state->tx_vq.queue_size); - - - #endif - return 0; }