X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=acbce0d6d784566d6496fc2287d52dbd4d83ff38;hb=1df601c90b519a54b64ca101fd6aa4c0a39bf0f0;hp=4f86bbe57ae299dbb653fff060ed35b1e32a2b1c;hpb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;p=palacios.git

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index 4f86bbe..acbce0d 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;
@@ -152,7 +150,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 +160,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;
@@ -176,12 +177,13 @@ static int pkt_tx(struct guest_info *core, struct virtio_net_state * virtio, str
 }
 
 
-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 +219,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,7 +229,8 @@ 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;
 
@@ -240,27 +244,15 @@ static int handle_rx_kick(struct guest_info *core, struct virtio_net_state * vir
     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 +319,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:
@@ -354,126 +328,10 @@ exit_error:
 }
 
 
-#if 0 //for multicore VNET
-/* used for poll pkt from virtio nic by VNET
- * only when vnet is running on sidecore */
-static int handle_pkt_tx_sidecore(struct guest_info *core, struct virtio_net_state * virtio) 
-{
-    struct virtio_queue * q = &(virtio->tx_vq);
-    struct virtio_net_hdr * hdr = NULL;
-    int recved = 0;
-    unsigned long flags;
-
-    if (!q->ring_avail_addr) {
-	return -ERR_VIRTIO_TXQ_NOSET;
-    }
-
-    flags = v3_lock_irqsave(virtio->tx_lock);
-
-    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];
-	int desc_cnt = get_desc_count(q, desc_idx);
-	uint32_t req_len = 0;
-	int i = 0;
-
-	hdr_desc = &(q->desc[desc_idx]);
-	if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, &(hdr_addr)) == -1) {
-	    PrintError("Could not translate block header address\n");
-	    goto exit_error;
-	}
-
-	hdr = (struct virtio_net_hdr*)hdr_addr;
-	desc_idx = hdr_desc->next;
-
-	if(desc_cnt > 2){
-	    PrintError("VNIC: merged rx buffer not supported\n");
-	    goto exit_error;
-	}
-
-	for (i = 0; i < desc_cnt - 1; i++) {	
-	    struct vring_desc * buf_desc = &(q->desc[desc_idx]);
-	    if (pkt_tx_sidecore(core, virtio, buf_desc) < 0) {
-		PrintError("Error handling nic operation\n");
-		goto exit_error;
-	    }
-
-	    req_len += buf_desc->length;
-	    desc_idx = buf_desc->next;
-	}
-	recved ++;
-	
-	q->cur_avail_idx ++;
-    }
-
-    if(recved) PrintDebug("VNIC: Tx polling %d pkts\n", recved);
-	
-    v3_unlock_irqrestore(virtio->tx_lock, flags);
-
-    return 0;
-
-exit_error:
-	
-    v3_unlock_irqrestore(virtio->tx_lock, flags);
-    return -ERR_VIRTIO_OTHER;
-}
-
-
-/* called by VNET, to notify Virtio to update the tx_queue used index 
- * used only when vnet running on sidecore */
-static int update_tx_queue(struct virtio_net_state * virtio, int handled_pkt){
-    struct virtio_queue * q = &(virtio->tx_vq);
-    unsigned long flags;
-
-    if (!q->ring_avail_addr) {
-	return -ERR_VIRTIO_TXQ_NOSET;
-    }
-
-    flags = v3_lock_irqsave(virtio->tx_lock);
-    while(handled_pkt > 0){
-    	q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[virtio->cur_notify_tx_idx % q->queue_size];
-    	q->used->ring[q->used->index % q->queue_size].length = req_len; // TODO:
-    	q->used->index ++;
-    	virtio->cur_notify_tx_idx ++;
-	handled_pkt --;
-    }
-    v3_unlock_irqrestore(virtio->tx_lock, flags);
-
-    if (handled_pkt && (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG))) {
-	v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev);
-	virtio->virtio_cfg.pci_isr = 0x1;
-
-	/* do we need to notify here? */
-	notify_guest(virtio);
-    }
-
-    virtio->pkt_sent += handled_pkt;
-	
-#ifdef CONFIG_VNET_PROFILE
-    if (virtio->pkt_sent % 50000 == 0){
-	    long cur_time, time;
-	    rdtscll(cur_time);
-	    time = cur_time - virtio_state->last_sent_time;
-	    PrintError("Virtio NIC: last sent 50000 cycles: %ld\n",time);
-	    PrintError("Virtio NIC: sent: %ld, rxed: %ld, dropped: %ld\n",
-			virtio->pkt_sent,
-			virtio->pkt_recv,
-			virtio->pkt_drop);
-	    rdtscll(virtio->last_sent_time);
-    }
-#endif
-
-
-    return 0;
-}
-#endif
-
 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;
@@ -510,7 +368,9 @@ 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;
@@ -605,7 +465,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;
@@ -757,7 +619,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;
 	}
@@ -766,8 +627,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;
@@ -789,118 +648,6 @@ exit:
 }
 
 
-#if 0 /* for encapuslation */
-/* virtio RX with encapulation version */
-static int virtio_rx_encap(uint8_t * data, 
-						  uint32_t size, 
-						  void * encap_header, 
-						  uint16_t encap_len,
-						  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_mrg_rxbuf hdr;
-    uint32_t hdr_len = sizeof(struct virtio_net_hdr_mrg_rxbuf);
-    uint32_t data_len = size + encap_len;
-    unsigned long flags;
-    int ret_val = -ERR_VIRTIO_OTHER;
-
-    if (q->ring_avail_addr == 0) {
-	PrintError("Queue is not set\n");
-	ret_val = -ERR_VIRTIO_RXQ_NOSET;
-	goto exit;
-    }
-	
-    memset(&hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf));
-
-    flags = v3_lock_irqsave(virtio->rx_lock);
-    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;
-       uint32_t offset = 0;
-
-	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");
-	    goto exit;
-	}
-	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;
-       uint32_t len = 0;
-	buf_idx = hdr_desc->next;
-       buf_desc = &(q->desc[buf_idx]);
-	
-	if(hdr_len > 0 && !encap_header) {
-	    len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, encap_header, encap_len, 0);
-	    offset += len;
-	}
-	
-	len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, data + offset, data_len - offset, offset);	    
-       offset += len;
-
-	if(data_len < offset)/* if there is large pkt, need merge more buffer */
-	    PrintDebug("Virtio NIC: data pkt larger than RX queue buffer\n");
-
-	buf_desc->length = offset;	
-	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->index++;
-	q->cur_avail_idx++;
-
-	/* notify guest 
-         * when it returns from EXIT, guest gets the virtio rx interrupt */
-	if((++virtio->buffed_rx > q->queue_size/2) &&
-	    (q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
-	    if(virtio->virtio_dev->vm->cores[0].cpu_id != V3_Get_CPU()){
-		  notify_guest(virtio);
-	    }
-	    virtio->buffed_rx = 0;
-	}
-       ret_val = offset;
-    } else {
-	virtio->pkt_drop++;
-	ret_val = -ERR_VIRTIO_RXQ_FULL;
-	goto exit;
-    }
-    virtio->pkt_recv ++;
-
-    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 CONFIG_VNET_PROFILE
-    if (virtio->pkt_recv % 50000 == 0){
-	    long cur_time, time;
-	    rdtscll(cur_time);
-	    time = cur_time - virtio->last_recv_time;
-	    PrintError("Virtio NIC: sent: %ld, rxed: %ld, dropped: %ld\n",
-		virtio->pkt_sent,
-		virtio->pkt_recv,
-		virtio->pkt_drop);
-	    rdtscll(virtio->last_recv_time);
-    }
-#endif
-
-exit:
-
-    v3_unlock_irqrestore(virtio->rx_lock, flags);
- 
-    return ret_val;
-}
-#endif 
-
-
-
 static struct v3_device_ops dev_ops = {
     .free = virtio_free,
     .reset = NULL,
@@ -908,85 +655,48 @@ static struct v3_device_ops dev_ops = {
     .stop = NULL,
 };
 
-#if 0 //temporary hacking LX
-static struct virtio_net_state *vnic_states[2] = {NULL, NULL};
-static int num_vnic = 0;
-
-void vnic_polling(void *data){
-    struct v3_vm_info *info = (struct v3_vm_info *)data;    
-    if(vnic_states[0] != NULL && info == vnic_states[0]->virtio_dev->vm){
-	handle_pkt_tx(&(info->cores[0]), vnic_states[0]);
-    }
-
-    if(vnic_states[1] != NULL && info == vnic_states[1]->virtio_dev->vm){
-	handle_pkt_tx(&(info->cores[0]), vnic_states[1]);
-    }
-}
-#endif
 
 /* 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
-}
-
-#if 0 /* NAPI */
-/* tx one pkt from guest */
-static int virtio_tx_pkt(struct guest_info *core, struct virtio_net_state * virtio_state){
-
-}
-
-static void virtio_nic_poll(struct v3_vm_info *vm, void *data, int budget){
-
-
 }
 
-#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];
@@ -1053,11 +763,6 @@ 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
-
     return 0;
 }