This patch fixes several issues with the console/cga code:

[palacios.git] / palacios / include / palacios / vmm_vnet.h

diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h
index 5a6e4fd..0e9bc17 100644 (file)
--- a/palacios/include/palacios/vmm_vnet.h
+++ b/palacios/include/palacios/vmm_vnet.h
@@ -26,11 +26,14 @@
 
 #include <palacios/vmm.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
 
-#define VNET_HASH_SIZE 16
+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_DATA_MAX   1500
 #define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_DATA_MAX)
@@ -66,31 +69,64 @@ struct v3_vnet_pkt {
        struct {
            uint8_t src_type;
            uint32_t src_id;
-           uint8_t data[ETHERNET_PACKET_LEN];
+           uint8_t header[ETHERNET_HEADER_LEN];
+           uint8_t *data;
        } __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
 
 
-int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt);
+#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 v3_vnet_add_route(struct v3_vnet_route route);
+    uint64_t  total_exit_time;
+    bool print;
 
-//int v3_vnet_del_route();
+    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_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);
 
 int V3_init_vnet();
 
-//int v3_vnet_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
+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, char * dev_name, 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);
 
+void v3_vnet_heartbeat(struct guest_info *core);
+
+
+int v3_vnet_disable_bridge();
+int v3_vnet_enable_bridge();
+
+void v3_vnet_bridge_polling();
 
-// temporary hack
-int v3_vnet_pkt_process();
+int v3_vnet_bridge_rx(uchar_t *buf, uint16_t size, uint16_t src_link);
 
 
 #endif