X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=254fbf55c0329d2bf053eceb11b39d0cd554a86a;hb=b580d9fca65a7b6f84eaebb57cad09bc6e941dfd;hp=0c2ded995e2afe4b7321964ce282645ae4202a67;hpb=3c073d909a9307685307ec597800fad9cca483cc;p=palacios.git diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h index 0c2ded9..254fbf5 100644 --- a/palacios/include/palacios/vmm_vnet.h +++ b/palacios/include/palacios/vmm_vnet.h @@ -7,17 +7,13 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * - * Copyright (c) 2009, Lei Xia + * Copyright (c) 2010, Lei Xia * Copyright (c) 2009, Yuan Tang - * Copyright (c) 2009, Jack Lange - * Copyright (c) 2009, Peter Dinda + * Copyright (c) 2010, The V3VEE Project * All rights reserved. * * Author: Lei Xia * Yuan Tang - * Jack Lange - * Peter Dinda -#include -#include -#include -#include -#include -#include - - -#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) +#ifdef __V3VEE__ -#define SOCK int +#include -//the routing entry -struct routing{ - char src_mac[6]; - char dest_mac[6]; - int src_mac_qual; - int dest_mac_qual; +#define V3_VNET_POLLING_VECTOR 50 - int dest; //link[dest] is the link to be used to send pkt - int type; //EDGE|INTERFACE|ANY - - int src; - int src_type; //EDGE|INTERFACE|ANY +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 - int use; - int next; - int prev; - // struct list_head entry_list; -}; - -//struct gen_route { - // uint_t num_entries; - // struct list_head entries; -//} +#define VNET_HASH_SIZE 17 +#define ETHERNET_HEADER_LEN 14 +#define ETHERNET_MTU 1500 +#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU) - //This is the structure that stores the topology -struct topology { - SOCK link_sock; +//routing table entry +struct v3_vnet_route { + uint8_t src_mac[6]; + uint8_t dst_mac[6]; - unsigned long dest; + uint8_t src_mac_qual; + uint8_t dst_mac_qual; - // Port for UDP - unsigned short remote_port; + uint32_t dst_id; //link[dest] is the link to be used to send pkt + uint8_t dst_type; //EDGE|INTERFACE|ANY + + uint32_t src_id; + uint8_t src_type; //EDGE|INTERFACE|ANY +} __attribute__((packed)); - int use; - int type; //TCP=0, UDP=1,VTP=2, can be extended so on - int next; - int prev; +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 sock_list { - SOCK sock; - int next; - int prev; +struct v3_vnet_bridge_xcall_args{ + struct v3_vm_info * vm; + struct v3_vnet_pkt *vnet_pkts; + uint16_t pkt_num; + void * private_data; }; +struct v3_vnet_dev_xcall_args{ + struct v3_vm_info * vm; + void * private_data; +}; -#define GENERAL_NIC 0 +struct v3_vnet_dev_ops { + int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt * pkt, void * dev_data); + void (*poll) (struct v3_vm_info *vm, void *dev_data); + void (*poll_xcall)(void *arg); -struct ethAddr{ - char addr[6]; + void (*start_tx)(void * dev_data); + void (*stop_tx)(void * dev_data); }; -struct vnet_if_device { - char name[50]; - struct ethAddr device_addr; - - int (*input)(uchar_t * pkt, uint_t size); - - void * data; +struct v3_vnet_bridge_ops { + int (*input)(struct v3_vm_info * vm, struct v3_vnet_pkt pkt[], uint16_t pkt_num, void * private_data); + int (*xcall_input)(void *data); + void (*polling_pkt)(struct v3_vm_info * vm, void *private_data); }; + +int v3_vnet_send_pkt(struct v3_vnet_pkt * pkt, void *private_data); -struct device_list { - struct vnet_if_device *device; - - int use; - int type; +int v3_vnet_add_route(struct v3_vnet_route route); - int next; - int prev; -}; - -// 14 (ethernet frame) + 20 bytes -struct HEADERS { - char ethernetdest[6]; - char ethernetsrc[6]; - unsigned char ethernettype[2]; // indicates layer 3 protocol type - char ip[20]; -}; +int v3_init_vnet(); -#define FOREACH(iter, list, start) for (iter = start; iter != -1; iter = list[iter].next) -#define FOREACH_SOCK(iter, socks, start) FOREACH(iter, socks, start) -#define FOREACH_LINK(iter, links, start) FOREACH(iter, links, start) -#define FOREACH_ROUTE(iter, routes, start) FOREACH(iter, routes, start) -#define FOREACH_DEVICE(iter, devices, start) FOREACH(iter, devices, start) +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),*/ + struct v3_vnet_bridge_ops *ops, + void * priv_data); +int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], + struct v3_vnet_dev_ops *ops, + void * priv_data); -int v3_Send_pkt(uchar_t *buf, int length); -int v3_Register_pkt_event(int (*netif_input)(uchar_t * pkt, uint_t size)); +void v3_vnet_poll(struct v3_vm_info *vm); +/* enable a vnet device, tell VNET can send pkts to it */ +int v3_vnet_enable_device(int dev_id); -int vnet_send_pkt(char *buf, int length); -int vnet_register_pkt_event(char *dev_name, int (*netif_input)(uchar_t * pkt, uint_t size), void *data); +/* tell VNET stop sending pkts to it */ +int v3_vnet_disable_device(int dev_id); -int v3_vnet_pkt_process(); - -void v3_vnet_init(); +#endif #endif