X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_vnet.h;h=1750fffbfdbd67879430166d5616079760f76e5f;hb=0a7690f54cb5bda83780dac26ce433ad24b1d766;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..1750fff 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 @@ -25,87 +23,107 @@ #define __VNET_H__ #include -#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) +#define MAC_NOSET 0 +#define MAC_ANY 11 +#define MAC_NOT 12 +#define MAC_NONE 13 +#define MAC_ADDR 14 -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 LINK_NOSET 0 +#define LINK_INTERFACE 11 +#define LINK_EDGE 12 +#define LINK_ANY 13 + +#define VNET_HASH_SIZE 17 //routing table entry -struct routing_entry{ - char src_mac[6]; - char dest_mac[6]; +struct v3_vnet_route { + uint8_t src_mac[ETH_ALEN]; + uint8_t dst_mac[ETH_ALEN]; - 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 + int dst_id; + uint8_t dst_type; - int src_link_idx; - link_type_t src_type; //EDGE|INTERFACE|ANY -}__attribute__((packed)); + int src_id; + uint8_t src_type; +} __attribute__((packed)); -struct vnet_if_device { - char name[50]; - uchar_t mac_addr[6]; - struct vm_device *dev; - - int (*input)(uchar_t *data, uint32_t len, void *private_data); +struct v3_vnet_pkt { + uint32_t size; - 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; +struct vnet_stat{ + uint64_t tx_bytes; + uint32_t tx_pkts; + uint64_t rx_bytes; + uint32_t rx_pkts; +}; - int (*input)(uchar_t *data, uint32_t len, void *private_data); - - void *private_data; -}__attribute__((packed)); +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); +}; -//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)); +#define HOST_LNX_BRIDGE 1 +#define CTL_VM_BRIDGE 2 + +int v3_vnet_add_bridge(struct v3_vm_info * vm, + 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 v3_vnet_find_dev(uint8_t * mac); +int v3_vnet_stat(struct vnet_stat * stats); - int use; -}__attribute__((packed)); +#ifdef __V3VEE__ +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, int budget, void * dev_data); +}; -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(void); +void v3_deinit_vnet(void); -int v3_vnet_pkt_process(); +void v3_vnet_do_poll(struct v3_vm_info * vm); -void v3_vnet_init(struct guest_info *vm); +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 #endif