X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=a22894ae505fc247eb05e7568b909e00e09a50e7;hb=c4fa59ab9c6963f1b7d8ab56718513070f92f768;hp=51d99c48183d955fe1b65263e6dcf22417879fab;hpb=9e9d28b5fe29fcf8fbed010c981254b5e25a6eac;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 51d99c4..a22894a 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -9,8 +9,6 @@
  *
  * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu> 
- * Copyright (c) 2009, Jack Lange <jarusl@cs.northwestern.edu> 
- * Copyright (c) 2009, Peter Dinda <pdinda@northwestern.edu
  * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
@@ -24,88 +22,92 @@
 #ifndef __VNET_H__
 #define __VNET_H__
 
+#ifdef __V3VEE__
+
 #include <palacios/vmm.h>
-#include <palacios/vmm_string.h>
-#include <palacios/vmm_types.h>
-#include <palacios/vmm_queue.h>
-#include <palacios/vmm_hashtable.h>
-#include <palacios/vmm_sprintf.h>
 
+typedef enum {MAC_ANY, MAC_NOT, MAC_NONE} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
+typedef enum {LINK_INTERFACE, LINK_EDGE, LINK_ANY} link_type_t; //for 'type' and 'src_type' in struct routing
+
+
+#define VNET_HASH_SIZE 17
 #define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MIN   46
 #define ETHERNET_DATA_MAX   1500
 #define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
 
-typedef enum {MAC_ANY, MAC_NOT, MAC_NONE, MAC_EMPTY} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
-typedef enum {LINK_INTERFACE, LINK_EDGE, LINK_ANY} link_type_t; //for 'type' and 'src_type' in struct routing
-typedef enum {TCP_TYPE, UDP_TYPE, NONE_TYPE} prot_type_t;
-
 //routing table entry
-struct routing_entry{
-    char src_mac[6];
-    char dest_mac[6];
+struct v3_vnet_route {
+    uint8_t src_mac[6];
+    uint8_t dst_mac[6];
 
-    int src_mac_qual;
-    int dest_mac_qual;
+    uint8_t src_mac_qual;
+    uint8_t dst_mac_qual;
 
-    int link_idx; //link[dest] is the link to be used to send pkt
-    link_type_t link_type; //EDGE|INTERFACE|ANY
+    uint32_t dst_id; //link[dest] is the link to be used to send pkt
+    uint8_t dst_type; //EDGE|INTERFACE|ANY
  
-    int src_link_idx;
-    link_type_t src_type; //EDGE|INTERFACE|ANY
-}__attribute__((packed));
+    uint32_t src_id;
+    uint8_t src_type; //EDGE|INTERFACE|ANY
+} __attribute__((packed));
 
 
-struct vnet_if_device {
-    char name[50];
-    uchar_t mac_addr[6];
-    struct vm_device *dev;
-    
-    int (*input)(uchar_t *data, uint32_t len, void *private_data);
+struct v3_vnet_pkt {
+    uint32_t size; 
     
-    void *private_data;
-}__attribute__((packed));
+    uint8_t dst_type;
+    uint32_t dst_id;
 
+    /*
+     * IMPORTANT The next three fields must be grouped and packed together
+     *  They are used to generate a hash value 
+     */
+    union {
+	uint8_t hash_buf[VNET_HASH_SIZE];
+	struct {
+	    uint8_t src_type;
+	    uint32_t src_id;
+	    uint8_t data[ETHERNET_PACKET_LEN];
+	} __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
 
-#define VNET_HEADER_LEN  64
-struct vnet_if_link {
-    prot_type_t pro_type; //protocal type of this link
-    unsigned long dest_ip;
-    uint16_t dest_port;
 
-    uchar_t vnet_header[VNET_HEADER_LEN]; //header applied to the packet in/out from this link
-    uint16_t hdr_len; 
+#ifdef CONFIG_VNET_PROFILE
+struct v3_vnet_profile{
+    uint64_t  time_copy_from_guest;
+    uint64_t  time_route_lookup;
+    uint64_t  time_mallocfree;
+    uint64_t  time_copy_to_guest;
+    uint64_t  total_handle_time;
+    uint64_t  memcpy_time;
 
-    int (*input)(uchar_t *data, uint32_t len, void *private_data);
-    
-    void *private_data;
-}__attribute__((packed));
+    uint64_t  total_exit_time;
+    bool print;
 
+    uint64_t virtio_handle_start;
+};
+#endif
 
-//link table entry
-struct link_entry {
-    link_type_t type;
-  
-    union {
-	struct vnet_if_device *dst_dev;
-	struct vnet_if_link *dst_link;
-    } __attribute__((packed));
 
-    int use;
-}__attribute__((packed));
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data);
+
+int v3_vnet_add_route(struct v3_vnet_route route);
+
+//int v3_vnet_del_route();
 
 
-int v3_vnet_send_pkt(uchar_t *buf, int length);
-//int vnet_register_device(struct vm_device *vdev, 
-//			 char *dev_name, 
-//			 uchar_t mac[6], 
-//			 int (*netif_input)(uchar_t * pkt, uint_t size, void *private_data), 
-//			 void *data);
-//int vnet_unregister_device(char *dev_name);
 
-int v3_vnet_pkt_process(); 
+int V3_init_vnet();
 
-void v3_vnet_init(struct guest_info *vm);
+//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+
+int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], 
+		    int (*dev_input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * private_data), 
+		    void * priv_data);
+
+
+
+#endif
 
 #endif