X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport.h;h=cfaea09bfd73bbada52864abb98d86ba3e31ef13;hb=e2f3178f0582eda302bdc5629189b6a56d9fbcdd;hp=186d6bf74e041919b3961126b71969ddd2852362;hpb=ec61a01cd8ed73b13ffe042ddff4baf41f6b63e7;p=sliver-openvswitch.git diff --git a/datapath/vport.h b/datapath/vport.h index 186d6bf74..cfaea09bf 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -1,198 +1,168 @@ /* - * Copyright (c) 2010 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2012 Nicira, Inc. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ #ifndef VPORT_H #define VPORT_H 1 +#include #include -#include +#include +#include +#include #include #include - -#include "datapath.h" -#include "openvswitch/datapath-protocol.h" -#include "odp-compat.h" +#include struct vport; -struct dp_port; +struct vport_parms; /* The following definitions are for users of the vport subsytem: */ +struct vport_net { + struct vport __rcu *gre_vport; + struct vport __rcu *gre64_vport; +}; -int vport_user_add(const struct odp_vport_add __user *); -int vport_user_mod(const struct odp_vport_mod __user *); -int vport_user_del(const char __user *udevname); - -#ifdef CONFIG_COMPAT -int compat_vport_user_add(struct compat_odp_vport_add __user *); -int compat_vport_user_mod(struct compat_odp_vport_mod __user *); -#endif - -int vport_user_stats_get(struct odp_vport_stats_req __user *); -int vport_user_stats_set(struct odp_vport_stats_req __user *); -int vport_user_ether_get(struct odp_vport_ether __user *); -int vport_user_ether_set(struct odp_vport_ether __user *); -int vport_user_mtu_get(struct odp_vport_mtu __user *); -int vport_user_mtu_set(struct odp_vport_mtu __user *); - -void vport_lock(void); -void vport_unlock(void); - -int vport_init(void); -void vport_exit(void); - -struct vport *vport_add(const char *name, const char *type, const void __user *config); -int vport_mod(struct vport *, const void __user *config); -int vport_del(struct vport *); - -struct vport *vport_locate(const char *name); - -int vport_attach(struct vport *, struct dp_port *); -int vport_detach(struct vport *); - -int vport_set_mtu(struct vport *, int mtu); -int vport_set_addr(struct vport *, const unsigned char *); -int vport_set_stats(struct vport *, struct rtnl_link_stats64 *); +int ovs_vport_init(void); +void ovs_vport_exit(void); -const char *vport_get_name(const struct vport *); -const char *vport_get_type(const struct vport *); -const unsigned char *vport_get_addr(const struct vport *); +struct vport *ovs_vport_add(const struct vport_parms *); +void ovs_vport_del(struct vport *); -struct dp_port *vport_get_dp_port(const struct vport *); -struct kobject *vport_get_kobj(const struct vport *); -int vport_get_stats(struct vport *, struct rtnl_link_stats64 *); +struct vport *ovs_vport_locate(struct net *net, const char *name); -unsigned vport_get_flags(const struct vport *); -int vport_is_running(const struct vport *); -unsigned char vport_get_operstate(const struct vport *); +void ovs_vport_set_stats(struct vport *, struct ovs_vport_stats *); +void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *); -int vport_get_ifindex(const struct vport *); -int vport_get_iflink(const struct vport *); +int ovs_vport_set_options(struct vport *, struct nlattr *options); +int ovs_vport_get_options(const struct vport *, struct sk_buff *); -int vport_get_mtu(const struct vport *); +int ovs_vport_set_upcall_portids(struct vport *, struct nlattr *pids); +int ovs_vport_get_upcall_portids(const struct vport *, struct sk_buff *); +u32 ovs_vport_find_upcall_portid(const struct vport *, struct sk_buff *); -int vport_send(struct vport *, struct sk_buff *); +int ovs_vport_send(struct vport *, struct sk_buff *); /* The following definitions are for implementers of vport devices: */ -struct vport_percpu_stats { - u64 rx_bytes; - u64 rx_packets; - u64 tx_bytes; - u64 tx_packets; - seqcount_t seqlock; -}; - struct vport_err_stats { u64 rx_dropped; u64 rx_errors; - u64 rx_frame_err; - u64 rx_over_err; - u64 rx_crc_err; u64 tx_dropped; u64 tx_errors; - u64 collisions; +}; +/** + * struct vport_portids - array of netlink portids of a vport. + * must be protected by rcu. + * @rn_ids: The reciprocal value of @n_ids. + * @rcu: RCU callback head for deferred destruction. + * @n_ids: Size of @ids array. + * @ids: Array storing the Netlink socket pids to be used for packets received + * on this port that miss the flow table. + */ +struct vport_portids { + struct reciprocal_value rn_ids; + struct rcu_head rcu; + u32 n_ids; + u32 ids[]; }; +/** + * struct vport - one port within a datapath + * @rcu: RCU callback head for deferred destruction. + * @dp: Datapath to which this port belongs. + * @upcall_portids: RCU protected 'struct vport_portids'. + * @port_no: Index into @dp's @ports array. + * @hash_node: Element in @dev_table hash table in vport.c. + * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. + * @ops: Class structure. + * @percpu_stats: Points to per-CPU statistics used and maintained by vport + * @stats_lock: Protects @err_stats and @offset_stats. + * @err_stats: Points to error statistics used and maintained by vport + * @offset_stats: Added to actual statistics as a sop to compatibility with + * XAPI for Citrix XenServer. Deprecated. + */ struct vport { + struct rcu_head rcu; + struct datapath *dp; + struct vport_portids __rcu *upcall_portids; + u16 port_no; + struct hlist_node hash_node; + struct hlist_node dp_hash_node; const struct vport_ops *ops; - struct dp_port *dp_port; - struct vport_percpu_stats *percpu_stats; + struct pcpu_sw_netstats __percpu *percpu_stats; spinlock_t stats_lock; struct vport_err_stats err_stats; - struct rtnl_link_stats64 offset_stats; + struct ovs_vport_stats offset_stats; }; -#define VPORT_F_REQUIRED (1 << 0) /* If init fails, module loading fails. */ -#define VPORT_F_GEN_STATS (1 << 1) /* Track stats at the generic layer. */ -#define VPORT_F_FLOW (1 << 2) /* Sets OVS_CB(skb)->flow. */ -#define VPORT_F_TUN_ID (1 << 3) /* Sets OVS_CB(skb)->tun_id. */ +/** + * struct vport_parms - parameters for creating a new vport + * + * @name: New vport's name. + * @type: New vport's type. + * @options: %OVS_VPORT_ATTR_OPTIONS attribute from Netlink message, %NULL if + * none was supplied. + * @dp: New vport's datapath. + * @port_no: New vport's port number. + */ +struct vport_parms { + const char *name; + enum ovs_vport_type type; + struct nlattr *options; + + /* For ovs_vport_alloc(). */ + struct datapath *dp; + u16 port_no; + struct nlattr *upcall_portids; +}; /** * struct vport_ops - definition of a type of virtual port * - * @type: Name of port type, such as "netdev" or "internal" to be matched - * against the device type when a new port needs to be created. - * @flags: Flags of type VPORT_F_* that influence how the generic vport layer - * handles this vport. - * @init: Called at module initialization. If VPORT_F_REQUIRED is set then the - * failure of this function will cause the module to not load. If the flag is - * not set and initialzation fails then no vports of this type can be created. - * @exit: Called at module unload. - * @create: Create a new vport called 'name' with vport type specific - * configuration 'config' (which must be copied from userspace before use). On - * success must allocate a new vport using vport_alloc(). - * @modify: Modify the configuration of an existing vport. May be null if - * modification is not supported. - * @destroy: Destroy and free a vport using vport_free(). Prior to destruction - * @detach will be called followed by synchronize_rcu(). - * @attach: Attach a previously created vport to a datapath. After attachment - * packets may be sent and received. Prior to attachment any packets may be - * silently discarded. May be null if not needed. - * @detach: Detach a vport from a datapath. May be null if not needed. - * @set_mtu: Set the device's MTU. May be null if not supported. - * @set_addr: Set the device's MAC address. May be null if not supported. - * @set_stats: Provides stats as an offset to be added to the device stats. - * May be null if not supported. + * @type: %OVS_VPORT_TYPE_* value for this type of virtual port. + * @create: Create a new vport configured as specified. On success returns + * a new vport allocated with ovs_vport_alloc(), otherwise an ERR_PTR() value. + * @destroy: Destroys a vport. Must call vport_free() on the vport but not + * before an RCU grace period has elapsed. + * @set_options: Modify the configuration of an existing vport. May be %NULL + * if modification is not supported. + * @get_options: Appends vport-specific attributes for the configuration of an + * existing vport to a &struct sk_buff. May be %NULL for a vport that does not + * have any configuration. * @get_name: Get the device's name. - * @get_addr: Get the device's MAC address. - * @get_kobj: Get the kobj associated with the device (may return null). - * @get_stats: Fill in the transmit/receive stats. May be null if stats are - * not supported or if generic stats are in use. If defined and - * VPORT_F_GEN_STATS is also set, the error stats are added to those already - * collected. - * @get_dev_flags: Get the device's flags. - * @is_running: Checks whether the device is running. - * @get_operstate: Get the device's operating state. - * @get_ifindex: Get the system interface index associated with the device. - * May be null if the device does not have an ifindex. - * @get_iflink: Get the system interface index associated with the device that - * will be used to send packets (may be different than ifindex for tunnels). - * May be null if the device does not have an iflink. - * @get_mtu: Get the device's MTU. - * @send: Send a packet on the device. Returns the length of the packet sent. + * @send: Send a packet on the device. Returns the length of the packet sent, + * zero for dropped packets or negative for error. */ struct vport_ops { - const char *type; - u32 flags; + enum ovs_vport_type type; - /* Called at module init and exit respectively. */ - int (*init)(void); - void (*exit)(void); + /* Called with ovs_mutex. */ + struct vport *(*create)(const struct vport_parms *); + void (*destroy)(struct vport *); - /* Called with RTNL lock. */ - struct vport *(*create)(const char *name, const void __user *config); - int (*modify)(struct vport *, const void __user *config); - int (*destroy)(struct vport *); + int (*set_options)(struct vport *, struct nlattr *); + int (*get_options)(const struct vport *, struct sk_buff *); - int (*attach)(struct vport *); - int (*detach)(struct vport *); - - int (*set_mtu)(struct vport *, int mtu); - int (*set_addr)(struct vport *, const unsigned char *); - int (*set_stats)(const struct vport *, struct rtnl_link_stats64 *); - - /* Called with rcu_read_lock or RTNL lock. */ + /* Called with rcu_read_lock or ovs_mutex. */ const char *(*get_name)(const struct vport *); - const unsigned char *(*get_addr)(const struct vport *); - struct kobject *(*get_kobj)(const struct vport *); - int (*get_stats)(const struct vport *, struct rtnl_link_stats64 *); - - unsigned (*get_dev_flags)(const struct vport *); - int (*is_running)(const struct vport *); - unsigned char (*get_operstate)(const struct vport *); - - int (*get_ifindex)(const struct vport *); - int (*get_iflink)(const struct vport *); - - int (*get_mtu)(const struct vport *); int (*send)(struct vport *, struct sk_buff *); }; @@ -200,16 +170,14 @@ struct vport_ops { enum vport_err_type { VPORT_E_RX_DROPPED, VPORT_E_RX_ERROR, - VPORT_E_RX_FRAME, - VPORT_E_RX_OVER, - VPORT_E_RX_CRC, VPORT_E_TX_DROPPED, VPORT_E_TX_ERROR, - VPORT_E_COLLISION, }; -struct vport *vport_alloc(int priv_size, const struct vport_ops *); -void vport_free(struct vport *); +struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *, + const struct vport_parms *); +void ovs_vport_free(struct vport *); +void ovs_vport_deferred_free(struct vport *vport); #define VPORT_ALIGN 8 @@ -224,7 +192,7 @@ void vport_free(struct vport *); */ static inline void *vport_priv(const struct vport *vport) { - return (u8 *)vport + ALIGN(sizeof(struct vport), VPORT_ALIGN); + return (u8 *)(uintptr_t)vport + ALIGN(sizeof(struct vport), VPORT_ALIGN); } /** @@ -237,20 +205,27 @@ static inline void *vport_priv(const struct vport *vport) * the result of a hash table lookup. @priv must point to the start of the * private data area. */ -static inline struct vport *vport_from_priv(const void *priv) +static inline struct vport *vport_from_priv(void *priv) { - return (struct vport *)(priv - ALIGN(sizeof(struct vport), VPORT_ALIGN)); + return (struct vport *)((u8 *)priv - ALIGN(sizeof(struct vport), VPORT_ALIGN)); } -void vport_receive(struct vport *, struct sk_buff *); -void vport_record_error(struct vport *, enum vport_err_type err_type); +void ovs_vport_receive(struct vport *, struct sk_buff *, + struct ovs_key_ipv4_tunnel *); /* List of statically compiled vport implementations. Don't forget to also * add yours to the list at the top of vport.c. */ -extern struct vport_ops netdev_vport_ops; -extern struct vport_ops internal_vport_ops; -extern struct vport_ops patch_vport_ops; -extern struct vport_ops gre_vport_ops; -extern struct vport_ops capwap_vport_ops; - +extern const struct vport_ops ovs_netdev_vport_ops; +extern const struct vport_ops ovs_internal_vport_ops; +extern const struct vport_ops ovs_gre_vport_ops; +extern const struct vport_ops ovs_gre64_vport_ops; +extern const struct vport_ops ovs_vxlan_vport_ops; +extern const struct vport_ops ovs_lisp_vport_ops; + +static inline void ovs_skb_postpush_rcsum(struct sk_buff *skb, + const void *start, unsigned int len) +{ + if (skb->ip_summed == CHECKSUM_COMPLETE) + skb->csum = csum_add(skb->csum, csum_partial(start, len, 0)); +} #endif /* vport.h */