X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=0f8c79390b64b5b22d24cfe075b0c2d2be39d229;hb=94f67717b6461df514dc225ed84f03b44c44061b;hp=0e9bc17a69580c2546c2517a0cee09e2c9c90ce9;hpb=a04b0778a7f74005560b99255de2c6d2df4d5292;p=palacios.git

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 0e9bc17..0f8c793 100644
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -7,9 +7,9 @@
  * and the University of New Mexico.  You can find out more at 
  * http://www.v3vee.org
  *
- * Copyright (c) 2009, Lei Xia <lxia@northwestern.edu> 
+ * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu> 
  * Copyright (c) 2009, Yuan Tang <ytang@northwestern.edu> 
- * Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org> 
+ * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org> 
  * All rights reserved.
  *
  * Author: Lei Xia <lxia@northwestern.edu>
@@ -19,38 +19,39 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VNET_H__
-#define __VNET_H__
-
-#ifdef __V3VEE__
+#ifndef __VNET_CORE_H__
+#define __VNET_CORE_H__
 
 #include <palacios/vmm.h>
+#include <palacios/vmm_ethernet.h>
 
+#define MAC_NOSET 	0
+#define MAC_ANY 	11
+#define MAC_NOT 	12
+#define MAC_NONE 	13 
+#define MAC_ADDR 	14
 
-#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 LINK_NOSET	0
+#define LINK_INTERFACE 	11
+#define LINK_EDGE 	12 
+#define LINK_ANY 	13
 
+#define VNET_HASH_SIZE 	17
 
-#define VNET_HASH_SIZE 17
-#define ETHERNET_HEADER_LEN 14
-#define ETHERNET_DATA_MAX   1500
-#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
+extern int v3_vnet_debug;
 
-//routing table entry
 struct v3_vnet_route {
-    uint8_t src_mac[6];
-    uint8_t dst_mac[6];
+    uint8_t src_mac[ETH_ALEN];
+    uint8_t dst_mac[ETH_ALEN];
 
     uint8_t src_mac_qual;
     uint8_t dst_mac_qual;
 
-    uint32_t dst_id; //link[dest] is the link to be used to send pkt
-    uint8_t dst_type; //EDGE|INTERFACE|ANY
+    int dst_id;
+    uint8_t dst_type;
  
-    uint32_t src_id;
-    uint8_t src_type; //EDGE|INTERFACE|ANY
+    int src_id;
+    uint8_t src_type;
 } __attribute__((packed));
 
 
@@ -70,63 +71,55 @@ struct v3_vnet_pkt {
 	    uint8_t src_type;
 	    uint32_t src_id;
 	    uint8_t header[ETHERNET_HEADER_LEN];
-	    uint8_t *data;
+	    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;
+struct vnet_stat{
+    uint64_t tx_bytes;
+    uint32_t tx_pkts;
+    uint64_t rx_bytes;
+    uint32_t rx_pkts;
 };
-#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_pkt(struct v3_vnet_pkt * pkt, void *private_data);
 
-void v3_vnet_send_pkt_xcall(void * data);
 
-int v3_vnet_add_route(struct v3_vnet_route route);
+struct v3_vnet_bridge_ops {
+    int (*input)(struct v3_vm_info * vm, 
+		struct v3_vnet_pkt * pkt,
+		void * private_data);
+    void (*poll)(struct v3_vm_info * vm,  
+		void * private_data);
+};
 
-int V3_init_vnet();
+#define HOST_LNX_BRIDGE 1
+#define CTL_VM_BRIDGE 	2
 
 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),
-		    uint16_t max_delayed_pkts,
-		    long max_latency,
-		    void * priv_data);
-
-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);
+		struct v3_vnet_bridge_ops * ops,
+		uint8_t type,
+		void * priv_data);
+int v3_vnet_add_route(struct v3_vnet_route route);
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void * private_data, int synchronize);
+int v3_vnet_find_dev(uint8_t  * mac);
+int v3_vnet_stat(struct vnet_stat * stats);
 
+#ifdef __V3VEE__
 
-int v3_vnet_disable_bridge();
-int v3_vnet_enable_bridge();
+struct v3_vnet_dev_ops {
+    int (*input)(struct v3_vm_info * vm, 
+		struct v3_vnet_pkt * pkt, 
+		void * dev_data);
+};
 
-void v3_vnet_bridge_polling();
+int v3_init_vnet(void);	
+void v3_deinit_vnet(void);
 
-int v3_vnet_bridge_rx(uchar_t *buf, uint16_t size, uint16_t src_link);
+int v3_vnet_add_dev(struct v3_vm_info * info, uint8_t * mac, 
+		    struct v3_vnet_dev_ops * ops,
+		    void * priv_data);
+int v3_vnet_del_dev(int dev_id);
 
 
 #endif