X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_vnet.c;h=69c183614dcc55b203b95dc912a53a5e0c310018;hb=a34275476494aeabed460b284a70cfc9b66a9896;hp=215e664df306659abb041cac23e0598e06920ac8;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_vnet.c b/palacios/src/devices/lnx_virtio_vnet.c index 215e664..69c1836 100644 --- a/palacios/src/devices/lnx_virtio_vnet.c +++ b/palacios/src/devices/lnx_virtio_vnet.c @@ -13,7 +13,7 @@ * All rights reserved. * * Author: Jack Lange - * Lei Xia + * Lei Xia * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "V3VEE_LICENSE". @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include -#ifndef CONFIG_DEBUG_LINUX_VIRTIO_VNET +#ifndef V3_CONFIG_DEBUG_LINUX_VIRTIO_VNET #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -75,7 +75,6 @@ struct virtio_vnet_state { #define VNET_ADD_LINK 21 #define VNET_DEL_LINK 22 -// structure of the vnet command header struct vnet_ctrl_hdr { uint8_t cmd_type; uint32_t num_cmds; @@ -123,12 +122,11 @@ static int get_desc_count(struct virtio_queue * q, int index) { } - - -static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * vnet_state) { +static int handle_cmd_kick(struct guest_info * core, + struct virtio_vnet_state * vnet_state) { struct virtio_queue * q = &(vnet_state->queue[0]); - PrintDebug("VNET Bridge: Handling command queue\n"); + PrintDebug(core->vm_info, core, "VNET Bridge: Handling command queue\n"); while (q->cur_avail_idx != q->avail->index) { struct vring_desc * hdr_desc = NULL; @@ -142,25 +140,23 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * uint8_t * status_ptr = NULL; uint8_t status = 0; - - PrintDebug("VNET Bridge: CMD: Descriptor Count=%d, index=%d, desc_idx=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE, desc_idx); + PrintDebug(core->vm_info, core, "VNET Bridge: CMD: Descriptor Count=%d, index=%d, desc_idx=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE, desc_idx); if (desc_cnt < 3) { - PrintError("VNET Bridge cmd must include at least 3 descriptors (cnt=%d)\n", desc_cnt); + PrintError(core->vm_info, core, "VNET Bridge cmd must include at least 3 descriptors (cnt=%d)\n", desc_cnt); return -1; } hdr_desc = &(q->desc[desc_idx]); if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, (addr_t *)&hdr) == -1) { - PrintError("Could not translate VirtioVNET header address\n"); + PrintError(core->vm_info, core, "Could not translate VirtioVNET header address\n"); return -1; } desc_idx = hdr_desc->next; - if (hdr->cmd_type == VNET_ADD_ROUTE) { - + if (hdr->cmd_type == VNET_ADD_ROUTE) { for (i = 0; i < hdr->num_cmds; i++) { uint8_t tmp_status = 0; struct v3_vnet_route * route = NULL; @@ -168,41 +164,36 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * buf_desc = &(q->desc[desc_idx]); if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(route)) == -1) { - PrintError("Could not translate route address\n"); + PrintError(core->vm_info, core, "Could not translate route address\n"); return -1; } - // add route - PrintDebug("VNET Bridge: Adding VNET Route\n"); - tmp_status = v3_vnet_add_route(*route); - - PrintDebug("VNET Route Added\n"); - if (tmp_status != 0) { - PrintError("Error adding VNET ROUTE\n"); + PrintError(core->vm_info, core, "Error adding VNET ROUTE\n"); + status = tmp_status; } + PrintDebug(core->vm_info, core, "VNET Route Added\n"); + xfer_len += buf_desc->length; desc_idx = buf_desc->next; } } - - status_desc = &(q->desc[desc_idx]); if (v3_gpa_to_hva(core, status_desc->addr_gpa, (addr_t *)&status_ptr) == -1) { - PrintError("VirtioVNET Error could not translate status address\n"); + PrintError(core->vm_info, core, "VirtioVNET Error could not translate status address\n"); return -1; } xfer_len += status_desc->length; *status_ptr = status; - PrintDebug("Transferred %d bytes (xfer_len)\n", xfer_len); + PrintDebug(core->vm_info, core, "Transferred %d bytes (xfer_len)\n", xfer_len); q->used->ring[q->used->index % QUEUE_SIZE].id = q->avail->ring[q->cur_avail_idx % QUEUE_SIZE]; q->used->ring[q->used->index % QUEUE_SIZE].length = xfer_len; // set to total inbound xfer length @@ -212,8 +203,8 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - PrintDebug("Raising IRQ %d\n", vnet_state->pci_dev->config_header.intr_line); - v3_pci_raise_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); + PrintDebug(core->vm_info, core, "Raising IRQ %d\n", vnet_state->pci_dev->config_header.intr_line); + v3_pci_raise_irq(vnet_state->pci_bus, vnet_state->pci_dev, 0); vnet_state->virtio_cfg.pci_isr = 1; } @@ -222,85 +213,58 @@ static int handle_cmd_kick(struct guest_info * core, struct virtio_vnet_state * } -static int vnet_pkt_input_cb(struct v3_vm_info * vm, struct v3_vnet_pkt vnet_pkts[], uint16_t pkt_num, void * private_data){ +static int vnet_pkt_input_cb(struct v3_vm_info * vm, + struct v3_vnet_pkt * pkt, + void * private_data){ struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; struct virtio_queue * q = &(vnet_state->queue[RECV_QUEUE]); int ret_val = -1; unsigned long flags; - uint16_t sent; - struct v3_vnet_pkt *pkt; - - if(pkt_num <= 0) - return 0; flags = v3_lock_irqsave(vnet_state->lock); if (q->ring_avail_addr == 0) { - PrintError("Queue is not set\n"); + PrintError(vm, VCORE_NONE, "Queue is not set\n"); + goto exit; } - PrintDebug("VNET Bridge: RX: running on cpu: %d, num of pkts: %d\n", V3_Get_CPU(), pkt_num); - - for(sent = 0; sent < pkt_num; sent ++) { - pkt = &vnet_pkts[sent]; - vnet_state->pkt_recv ++; - - if (q->cur_avail_idx != q->avail->index) { - uint16_t pkt_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; - struct vring_desc * pkt_desc = NULL; - struct vnet_bridge_pkt * virtio_pkt = NULL; + if (q->cur_avail_idx != q->avail->index) { + uint16_t pkt_idx = q->avail->ring[q->cur_avail_idx % q->queue_size]; + struct vring_desc * pkt_desc = NULL; + struct vnet_bridge_pkt * virtio_pkt = NULL; - pkt_desc = &(q->desc[pkt_idx]); - PrintDebug("VNET Bridge RX: buffer desc len: %d\n", pkt_desc->length); + pkt_desc = &(q->desc[pkt_idx]); - if (v3_gpa_to_hva(&(vm->cores[0]), pkt_desc->addr_gpa, (addr_t *)&(virtio_pkt)) == -1) { - PrintError("Could not translate buffer address\n"); - goto exit; - } + if (v3_gpa_to_hva(&(vm->cores[0]), pkt_desc->addr_gpa, (addr_t *)&(virtio_pkt)) == -1) { + PrintError(vm, VCORE_NONE, "Could not translate buffer address\n"); + goto exit; + } - PrintDebug("VNET Bridge: RX: pkt sent to guest pkt size: %d, dst link: %d\n", pkt->size, pkt->dst_id); + PrintDebug(vm, VCORE_NONE, "VNET Bridge: RX: pkt sent to guest pkt size: %d, dst link: %d\n", pkt->size, pkt->dst_id); - // Fill in dst packet buffer - virtio_pkt->link_id = pkt->dst_id; - virtio_pkt->pkt_size = pkt->size; - memcpy(virtio_pkt->pkt, pkt->data, pkt->size); + // Fill in dst packet buffer + virtio_pkt->link_id = pkt->dst_id; + virtio_pkt->pkt_size = pkt->size; + memcpy(virtio_pkt->pkt, pkt->data, pkt->size); - 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 = sizeof(struct vnet_bridge_pkt); - - q->used->index++; - q->cur_avail_idx++; - } else { - vnet_state->pkt_drop ++; - v3_vnet_disable_bridge(); - } - } + 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 = sizeof(struct vnet_bridge_pkt); - if(sent == 0){ - goto exit; + q->used->index++; + q->cur_avail_idx++; + } else { + vnet_state->pkt_drop ++; } if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - v3_pci_raise_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); + v3_pci_raise_irq(vnet_state->pci_bus, vnet_state->pci_dev, 0); vnet_state->virtio_cfg.pci_isr = 0x1; - PrintDebug("Raising IRQ %d\n", vnet_state->pci_dev->config_header.intr_line); + PrintDebug(vm, VCORE_NONE, "Raising IRQ %d\n", vnet_state->pci_dev->config_header.intr_line); } ret_val = 0; - -#ifdef CONFIG_VNET_PROFILE - if (vnet_state->pkt_recv % 200000 == 0) - PrintError("Vnet Bridge: sent: %ld, rxed: %ld, dropped: %ld, total exit: %ld, tx exit: %ld, rx exit: %ld\n", - vnet_state->pkt_sent, - vnet_state->pkt_recv, - vnet_state->pkt_drop, - vnet_state->total_exit, - vnet_state->tx_exit, - vnet_state->rx_exit); -#endif - exit: v3_unlock_irqrestore(vnet_state->lock, flags); @@ -308,22 +272,14 @@ exit: return ret_val; } -static void vnet_pkt_input_xcall(void *data){ - struct v3_vnet_bridge_input_args *args = (struct v3_vnet_bridge_input_args *)data; - - vnet_pkt_input_cb(args->vm, args->vnet_pkts, args->pkt_num, args->private_data); -} - -static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * vnet_state) +static int do_tx_pkts(struct guest_info * core, + struct virtio_vnet_state * vnet_state) { struct virtio_queue * q = &(vnet_state->queue[XMIT_QUEUE]); - unsigned long flags = 0; int recvd = 0; - flags = v3_lock_irqsave(vnet_state->lock); - if (q->ring_avail_addr == 0) { - goto exit; + return -1; } while (q->cur_avail_idx != q->avail->index) { @@ -332,18 +288,23 @@ static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * v struct vnet_bridge_pkt * virtio_pkt = NULL; pkt_desc = &(q->desc[desc_idx]); - - PrintDebug("VNET Bridge: Handle TX desc buf_len: %d\n", pkt_desc->length); if (v3_gpa_to_hva(core, pkt_desc->addr_gpa, (addr_t *)&(virtio_pkt)) == -1) { - PrintError("Could not translate buffer address\n"); + PrintError(core->vm_info, core, "Could not translate buffer address\n"); return -1; } - PrintDebug("VNET Bridge: TX: on cpu %d pkt size: %d, dst link: %d\n", cpu, virtio_pkt->pkt_size, virtio_pkt->link_id); - - v3_vnet_rx(virtio_pkt->pkt, virtio_pkt->pkt_size, virtio_pkt->link_id, LINK_EDGE); + //PrintDebug(core->vm_info, core, "VNET Bridge: TX: on cpu %d pkt size: %d, dst link: %d\n", cpu, virtio_pkt->pkt_size, virtio_pkt->link_id); + + struct v3_vnet_pkt pkt; + pkt.size = virtio_pkt->pkt_size; + pkt.src_type = LINK_EDGE; + pkt.src_id = 0; + memcpy(pkt.header, virtio_pkt->pkt, ETHERNET_HEADER_LEN); + pkt.data = virtio_pkt->pkt; + v3_vnet_send_pkt(&pkt, NULL); + 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 = pkt_desc->length; // What do we set this to???? q->used->index++; @@ -355,72 +316,45 @@ static int handle_pkt_kick(struct guest_info *core, struct virtio_vnet_state * v } if(recvd == 0){ - goto exit; - } - - //PrintError("In polling get %d\n", recvd); - - //if on the dom0 core, interrupt the domU core to poll pkts - //otherwise, call the polling directly - int cpu = V3_Get_CPU(); - if(vnet_state->vm->cores[0].cpu_id == cpu){ - cpu = (cpu == 0)?1:0; - v3_interrupt_cpu(vnet_state->vm, cpu, V3_VNET_POLLING_VECTOR); - }else{ - v3_vnet_polling(); + return 0; } - if((vnet_state->pkt_sent % (QUEUE_SIZE/20)) == 0) { //optimized for guest's, batch the interrupts - if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - v3_pci_raise_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); - vnet_state->virtio_cfg.pci_isr = 0x1; - } + if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { + v3_pci_raise_irq(vnet_state->pci_bus, vnet_state->pci_dev, 0); + vnet_state->virtio_cfg.pci_isr = 0x1; } - -#ifdef CONFIG_VNET_PROFILE - if (vnet_state->pkt_sent % 200000 == 0) - PrintError("Vnet Bridge: sent: %ld, rxed: %ld, dropped: %ld, total exit: %ld, tx exit: %ld, rx exit: %ld\n", - vnet_state->pkt_sent, - vnet_state->pkt_recv, - vnet_state->pkt_drop, - vnet_state->total_exit, - vnet_state->tx_exit, - vnet_state->rx_exit); -#endif - -exit: - v3_unlock_irqrestore(vnet_state->lock,flags); - + return 0; } -static int polling_pkt_from_guest(struct v3_vm_info * vm, void *private_data){ +static void vnet_virtio_poll(struct v3_vm_info * vm, void * private_data){ struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; - - return handle_pkt_kick(&(vm->cores[0]), vnet_state); + + if(vm == vnet_state->vm){ + do_tx_pkts(&(vm->cores[0]), vnet_state); + } } -static int handle_rx_kick(struct guest_info *core, struct virtio_vnet_state * vnet_state) -{ - v3_vnet_enable_bridge(); - +static int handle_rx_queue_kick(struct guest_info *core, + struct virtio_vnet_state * vnet_state) +{ return 0; } -static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * src, uint_t length, void * private_data) { +static int vnet_virtio_io_write(struct guest_info * core, + uint16_t port, void * src, + uint_t length, void * private_data) { struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; int port_idx = port % vnet_state->io_range_size; - PrintDebug("VNET Bridge: VIRTIO VNET Write for port %d len=%d, value=%x\n", + PrintDebug(core->vm_info, core, "VNET Bridge: VIRTIO VNET Write for port %d len=%d, value=%x\n", port, length, *(uint32_t *)src); - PrintDebug("VNET Bridge: port idx=%d\n", port_idx); vnet_state->total_exit ++; - switch (port_idx) { case GUEST_FEATURES_PORT: if (length != 4) { - PrintError("Illegal write length for guest features\n"); + PrintError(core->vm_info, core, "Illegal write length for guest features\n"); return -1; } vnet_state->virtio_cfg.guest_features = *(uint32_t *)src; @@ -443,39 +377,40 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * vnet_state->cur_queue->ring_used_addr = (vnet_state->cur_queue->ring_used_addr + 0xfff) & ~0xfff; if (v3_gpa_to_hva(core, vnet_state->cur_queue->ring_desc_addr, (addr_t *)&(vnet_state->cur_queue->desc)) == -1) { - PrintError("Could not translate ring descriptor address\n"); + PrintError(core->vm_info, core, "Could not translate ring descriptor address\n"); return -1; } if (v3_gpa_to_hva(core, vnet_state->cur_queue->ring_avail_addr, (addr_t *)&(vnet_state->cur_queue->avail)) == -1) { - PrintError("Could not translate ring available address\n"); + PrintError(core->vm_info, core, "Could not translate ring available address\n"); return -1; } if (v3_gpa_to_hva(core, vnet_state->cur_queue->ring_used_addr, (addr_t *)&(vnet_state->cur_queue->used)) == -1) { - PrintError("Could not translate ring used address\n"); + PrintError(core->vm_info, core, "Could not translate ring used address\n"); return -1; } - PrintDebug("VNET Bridge: RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n", + PrintDebug(core->vm_info, core, "VNET Bridge: RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n", (void *)(vnet_state->cur_queue->ring_desc_addr), (void *)(vnet_state->cur_queue->ring_avail_addr), (void *)(vnet_state->cur_queue->ring_used_addr)); - PrintDebug("VNET Bridge: RingDesc=%p, Avail=%p, Used=%p\n", + PrintDebug(core->vm_info, core, "VNET Bridge: RingDesc=%p, Avail=%p, Used=%p\n", vnet_state->cur_queue->desc, vnet_state->cur_queue->avail, vnet_state->cur_queue->used); if(vnet_state->queue[RECV_QUEUE].avail != NULL){ vnet_state->ready = 1; + vnet_state->queue[RECV_QUEUE].used->flags |= VRING_NO_NOTIFY_FLAG; } //No notify when there is pkt tx from guest + //palacios will do the polling if(vnet_state->queue[XMIT_QUEUE].used != NULL){ vnet_state->queue[XMIT_QUEUE].used->flags |= VRING_NO_NOTIFY_FLAG; } - } else { - PrintError("Illegal write length for page frame number\n"); + PrintError(core->vm_info, core, "Illegal write length for page frame number\n"); return -1; } break; @@ -483,7 +418,7 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * vnet_state->virtio_cfg.vring_queue_selector = *(uint16_t *)src; if (vnet_state->virtio_cfg.vring_queue_selector > NUM_QUEUES) { - PrintError("VNET Bridge device has no qeueues. Selected %d\n", + PrintError(core->vm_info, core, "VNET Bridge device has no qeueues. Selected %d\n", vnet_state->virtio_cfg.vring_queue_selector); return -1; } @@ -494,28 +429,27 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * case VRING_Q_NOTIFY_PORT: { uint16_t queue_idx = *(uint16_t *)src; - PrintDebug("VNET Bridge: Handling Kick\n"); + PrintDebug(core->vm_info, core, "VNET Bridge: Handling Kick\n"); if (queue_idx == 0) { if (handle_cmd_kick(core, vnet_state) == -1) { - PrintError("Could not handle Virtio VNET Control command\n"); + PrintError(core->vm_info, core, "Could not handle Virtio VNET Control command\n"); return -1; } } else if (queue_idx == 1) { - if (handle_pkt_kick(core, vnet_state) == -1){ - PrintError("Could not handle Virtio VNET TX\n"); + if (do_tx_pkts(core, vnet_state) == -1){ + PrintError(core->vm_info, core, "Could not handle Virtio VNET TX\n"); return -1; } - vnet_state->tx_exit ++; - //PrintError("Notify on TX\n"); + PrintError(core->vm_info, core, "Notify on TX\n"); } else if (queue_idx == 2) { - if (handle_rx_kick(core, vnet_state) == -1){ - PrintError("Could not handle Virtio RX buffer refills Kick\n"); + if (handle_rx_queue_kick(core, vnet_state) == -1){ + PrintError(core->vm_info, core, "Could not handle Virtio RX buffer refills Kick\n"); return -1; } vnet_state->rx_exit ++; } else { - PrintError("VNET Bridge: Kick on invalid queue (%d)\n", queue_idx); + PrintError(core->vm_info, core, "VNET Bridge: Kick on invalid queue (%d)\n", queue_idx); return -1; } @@ -525,7 +459,7 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * vnet_state->virtio_cfg.status = *(uint8_t *)src; if (vnet_state->virtio_cfg.status == 0) { - PrintDebug("VNET Bridge: Resetting device\n"); + PrintDebug(core->vm_info, core, "VNET Bridge: Resetting device\n"); virtio_reset(vnet_state); } @@ -543,7 +477,9 @@ static int vnet_virtio_io_write(struct guest_info * core, uint16_t port, void * } -static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * private_data) { +static int vnet_virtio_io_read(struct guest_info * core, + uint16_t port, void * dst, + uint_t length, void * private_data) { struct virtio_vnet_state * vnet_state = (struct virtio_vnet_state *)private_data; int port_idx = port % vnet_state->io_range_size; @@ -551,7 +487,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d switch (port_idx) { case HOST_FEATURES_PORT: if (length != 4) { - PrintError("Illegal read length for host features\n"); + PrintError(core->vm_info, core, "Illegal read length for host features\n"); return -1; } @@ -560,7 +496,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d break; case VRING_PG_NUM_PORT: if (length != 4) { - PrintError("Illegal read length for page frame number\n"); + PrintError(core->vm_info, core, "Illegal read length for page frame number\n"); return -1; } @@ -569,7 +505,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d break; case VRING_SIZE_PORT: if (length != 2) { - PrintError("Illegal read length for vring size\n"); + PrintError(core->vm_info, core, "Illegal read length for vring size\n"); return -1; } @@ -579,7 +515,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d case VIRTIO_STATUS_PORT: if (length != 1) { - PrintError("Illegal read length for status\n"); + PrintError(core->vm_info, core, "Illegal read length for status\n"); return -1; } @@ -589,7 +525,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d case VIRTIO_ISR_PORT: *(uint8_t *)dst = vnet_state->virtio_cfg.pci_isr; vnet_state->virtio_cfg.pci_isr = 0; - v3_pci_lower_irq(vnet_state->pci_bus, 0, vnet_state->pci_dev); + v3_pci_lower_irq(vnet_state->pci_bus, vnet_state->pci_dev, 0); break; default: @@ -601,7 +537,7 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d memcpy(dst, cfg_ptr + cfg_offset, length); } else { - PrintError("Read of Unhandled Virtio Read\n"); + PrintError(core->vm_info, core, "Read of Unhandled Virtio Read\n"); return -1; } @@ -612,12 +548,20 @@ static int vnet_virtio_io_read(struct guest_info * core, uint16_t port, void * d } +static int virtio_free(struct virtio_vnet_state * vnet_state) { + + // unregister from PCI + + v3_lock_deinit(&(vnet_state->lock)); + + V3_Free(vnet_state); + + return 0; +} + static struct v3_device_ops dev_ops = { - .free = NULL, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))virtio_free, }; static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { @@ -626,22 +570,29 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct pci_device * pci_dev = NULL; char * name = v3_cfg_val(cfg, "name"); - PrintDebug("VNET Bridge: Initializing VNET Bridge Control device: %s\n", name); + PrintDebug(vm, VCORE_NONE, "VNET Bridge: Initializing VNET Bridge Control device: %s\n", name); if (pci_bus == NULL) { - PrintError("VNET Bridge device require a PCI Bus"); + PrintError(vm, VCORE_NONE, "VNET Bridge device require a PCI Bus"); return -1; } vnet_state = (struct virtio_vnet_state *)V3_Malloc(sizeof(struct virtio_vnet_state)); + + if (!vnet_state) { + PrintError(vm, VCORE_NONE, "Cannot allocate in init\n"); + return -1; + } + memset(vnet_state, 0, sizeof(struct virtio_vnet_state)); vnet_state->vm = vm; - struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnet_state); + struct vm_device * dev = v3_add_device(vm, name, &dev_ops, vnet_state); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + if (dev == NULL) { + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", name); + V3_Free(vnet_state); return -1; } @@ -679,12 +630,13 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { bars[0].private_data = vnet_state; pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE, - 0, PCI_AUTO_DEV_NUM, 0, + 0, 5 /*PCI_AUTO_DEV_NUM*/, 0, "LNX_VIRTIO_VNET", bars, - NULL, NULL, NULL, vnet_state); + NULL, NULL, NULL, NULL, vnet_state); if (!pci_dev) { - PrintError("Could not register PCI Device\n"); + PrintError(vm, VCORE_NONE, "Could not register PCI Device\n"); + v3_remove_device(dev); return -1; } @@ -704,9 +656,13 @@ static int dev_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { virtio_reset(vnet_state); - V3_Print("Registering Virtio device as vnet bridge\n"); - v3_vnet_add_bridge(vm, vnet_pkt_input_cb, vnet_pkt_input_xcall, polling_pkt_from_guest, 0, 500000, (void *)vnet_state); + struct v3_vnet_bridge_ops brg_ops; + brg_ops.input = vnet_pkt_input_cb; + brg_ops.poll = vnet_virtio_poll; + + V3_Print(vm, VCORE_NONE, "Registering Virtio device as vnet bridge\n"); + v3_vnet_add_bridge(vm, &brg_ops, CTL_VM_BRIDGE, (void *)vnet_state); return 0; }