X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=d3d5cfbe24510ae4f7ab8eec9059d67f4738b0dc;hb=610d3af422ae2f0eb43d156984bf5d56d3352e46;hp=58e9e58ce14e2c2fcea4555530a9e7f5d66b9a08;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios.releases.git

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index 58e9e58..d3d5cfb 100644
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -66,7 +66,7 @@ struct virtio_net_config
 struct virtio_dev_state {
     struct vm_device * pci_bus;
     struct list_head dev_list;
-    struct guest_info * vm;
+    struct guest_info *vm;
 };
 
 struct virtio_net_state {
@@ -82,21 +82,16 @@ struct virtio_net_state {
     struct virtio_queue ctrl_vq; //index 2, ctrol info from guest
 
     ulong_t pkt_sent, pkt_recv, pkt_drop;
-    struct gen_queue * inpkt_q;
 
     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;
 };
 
-#define ETHERNET_PACKET_LEN 1514
-struct eth_pkt {
-    uint32_t size; //size of data
-    char data[ETHERNET_PACKET_LEN];
-}__attribute__((packed));
-
 static int virtio_free(struct vm_device * dev) 
 {
 	
@@ -127,10 +122,11 @@ static int virtio_init_state(struct virtio_net_state * virtio)
     //virtio->virtio_cfg.status = VIRTIO_NET_S_LINK_UP;
     virtio->virtio_cfg.pci_isr = 0;
 
-    virtio->pkt_sent = virtio->pkt_recv = virtio->pkt_drop = 0;
+    if (v3_lock_init(&(virtio->lock)) == -1){
+        PrintError("Virtio NIC: Failure to init lock for net_state\n");
+    }
 
-    virtio->inpkt_q = v3_create_queue();
-    v3_init_queue(virtio->inpkt_q);
+    virtio->pkt_sent = virtio->pkt_recv = virtio->pkt_drop = 0;
 
     return 0;
 }
@@ -181,119 +177,8 @@ static int copy_data_to_desc(struct virtio_net_state * virtio_state, struct vrin
     return len;
 }
 
-//send data to guest
-int send_pkt_to_guest(struct virtio_net_state * virtio, uchar_t * buf, uint_t size, int raw, void * 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 NIC:  sending packet to virtio nic %p, size:%d", virtio, size);
-
-    virtio->pkt_recv ++;
-    if (!raw) {
-	data_len -= hdr_len;
-    }
-
-    build_receive_header(&hdr, buf, 1);
-
-    if (q->ring_avail_addr == 0) {
-	PrintError("Queue is not set\n");
-	return -1;
-    }
-
-    if (q->last_avail_idx > q->avail->index)
-	q->idx_overflow = true;
-    q->last_avail_idx = q->avail->index;
-
-    if (q->cur_avail_idx < q->avail->index || (q->idx_overflow && q->cur_avail_idx < q->avail->index+65536)){
-	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, hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
-	    PrintError("Could not translate receive buffer address\n");
-	    return -1;
-	}
-
-	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, 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++;
-
-	int last_idx = q->cur_avail_idx;
-	q->cur_avail_idx++;
-	if (q->cur_avail_idx < last_idx)
-	    q->idx_overflow = false;
-    } else {
-	virtio->pkt_drop++;
-
-#ifdef VIRTIO_NIC_PROFILE
-	PrintError("Virtio NIC: %p, one pkt dropped receieved: %ld, dropped: %ld, sent: %ld curidx: %d, avaiIdx: %d\n", 
-		virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent, q->cur_avail_idx, q->avail->index);
-#endif
-    }
-
-    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;
-    }
-
-#ifdef VIRTIO_NIC_PROFILE
-    if ((virtio->pkt_recv % 10000) == 0){
-	PrintError("Virtio NIC: %p, receieved: %ld, dropped: %ld, sent: %ld\n", 
-		virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent);
-    }
-#endif
-
-    
-    return offset;
-}
-
-static int virtio_sendto_buf(struct virtio_net_state * net_state, uchar_t * buf, uint_t size) {
-    struct eth_pkt *pkt;
-
-    pkt = (struct eth_pkt *)V3_Malloc(sizeof(struct eth_pkt));
-    if(pkt == NULL){
-        PrintError("Virtio NIC: Memory allocate fails\n");
-        return -1;
-    }
-  
-    pkt->size = size;
-    memcpy(pkt->data, buf, size);
-    v3_enqueue(net_state->inpkt_q, (addr_t)pkt);
-	
-    PrintDebug("Virtio NIC: __virtio_sendto_buf: transmitting packet: (size:%d)\n", (int)pkt->size);
 
-    return pkt->size;
-}
 
-int virtio_dev_send(uchar_t * buf, uint32_t size, void *private_data) {
-    struct virtio_net_state *virtio_state = (struct virtio_net_state *)private_data;
-	
-    return virtio_sendto_buf(virtio_state, buf, size);
-}
 
 static int get_desc_count(struct virtio_queue * q, int index) {
     struct vring_desc * tmp_desc = &(q->desc[index]);
@@ -316,12 +201,14 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state)
     struct virtio_queue * q = &(virtio_state->tx_vq);
     struct virtio_net_hdr * hdr = NULL;
 
-    if (q->avail->index < q->last_avail_idx)
+    if (q->avail->index < q->last_avail_idx) {
 	q->idx_overflow = true;
+    }
+
     q->last_avail_idx = q->avail->index;
 
     while (q->cur_avail_idx < q->avail->index || 
-		 (q->idx_overflow && q->cur_avail_idx < (q->avail->index + 65536))) {
+	   (q->idx_overflow && q->cur_avail_idx < (q->avail->index + 65536))) {
 	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];
@@ -355,9 +242,12 @@ static int handle_pkt_tx(struct virtio_net_state * virtio_state)
 	q->used->index++;
 
 	int last_idx = q->cur_avail_idx;
+
 	q->cur_avail_idx ++;
-	if (q->cur_avail_idx < last_idx)
+
+	if (q->cur_avail_idx < last_idx) {
 	    q->idx_overflow = false;
+	}
     }
 
     if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
@@ -583,6 +473,100 @@ static int virtio_io_read(struct guest_info *core, uint16_t port, void * dst, ui
 }
 
 
+
+
+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;
+
+    flags = v3_lock_irqsave(virtio->lock);
+	
+    PrintDebug("VIRTIO NIC:  sending packet to virtio nic %p, size:%d", virtio, size);
+
+    virtio->pkt_recv ++;
+    data_len -= hdr_len;
+
+    build_receive_header(&hdr, buf, 1);
+
+    if (q->ring_avail_addr == 0) {
+	PrintError("Queue is not set\n");
+	return -1;
+    }
+
+    if (q->last_avail_idx > q->avail->index)
+	q->idx_overflow = true;
+    q->last_avail_idx = q->avail->index;
+
+    if (q->cur_avail_idx < q->avail->index || (q->idx_overflow && q->cur_avail_idx < q->avail->index+65536)){
+	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, hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
+	    PrintError("Could not translate receive buffer address\n");
+	    return -1;
+	}
+
+	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, 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++;
+
+	int last_idx = q->cur_avail_idx;
+	q->cur_avail_idx++;
+	if (q->cur_avail_idx < last_idx)
+	    q->idx_overflow = false;
+    } else {
+	virtio->pkt_drop++;
+
+#ifdef VIRTIO_NIC_PROFILE
+	PrintError("Virtio NIC: %p, one pkt dropped receieved: %ld, dropped: %ld, sent: %ld curidx: %d, avaiIdx: %d\n", 
+		virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent, q->cur_avail_idx, q->avail->index);
+#endif
+    }
+
+    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;
+    }
+
+#ifdef VIRTIO_NIC_PROFILE
+    if ((virtio->pkt_recv % 10000) == 0){
+	PrintError("Virtio NIC: %p, receieved: %ld, dropped: %ld, sent: %ld\n", 
+		virtio, virtio->pkt_recv, virtio->pkt_drop, virtio->pkt_sent);
+    }
+#endif
+
+    v3_unlock_irqrestore(virtio->lock, flags);
+    
+    return offset;
+}
+
+
 static struct v3_device_ops dev_ops = {
     .free = virtio_free,
     .reset = NULL,
@@ -673,6 +657,9 @@ static int connect_fn(struct v3_vm_info * info,
     net_state->net_ops = ops;
     net_state->backend_data = private_data;
 
+    ops->recv = virtio_rx;
+    ops->frontend_data = net_state;
+
     return 0;
 }
 
@@ -693,7 +680,6 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     INIT_LIST_HEAD(&(virtio_state->dev_list));
     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) {