Vnet updated. Working both single guest or multiple guests now

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 452f325..a22894a 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -79,7 +79,10 @@ struct v3_vnet_profile{
     uint64_t  time_mallocfree;
     uint64_t  time_copy_to_guest;
     uint64_t  total_handle_time;
-    uint64_t  vnet_handle_time;
+    uint64_t  memcpy_time;
+
+    uint64_t  total_exit_time;
+    bool print;
 
     uint64_t virtio_handle_start;
 };

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index a2abb6e..37f8cc5 100644 (file)
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -37,7 +37,9 @@
 #define PrintDebug(fmt, args...)
 #endif
 
+#ifdef CONFIG_VNET_PROFILE
 #define VIRTIO_NIC_PROFILE
+#endif
 
 #define VIRTIO_NET_S_LINK_UP   1       /* Link is up */
 #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10))
@@ -269,14 +271,7 @@ static int handle_pkt_tx(struct guest_info *core, struct virtio_net_state * virt
     uint64_t time;
     rdtscll(time);
     core->vnet_times.total_handle_time = time - core->vnet_times.virtio_handle_start;
-
-    PrintError("Vnet_profiling: total_handle_time: %ld vnet_time: %ld  copy_from_guest: %ld copy_to_guest: %ld malloc_free: %ld, route_lookup: %ld\n", 
-                        (long)core->vnet_times.total_handle_time,
-                        (long)core->vnet_times.vnet_handle_time,
-                        (long)core->vnet_times.time_copy_from_guest,
-                        (long)core->vnet_times.time_copy_to_guest,
-                        (long)core->vnet_times.time_mallocfree,
-                        (long)core->vnet_times.time_route_lookup);
+    core->vnet_times.print = true;
 #endif
 
     return 0;

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index 8b1280d..c1f6dc9 100644 (file)
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -39,14 +39,17 @@ struct vnet_nic_state {
     struct v3_dev_net_ops net_ops;
 };
 
+#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; 
 
-    PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
-#ifdef CONFIG_DEBUG_VNET_NIC
-    v3_hexdump(buf, len, NULL, 0);
+#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
@@ -70,36 +73,109 @@ static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm
 
 
     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.time_copy_from_guest = start - end;
+       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.vnet_handle_time = end - start;
+       core->vnet_times.time_mallocfree += end - start;
     }
 #endif
 
-    V3_Free(pkt);
+    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){
+    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; 
+
+    
+#ifdef CONFIG_DEBUG_VNET_NIC
     {
-       rdtscll(start);
-       core->vnet_times.time_mallocfree += start - end;
+       PrintDebug("Virtio VNET-NIC: send pkt size: %d\n", len);
+       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
 
     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;
@@ -149,13 +225,18 @@ 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 * macstr;
+    char * macstr = NULL;
     char mac[6];
     int vnet_dev_id;
 
     v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
     macstr = v3_cfg_val(frontend_cfg, "mac");
-    str2mac(macstr, mac);
+
+    if (macstr == NULL) {
+       PrintDebug("Vnet-nic: No Mac specified\n");
+    } else {
+       str2mac(macstr, mac);
+    }
 
     vnetnic = (struct vnet_nic_state *)V3_Malloc(sizeof(struct vnet_nic_state));
     memset(vnetnic, 0, sizeof(struct vnet_nic_state));
@@ -181,22 +262,22 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
                   name, v3_cfg_val(frontend_cfg, "tag"));
 
     if ((vnet_dev_id = register_to_vnet(vm, vnetnic, name, vnetnic->mac)) == -1) {
-       return -1;
+       PrintError("Vnet-nic device %s (mac: %s) fails to registered to VNET\n", name, macstr);
     }
 
-    PrintDebug("Vnet-nic device %s (mac: %s, %ld) initialized\n", name, macstr, *((ulong_t *)vnetnic->mac));
+    PrintDebug("Vnet-nic device %s (mac: %s, %ld) registered to VNET\n", name, macstr, *((ulong_t *)vnetnic->mac));
 
 
 //for temporary hack
 #if 1  
     {
-        //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 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_id = vnet_dev_id;
        route.dst_type = LINK_INTERFACE;
        route.src_id = -1;
        route.src_type = LINK_ANY;

diff --git a/palacios/src/palacios/vmm_vnet.c b/palacios/src/palacios/vmm_vnet.c
index f87ad58..cac5dc0 100644 (file)
--- a/palacios/src/palacios/vmm_vnet.c
+++ b/palacios/src/palacios/vmm_vnet.c
@@ -148,12 +148,12 @@ static void dump_routes(){
  * This means we can generate the hash from an offset into the pkt struct
  */
 static inline uint_t hash_fn(addr_t hdr_ptr) {    
-    uint8_t * hdr_buf = (uint8_t *)&(hdr_ptr);
-    
+    uint8_t * hdr_buf = (uint8_t *)hdr_ptr;
+
     return v3_hash_buffer(hdr_buf, VNET_HASH_SIZE);
 }
 
-static inline int hash_eq(addr_t key1, addr_t key2) {
+static inline int hash_eq(addr_t key1, addr_t key2) {  
     return (memcmp((uint8_t *)key1, (uint8_t *)key2, VNET_HASH_SIZE) == 0);
 }
 
@@ -179,7 +179,7 @@ static int clear_hash_cache() {
 
 static int look_into_cache(struct v3_vnet_pkt * pkt, struct route_list ** routes) {
     
-    *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)pkt);
+    *routes = (struct route_list *)v3_htable_search(vnet_state.route_cache, (addr_t)(pkt->hash_buf));
    
     return 0;
 }
@@ -419,6 +419,8 @@ static int handle_one_pkt(struct v3_vnet_pkt * pkt, void *private_data) {
     look_into_cache(pkt, &matched_routes);
        
     if (matched_routes == NULL) {  
+       PrintDebug("Vnet: can not find route in cache, looking into routing table\n");
+       
        matched_routes = match_route(pkt);
                
        if (matched_routes) {