X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=4316c9976f407487dd068bccf570758b6437948b;hb=c34c5f5b168274193ef1b766b2054bd3939466d4;hp=1a88c2411eeacdac071e752845069f17c08e3a80;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 1a88c24..4316c99 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -22,61 +22,115 @@
 #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 V3_VNET_POLLING_VECTOR	50
+
+typedef enum {MAC_ANY=0, MAC_NOT, MAC_NONE, MAC_ADDR} mac_type_t; //for 'src_mac_qual' and 'dst_mac_qual'
+typedef enum {LINK_INTERFACE=0, 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_MTU   6000
+#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU)
 
 //routing table entry
 struct v3_vnet_route {
-    char src_mac[6];
-    char dest_mac[6];
+    uint8_t src_mac[6];
+    uint8_t dst_mac[6];
 
-    mac_type_t src_mac_qual;
-    mac_type_t 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
+    uint32_t src_id;
+    uint8_t src_type; //EDGE|INTERFACE|ANY
+} __attribute__((packed));
+
+
+struct v3_vnet_pkt {
+    uint32_t size; 
+    
+    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 header[ETHERNET_HEADER_LEN];
+	    uint8_t *data;
+	} __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+#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;
+
+    uint64_t  total_exit_time;
+    bool print;
+
+    uint64_t virtio_handle_start;
 };
+#endif
 
+struct v3_vnet_bridge_input_args{
+    struct v3_vm_info * vm;
+    struct v3_vnet_pkt *vnet_pkts; 
+    uint16_t pkt_num;
+    void * private_data;
+};
 
-int v3_vnet_send_rawpkt(uchar_t *buf, int len, void *private_data);
-int v3_vnet_send_udppkt(uchar_t *buf, int len, void *private_data);
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data);
 
-int v3_vnet_add_route(struct v3_vnet_route *route);
+void v3_vnet_send_pkt_xcall(void * data);
 
-//int v3_vnet_del_route();
-//int v3_vnet_get_routes();
+int v3_vnet_add_route(struct v3_vnet_route route);
 
+int V3_init_vnet();
 
-//int v3_vnet_add_link(struct v3_vnet_link link);
+int v3_vnet_add_bridge(struct v3_vm_info * vm,
+		int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt pkt[], uint16_t pkt_num, void * private_data),
+		void (*xcall_input)(void *data),
+		int (*poll_pkt)(struct v3_vm_info * vm, void * private_data),
+		uint16_t max_delayed_pkts,
+		long max_latency,
+		void * priv_data);
 
-// int v3_vnet_del_link();
-//int v3_vnet_get_link(int idx, struct vnet_link * link);
+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);
 
+void v3_vnet_heartbeat(struct guest_info *core);
 
-int v3_init_vnet();
 
-//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+int v3_vnet_disable_bridge();
+int v3_vnet_enable_bridge();
 
-int v3_vnet_add_node(struct v3_vm_info *info, 
-	           char * dev_name, 
-	           uchar_t mac[6], 
-		    int (*netif_input)(struct v3_vm_info * vm, uchar_t * pkt, uint_t size, void * private_data), 
-		    void * priv_data);
+void v3_vnet_polling();
 
+int v3_vnet_rx(uchar_t *buf, uint16_t size, uint16_t src_id, uint8_t src_type);
 
-// temporary hack
-int v3_vnet_pkt_process();
 
+#endif
 
 #endif