X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport.h;h=5cd3c18c83ab544f2f0cd9f27af922dd706eeae3;hb=e8d780af73b8571f5998cae8d3fa97069e49c9fe;hp=e7d2eb5cb46847f7b3ad340e9d66ee9251ca893f;hpb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;p=sliver-openvswitch.git diff --git a/datapath/vport.h b/datapath/vport.h index e7d2eb5cb..5cd3c18c8 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -1,57 +1,58 @@ /* - * Copyright (c) 2010, 2011 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 "datapath.h" -#include "openvswitch/datapath-protocol.h" +#include "vport-capwap.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 *); -void vport_del(struct vport *); - -struct vport *vport_locate(const char *name); - -int vport_set_addr(struct vport *, const unsigned char *); -void vport_set_stats(struct vport *, struct ovs_vport_stats *); +struct vport_net { + struct capwap_net capwap; +}; -const char *vport_get_name(const struct vport *); -enum ovs_vport_type vport_get_type(const struct vport *); -const unsigned char *vport_get_addr(const struct vport *); +/* The following definitions are for users of the vport subsytem: */ -struct kobject *vport_get_kobj(const struct vport *); -void vport_get_stats(struct vport *, struct ovs_vport_stats *); +int ovs_vport_init(void); +void ovs_vport_exit(void); -unsigned vport_get_flags(const struct vport *); -int vport_is_running(const struct vport *); -unsigned char vport_get_operstate(const struct vport *); +struct vport *ovs_vport_add(const struct vport_parms *); +void ovs_vport_del(struct vport *); -int vport_get_ifindex(const struct vport *); +struct vport *ovs_vport_locate(struct net *net, const char *name); -int vport_get_mtu(const struct vport *); +int ovs_vport_set_addr(struct vport *, const unsigned char *); +void ovs_vport_set_stats(struct vport *, struct ovs_vport_stats *); +void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *); -int vport_set_options(struct vport *, struct nlattr *options); -int vport_get_options(const struct vport *, struct sk_buff *); +int ovs_vport_set_options(struct vport *, struct nlattr *options); +int ovs_vport_get_options(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: */ @@ -60,7 +61,7 @@ struct vport_percpu_stats { u64 rx_packets; u64 tx_bytes; u64 tx_packets; - seqcount_t seqlock; + struct u64_stats_sync sync; }; struct vport_err_stats { @@ -79,10 +80,10 @@ struct vport_err_stats { * @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_pid: The Netlink port to use for packets received on this port that + * miss the flow table. * @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. @@ -96,10 +97,10 @@ struct vport { struct datapath *dp; struct kobject kobj; char linkname[IFNAMSIZ]; - struct list_head node; - atomic_t sflow_pool; + u32 upcall_pid; struct hlist_node hash_node; + struct hlist_node dp_hash_node; const struct vport_ops *ops; struct vport_percpu_stats __percpu *percpu_stats; @@ -128,9 +129,10 @@ struct vport_parms { enum ovs_vport_type type; struct nlattr *options; - /* For vport_alloc(). */ + /* For ovs_vport_alloc(). */ struct datapath *dp; u16 port_no; + u32 upcall_pid; }; /** @@ -144,7 +146,7 @@ struct vport_parms { * not set and initialzation fails then no vports of this type can be created. * @exit: Called at module unload. * @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 @@ -163,7 +165,8 @@ struct vport_parms { * @get_ifindex: Get the system interface index associated with the device. * May be null if the device does not have an ifindex. * @get_mtu: Get the device's MTU. May be %NULL if the device does not have an - * MTU (as e.g. some tunnels do not). + * MTU (as e.g. some tunnels do not). Must be implemented if @get_ifindex is + * implemented. * @send: Send a packet on the device. Returns the length of the packet sent. */ struct vport_ops { @@ -207,8 +210,9 @@ enum vport_err_type { 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 *); #define VPORT_ALIGN 8 @@ -241,15 +245,15 @@ static inline struct vport *vport_from_priv(const void *priv) return (struct vport *)(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 *); +void ovs_vport_record_error(struct vport *, enum vport_err_type err_type); /* 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; +extern const struct vport_ops ovs_netdev_vport_ops; +extern const struct vport_ops ovs_internal_vport_ops; +extern const struct vport_ops ovs_patch_vport_ops; +extern const struct vport_ops ovs_gre_vport_ops; +extern const struct vport_ops ovs_capwap_vport_ops; #endif /* vport.h */