Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Minor fix to virtio networking
[palacios.git] / palacios / include / palacios / vmm_vnet.h
index d6fd9b1..49951ad 100644 (file)
@@ -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.
  *
 #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;
+struct v3_vnet_pkt {
+    uint32_t size; 
     
-    int (*input)(uchar_t *data, uint32_t len, void *private_data);
-    
-    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; 
+int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt);
 
-    int (*input)(uchar_t *data, uint32_t len, void *private_data);
-    
-    void *private_data;
-}__attribute__((packed));
+int v3_vnet_add_route(struct v3_vnet_route route);
 
+//int v3_vnet_del_route();
 
-//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_init_vnet();
 
-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_add_bridge(struct v3_vm_info * vm, uint8_t mac[6]);
 
-int v3_vnet_pkt_process(); 
+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_init(struct guest_info *vm);
+
+
+#endif
 
 #endif