X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=479593b97293906adb9d6f6e10a6298e6d72b254;hb=964e7836a6227341b5d895a830b7e36ad6debffb;hp=70e45c31a203018ec41d332c26206bcc6c586727;hpb=83790cde959d56c148be1b5f64d2e4a4414acac9;p=palacios.git

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index 70e45c3..479593b 100644
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -35,148 +35,44 @@
 
 struct vnet_nic_state {
     char mac[6];
-    struct guest_info * core;
+    struct v3_vm_info * vm;
     struct v3_dev_net_ops net_ops;
+    int vnet_dev_id;
 };
 
-#if 0
-//used when virtio_nic get a packet from guest and send it to the backend
-static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
-    struct v3_vnet_pkt * pkt = NULL;
-    struct guest_info *core  = (struct guest_info *)private_data; 
-
-#ifdef WCONFIG_DEBUG_VNET_NIC
-    {
-    	PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
-    	v3_hexdump(buf, len, NULL, 0);
-    }
-#endif
-
-#ifdef CONFIG_VNET_PROFILE
-    uint64_t start, end;
-    rdtscll(start);
-#endif
-
-    pkt = (struct v3_vnet_pkt *)V3_Malloc(sizeof(struct v3_vnet_pkt));
-
-    if(pkt == NULL){
-	PrintError("Malloc() fails");
-	return -1;
-    }
-	
-#ifdef CONFIG_VNET_PROFILE
-    {
-    	rdtscll(end);
-    	core->vnet_times.time_mallocfree = end - start;
-    }
-#endif
-
-
-    pkt->size = len;
-    pkt->src_type = LINK_INTERFACE;
-    pkt->src_id = 0;
-    memcpy(pkt->data, buf, pkt->size);
-
-#ifdef CONFIG_VNET_PROFILE
-    {
-    	rdtscll(start);
-    	core->vnet_times.memcpy_time = start - end;
-	core->vnet_times.time_copy_from_guest = start - core->vnet_times.virtio_handle_start - core->vnet_times.time_mallocfree;
-    }
-#endif
-
-    v3_vnet_send_pkt(pkt, (void *)core);
 
-#ifdef CONFIG_VNET_PROFILE
-    rdtscll(start);
-#endif
-
-    V3_Free(pkt);
-
-#ifdef CONFIG_VNET_PROFILE
-    {
-    	rdtscll(end);
-    	core->vnet_times.time_mallocfree += end - start;
-    }
-#endif
-
-    return 0;
-}
-
-#endif
-
-#if 1
-//alternative way, no malloc/free
-static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
+static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device * dest_dev){
+    struct vnet_nic_state * vnetnic = (struct vnet_nic_state *)private_data;
     struct v3_vnet_pkt pkt;
-    struct guest_info *core  = (struct guest_info *)private_data; 
-
-#ifdef CONFIG_DEBUG_VNET_NIC
-    {
-    	PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
-    	v3_hexdump(buf, len, NULL, 0);
-    }
-#endif
-
-#ifdef CONFIG_VNET_PROFILE
-    uint64_t start, end;
-    rdtscll(start);
-#endif
 
     pkt.size = len;
     pkt.src_type = LINK_INTERFACE;
-    pkt.src_id = 0;
-    memcpy(pkt.data, buf, pkt.size);
-
-#ifdef CONFIG_VNET_PROFILE
-    rdtscll(end);
-    core->vnet_times.time_copy_from_guest = end - core->vnet_times.virtio_handle_start;
-    core->vnet_times.memcpy_time = end - start;
-#endif
-
-    v3_vnet_send_pkt(&pkt, (void *)core);
-
-    return 0;
-}
-#endif
-
-#if 0
-//alternative way, no malloc/free, no copy
-//need to change pkt format
-static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
-    struct v3_vnet_pkt pkt;
-    struct guest_info *core  = (struct guest_info *)private_data; 
+    pkt.src_id = vnetnic->vnet_dev_id;
+    memcpy(pkt.header, buf, ETHERNET_HEADER_LEN);
+    pkt.data = buf;
 
-    
 #ifdef CONFIG_DEBUG_VNET_NIC
     {
-    	PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
+    	PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", 
+			len,  vnetnic->vnet_dev_id);
     	v3_hexdump(buf, len, NULL, 0);
     }
 #endif
-
-    pkt.size = len;
-    pkt.data = buf;
-
-#ifdef CONFIG_VNET_PROFILE
-    uint64_t start, end;
-    rdtscll(start);
-#endif
-
-    v3_vnet_send_pkt(&pkt, (void *)core);
-
-#ifdef CONFIG_VNET_PROFILE
-    {
-    	rdtscll(end);
-    	core->vnet_times.vnet_handle_time = end - start;
-    }
-#endif
+/*
+    v3_vnet_rx(buf, len, vnetnic->vnet_dev_id, LINK_INTERFACE);
+	
+    //if on the dom0 core, interrupt the domU core to poll pkts
+    //otherwise, call the polling directly
+    int cpu = V3_Get_CPU();
+    cpu = (cpu == 0)?1:0;
+    v3_interrupt_cpu(vnetnic->vm, cpu, V3_VNET_POLLING_VECTOR);
+ */
+ 
+    v3_vnet_send_pkt(&pkt, NULL);
 
     return 0;
 }
 
-#endif
-
 static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 	
@@ -186,10 +82,10 @@ static int virtio_input(struct v3_vm_info *info, struct v3_vnet_pkt * pkt, void
 }
 
 static int register_to_vnet(struct v3_vm_info * vm,
-		     struct vnet_nic_state *vnet_nic,
-		     char *dev_name,
-		     uchar_t mac[6]) { 
-   
+			    struct vnet_nic_state * vnet_nic,
+			    char * dev_name,
+			    uint8_t mac[6]) { 
+    
     PrintDebug("Vnet-nic: register Vnet-nic device %s, state %p to VNET\n", dev_name, vnet_nic);
 	
     return v3_vnet_add_dev(vm, mac, virtio_input, (void *)vnet_nic);
@@ -207,16 +103,24 @@ static struct v3_device_ops dev_ops = {
 };
 
 
-static int str2mac(char *macstr, char mac[6]){
-    char hex[2], *s = macstr;
+static int str2mac(char * macstr, uint8_t mac[6]){
+    uint8_t hex[2];
     int i = 0;
+    char * s = macstr;
 
-    while(s){
+    while (s) {
 	memcpy(hex, s, 2);
 	mac[i++] = (char)atox(hex);
-	if (i == 6) return 0;
-	s=strchr(s, ':');
-	if(s) s++;
+
+	if (i == 6) {
+	    return 0;
+	}
+
+	s = strchr(s, ':');
+
+	if (s) {
+	    s++;
+	}
     }
 
     return -1;
@@ -224,91 +128,53 @@ static int str2mac(char *macstr, char mac[6]){
 
 static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vnet_nic_state * vnetnic = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
     char * macstr = NULL;
-    char mac[6];
-    int vnet_dev_id;
-
+    int vnet_dev_id = 0;
     v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
+
     macstr = v3_cfg_val(frontend_cfg, "mac");
 
     if (macstr == NULL) {
-	PrintDebug("Vnet-nic: No Mac specified\n");
-    } else {
-    	str2mac(macstr, mac);
+	PrintDebug("Vnet-nic configuration error: No Mac specified\n");
+	return -1;
     }
 
     vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state));
     memset(vnetnic, 0, sizeof(struct vnet_nic_state));
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, vnetnic);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, vnetnic);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }
 
+
+
     vnetnic->net_ops.send = vnet_send;
-    memcpy(vnetnic->mac, mac, 6);
+    str2mac(macstr, vnetnic->mac);
+    vnetnic->vm = vm;
 	
     if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), 
 			   &(vnetnic->net_ops), frontend_cfg, vnetnic) == -1) {
 	PrintError("Could not connect %s to frontend %s\n", 
-		   name, v3_cfg_val(frontend_cfg, "tag"));
+		   dev_id, v3_cfg_val(frontend_cfg, "tag"));
 	return -1;
     }
 
     PrintDebug("Vnet-nic: Connect %s to frontend %s\n", 
-		   name, v3_cfg_val(frontend_cfg, "tag"));
+	       dev_id, v3_cfg_val(frontend_cfg, "tag"));
 
-    if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) {
-	PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr);
+    if ((vnet_dev_id = register_to_vnet(vm, vnetnic, dev_id, vnetnic->mac)) == -1) {
+	PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", dev_id, macstr);
+	return -1;
     }
 
-    PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", name, macstr, *((ulong_t *)vnetnic->mac));
+    vnetnic->vnet_dev_id = vnet_dev_id;
 
+    PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", dev_id, macstr, *((uint32_t *)vnetnic->mac));
 
-//for temporary hack
-#if 0
-    {
-	uchar_t tapmac[6] = {0x00,0x02,0x55,0x67,0x42,0x39}; //for Intel-VT test HW
-    	//uchar_t tapmac[6] = {0x6e,0xa8,0x75,0xf4,0x82,0x95};
-    	uchar_t dstmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
-    	uchar_t zeromac[6] = {0,0,0,0,0,0};
-
-	struct v3_vnet_route route;
-        route.dst_id = vnet_dev_id;
-	route.dst_type = LINK_INTERFACE;
-	route.src_id = -1;
-	route.src_type = LINK_ANY;
-
-	if(!strcmp(name, "vnet_nicdom0")){
-	    memcpy(route.dst_mac, tapmac, 6);
-	    route.dst_mac_qual = MAC_NONE;
-	    memcpy(route.src_mac, zeromac, 6);
-	    route.src_mac_qual = MAC_ANY;
-	   
-	    v3_vnet_add_route(route);
-
-	    memcpy(route.dst_mac, dstmac, 6);
-	    route.dst_mac_qual = MAC_NONE;
-	    memcpy(route.src_mac, tapmac, 6);
-	    route.src_mac_qual = MAC_NOT;
-
-	    v3_vnet_add_route(route);
-	}
-
-	if (!strcmp(name, "vnet_nic0")){
-	    memcpy(route.dst_mac, zeromac, 6);
-	    route.dst_mac_qual = MAC_ANY;
-	    memcpy(route.src_mac, tapmac, 6);
-	    route.src_mac_qual = MAC_NONE;
-	   
-	    v3_vnet_add_route(route);
-	}
-    }
-
-#endif
 
     return 0;
 }