X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=datapath%2Fvport.h;h=33c3935e9fd7a2dc45fd279cc479dbd240838fe9;hb=8f79bb4d3999d993424e9578342b4130d10a556c;hp=ee3b127d4f0b46f323c8aae40a820f5459529c8f;hpb=057dd6d279c20e88f98bbe8328383564391bbc8f;p=cascardo%2Fovs.git diff --git a/datapath/vport.h b/datapath/vport.h index ee3b127d4..33c3935e9 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -1,155 +1,136 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2015 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 +#include #include "datapath.h" -#include "openvswitch/datapath-protocol.h" struct vport; struct vport_parms; /* The following definitions are for users of the vport subsytem: */ -int vport_init(void); -void vport_exit(void); - -struct vport *vport_add(const struct vport_parms *); -int vport_del(struct vport *); - -struct vport *vport_locate(const char *name); - -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 *); -enum odp_vport_type 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 kobject *vport_get_kobj(const struct vport *); -int vport_get_stats(struct vport *, struct rtnl_link_stats64 *); +struct vport *ovs_vport_locate(const 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_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 *, const 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_set_options(struct vport *, struct nlattr *options); -int vport_get_options(const struct vport *, struct sk_buff *); +int ovs_tunnel_get_egress_info(struct dp_upcall_info *upcall, + struct net *net, + struct sk_buff *, + u8 ipproto, + __be16 tp_src, + __be16 tp_dst); -int vport_send(struct vport *, struct sk_buff *); +int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, + struct dp_upcall_info *upcall); -/* 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 tx_dropped; - u64 tx_errors; +/** + * 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. - * @port_no: Index into @dp's @ports array. * @dp: Datapath to which this port belongs. - * @kobj: Represents /sys/class/net//brport. - * @linkname: The name of the link from /sys/class/net//brif to this - * &struct vport. (We keep this around so that we can delete it if the - * device gets renamed.) Set to the null string when no link exists. - * @node: Element in @dp's @port_list. - * @sflow_pool: Number of packets that were candidates for sFlow sampling, - * regardless of whether they were actually chosen and sent down to userspace. + * @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 the vport - * code if %VPORT_F_GEN_STATS is set to 1 in @ops flags, otherwise unused. - * @stats_lock: Protects @err_stats and @offset_stats. - * @err_stats: Points to error statistics used and maintained by the vport code - * if %VPORT_F_GEN_STATS is set to 1 in @ops flags, otherwise unused. - * @offset_stats: Added to actual statistics as a sop to compatibility with - * XAPI for Citrix XenServer. Deprecated. + * @detach_list: list used for detaching vport in net-exit call. */ struct vport { - struct rcu_head rcu; - u16 port_no; + struct net_device *dev; struct datapath *dp; - struct kobject kobj; - char linkname[IFNAMSIZ]; - struct list_head node; - atomic_t sflow_pool; + 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 vport_percpu_stats __percpu *percpu_stats; - - spinlock_t stats_lock; - struct vport_err_stats err_stats; - struct rtnl_link_stats64 offset_stats; + struct list_head detach_list; + struct rcu_head rcu; }; -#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: %ODP_VPORT_ATTR_OPTIONS attribute from Netlink message, %NULL if + * @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 odp_vport_type type; + enum ovs_vport_type type; struct nlattr *options; - /* For vport_alloc(). */ + /* 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: %ODP_VPORT_TYPE_* value for this type of virtual port. - * @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. + * @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 vport_alloc(), otherwise an ERR_PTR() value. + * 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 @@ -157,73 +138,33 @@ struct vport_parms { * @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. - * @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. - * @get_name: Get the device's name. - * @get_addr: Get the device's MAC address. - * @get_config: Get the device's configuration. - * @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. + * zero for dropped packets or negative for error. + * @get_egress_tun_info: Get the egress tunnel 5-tuple and other info for + * a packet. */ struct vport_ops { - enum odp_vport_type type; - u32 flags; + enum ovs_vport_type type; - /* Called at module init and exit respectively. */ - int (*init)(void); - void (*exit)(void); - - /* Called with RTNL lock. */ + /* Called with ovs_mutex. */ struct vport *(*create)(const struct vport_parms *); - int (*destroy)(struct vport *); + void (*destroy)(struct vport *); int (*set_options)(struct vport *, struct nlattr *); int (*get_options)(const struct vport *, struct sk_buff *); - int (*set_mtu)(struct vport *, int mtu); - int (*set_addr)(struct vport *, const unsigned char *); - - /* Called with rcu_read_lock or RTNL lock. */ - const char *(*get_name)(const struct vport *); - const unsigned char *(*get_addr)(const struct vport *); - void (*get_config)(const struct vport *, void *); - 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 (*get_egress_tun_info)(struct vport *, struct sk_buff *, + struct dp_upcall_info *upcall); + netdev_tx_t (*send)(struct sk_buff *skb); - int (*send)(struct vport *, struct sk_buff *); + struct module *owner; + struct list_head list; }; -enum vport_err_type { - VPORT_E_RX_DROPPED, - VPORT_E_RX_ERROR, - VPORT_E_TX_DROPPED, - VPORT_E_TX_ERROR, -}; - -struct vport *vport_alloc(int priv_size, const struct vport_ops *, const struct vport_parms *); -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 @@ -238,7 +179,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); } /** @@ -251,20 +192,53 @@ 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); +int ovs_vport_receive(struct vport *, struct sk_buff *, + const struct ip_tunnel_info *); + +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)); +} -/* List of statically compiled vport implementations. Don't forget to also - * add yours to the list at the top of vport.c. */ -extern const struct vport_ops netdev_vport_ops; -extern const struct vport_ops internal_vport_ops; -extern const struct vport_ops patch_vport_ops; -extern const struct vport_ops gre_vport_ops; -extern const struct vport_ops capwap_vport_ops; +static inline const char *ovs_vport_name(struct vport *vport) +{ + return vport->dev->name; +} + +int __ovs_vport_ops_register(struct vport_ops *ops); +#define ovs_vport_ops_register(ops) \ +({ \ + (ops)->owner = THIS_MODULE; \ + __ovs_vport_ops_register(ops); \ +}) + +void ovs_vport_ops_unregister(struct vport_ops *ops); + +static inline struct rtable *ovs_tunnel_route_lookup(struct net *net, + const struct ip_tunnel_key *key, + u32 mark, + struct flowi4 *fl, + u8 protocol) +{ + struct rtable *rt; + + memset(fl, 0, sizeof(*fl)); + fl->daddr = key->u.ipv4.dst; + fl->saddr = key->u.ipv4.src; + fl->flowi4_tos = RT_TOS(key->tos); + fl->flowi4_mark = mark; + fl->flowi4_proto = protocol; + + rt = ip_route_output_key(net, fl); + return rt; +} +void ovs_vport_send(struct vport *vport, struct sk_buff *skb); #endif /* vport.h */