X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.h;h=3dbc68fcba635b2d5ccf10cf3bbea2ab988e3d82;hb=7229a773ead96f891b621cd5f3e1219af5f24dd7;hp=0a6d831c5444be8ebd0aa5d6cdf67acbcb6a5902;hpb=ff8d7a5e81625bbb13d33ca73888fc848b02db83;p=openvswitch diff --git a/datapath/vport.h b/datapath/vport.h index 0a6d831c..3dbc68fc 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -10,12 +10,12 @@ #define VPORT_H 1 #include +#include #include #include #include #include "datapath.h" -#include "openvswitch/datapath-protocol.h" struct vport; struct vport_parms; @@ -26,28 +26,13 @@ int vport_init(void); void vport_exit(void); struct vport *vport_add(const struct vport_parms *); -int vport_del(struct vport *); +void 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 *); - -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 *); - -struct kobject *vport_get_kobj(const struct vport *); -int vport_get_stats(struct vport *, struct rtnl_link_stats64 *); - -unsigned vport_get_flags(const struct vport *); -int vport_is_running(const struct vport *); -unsigned char vport_get_operstate(const struct vport *); - -int vport_get_ifindex(const struct vport *); - -int vport_get_mtu(const struct vport *); +void vport_set_stats(struct vport *, struct ovs_vport_stats *); +void 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 *); @@ -81,15 +66,13 @@ struct vport_err_stats { * &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. * @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. + * @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 the vport code - * if %VPORT_F_GEN_STATS is set to 1 in @ops flags, otherwise unused. + * @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. */ @@ -100,7 +83,7 @@ struct vport { struct kobject kobj; char linkname[IFNAMSIZ]; struct list_head node; - atomic_t sflow_pool; + u32 upcall_pid; struct hlist_node hash_node; const struct vport_ops *ops; @@ -109,13 +92,12 @@ struct vport { 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. */ +#define VPORT_F_FLOW (1 << 1) /* Sets OVS_CB(skb)->flow. */ +#define VPORT_F_TUN_ID (1 << 2) /* Sets OVS_CB(skb)->tun_id. */ /** * struct vport_parms - parameters for creating a new vport @@ -135,6 +117,7 @@ struct vport_parms { /* For vport_alloc(). */ struct datapath *dp; u16 port_no; + u32 upcall_pid; }; /** @@ -156,23 +139,19 @@ 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_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 { @@ -185,12 +164,11 @@ struct vport_ops { /* Called with RTNL lock. */ 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. */ @@ -198,7 +176,6 @@ struct vport_ops { 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 *); @@ -218,7 +195,8 @@ enum vport_err_type { VPORT_E_TX_ERROR, }; -struct vport *vport_alloc(int priv_size, const struct vport_ops *, const struct vport_parms *); +struct vport *vport_alloc(int priv_size, const struct vport_ops *, + const struct vport_parms *); void vport_free(struct vport *); #define VPORT_ALIGN 8