X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=ca56633d4fda9fe8b659f0993e7058dc5f80cf3e;hb=bd0be459f4bbfe75bdfaf7f497a671dd0698550b;hp=ca492fb4e86b777b1ba29a29094f505429a0809d;hpb=0956466aad020813d1e470df366d552fdabab2a9;p=palacios-OLD.git

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index ca492fb..ca56633 100644
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -95,10 +95,8 @@ struct virtio_net_state {
 
     int buffed_rx;
     int tx_disabled; 			/* stop TX pkts from guest */
-    uint16_t cur_notify_tx_idx; 	/*for used in update_tx_queue */
 
     uint64_t pkt_sent, pkt_recv, pkt_drop;
-    uint64_t tx_stop_times, rx_stop_times, tx_poll_times, rx_ipi_num;
 
     struct v3_dev_net_ops * net_ops;
     v3_lock_t rx_lock, tx_lock;
@@ -117,11 +115,7 @@ struct virtio_net_state {
 #define ERR_VIRTIO_TXQ_DISABLED 6
 
 
-static int virtio_free(struct vm_device * dev) 
-{
-	
-    return 0;
-}
+
 
 static int virtio_init_state(struct virtio_net_state * virtio) 
 {
@@ -152,7 +146,7 @@ static int virtio_init_state(struct virtio_net_state * virtio)
     virtio->virtio_cfg.host_features = 0; // (1 << VIRTIO_NET_F_MAC);
 
     if ((v3_lock_init(&(virtio->rx_lock)) == -1) ||
-	  (v3_lock_init(&(virtio->tx_lock)) == -1)){
+	(v3_lock_init(&(virtio->tx_lock)) == -1)){
         PrintError("Virtio NIC: Failure to init locks for net_state\n");
     }
 
@@ -162,7 +156,10 @@ static int virtio_init_state(struct virtio_net_state * virtio)
     return 0;
 }
 
-static int pkt_tx(struct guest_info *core, 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) 
 {
     uint8_t * buf = NULL;
     uint32_t len = buf_desc->length;
@@ -172,16 +169,17 @@ static int pkt_tx(struct guest_info *core, struct virtio_net_state * virtio, str
 	return -ERR_VIRTIO_OTHER;
     }
 
-    return virtio->net_ops->send(buf, len, virtio->backend_data, NULL);
+    return virtio->net_ops->send(buf, len, virtio->backend_data);
 }
 
 
-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)
+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;
@@ -217,6 +215,7 @@ 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
  * this happens when there are either incoming pkts for the guest
  * or the guest can start TX pkts again */
@@ -226,41 +225,32 @@ static inline void notify_guest(struct virtio_net_state * virtio){
 
 
 /* guest free some pkts from rx queue */
-static int handle_rx_kick(struct guest_info *core, struct virtio_net_state * virtio) 
+static int handle_rx_kick(struct guest_info *core, 
+			  struct virtio_net_state * virtio) 
 {
     unsigned long flags;
 
     flags = v3_lock_irqsave(virtio->rx_lock);
 
-    virtio->net_ops->start_rx(virtio->backend_data);
-    disable_cb(&virtio->rx_vq);
+    if(virtio->net_ops->start_rx != NULL){
+	virtio->net_ops->start_rx(virtio->backend_data);
+    }
+    	//disable_cb(&virtio->rx_vq);
 
     v3_unlock_irqrestore(virtio->rx_lock, flags);
 	
     return 0;
 }
 
-#ifdef CONFIG_VNET_PROFILE
-static void print_profile_info(struct virtio_net_state *virtio){
-    PrintError("Virtio NIC: %p,  sent: %lld, rxed: %lld, dropped: %lld, \
-			tx_stop: %lld, rx_stop: %lld, poll_time: %lld, rx_ipi: %lld\n",
-			virtio,
-			virtio->pkt_sent,
-			virtio->pkt_recv,
-			virtio->pkt_drop, 
-			virtio->tx_stop_times,
-			virtio->rx_stop_times,
-			virtio->tx_poll_times,
-			virtio->rx_ipi_num);
-}
-#endif
 
-static int handle_ctrl(struct guest_info *core, struct virtio_net_state * virtio) {
+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) 
+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;
@@ -327,24 +317,6 @@ static int handle_pkt_tx(struct guest_info *core, struct virtio_net_state * virt
 	virtio_state->virtio_cfg.pci_isr = 0x1;
     }
 
-
-#ifdef CONFIG_VNET_PROFILE
-	static long min = 1024, max = 0, total=0;
-	static int i=0;
-	total += recved;
-	i ++;
-	if(recved > max) max = recved;
-	if(recved < min) min = recved;
-	if(total > 100000) {
-		PrintError("VNIC: TX polling: %ld, min %ld, max %ld, avg: %ld pkts\n", total, min, max, total/i);
-		min = 1024;
-		max = 0;
-		i = 1; 
-		total = 0;
-	}
-#endif
-
-
     return 0;
 
 exit_error:
@@ -355,10 +327,9 @@ exit_error:
 
 
 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;
@@ -395,12 +366,13 @@ static int virtio_setup_queue(struct guest_info *core,
     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);
 
@@ -424,11 +396,11 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u
 	    switch (queue_idx) {
 		case 0:
 		    virtio_setup_queue(core, virtio, &virtio->rx_vq, pfn, page_addr);
-		    disable_cb(&virtio->rx_vq);
+		    //disable_cb(&virtio->rx_vq);
 		    break;
 		case 1:
 		    virtio_setup_queue(core, virtio, &virtio->tx_vq, pfn, page_addr);
-		    disable_cb(&virtio->tx_vq);
+		    //disable_cb(&virtio->tx_vq);
 		    break;
 		case 2:
 		    virtio_setup_queue(core, virtio, &virtio->ctrl_vq, pfn, page_addr);
@@ -452,9 +424,7 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u
 		uint16_t queue_idx = *(uint16_t *)src;	   		
 		if (queue_idx == 0){
 		    handle_rx_kick(core, virtio);
-		    PrintError("rx kick\n");
 		} else if (queue_idx == 1){
-		    PrintError("tx kick\n");
 		    if (handle_pkt_tx(core, virtio) == -1) {
 			PrintError("Could not handle NIC Notification\n");
 			return -1;
@@ -490,7 +460,9 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u
     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;
@@ -582,6 +554,13 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
     int ret_val = -ERR_VIRTIO_OTHER;
     int raw = 1;
 
+#ifndef CONFIG_DEBUG_VIRTIO_NET
+   {
+    	PrintDebug("Virtio-NIC: virtio_rx: size: %d\n", size);	
+    	//v3_hexdump(buf, size, NULL, 0);
+   }
+#endif
+
     flags = v3_lock_irqsave(virtio->rx_lock);
 
     virtio->pkt_recv ++;
@@ -642,7 +621,6 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
 	    (q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
 	    if(virtio->virtio_dev->vm->cores[0].cpu_id != V3_Get_CPU()){
 		  notify_guest(virtio);
-		  virtio->rx_ipi_num ++;
 	    }
 	    virtio->buffed_rx = 0;
 	}
@@ -651,8 +629,6 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
 	/* RX queue is full,  tell backend to stop RX on this device */
 	virtio->net_ops->stop_rx(virtio->backend_data);
 	enable_cb(&virtio->rx_vq);
-
-	virtio->rx_stop_times ++;
 	
 	ret_val = -ERR_VIRTIO_RXQ_FULL;
 	goto exit;
@@ -673,64 +649,70 @@ exit:
     return ret_val;
 }
 
+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,
 };
 
 
 /* TODO: Issue here: which vm info it needs? calling VM or the device's own VM? */
-static void virtio_nic_poll(struct v3_vm_info *vm, void *data){
-    struct virtio_net_state *virtio = (struct virtio_net_state *)data;
+static void virtio_nic_poll(struct v3_vm_info * vm, void * data){
+    struct virtio_net_state * virtio = (struct virtio_net_state *)data;
 	
     handle_pkt_tx(&(vm->cores[0]), virtio);
-
-    virtio->tx_poll_times ++;
-
-#ifdef CONFIG_VNET_PROFILE
-    static uint64_t last_time = 0;
-    uint64_t time;
-    rdtscll(time);
-    if((time - last_time) > 5000000000){
-	last_time = time;
-       print_profile_info(virtio);
-    }
-#endif
 }
 
-static void virtio_start_tx(void *data){
+static void virtio_start_tx(void * data){
     struct virtio_net_state * virtio = (struct virtio_net_state *)data;
+    unsigned long flags;
 
-    /* do we need a lock here? */
+    flags = v3_lock_irqsave(virtio->tx_lock);
     virtio->tx_disabled = 0;
 
-    /* notify the device's guest it can start sending pkt */
+    /* notify the device's guest to start sending pkt */
     if(virtio->virtio_dev->vm->cores[0].cpu_id != V3_Get_CPU()){
 	notify_guest(virtio);
     }
+    v3_unlock_irqrestore(virtio->tx_lock, flags);	
 }
 
-static void virtio_stop_tx(void *data){
+static void virtio_stop_tx(void * data){
     struct virtio_net_state * virtio = (struct virtio_net_state *)data;
+    unsigned long flags;
 
-    /* do we need a lock here? */
+    flags = v3_lock_irqsave(virtio->tx_lock);
     virtio->tx_disabled = 1;
 
-    /* how do we stop the guest to exit to palacios for sending pkt? */
+    /* stop the guest to exit to palacios for sending pkt? */
     if(virtio->virtio_dev->vm->cores[0].cpu_id != V3_Get_CPU()){
        disable_cb(&virtio->tx_vq);
     }
 
-    virtio->tx_stop_times ++;
+    v3_unlock_irqrestore(virtio->tx_lock, flags);
 }
 
 	
 
 
-static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_state * net_state) 
+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];
@@ -797,10 +779,9 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_stat
     
     virtio_init_state(net_state);
 
-#if 0 //temporary hacking LX
-    vnic_states[num_vnic ++] = net_state;
-    PrintError("VNIC: num of vnic %d\n", num_vnic);
-#endif
+
+    /* Add backend to list of devices */
+    list_add(&(net_state->dev_link), &(virtio->dev_list));
 
     return 0;
 }
@@ -818,6 +799,8 @@ static int connect_fn(struct v3_vm_info * info,
 
     net_state->net_ops = ops;
     net_state->backend_data = private_data;
+    net_state->virtio_dev = virtio;
+	
 
     ops->recv = virtio_rx;
     ops->poll = virtio_nic_poll;
@@ -831,9 +814,9 @@ static int connect_fn(struct v3_vm_info * info,
 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");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
-    PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name);
+    PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", dev_id);
 
     if (pci_bus == NULL) {
 	PrintError("Virtio NIC: VirtIO devices require a PCI Bus");
@@ -847,14 +830,17 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     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);
+    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;
     }