X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=254fbf55c0329d2bf053eceb11b39d0cd554a86a;hb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;hp=51d99c48183d955fe1b65263e6dcf22417879fab;hpb=9e9d28b5fe29fcf8fbed010c981254b5e25a6eac;p=palacios.git diff --git a/palacios/include/palacios/vmm_vnet.h b/palacios/include/palacios/vmm_vnet.h index 51d99c4..254fbf5 100644 --- a/palacios/include/palacios/vmm_vnet.h +++ b/palacios/include/palacios/vmm_vnet.h @@ -7,11 +7,9 @@ * 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 @@ -24,88 +22,131 @@ #ifndef __VNET_H__ #define __VNET_H__ +#ifdef __V3VEE__ + #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) -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; +#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 1500 +#define ETHERNET_PACKET_LEN (ETHERNET_HEADER_LEN + ETHERNET_MTU) //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 header[ETHERNET_HEADER_LEN]; + uint8_t *data; + } __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; +#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 (*input)(uchar_t *data, uint32_t len, void *private_data); - - void *private_data; -}__attribute__((packed)); + uint64_t total_exit_time; + bool print; + uint64_t virtio_handle_start; +}; +#endif -//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)); +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; +}; + +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); + + void (*start_tx)(void * dev_data); + void (*stop_tx)(void * dev_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); +int v3_vnet_add_route(struct v3_vnet_route route); -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_init_vnet(); -int v3_vnet_pkt_process(); +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); -void v3_vnet_init(struct guest_info *vm); +int v3_vnet_add_dev(struct v3_vm_info *info, uint8_t mac[6], + struct v3_vnet_dev_ops *ops, + void * priv_data); + +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); + +/* tell VNET stop sending pkts to it */ +int v3_vnet_disable_device(int dev_id); + +#endif #endif