X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.h;h=8e70762853f4ce0217a6ee32b9d58a36ff3db0f3;hb=530af29c41eb04d355e400871fa58f39002315de;hp=7251b4cdf6bad22a455131117a94bf370b00c391;hpb=c3827f619a38d3d202020838e1f92860046a3dbe;p=openvswitch diff --git a/datapath/vport.h b/datapath/vport.h index 7251b4cd..8e707628 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -16,47 +16,28 @@ #include "datapath.h" #include "openvswitch/datapath-protocol.h" -#include "odp-compat.h" struct vport; struct vport_parms; -struct dp_port; /* The following definitions are for users of the vport subsytem: */ -int vport_user_mod(const struct odp_port __user *); - -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 struct vport_parms *); -int vport_mod(struct vport *, struct odp_port *); 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 *); const char *vport_get_name(const struct vport *); -const char *vport_get_type(const struct vport *); +enum odp_vport_type vport_get_type(const struct vport *); const unsigned char *vport_get_addr(const 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 *); @@ -69,6 +50,9 @@ int vport_get_iflink(const struct vport *); int vport_get_mtu(const struct vport *); +int vport_set_options(struct vport *, struct nlattr *options); +int vport_get_options(const struct vport *, struct sk_buff *); + int vport_send(struct vport *, struct sk_buff *); /* The following definitions are for implementers of vport devices: */ @@ -88,12 +72,41 @@ struct vport_err_stats { u64 tx_errors; }; +/** + * 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. + * @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. + * @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. + */ struct vport { + struct rcu_head rcu; + u16 port_no; + struct datapath *dp; + struct kobject kobj; + char linkname[IFNAMSIZ]; + struct list_head node; + atomic_t sflow_pool; + struct hlist_node hash_node; const struct vport_ops *ops; - struct dp_port *dp_port; - struct vport_percpu_stats *percpu_stats; + struct vport_percpu_stats __percpu *percpu_stats; spinlock_t stats_lock; struct vport_err_stats err_stats; @@ -110,20 +123,25 @@ struct vport { * * @name: New vport's name. * @type: New vport's type. - * @config: Kernel copy of 'config' member of &struct odp_port describing - * configuration for new port. Exactly %VPORT_CONFIG_SIZE bytes. + * @options: %ODP_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; - const char *type; - const void *config; + enum odp_vport_type type; + struct nlattr *options; + + /* For vport_alloc(). */ + struct datapath *dp; + u16 port_no; }; /** * 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. + * @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 @@ -132,20 +150,18 @@ struct vport_parms { * @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. - * @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. + * @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. * @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. * @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 @@ -159,11 +175,12 @@ struct vport_parms { * @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. + * @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). * @send: Send a packet on the device. Returns the length of the packet sent. */ struct vport_ops { - const char *type; + enum odp_vport_type type; u32 flags; /* Called at module init and exit respectively. */ @@ -172,19 +189,18 @@ struct vport_ops { /* Called with RTNL lock. */ struct vport *(*create)(const struct vport_parms *); - int (*modify)(struct vport *, struct odp_port *); int (*destroy)(struct vport *); - int (*attach)(struct vport *); - int (*detach)(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 *); - int (*set_stats)(const struct vport *, struct rtnl_link_stats64 *); /* 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 *); @@ -207,7 +223,7 @@ enum vport_err_type { VPORT_E_TX_ERROR, }; -struct vport *vport_alloc(int priv_size, const struct vport_ops *); +struct vport *vport_alloc(int priv_size, const struct vport_ops *, const struct vport_parms *); void vport_free(struct vport *); #define VPORT_ALIGN 8